From 823bec9a5f7eee9050cc9fdf0e0f334bc18fa18e Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Thu, 28 Nov 2013 15:28:33 +0100
Subject: use (my|u)gtk3 instead of *tk2

---
 draklive-install | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/draklive-install b/draklive-install
index b847d7f..ca87fdf 100755
--- a/draklive-install
+++ b/draklive-install
@@ -98,13 +98,13 @@ sub display_start_message() {
     require any;
     my $has_running_wm = to_bool(any::running_window_manager());
     local $::isStandalone = $has_running_wm; # center me if run in xsetup.d script
-    mygtk2::enable_quit_popup(1);
-    my $w = ugtk2->new(N("Mageia Live"));
-    ugtk2::gtkadd($w->{window},
-                  ugtk2::gtkcreate_img("MageiaLive-install"),
-                  ugtk2::gtknew('Label', height => 5),
+    mygtk3::enable_quit_popup(1);
+    my $w = ugtk3->new(N("Mageia Live"));
+    ugtk3::gtkadd($w->{window},
+                  ugtk3::gtkcreate_img("MageiaLive-install"),
+                  ugtk3::gtknew('Label', height => 5),
                   N("This wizard will help you to install the live distribution."),
-                  ugtk2::create_okcancel($w));
+                  ugtk3::create_okcancel($w));
     $w->{ok}->grab_focus;
     $w->main;
 }
@@ -404,8 +404,8 @@ Quit anyway?", $part->{device}, $part->{mntpoint})) or return if $::isStandalone
 sub copying_message {
     my ($o, $title, $message, $b_temp) = @_;
 
-    my $w = $o->wait_messageW($title, N("Copying in progress"), ugtk2::gtknew('VBox', padding => 5, children_tight => [
-        ugtk2::gtkcreate_img("MageiaLive-advert"),
+    my $w = $o->wait_messageW($title, N("Copying in progress"), ugtk3::gtknew('VBox', padding => 5, children_tight => [
+        ugtk3::gtkcreate_img("MageiaLive-advert"),
         $message,
     ]));
     push @tempory::objects, $w if $b_temp;
@@ -437,11 +437,11 @@ sub copying_message_with_progress_bar {
 		$progress->set_fraction($fraction);
 		$progress->show;
 		$displayed = 0;
-		mygtk2::flush() while !$displayed;
+		mygtk3::flush() while !$displayed;
 	    }
 	} else {
 	    $progress->hide;
-	    mygtk2::flush();
+	    mygtk3::flush();
 	}
     };
 }
-- 
cgit v1.2.1