switch from gtk2-perl to gtk2-perl-xs

2 files changed, 8 insertions, 9 deletions

diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index f7575b7c6..7d674e263 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -150,7 +150,7 @@ sub add_kind2notebook {
 
 sub general_action_box {
     my ($box, $nowizard, $interactive_help) = @_;
-    $_->widget->destroy foreach $box->children;
+    $_->destroy foreach $box->get_children;
 
     gtkadd($box, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-help'), clicked => $interactive_help)) if $interactive_help;
 
@@ -165,7 +165,7 @@ sub general_action_box {
 }
 sub per_kind_action_box {
     my ($box, $kind) = @_;
-    $_->widget->destroy foreach $box->children;
+    $_->destroy foreach $box->get_children;
 
     $kind->{type} =~ /hd|lvm/ or return;
 
@@ -177,7 +177,7 @@ sub per_kind_action_box {
 }
 sub per_entry_action_box {
     my ($box, $kind, $entry) = @_;
-    $_->widget->destroy foreach $box->children;
+    $_->destroy foreach $box->get_children;
 
     if ($entry) {
 	my @buttons = map { 
@@ -200,7 +200,7 @@ I suggest you first resize that partition
 
 sub per_entry_info_box {
     my ($box, $kind, $entry) = @_;
-    $_->widget->destroy foreach $box->children;
+    $_->destroy foreach $box->get_children;
     my $info;
     if ($entry) {
 	$info = diskdrake::interactive::format_part_info(kind2hd($kind), $entry);
@@ -213,7 +213,7 @@ sub per_entry_info_box {
 sub current_kind_changed {
     my ($_in, $kind) = @_;
 
-    $_->widget->destroy foreach $kind->{display_box}->children;
+    $_->destroy foreach $kind->{display_box}->get_children;
 
     my $v = $kind->{val};
     my @parts = 
diff --git a/perl-install/diskdrake/smbnfs_gtk.pm b/perl-install/diskdrake/smbnfs_gtk.pm
index 8197d9ed1..ff2ffee12 100644
--- a/perl-install/diskdrake/smbnfs_gtk.pm
+++ b/perl-install/diskdrake/smbnfs_gtk.pm
@@ -68,7 +68,7 @@ sub per_entry_info_box {
 
 sub per_entry_action_box {
     my ($box, $kind, $entry) = @_;
-    $_->widget->destroy foreach $box->children;
+    $_->destroy foreach $box->get_children;
 
     my @buttons;
 
@@ -107,7 +107,7 @@ sub update {
     my ($kind) = @_;
     per_entry_action_box($kind->{action_box}, $kind, $current_entry);
     per_entry_info_box($kind->{info_box}, $kind, $current_entry);
-    $tree_model->set($current_leaf, [ 0 => export_icon($current_entry) ]) if $current_entry;
+    $tree_model->set($current_leaf, 0 => export_icon($current_entry)) if $current_entry;
 }
 
 sub find_fstab_entry {
@@ -129,7 +129,7 @@ sub import_tree {
     my ($kind, $info_box) = @_;
     my (%servers_displayed, %wservers, %wexports);
 
-    $tree_model = Gtk2::TreeStore->new(Gtk2::GType->OBJECT, Gtk2::GType->STRING);
+    $tree_model = Gtk2::TreeStore->new("Gtk2::Gdk::Pixbuf", "Glib::String");
     my $tree = Gtk2::TreeView->new_with_model($tree_model);
     $tree->get_selection->set_mode('browse');
 
@@ -194,7 +194,6 @@ sub import_tree {
 
 	my $path = $tree_model->get_path($node);
 	$tree->expand_row($path, 0);
-	$path->free;
 
 	foreach ($find_exports->($wservers{$tree_model->get_path_str($node)} || return)) { #- can't die here since insert_node provoque a tree_select_row before the %wservers is filled
 	    my $s = $kind->to_string($_);