use (my|u)gtk3 instead of *tk2

21 files changed, 97 insertions, 97 deletions

diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake
index e3b304c4a..7e5645509 100755
--- a/perl-install/standalone/diskdrake
+++ b/perl-install/standalone/diskdrake
@@ -34,7 +34,7 @@ use fs;
 use log;
 use c;
 
-$ugtk2::wm_icon = "/usr/share/mcc/themes/default/diskdrake_hd.png";
+$ugtk3::wm_icon = "/usr/share/mcc/themes/default/diskdrake_hd.png";
 
 my %options;
 my @l = @ARGV;
diff --git a/perl-install/standalone/display_help b/perl-install/standalone/display_help
index 3894d04e3..bc219eb8a 100755
--- a/perl-install/standalone/display_help
+++ b/perl-install/standalone/display_help
@@ -22,8 +22,8 @@
 use lib qw(/usr/lib/libDrakX);
 use common;
 use any;
-use mygtk2 qw(gtknew);
-use ugtk2 qw(:wrappers :create);
+use mygtk3 qw(gtknew);
+use ugtk3 qw(:wrappers :create);
 use Gtk2::WebKit;
 
 my $view = gtknew('WebKit_View', no_popup_menu => 1);
@@ -31,11 +31,11 @@ my $view = gtknew('WebKit_View', no_popup_menu => 1);
 my $websettings = $view->get_settings;
 $websettings->set_property('allow-scripts-to-close-windows', 1);
 $view->set_settings($websettings);
-$view->signal_connect('close-web-view', sub { ugtk2::exit(0) });
+$view->signal_connect('close-web-view', sub { ugtk3::exit(0) });
 
 $view->open($ARGV[0]);
 
-# FIXME: merge this with mcc code into new mygtk2::set_standalone_main_window_size()?
+# FIXME: merge this with mcc code into new mygtk3::set_standalone_main_window_size()?
 my ($rootwin_width, $rootwin_height) = gtkroot()->get_size;
 my ($default_width, $default_height);
 my $wm = any::running_window_manager();
@@ -51,7 +51,7 @@ if (!$is_firstime) {
 }
 
 # TODO: got XID from mcc/... ? (transient & modal hints?)
