From 6c1fa5cd83b0d46528ee8cecda42f9b1adca0b32 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Mon, 18 Nov 2013 15:41:22 +0100
Subject: use (my|u)gtk3 instead of *tk2

---
 mgaapplet | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'mgaapplet')

diff --git a/mgaapplet b/mgaapplet
index 967b0889..4597687f 100755
--- a/mgaapplet
+++ b/mgaapplet
@@ -31,8 +31,8 @@ use feature 'state';
 
 BEGIN { unshift @::textdomains, 'mgaonline' }
 
-use mygtk2 qw(gtknew); #- do not import gtkadd which conflicts with ugtk2 version
-use ugtk2 qw(:all);
+use mygtk3 qw(gtknew); #- do not import gtkadd which conflicts with ugtk2 version
+use ugtk3 qw(:all);
 use lib qw(/usr/lib/libDrakX/drakfirsttime);
 use mgaonline;
 use mgaapplet_gui;
@@ -262,7 +262,7 @@ run_program::raw({ detach => 1 }, 'ionice', '-p', $$, '-n7');
 
 Gtk2->main;
 
-ugtk2::exit(0);
+ugtk3::exit(0);
 
 sub gnome_shell_exit_overview() {
     eval { Net::DBus->session->get_service('org.gnome.Shell')->get_object('/org/gnome/Shell', 'org.freedesktop.DBus.Properties')->Set('org.gnome.Shell', 'OverviewActive', dbus_boolean(0)) };
@@ -384,7 +384,7 @@ sub configNetwork() {
 }
 
 sub confirm_upgrade() {
-    local $mygtk2::left_padding = 0;
+    local $mygtk3::left_padding = 0;
     my $warn_me = text2bool($local_config{DO_NOT_ASK_FOR_DISTRO_UPGRADE});
     my $w = new_portable_dialog(N("New version of Mageia distribution"));
     my ($temp_dir, $box);
@@ -453,7 +453,7 @@ sub refresh_no_more_supported_msg() {
 }
 
 sub no_more_supported_choice() {
-    local $mygtk2::left_padding = 0;
+    local $mygtk3::left_padding = 0;
     my $warn_me = text2bool($local_config{DO_NOT_ASK_FOR_NO_MORE_SUPPORTED});
     # FIXME: just tell radio buttons' children to wrap instead:
     local $mgaapplet_gui::width = 580;
@@ -522,8 +522,8 @@ sub no_more_supported() {
 }
 
 sub really_confirm_upgrade() {
-    local $mygtk2::left_padding = 0;
-    my $w = ugtk2->new(N("New version of Mageia distribution"), width => $width + 20);
+    local $mygtk3::left_padding = 0;
+    my $w = ugtk3->new(N("New version of Mageia distribution"), width => $width + 20);
 
     # estimated package size:
     my $c;
-- 
cgit v1.2.1