From 984199eeca87dbdb64a17a82547c30aba43a611c Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 7 Jan 2005 10:59:05 +0000
Subject: simplify using mygtk2

---
 perl-install/ugtk2.pm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index ef8888b6b..32b5edb26 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -863,10 +863,12 @@ sub new {
 	$::WizardTable ||= gtknew('VBox');
 
 	if (!$::Plug && $o->{isEmbedded}) {
-	    $::Plug = $::WizardWindow = gtkshow(Gtk2::Plug->new($::XID));
-	    may_set_icon($::Plug, wm_icon());
-	    flush();
-	    gtkadd($::Plug, $::WizardTable);
+	    $::Plug = $::WizardWindow = gtknew('Plug',
+					       socket_id => $::XID,
+					       icon => wm_icon(),
+					       child => $::WizardTable,
+					       title => $title || '',
+					   );
 	} elsif (!$::WizardWindow) {
 	    $::WizardWindow = _create_window(title => $title);
 	    gtkadd($::WizardWindow, gtknew('Frame', shadow_type => 'out', child => $::WizardTable));
@@ -878,11 +880,11 @@ sub new {
 		$::WizardWindow->set_position('center_always') if !$::isStandalone;
 		eval { gtkpack__($::WizardTable, Gtk2::Banner->new(wm_icon(), $::Wizard_title)) };
 		$@ and log::l("ERROR: missing wizard banner");
-	may_set_icon($::WizardWindow, wm_icon());
+		may_set_icon($::WizardWindow, wm_icon());
 	    }
-	    $::WizardWindow->show;
 	}
-	$::WizardWindow->set_title($title || '');
+	$::WizardWindow->show;
+	flush();
 	gtkpack($::WizardTable, $o->{window});
     }
     $o->{rwindow}->signal_connect(destroy => sub { $o->{destroyed} = 1 });
-- 
cgit v1.2.1