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_gui.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'mgaapplet_gui.pm')

diff --git a/mgaapplet_gui.pm b/mgaapplet_gui.pm
index ebec40a3..605cf3c8 100644
--- a/mgaapplet_gui.pm
+++ b/mgaapplet_gui.pm
@@ -46,14 +46,14 @@ our @EXPORT_OK = qw(
     run_no_rights_dialog
 );
 
-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 mgaonline qw();	# you don't want to polute the namespace
 use interactive;
 use interactive::gtk;
 use lib qw(/usr/lib/libDrakX/drakfirsttime);
 
-ugtk2::add_icon_path("/usr/share/mgaonline/pixmaps/");
+ugtk3::add_icon_path("/usr/share/mgaonline/pixmaps/");
 
 our $localdir = "$ENV{HOME}/.MgaOnline";
 our $localfile = "$localdir/mgaonline";
@@ -77,7 +77,7 @@ our @common = (
 
 sub new_portable_dialog {
     my ($title) = @_;
-    ugtk2->new($title, width => $width + 20);
+    ugtk3->new($title, width => $width + 20);
 }
 
 sub fill_n_run_portable_dialog {
@@ -197,7 +197,7 @@ sub run_ask_credentials_dialog {
 		       )
 		   )
 	       ]),
-	ugtk2::create_okcancel($w, N("Next"), N("Cancel")),
+	ugtk3::create_okcancel($w, N("Next"), N("Cancel")),
 	);
 
     fill_n_run_portable_dialog($w, \@widgets);
-- 
cgit v1.2.1


From 9566b9f9abbb375d73bb583191502b0859507665 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 Gtk3 namespace instead of Gtk2

---
 mgaapplet_gui.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'mgaapplet_gui.pm')

diff --git a/mgaapplet_gui.pm b/mgaapplet_gui.pm
index 605cf3c8..a0273618 100644
--- a/mgaapplet_gui.pm
+++ b/mgaapplet_gui.pm
@@ -62,7 +62,7 @@ our $localfile = "$localdir/mgaonline";
 mkdir_p($localdir) if !-d $localdir;
 -e "$ENV{HOME}/.mgaonline" and system("mv", "$ENV{HOME}/.mgaonline", $localfile);
 
-interactive::gtk::add_padding(Gtk2::Label->new);
+interactive::gtk::add_padding(Gtk3::Label->new);
 
 our %local_config;
 read_local_config();
@@ -113,7 +113,7 @@ sub fill_n_run_portable_dialog {
 
 sub new_link_button {
     my ($url, $text) = @_;
-    my $link = Gtk2::LinkButton->new($url, $text);
+    my $link = Gtk3::LinkButton->new($url, $text);
     $link->set_uri_hook(sub {
                             my (undef, $url) = @_;
                             run_program::raw({ detach => 1, setuid => get_parent_uid() }, 'www-browser', $url);
@@ -160,7 +160,7 @@ sub run_ask_credentials_dialog {
 	$password_text = $password_w->get_text;
 	$email_text = $email_w->get_text;
 	$ok_clicked = 1;
-	Gtk2->main_quit;
+	Gtk3->main_quit;
     };
 
     my @widgets = (
-- 
cgit v1.2.1


From 61563398324066693ec8d07b4f39b0fcc474ea87 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Fri, 6 Dec 2013 12:09:43 +0100
Subject: s/gtk2/gtk3/ in comments

---
 mgaapplet_gui.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mgaapplet_gui.pm')

diff --git a/mgaapplet_gui.pm b/mgaapplet_gui.pm
index a0273618..bc798e55 100644
--- a/mgaapplet_gui.pm
+++ b/mgaapplet_gui.pm
@@ -46,7 +46,7 @@ our @EXPORT_OK = qw(
     run_no_rights_dialog
 );
 
-use mygtk3 qw(gtknew); #- do not import gtkadd which conflicts with ugtk2 version
+use mygtk3 qw(gtknew); #- do not import gtkadd which conflicts with ugtk3 version
 use ugtk3 qw(:all);
 use mgaonline qw();	# you don't want to polute the namespace
 use interactive;
-- 
cgit v1.2.1


From 4bfd0b9c84baa0d380e15f051984058c6c9adcf0 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Mon, 16 Dec 2013 10:30:18 +0100
Subject: fix my email

---
 mgaapplet_gui.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mgaapplet_gui.pm')

diff --git a/mgaapplet_gui.pm b/mgaapplet_gui.pm
index bc798e55..e5d87b24 100644
--- a/mgaapplet_gui.pm
+++ b/mgaapplet_gui.pm
@@ -6,7 +6,7 @@ package mgaapplet_gui;
 # Copyright (C) 2003-2010 Mandriva                                             #
 #                                                                              #
 # Daouda Lo                                                                    #
-# Thierry Vignaud <tvignaud at mandriva dot com>                               #
+# Thierry Vignaud <thierry.vignaud at gmail dot com>                               #
 #                                                                              #
 # This program is free software; you can redistribute it and/or modify         #
 # it under the terms of the GNU General Public License Version 2 as            #
-- 
cgit v1.2.1