Merge branch 'master' of git://git.mageia.org/software/drakx

1 files changed, 19 insertions, 19 deletions

diff --git a/perl-install/standalone/drakbug b/perl-install/standalone/drakbug
index d483605b3..965c44196 100755
--- a/perl-install/standalone/drakbug
+++ b/perl-install/standalone/drakbug
@@ -26,8 +26,8 @@ use standalone;
 use MDK::Common;
 use common;
 BEGIN { $::no_ugtk_init = 1 }
-use mygtk2 qw(gtknew);
-use ugtk2 qw(:all);
+use mygtk3 qw(gtknew);
+use ugtk3 qw(:all);
 use Config;
 use URI::Escape;
 use run_program;
@@ -56,12 +56,12 @@ if (!check_for_xserver()) {
     c::_exit(0);
 }
 
-mygtk2::init();
+mygtk3::init();
 
-$ugtk2::wm_icon = 'drakbug-16';
-my $window = ugtk2->new(N("%s Bug Report Tool", N("Mageia")), center => 1);
+$ugtk3::wm_icon = 'drakbug-16';
+my $window = ugtk3->new(N("%s Bug Report Tool", N("Mageia")), center => 1);
 $window->{rwindow}->set_border_width(5);
-$window->{window}->signal_connect("delete_event", sub { ugtk2->exit(0) });
+$window->{window}->signal_connect("delete_event", sub { ugtk3->exit(0) });
 
 my $mdk_app = { 
 	       N("%s Control Center", N("Mageia")) => 'drakconf',
@@ -96,15 +96,15 @@ my $bugzilla_url = 'http://bugs.mageia.org/enter_bug.cgi';
 my $wizard_name = "Bugzilla";
 
 $table = create_packtable({ col_spacings => 5, row_spacings => 10 },
-		          [ gtknew('Label_Left', text => N("Select %s Tool:", N("Mageia"))), $comb_app = Gtk2::ComboBox->new_text, $comb_app->set_wrap_width(3) ],
+		          [ gtknew('Label_Left', text => N("Select %s Tool:", N("Mageia"))), $comb_app = Gtk3::ComboBoxText->new, $comb_app->set_wrap_width(3) ],
                           [ gtknew('Label_Left', text => N("or Application Name\n(or Full Path):")), 
-			  gtkpack_(Gtk2::HBox->new(0, 5),
-				   1, $com_app = gtkset_editable(Gtk2::Entry->new, 1), 
-				   0, $button_pkg = Gtk2::Button->new(N("Find Package")),
-				   0, $button_browse = Gtk2::FileChooserButton->new(N("Browse"), 'GTK_FILE_CHOOSER_ACTION_OPEN'),
+			  gtkpack_(Gtk3::HBox->new(0, 5),
+				   1, $com_app = gtkset_editable(Gtk3::Entry->new, 1), 
+				   0, $button_pkg = Gtk3::Button->new(N("Find Package")),
+				   0, $button_browse = Gtk3::FileChooserButton->new(N("Browse"), 'GTK_FILE_CHOOSER_ACTION_OPEN'),
 				  ) ],
-			  [ gtknew('Label_Left', text => N("Package: ")), $package = Gtk2::Entry->new_with_text("...") ], # complain on gtk-perl@ml
-			  [ gtknew('Label_Left', text => N("Kernel:")), gtkset_editable(Gtk2::Entry->new_with_text($kernel_release), 0) ]
+			  [ gtknew('Label_Left', text => N("Package: ")), $package = Gtk3::Entry->new_with_text("...") ], # complain on gtk-perl@ml
+			  [ gtknew('Label_Left', text => N("Kernel:")), gtkset_editable(Gtk3::Entry->new_with_text($kernel_release), 0) ]
                          );
 $comb_app->set_popdown_strings("", uniq(sort(@generic_tool), if_($prog, $prog)));
 $comb_app->set_text("");
@@ -127,7 +127,7 @@ my $parent_uid = get_parent_uid();
 
 my $width = 600;
 gtkadd($window->{window},
-       gtkpack_(Gtk2::VBox->new(0, 5),
+       gtkpack_(Gtk3::VBox->new(0, 5),
                 0, gtknew('Title1', label => $mageia_release, width => $width),
                 1, create_scrolled_window(
                     gtknew('TextView', editable => 0, height => 150,
@@ -167,15 +167,15 @@ gtkadd($window->{window},
 		if_(!$error,
                     0, gtkadd($table),
                 ),
-		0, gtkpack(Gtk2::HSeparator->new),
+		0, gtkpack(Gtk3::HSeparator->new),
 		0, gtkpack(create_hbox('edge'),
                            gtksignal_connect(
-                               Gtk2::Button->new(N("Help")), clicked => sub {
+                               Gtk3::Button->new(N("Help")), clicked => sub {
                                    run_program::raw({ detach => 1, setuid => $parent_uid }, 'drakhelp', '--id', 'drakbug');
                                }),
                            gtkpack(create_hbox('end'),
-                                   gtksignal_connect(Gtk2::Button->new(N("Report")), clicked => \&report_bug_to_bugzilla),
-                                   gtksignal_connect(Gtk2::Button->new(N("Close")), clicked => sub { ugtk2->exit(0) }),
+                                   gtksignal_connect(Gtk3::Button->new(N("Report")), clicked => \&report_bug_to_bugzilla),
+                                   gtksignal_connect(Gtk3::Button->new(N("Close")), clicked => sub { ugtk3->exit(0) }),
                                ))));
 
 if (defined $prog) {
@@ -197,7 +197,7 @@ $button_browse->signal_connect('file-set', sub { $com_app->set_text($button_brow
 
 $window->{window}->show_all;
 $window->main;
-ugtk2->exit(0);
+ugtk3->exit(0);
 
 sub update_app {
     my ($text) = @_;