use Gtk3 namespace instead of Gtk2

1 files changed, 24 insertions, 24 deletions

diff --git a/rpmdrake b/rpmdrake
index 1f19f173..78e06f0e 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -103,7 +103,7 @@ sub do_search($$$$$$$) {
 		    gtkpack__(
 			gtknew('HButtonBox', layout => 'spread'),
 			gtksignal_connect(
-			    Gtk2::Button->new(but(N("Stop"))),
+			    Gtk3::Button->new(but(N("Stop"))),
 			    clicked => sub { $searchstop = 1 },
 			),
 		    ),
@@ -247,16 +247,16 @@ sub run_treeview_dialog {
 	rebuild_tree => sub {},
     };
 
-    $tree_model = Gtk2::TreeStore->new("Glib::String", "Glib::String", "Gtk2::Gdk::Pixbuf");
+    $tree_model = Gtk3::TreeStore->new("Glib::String", "Glib::String", "Gtk3::Gdk::Pixbuf");
     $tree_model->set_sort_column_id($grp_columns{label}, 'ascending');
-    $tree = Gtk2::TreeView->new_with_model($tree_model);
+    $tree = Gtk3::TreeView->new_with_model($tree_model);
     $tree->get_selection->set_mode('browse');
 
-    $tree->append_column(Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::MDV::CellRendererPixWithLabel->new, 'pixbuf' => $grp_columns{icon}, label => $grp_columns{label}));
+    $tree->append_column(Gtk3::TreeViewColumn->new_with_attributes(undef, Gtk3::MDV::CellRendererPixWithLabel->new, 'pixbuf' => $grp_columns{icon}, label => $grp_columns{label}));
     $tree->set_headers_visible(0);
 
