From 504f6c89db28716c7038153fb7838565b4ba0583 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Wed, 1 Aug 2012 17:16:09 +0200
Subject: use (my|u)gtk3 instead of *tk2

---
 perl-install/diskdrake/hd_gtk.pm     | 12 ++++++------
 perl-install/diskdrake/smbnfs_gtk.pm |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'perl-install/diskdrake')

diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index 89d46dbfd..f552fb1af 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -4,8 +4,8 @@ use diagnostics;
 use strict;
 
 use common;
-use mygtk2 qw(gtknew);
-use ugtk2 qw(:helpers :wrappers :create);
+use mygtk3 qw(gtknew);
+use ugtk3 qw(:helpers :wrappers :create);
 use partition_table;
 use fs::type;
 use detect_devices;
@@ -58,8 +58,8 @@ sub main {
 
     local $in->{grab} = 1;
 
-    $w = ugtk2->new(N("Partitioning"));
-    mygtk2::register_main_window($w->{real_window}) if !$::isEmbedded && !$::isInstall;
+    $w = ugtk3->new(N("Partitioning"));
+    mygtk3::register_main_window($w->{real_window}) if !$::isEmbedded && !$::isInstall;
 
     load_theme();
 
@@ -72,7 +72,7 @@ sub main {
 		    0, gtknew(($::isInstall ? ('Title1', 'label') : ('Label_Left', 'text'))
                                 => N("Click on a partition, choose a filesystem type then choose an action"),
                               # workaround infamous 6 years old gnome bug #101968:
-                              width => mygtk2::get_label_width()
+                              width => mygtk3::get_label_width()
                             ),
 		    1, (my $notebook_widget = Gtk2::Notebook->new),
 		    0, (my $per_kind_action_box = gtknew('HButtonBox', layout => 'edge')),
@@ -176,7 +176,7 @@ sub add_kind2notebook {
         1, $box,
         0, $kind->{action_box},
     ]);
-    ugtk2::add2notebook($notebook_widget, $kind->{name}, $kind->{main_box});
+    ugtk3::add2notebook($notebook_widget, $kind->{name}, $kind->{main_box});
     push @notebook, $kind;
     $kind;
 }
diff --git a/perl-install/diskdrake/smbnfs_gtk.pm b/perl-install/diskdrake/smbnfs_gtk.pm
index 28fc9f2ea..e29101b44 100644
--- a/perl-install/diskdrake/smbnfs_gtk.pm
+++ b/perl-install/diskdrake/smbnfs_gtk.pm
@@ -9,8 +9,8 @@ use common;
 use interactive;
 use fs::remote::smb;
 use fs::remote::nfs;
-use mygtk2 qw(gtknew gtkset);
-use ugtk2 qw(:helpers :wrappers :create);
+use mygtk3 qw(gtknew gtkset);
+use ugtk3 qw(:helpers :wrappers :create);
 
 my ($all_hds, $in, $tree_model, $current_entry, $current_leaf, %icons);
 
@@ -19,7 +19,7 @@ sub main {
     my ($kind) = $type eq 'smb' ? smb2kind() : nfs2kind();
     $kind->check($in) or return;
 
-    my $w = ugtk2->new(N("Partitioning"));
+    my $w = ugtk3->new(N("Partitioning"));
 
     add_smbnfs($w->{window}, $kind);
     $w->{rwindow}->set_default_size(400, 300) if $w->{rwindow}->can('set_default_size');
@@ -227,7 +227,7 @@ sub import_tree {
 	} else {
 	    if (!$tree_model->iter_has_child($curr)) {
 		gtkset_mousecursor_wait($tree->window);
-		ugtk2::flush();
+		ugtk3::flush();
 		$add_exports->($curr);		
 		gtkset_mousecursor_normal($tree->window);
 	    }
-- 
cgit v1.2.1