From 1c2faefdc0d57d1f4423bec36aaad88c242392a3 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 7 Jan 2005 15:10:20 +0000
Subject: $w->{isWizard} is unused

---
 perl-install/interactive/gtk.pm | 2 +-
 perl-install/ugtk2.pm           | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index a0dceff4e..d234a3ad2 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -732,7 +732,7 @@ sub wait_messageW($$$) {
     $box->pack_start($_, 1, 1, 4) foreach @l;
 
     ($w->{wait_messageW} = $l[-1])->signal_connect(expose_event => sub { $w->{displayed} = 1; 0 });
-    $w->{rwindow}->set_position('center') if $::isStandalone && !$w->{isEmbedded} && !$w->{isWizard};
+    $w->{rwindow}->set_position('center') if $::isStandalone && !$w->{isEmbedded} && !$::isWizard;
     $w->{window}->show_all;
     $w->sync until $w->{displayed};
     $w;
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index ee8fcc568..5714856d5 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -831,10 +831,9 @@ sub new {
     my $o = bless { %opts }, $type;
     while (my $e = shift @tempory::objects) { $e->destroy }
 
-    $o->{isWizard} ||= $::isWizard;
     $o->{isEmbedded} ||= $::isEmbedded;
 
-    $o->{pop_it} ||= $pop_it || !$o->{isWizard} && !$o->{isEmbedded} || $::WizardTable && do {
+    $o->{pop_it} ||= $pop_it || !$::isWizard && !$o->{isEmbedded} || $::WizardTable && do {
 	#- do not take into account the DrawingArea
 	any { !$_->isa('Gtk2::DrawingArea') && $_->visible } $::WizardTable->get_children;
     };
@@ -895,7 +894,7 @@ sub new {
 }
 sub set_main_window_size {
     my ($o) = @_;
-    my ($width, $height) = $::isInstall ? ($::real_windowwidth, $::real_windowheight) : $o->{isWizard} ? (540, 360) : (600, 400);
+    my ($width, $height) = $::isInstall ? ($::real_windowwidth, $::real_windowheight) : $::isWizard ? (540, 360) : (600, 400);
     $o->{window}->set_size_request($width, $height);
 }
 
-- 
cgit v1.2.1