-    $detail_list_model = Gtk2::ListStore->new("Glib::String",
-                                              "Gtk2::Gdk::Pixbuf",
+    $detail_list_model = Gtk3::ListStore->new("Glib::String",
+                                              "Gtk3::Gdk::Pixbuf",
                                               "Glib::String",
                                               "Glib::Boolean",
                                               "Glib::String",
@@ -265,11 +265,11 @@ sub run_treeview_dialog {
                                               "Glib::String", 
                                               "Glib::Boolean");
 
-    $detail_list = Gtk2::TreeView->new_with_model($detail_list_model);
+    $detail_list = Gtk3::TreeView->new_with_model($detail_list_model);
     $detail_list->append_column(
-        my $col_sel = Gtk2::TreeViewColumn->new_with_attributes(
+        my $col_sel = Gtk3::TreeViewColumn->new_with_attributes(
             undef,
-            Gtk2::CellRendererToggle->new,
+            Gtk3::CellRendererToggle->new,
             active => $pkg_columns{selected},
             activatable => $pkg_columns{selectable}
         ));
@@ -303,9 +303,9 @@ sub run_treeview_dialog {
     foreach my $col (@columns{@columns}) {
         $detail_list->append_column(
             $col->{widget} =
-              Gtk2::TreeViewColumn->new_with_attributes(
+              Gtk3::TreeViewColumn->new_with_attributes(
                   ' ' . $col->{title} . ' ',
-                  $col->{renderer} = Gtk2::CellRendererText->new,
+                  $col->{renderer} = Gtk3::CellRendererText->new,
                   ($col->{markup} ? (markup => $col->{markup}) : (text => $col->{text})),
               )
             );
@@ -322,10 +322,10 @@ sub run_treeview_dialog {
 
     $detail_list->append_column(
         my $pixcolumn =
-          Gtk2::TreeViewColumn->new_with_attributes(
+          Gtk3::TreeViewColumn->new_with_attributes(
               #-PO: "Status" should be kept *small* !!!
               N("Status"),
-              my $rdr = Gtk2::CellRendererPixbuf->new,
+              my $rdr = Gtk3::CellRendererPixbuf->new,
               'pixbuf' => $pkg_columns{state_icon})
         );
     $rdr->set_fixed_size(34, 24);
@@ -486,18 +486,18 @@ sub run_treeview_dialog {
 
     my @search_types = qw(normal descriptions summaries files);
     my $current_search_type = $search_types[0];
-    my $search_menu = Gtk2::Menu->new;
+    my $search_menu = Gtk3::Menu->new;
     my $i = 0;
     my $previous;
     foreach (N("in names"), N("in descriptions"), N("in summaries"), N("in file names")) { 
         my ($name, $val) = ($_, $i);
 	$search_menu->append(gtksignal_connect(gtkshow(
-            $previous = Gtk2::RadioMenuItem->new_with_label($previous, $name)),
+            $previous = Gtk3::RadioMenuItem->new_with_label($previous, $name)),
                                                activate => sub { $current_search_type = $search_types[$val] }));
         $i++;
     }
 
-    my $info = Gtk2::Mdv::TextView->new;
+    my $info = Gtk3::Mdv::TextView->new;
     $info->set_left_margin(2);
     $info->set_right_margin(15);  #- workaround when right elevator of scrolled window appears
 
@@ -564,7 +564,7 @@ sub run_treeview_dialog {
 	    $size_selected = 0;
 	    $force_displaying_group = 1;
 	    my $tree_selection = $tree->get_selection;
-	    $tree_selection->select_path(Gtk2::TreePath->new_from_string('0')) if !$tree_selection->get_selected;
+	    $tree_selection->select_path(Gtk3::TreePath->new_from_string('0')) if !$tree_selection->get_selected;
 	    $tree_selection->signal_emit('changed');
 	}, undef, '<Item>' ],
 	[ N("/_File") . N("/Reload the _packages list"), undef, $reload_db_and_clear_all, undef, '<Item>' ],
@@ -670,8 +670,8 @@ sub run_treeview_dialog {
     $checkbox_show_autoselect = $factory->get_widget("<main>" . strip_first_underscore(N("/_Options"), N("/_Show automatically selected packages")))
 	and $checkbox_show_autoselect->set_active(!$dont_show_selections->[0]);
 
-    my $accel = Gtk2::AccelGroup->new;
-    $accel->connect(Gtk2::Gdk->keyval_from_name('F'), [ 'control-mask' ], [ 'visible' ], sub { $find_entry->grab_focus });
+    my $accel = Gtk3::AccelGroup->new;
+    $accel->connect(Gtk3::Gdk->keyval_from_name('F'), [ 'control-mask' ], [ 'visible' ], sub { $find_entry->grab_focus });
     $w->{real_window}->add_accel_group($accel);
 
     gtkadd(
@@ -705,7 +705,7 @@ sub run_treeview_dialog {
                                                  $search_menu->popup(undef, undef, undef, undef, $event->button, $event->time);
                                              },
 			    key_press_event => sub {
-				member($_[1]->keyval, $Gtk3::Gdk::KEY_Return, $Gtk2::Gdk::Keysyms{KP_Enter})
+				member($_[1]->keyval, $Gtk3::Gdk::KEY_Return, $Gtk3::Gdk::Keysyms{KP_Enter})
 				    and $find_callback->();
 			    },
                                          ),
@@ -715,24 +715,24 @@ sub run_treeview_dialog {
 		    0, gtkpack_(
 			gtknew('HBox', spacing => 20),
 			0, gtksignal_connect(
-			    Gtk2::Button->new(but_(N("Select all"))),
+			    Gtk3::Button->new(but_(N("Select all"))),
 			    clicked => sub {
                        toggle_all($options, 1);
                    },
 			),
 			1, gtknew('Label'),
 			0, my $action_button = gtksignal_connect(
-			    Gtk2::Button->new(but_(N("Apply"))),
+			    Gtk3::Button->new(but_(N("Apply"))),
 			    clicked => sub { do_action($options, $callback_action, $info) },
 			),
 			0, gtksignal_connect(
-			    Gtk2::Button->new(but_(N("Quit"))),
+			    Gtk3::Button->new(but_(N("Quit"))),
 			    clicked => \&quit,
 			),
 		    ),
 		),
 	    ),
-	    0, $statusbar = Gtk2::Statusbar->new,
+	    0, $statusbar = Gtk3::Statusbar->new,
 	),
     );
     $action_button->set_sensitive(0) if $>;