diff options
| author | damien <damien@mandriva.com> | 2001-08-28 15:59:25 +0000 |
|---|---|---|
| committer | damien <damien@mandriva.com> | 2001-08-28 15:59:25 +0000 |
| commit | eb9e2baf8c1f66710eb359779788c4929a3cf4b0 (patch) | |
| tree | bc49ba80f2ee994c1e7ba37879f1b7f6f7caf6e6 | |
| parent | cd18e6bb3295a3f23d6c35d12b3c117b5cb4b6a5 (diff) | |
| download | drakx-eb9e2baf8c1f66710eb359779788c4929a3cf4b0.tar drakx-eb9e2baf8c1f66710eb359779788c4929a3cf4b0.tar.gz drakx-eb9e2baf8c1f66710eb359779788c4929a3cf4b0.tar.bz2 drakx-eb9e2baf8c1f66710eb359779788c4929a3cf4b0.tar.xz drakx-eb9e2baf8c1f66710eb359779788c4929a3cf4b0.zip | |
corrected icon handling
| -rw-r--r-- | perl-install/install2.pm | 2 | ||||
| -rw-r--r-- | 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; } } |