summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2001-08-17 11:18:48 +0000
committerdamien <damien@mandriva.com>2001-08-17 11:18:48 +0000
commit5539c75ddb958803b45f203e11626ec3e2b75f32 (patch)
treece83ab51a0ba6ec97e605509069f231fe24ffe4d
parent98b2c7e5242eb5e938d775d40e18df2c576749db (diff)
downloaddrakx-5539c75ddb958803b45f203e11626ec3e2b75f32.tar
drakx-5539c75ddb958803b45f203e11626ec3e2b75f32.tar.gz
drakx-5539c75ddb958803b45f203e11626ec3e2b75f32.tar.bz2
drakx-5539c75ddb958803b45f203e11626ec3e2b75f32.tar.xz
drakx-5539c75ddb958803b45f203e11626ec3e2b75f32.zip
removed no_incon
-rw-r--r--perl-install/install2.pm2
-rw-r--r--perl-install/interactive.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index b8ddbb3d3..392ad4c3b 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};
+ $o->{steps}{$o->{step}}{icon} && $o->{steps}{$o->{step}}{icon} != 'default' and $o->{icon} = $o->{steps}{$o->{step}}{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 0f2541943..0f5aabc22 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;
+ $icon && $icon != 'default' && !$::isWizard and $o->{icon} = $icon;
return $o;
}
}