-my $w = ugtk2->new(N("Help"), width => $default_width, height => $default_height);
+my $w = ugtk3->new(N("Help"), width => $default_width, height => $default_height);
 
 gtkadd($w->{rwindow},
        gtkpack_(Gtk2::VBox->new,
diff --git a/perl-install/standalone/drakautoinst b/perl-install/standalone/drakautoinst
index e1d27a72a..63b8c4974 100755
--- a/perl-install/standalone/drakautoinst
+++ b/perl-install/standalone/drakautoinst
@@ -104,8 +104,8 @@ my $o_old = $o; # BUG (maybe install's $::o ?)
 my %struct_gui;
 
 if (!$::isEmbedded && $in->isa('interactive::gtk')) {
-    require ugtk2;
-    ugtk2->import(qw(:helpers :wrappers :create));
+    require ugtk3;
+    ugtk3->import(qw(:helpers :wrappers :create));
 
     my %tree;
     $struct_gui{$_} = 'General' foreach qw(lang isUpgrade autoExitInstall timezone default_packages);
@@ -138,7 +138,7 @@ if (!$::isEmbedded && $in->isa('interactive::gtk')) {
 
     exists $struct_gui{$_} and push @{$tree{$struct_gui{$_}}}, [ $_ , $pixmap{$_}, h2widget($o->{$_}, "\$o->\{$_}") ] foreach keys %$o;
 
-    my $W = ugtk2->new('$o edition');
+    my $W = ugtk3->new('$o edition');
     my @box_to_hide;
     my $nb_pages=0;
     my $notebook = Gtk2::Notebook->new;
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index fec394ce3..dc2b2267b 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -66,27 +66,27 @@ if ($is_bootloader_mode) {
     $in->exit(0);
 }
 
-require ugtk2;
-ugtk2->import(qw(:helpers :wrappers :create));
-require mygtk2;
-mygtk2->import(qw(gtknew));
+require ugtk3;
+ugtk3->import(qw(:helpers :wrappers :create));
+require mygtk3;
+mygtk3->import(qw(gtknew));
 
 autologin_choice();
 
 sub run_boot_window {
     my ($title, $pack_list, $apply_sub) = @_;
 
-    my $w = ugtk2->new($title);
+    my $w = ugtk3->new($title);
     my $window = $w->{window};
     mygtk3::register_main_window($w->{real_window});
 
-    $window->signal_connect(delete_event => sub { ugtk2->exit(0) });
+    $window->signal_connect(delete_event => sub { ugtk3->exit(0) });
     unless ($::isEmbedded) {
         $window->set_border_width(2);
         ### menus definition
         # the menus are not shown but they provides shiny shortcut like C-q
         my @menu_items = ([ N("/_File"), undef, undef, undef, '<Branch>' ],
-                          [ N("/File/_Quit"), N("<control>Q"), sub { ugtk2->exit(0) }, undef, '<Item>' ],
+                          [ N("/File/_Quit"), N("<control>Q"), sub { ugtk3->exit(0) }, undef, '<Item>' ],
                          );
         create_factory_menu($w->{rwindow}, @menu_items);
         ######### menus end
@@ -94,10 +94,10 @@ sub run_boot_window {
     gtkadd($window, gtknew('VBox', children => [
                              @$pack_list,
                              0, create_okcancel({
-                                                 cancel_clicked => sub { ugtk2->exit(0) },
+                                                 cancel_clicked => sub { ugtk3->exit(0) },
                                                  ok_clicked => sub {
                                                      $apply_sub->();
-                                                     ugtk2->exit(0);
+                                                     ugtk3->exit(0);
                                                  }
                                                 }) ]));
     $window->show_all;
diff --git a/perl-install/standalone/drakbug b/perl-install/standalone/drakbug
index d483605b3..a960a248d 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',
@@ -175,7 +175,7 @@ gtkadd($window->{window},
                                }),
                            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(Gtk2::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) = @_;
diff --git a/perl-install/standalone/drakclock b/perl-install/standalone/drakclock
index fdda6e96d..71653b7b1 100755
--- a/perl-install/standalone/drakclock
+++ b/perl-install/standalone/drakclock
@@ -6,8 +6,8 @@ use POSIX;
 use common;
 # i18n : IMPORTANT to get correct namespace (drakconf instead of libDrakX)
 BEGIN { unshift @::textdomains, 'drakconf' }
-use mygtk2 qw(gtknew);
-use ugtk2 qw(:all);
+use mygtk3 qw(gtknew);
+use ugtk3 qw(:all);
 use interactive;
 use standalone;
 use timezone;
@@ -21,14 +21,14 @@ my $timer;
 my $first = 1;
 my $its_reset = 0;
 
-$ugtk2::wm_icon = "/usr/share/mcc/themes/default/time-mdk.png";
+$ugtk3::wm_icon = "/usr/share/mcc/themes/default/time-mdk.png";
 
 my $ntpd = $timezone::ntp . 'd';
 my $ntpfile = '/etc/' . $timezone::ntp . '.conf';
 
-my $my_win = ugtk2->new(N("Date, Clock & Time Zone Settings"));
+my $my_win = ugtk3->new(N("Date, Clock & Time Zone Settings"));
 
-$my_win->{window}->signal_connect(delete_event => sub { ugtk2->exit(0) });
+$my_win->{window}->signal_connect(delete_event => sub { ugtk3->exit(0) });
 
 my $calendar = gtknew('Calendar');
 $calendar->signal_connect($_ => \&cal_changed) foreach 'month-changed', 'day-selected', 'day-selected-double-click', 'prev-month', 'next-month', 'prev-year', 'next-year';
@@ -103,7 +103,7 @@ $my_win->{window}->add(gtknew('VBox', border_width => $::isEmbedded ? 0 : 5, chi
                                            ]),
                                 0, create_okcancel(my $w =
                                                    {
-                                                    cancel_clicked => sub { ugtk2->exit(0) },
+                                                    cancel_clicked => sub { ugtk3->exit(0) },
                                                     ok_clicked => sub {
 							my $need_date = 1;
                                                         any::disable_x_screensaver();
@@ -156,7 +156,7 @@ $my_win->{window}->add(gtknew('VBox', border_width => $::isEmbedded ? 0 : 5, chi
 							-e '/sbin/hwclock' and system('/sbin/hwclock', '--systohc');
                                                         any::enable_x_screensaver();
                                                         system(qw(dcop kicker Panel restart)) if $ENV{DESKTOP} eq 'kde';
-                                                        ugtk2->exit(0);
+                                                        ugtk3->exit(0);
                                                     },
                                                    },
                                                    undef, undef, '',
@@ -230,7 +230,7 @@ $drawing_area->show;
 $my_win->{window}->show_all;
 my ($midx, $midy) = ($drawing_area->allocation->width/2, $drawing_area->allocation->height/2);
 $my_win->main;
-ugtk2->exit(0);
+ugtk3->exit(0);
 
 sub ntp_widget_state {
     my ($state) = @_;
@@ -345,7 +345,7 @@ sub Repaint {
     my $dRadians_min_real  = POSIX::floor($dRadians_min / $PI * 30) * $PI / 30;
     my $dRadians_sec_real  = $dRadians_sec;
     my $gc = $drawing_area->style->white_gc;
-    # fix race on ugtk2->exit that causes a crash (#33894)
+    # fix race on ugtk3->exit that causes a crash (#33894)
     return 0  if !$gc;
     $pixmap->draw_rectangle($drawing_area->style->white_gc, 1, 0, 0, $width, $height);
     my ($midx, $midy) = ($width / 2, $height / 2);
diff --git a/perl-install/standalone/drakdvb b/perl-install/standalone/drakdvb
index ce735cafa..9ed351b71 100755
--- a/perl-install/standalone/drakdvb
+++ b/perl-install/standalone/drakdvb
@@ -22,14 +22,14 @@ use lib qw(/usr/lib/libDrakX);
 use MDK::Common;
 use common;
 use standalone;
-use mygtk2;
+use mygtk3;
 use interactive;
-use ugtk2 qw(:create :helpers :wrappers);
+use ugtk3 qw(:create :helpers :wrappers);
 use Gtk2::SimpleList;
 
 my $title = N("DVB");
-$ugtk2::wm_icon = "/usr/share/mcc/themes/default/tv-mdk.png";
-my $w = ugtk2->new($title);
+$ugtk3::wm_icon = "/usr/share/mcc/themes/default/tv-mdk.png";
+my $w = ugtk3->new($title);
 $w->{window}->signal_connect('destroy' => \&exitapp);
 mygtk3::register_main_window($w->{real_window});
 my $in = 'interactive'->vnew;
@@ -77,7 +77,7 @@ sub detect_channels() {
         $buttons{detect}->set_sensitive(1);
         $channel_list->set_sensitive(1);
     };
-    $wait = ugtk2->new(N("Please wait"), grab => 1);
+    $wait = ugtk3->new(N("Please wait"), grab => 1);
     $wait->{window}->signal_connect('destroy' => \&exitapp);
     if ($pid = fork()) {
         gtkadd($wait->{window},
@@ -142,7 +142,7 @@ sub launch_tv() {
 
 gtkadd($w->{window},
        gtknew('VBox', spacing => 5, children => [
-                  $::isEmbedded ? () : (0, Gtk2::Banner->new($ugtk2::wm_icon, $title)),
+                  $::isEmbedded ? () : (0, Gtk2::Banner->new($ugtk3::wm_icon, $title)),
                   1, gtknew('ScrolledWindow', width => 300, height => 400, child => $channel_list),
                   0, gtknew('HButtonBox', layout => 'end', children_loose => [
                                 $buttons{detect} = gtknew('Button', text => N("Detect Channels"), clicked => \&detect_channels),
diff --git a/perl-install/standalone/drakedm b/perl-install/standalone/drakedm
index 77a9180cc..687846932 100755
--- a/perl-install/standalone/drakedm
+++ b/perl-install/standalone/drakedm
@@ -26,7 +26,7 @@ use interactive;
 use services;
 use run_program;
 
-$ugtk2::wm_icon = "/usr/share/mcc/themes/default/drakedm-mdk.png";
+$ugtk3::wm_icon = "/usr/share/mcc/themes/default/drakedm-mdk.png";
 
 my $in = 'interactive'->vnew('su');
 
diff --git a/perl-install/standalone/drakfloppy b/perl-install/standalone/drakfloppy
index c7a21b1ed..11597c6aa 100755
--- a/perl-install/standalone/drakfloppy
+++ b/perl-install/standalone/drakfloppy
@@ -29,23 +29,23 @@ use lib qw(/usr/lib/libDrakX);
 
 use standalone; #- warning, standalone must be loaded very first, for 'explanations'
 use common;
-use mygtk2 qw(gtknew);
-use ugtk2 qw(:create :dialogs :helpers :wrappers);
+use mygtk3 qw(gtknew);
+use ugtk3 qw(:create :dialogs :helpers :wrappers);
 use detect_devices;
 
-$ugtk2::wm_icon = "/usr/share/mcc/themes/default/drakfloppy-mdk.png";
+$ugtk3::wm_icon = "/usr/share/mcc/themes/default/drakfloppy-mdk.png";
 require_root_capability();
 
-my $window = ugtk2->new(N("Boot Floppy"));
+my $window = ugtk3->new(N("Boot Floppy"));
 unless ($::isEmbedded) {
-    $window->{rwindow}->signal_connect(delete_event => sub { ugtk2->exit(0) });
+    $window->{rwindow}->signal_connect(delete_event => sub { ugtk3->exit(0) });
     $window->{rwindow}->set_border_width(5);
     
     ### menus definition
     # the menus are not shown but they provides shiny shortcut like C-q
     create_factory_menu($window->{rwindow}, ( 
                                              { path => N("/_File"), item_type => '<Branch>' },
-                                             { path => N("/File/_Quit"), accelerator => N("<control>Q"), callback => sub { ugtk2->exit(0) } },
+                                             { path => N("/File/_Quit"), accelerator => N("<control>Q"), callback => sub { ugtk3->exit(0) } },
                                             )
                        );
 }
@@ -96,7 +96,7 @@ $window->{window}->add(
                                          ),
                                 1, gtknew('VBox'),
                                 0, create_okcancel({
-                                                    cancel_clicked => sub { ugtk2->exit(0) },
+                                                    cancel_clicked => sub { ugtk3->exit(0) },
                                                     ok_clicked  => \&build_it,
                                                    },
                                                    undef, undef, '',
@@ -108,7 +108,7 @@ $window->{window}->add(
 $window->{rwindow}->show_all;
 
 $window->main;
-ugtk2->exit(0);
+ugtk3->exit(0);
 
 
 my $remove_but;
@@ -301,7 +301,7 @@ sub build_it() {
     my $log = join('', <$STATUS>);
     if (close $STATUS) {
         info_dialog(N("Floppy creation completed"), N("The creation of the boot floppy has been successfully completed \n"));
-        ugtk2->exit;
+        ugtk3->exit;
     } else {
         err_dialog(N("Error"),
                    #-PO: Do not alter the <span ..> and </span> tags
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index c4657ffc1..4599d76f7 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -87,14 +87,14 @@ use lib qw(/usr/lib/libDrakX);
 
 use standalone;    #- warning, standalone must be loaded very first, for 'explanations'
 
-use mygtk2 qw(gtknew); #- do not import gtkadd which conflicts with ugtk2 version
-use ugtk2 qw(:create :dialogs :helpers :wrappers);
+use mygtk3 qw(gtknew); #- do not import gtkadd which conflicts with ugtk3 version
+use ugtk3 qw(:create :dialogs :helpers :wrappers);
 use common;
 use run_program;
 
 require_root_capability();
 
-$ugtk2::wm_icon = "drakfont";
+$ugtk3::wm_icon = "drakfont";
 
 #   global variables needed by each functions
 my $xlsfonts = 0;
@@ -476,9 +476,9 @@ sub backend_mod() {
 
 sub interactive_mode() {
     $interactive = 1;
-    $window1 = ugtk2->new(N("Font Installation"));
-    mygtk2::register_main_window($window1->{real_window});
-    $window1->{rwindow}->signal_connect(delete_event => sub { ugtk2->exit(0) });
+    $window1 = ugtk3->new(N("Font Installation"));
+    mygtk3::register_main_window($window1->{real_window});
+    $window1->{rwindow}->signal_connect(delete_event => sub { ugtk3->exit(0) });
     $window1->{rwindow}->set_position('center') if !$::isEmbedded;
     
     my $button = {};
@@ -510,7 +510,7 @@ sub interactive_mode() {
     $window1->{rwindow}->show_all;
     $window1->{rwindow}->realize;
     $window1->main;
-    ugtk2->exit(0);
+    ugtk3->exit(0);
 }
 
 $list_all_font_path || $xlsfonts || $windows || @install || @uninstall ? backend_mod() : interactive_mode();
diff --git a/perl-install/standalone/drakhelp b/perl-install/standalone/drakhelp
index 8a8048c81..cc7aa434c 100755
--- a/perl-install/standalone/drakhelp
+++ b/perl-install/standalone/drakhelp
@@ -48,7 +48,7 @@ if (-f $instpath) {
     local $ENV{HOME} = '/root' if !$<;
     run_program::raw({ detach => 1 }, 'display_help', "file://$ancpath");
 } else {
-    $ugtk2::wm_icon = "help";
+    $ugtk3::wm_icon = "help";
     my $in = interactive->vnew;
     $in->ask_warn(N("%s Help Center", N("Mageia")), N("No Help entry for %s\n", $idlabel));
 }
diff --git a/perl-install/standalone/drakperm b/perl-install/standalone/drakperm
index 1ad449519..c7fae3143 100755
--- a/perl-install/standalone/drakperm
+++ b/perl-install/standalone/drakperm
@@ -7,10 +7,10 @@ use standalone;
 
 use MDK::Common;
 use common;
-use mygtk2 qw(gtknew gtkset);
-use ugtk2 qw(:create :dialogs :helpers :wrappers);
+use mygtk3 qw(gtknew gtkset);
+use ugtk3 qw(:create :dialogs :helpers :wrappers);
 
-$ugtk2::wm_icon = "/usr/share/mcc/themes/default/drakperm-mdk.png";
+$ugtk3::wm_icon = "/usr/share/mcc/themes/default/drakperm-mdk.png";
 require_root_capability();
 
 #- vars declaration
@@ -30,10 +30,10 @@ my ($editable, $modified) = (0, 0);
 my @rules;
 
 #- Widget declaration
-my $w = ugtk2->new(N("Security Permissions"));
+my $w = ugtk3->new(N("Security Permissions"));
 $w->{rwindow}->set_size_request(620, 400) unless $::isEmbedded;
 my $W = $w->{window};
-$W->signal_connect(delete_event => sub { ugtk2->exit });
+$W->signal_connect(delete_event => sub { ugtk3->exit });
 my $model = Gtk2::ListStore->new("Gtk2::Gdk::Pixbuf", ("Glib::String") x 5);
 my $permList = Gtk2::TreeView->new_with_model($model);
 
@@ -129,7 +129,7 @@ Select permissions to see/edit", $level), alignment => [ 0, 0 ]),
                                     0, gtknew('VBox'),
                                    ]),
                  0, create_okcancel({
-                                     cancel_clicked => sub { ugtk2->exit },
+                                     cancel_clicked => sub { ugtk3->exit },
                                      ok_clicked => \&save_perm,
                                     },
                                     undef, undef, '',
@@ -160,7 +160,7 @@ $permList->get_selection->signal_connect('changed' => sub {
                                            });
 
 $w->main;
-ugtk2->exit;
+ugtk3->exit;
 
 
 sub hide_up_button_iffirst_item {
@@ -211,7 +211,7 @@ sub save_perm() {
         close $F;
     }
     $modified = 0;
-    ugtk2->exit;
+    ugtk3->exit;
 }
 
 sub load_perms() {
diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec
index f78b5f63a..b4d99469f 100755
--- a/perl-install/standalone/draksec
+++ b/perl-install/standalone/draksec
@@ -26,8 +26,8 @@ use common;
 use standalone;
 use vars qw($MODE %options);
 use interactive;
-use mygtk2 qw(gtknew gtkset);
-use ugtk2 qw(:helpers :wrappers :ask :create);
+use mygtk3 qw(gtknew gtkset);
+use ugtk3 qw(:helpers :wrappers :ask :create);
 use run_program;
 use security::level;
 use security::msec;
@@ -43,7 +43,7 @@ use security::l10n;
 
 my $_in = 'interactive'->vnew('su'); # enforce being root
 
-$ugtk2::wm_icon = "/usr/share/mcc/themes/default/draksec-mdk.png";
+$ugtk3::wm_icon = "/usr/share/mcc/themes/default/draksec-mdk.png";
 my ($w);
 
 ############################    I18N     ###################################
@@ -66,7 +66,7 @@ sub resize { gtkset($_[0], width => 50) }
 
 # factorize this with drakrpm and harddrake2
 sub wait_msg {
-    my $mainw = ugtk2->new(N("Please wait"), (modal => 1, transient => $w->{real_window}));
+    my $mainw = ugtk3->new(N("Please wait"), (modal => 1, transient => $w->{real_window}));
     $mainw->{window}->add(gtknew('WrappedLabel', text => $_[0]));
     $mainw->{rwindow}->show_all;
     gtkset_mousecursor_wait($mainw->{rwindow}->window);
@@ -84,7 +84,7 @@ sub new_nonedit_combo {
 }
 
 #my $msec = security::msec->new;
-$w = ugtk2->new(N("Security Level and Checks"));
+$w = ugtk3->new(N("Security Level and Checks"));
 my $window = $w->{window};
 
 
@@ -98,7 +98,7 @@ unless ($::isEmbedded) {
 
 # Connect the signals
 $window->signal_connect('delete_event', sub { $window->destroy });
-$window->signal_connect('destroy', sub { ugtk2->exit });
+$window->signal_connect('destroy', sub { ugtk3->exit });
 
 $window->add(my $vbox = gtkshow(gtknew('VBox')));
 
@@ -231,7 +231,7 @@ gtkpack_($vbox,
 
          0, create_okcancel(my $oc =
                             {
-                             cancel_clicked => sub { ugtk2->exit(0) },
+                             cancel_clicked => sub { ugtk3->exit(0) },
                              ok_clicked => sub {
                                 log::explanations("Setting up right delegation");
                                 my %rev_auth = reverse %auth;
@@ -242,7 +242,7 @@ gtkpack_($vbox,
 
                                 write_rules();
                                 remove_wait_msg($w);
-                                ugtk2->exit(0);
+                                ugtk3->exit(0);
                             }
                             },
                             undef, undef, ''
@@ -253,4 +253,4 @@ $oc->{cancel}->can_default(1);
 $oc->{cancel}->grab_default;
 
 $w->main;
-ugtk2->exit(0);
+ugtk3->exit(0);
diff --git a/perl-install/standalone/draksound b/perl-install/standalone/draksound
index 6a8e899ea..a51dffbca 100755
--- a/perl-install/standalone/draksound
+++ b/perl-install/standalone/draksound
@@ -29,7 +29,7 @@ use detect_devices;
 
 my $in = 'interactive'->vnew('su');
 
-$ugtk2::wm_icon = 'draksound-16';
+$ugtk3::wm_icon = 'draksound-16';
 my $modules_conf = modules::any_conf->read;
 
 if (my @devices = detect_devices::probe_category('multimedia/sound')) {
diff --git a/perl-install/standalone/drakups b/perl-install/standalone/drakups
index 8524daf2a..266c6fd1b 100755
--- a/perl-install/standalone/drakups
+++ b/perl-install/standalone/drakups
@@ -6,7 +6,7 @@ use standalone;
 use common;
 use mouse;
 use detect_devices;
-use ugtk2 qw(:create :dialogs :helpers :wrappers);
+use ugtk3 qw(:create :dialogs :helpers :wrappers);
 use interactive;
 use Libconf qw(:functions);
 use Libconf::Glueconf::NUT::Ups_conf;
@@ -313,7 +313,7 @@ my @pages = (
 #$in = 'interactive'->vnew('su'); # require_root_capability();
 $in = 'interactive'->vnew;
 
-$ugtk2::wm_icon = "drakups";
+$ugtk3::wm_icon = "drakups";
 
 if (!$::testing) {
     $in->do_pkgs->ensure_is_installed('nut-server', '/usr/sbin/upsd') or $in->exit(1);
@@ -326,7 +326,7 @@ if (member('--wizard', @ARGV)) {
     $in->exit($@ ? 1 : 0);
 }
 
-$w = ugtk2->new(N("UPS Management"));
+$w = ugtk3->new(N("UPS Management"));
 if (!$::isEmbedded) {
     mygtk3::register_main_window($w->{real_window});
     $w->{window}->set_size_request(500, 550);
diff --git a/perl-install/standalone/drakxservices b/perl-install/standalone/drakxservices
index 91317d1f4..5d814354e 100755
--- a/perl-install/standalone/drakxservices
+++ b/perl-install/standalone/drakxservices
@@ -10,7 +10,7 @@ use interactive;
 use services;
 use log;
 
-$ugtk2::wm_icon = "/usr/share/mcc/themes/default/service-mdk.png";
+$ugtk3::wm_icon = "/usr/share/mcc/themes/default/service-mdk.png";
 my $in = 'interactive'->vnew('su');
 begin:
 my $l = services::ask($in);
diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv
index 9b56007e2..e8cf7d9be 100755
--- a/perl-install/standalone/drakxtv
+++ b/perl-install/standalone/drakxtv
@@ -29,7 +29,7 @@ use detect_devices;
 use lang;
 use log;
 
-$ugtk2::wm_icon = "/usr/share/mcc/themes/default/tv-mdk.png";
+$ugtk3::wm_icon = "/usr/share/mcc/themes/default/tv-mdk.png";
 
 my $in = 'interactive'->vnew;
 
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index 588ac6841..bd1bcd9d0 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -12,11 +12,11 @@ use common;
 # i18n: IMPORTANT: to get correct namespace (drakconf instead of only libDrakX)
 BEGIN { unshift @::textdomains, 'drakconf' }
 
-use mygtk2 qw(gtknew); #- do not import gtkadd which conflicts with ugtk2 version
-use ugtk2 qw(:create :helpers :wrappers);
+use mygtk3 qw(gtknew); #- do not import gtkadd which conflicts with ugtk3 version
+use ugtk3 qw(:create :helpers :wrappers);
 use interactive;
 use modules::parameters;
-use harddrake::data;  #- needs to stay after use-ugtk2 as long as this module defines globals containing some N()
+use harddrake::data;  #- needs to stay after use-ugtk3 as long as this module defines globals containing some N()
 use fsedit;
 use pkgs;
 use POSIX qw(:sys_wait_h);
@@ -188,8 +188,8 @@ my %menu_options = (
                     'PARALLEL_ZIP_DETECTION' => [ $menus{options}, N("/Autodetect parallel _zip drives") ],
                     );
 
-$ugtk2::wm_icon = "harddrake";
-$w = ugtk2->new(N("Hardware Configuration"));
+$ugtk3::wm_icon = "harddrake";
+$w = ugtk3->new(N("Hardware Configuration"));
 # fake diagnostics pragma:
 local $::main_window = $w->{real_window};
 
@@ -548,7 +548,7 @@ $w->main;
 sub quit_global() {
     kill(15, $pid) if $pid;
     setVarsInSh($conffile, \%options) if !$::testing;
-    ugtk2->exit(0);
+    ugtk3->exit(0);
 }
 
 sub show_hide {
diff --git a/perl-install/standalone/localedrake b/perl-install/standalone/localedrake
index cb2b81da6..231c528ea 100755
--- a/perl-install/standalone/localedrake
+++ b/perl-install/standalone/localedrake
@@ -34,7 +34,7 @@ if (defined $klang) {
 my $locale = lang::read($>);
 my $in = 'interactive'->vnew;
 
-$ugtk2::wm_icon = "localedrake";
+$ugtk3::wm_icon = "localedrake";
 $::Wizard_title = N("LocaleDrake");
 
 any::selectLanguage_and_more_standalone($in, $locale);
diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake
index d5f391b05..2c420affd 100755
--- a/perl-install/standalone/logdrake
+++ b/perl-install/standalone/logdrake
@@ -28,10 +28,10 @@ use c;
 use common;
 use interactive;
 use do_pkgs;
-use mygtk2 qw(gtknew); #- do not import gtkadd which conflicts with ugtk2 version
-use ugtk2 qw(:create :dialogs :helpers :wrappers);
+use mygtk3 qw(gtknew); #- do not import gtkadd which conflicts with ugtk3 version
+use ugtk3 qw(:create :dialogs :helpers :wrappers);
 
-$ugtk2::wm_icon = "/usr/share/mcc/themes/default/logdrake-mdk.png";
+$ugtk3::wm_icon = "/usr/share/mcc/themes/default/logdrake-mdk.png";
 my $in = 'interactive'->vnew('su');
 
 my ($isExplain, $Explain, $isFile, $File, $isWord, $Word);
@@ -50,9 +50,9 @@ my $isTail = $isFile;
 $| = 1 if $isTail;
 my $h = chomp_(`hostname -s`);
 
-$ugtk2::wm_icon = "logdrake";
+$ugtk3::wm_icon = "logdrake";
 my $explain_title = N("%s Tools Logs", N("Mageia"));
-my $my_win = ugtk2->new($isExplain ? $explain_title : N("Logs"));
+my $my_win = ugtk3->new($isExplain ? $explain_title : N("Logs"));
 
 unless ($::isEmbedded) {
     $my_win->{window}->set_border_width(5);
@@ -186,7 +186,7 @@ $my_win->{window}->show_all;
 search() if $isFile;
 $my_win->main;
 
-sub quit() { ugtk2->exit(0) }
+sub quit() { ugtk3->exit(0) }
 
 #-------------------------------------------------------------
 # search functions
@@ -364,7 +364,7 @@ sub log_output {
 }
 
 sub insert_text_n_scroll() {
-    ugtk2::gtktext_insert($log_text, \@logs, append => 1);
+    ugtk3::gtktext_insert($log_text, \@logs, append => 1);
     $log_text->scroll_to_iter($log_buf->get_end_iter, 0, 1, 0.5, 0.5);
     undef @logs;
 }
diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake
index 112953b27..f36cf4967 100755
--- a/perl-install/standalone/scannerdrake
+++ b/perl-install/standalone/scannerdrake
@@ -39,7 +39,7 @@ foreach (@ARGV) {
     /^--dynamic=(.*)$/ and do { dynamic(); exit() };
 }
 
-$ugtk2::wm_icon = "scannerdrake";
+$ugtk3::wm_icon = "scannerdrake";
 my $in = 'interactive'->vnew('su');
 if (!files_exist(qw(/usr/bin/scanimage
 		    /etc/sane.d/dll.conf)) ||