From eb9e2baf8c1f66710eb359779788c4929a3cf4b0 Mon Sep 17 00:00:00 2001
From: damien <damien@mandriva.com>
Date: Tue, 28 Aug 2001 15:59:25 +0000
Subject: corrected icon handling

---
 perl-install/install2.pm    | 2 +-
 perl-install/interactive.pm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 05a6b1597..36f1c15e5 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -544,7 +544,7 @@ sub main {
     MAIN: for ($o->{step} = $o->{steps}{first};; $o->{step} = getNextStep()) {
 	$o->{steps}{$o->{step}}{entered}++;
 	$o->enteringStep($o->{step});
-	$o->{steps}{$o->{step}}{icon} and $o->{icon} = $o->{steps}{$o->{step}}{icon};
+	if ($o->{steps}{$o->{step}}{icon}) { $o->{icon} = $o->{steps}{$o->{step}}{icon} } else { undef $o->{icon} }
 	eval {
 	    &{$install2::{$o->{step}}}($clicked || $o->{steps}{$o->{step}}{noauto},
 				       $o->{steps}{$o->{step}}{entered},
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index 14c9eb8f0..d4b331ef5 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -74,7 +74,7 @@ sub vnew {
 	eval { require interactive_gtk };
 	if (!$@) {
 	    my $o = interactive_gtk->new;
-	    $icon && $icon != 'default' && !$::isWizard and $o->{icon} = $icon;
+	    if ($icon && $icon != 'default' && !$::isWizard) { $o->{icon} = $icon } else { undef $o->{icon} }
 	    return $o;
 	}
     }
-- 
cgit v1.2.1