From f2dffc6fa695defa60e90367426b806921b74a64 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 7 Jan 2003 20:29:31 +0000
Subject: cleanup

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

(limited to 'perl-install')

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 0305a7bb7..a24c0ae99 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -299,7 +299,7 @@ sub configureX {
     modules::write_conf($o->{prefix});
 
     require pkgs;
-    installStepsCall($o, $auto, 'configureX', $clicked) if pkgs::packageByName($o->{packages}, 'XFree86')->flag_installed && !$o->{X}{disabled} || $clicked || $::testing;
+    installStepsCall($o, $auto, 'configureX') if pkgs::packageByName($o->{packages}, 'XFree86')->flag_installed && !$o->{X}{disabled} || $::testing;
 }
 #------------------------------------------------------------------------------
 sub exitInstall {
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index de992bc1f..eb51551b2 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -906,14 +906,14 @@ sub configureXBefore {
 }
 sub configureX {
     my ($o) = @_;
-    $o->configureXBefore;
+    configureXBefore($o);
 
     require Xconfig::main;
     Xconfig::main::configure_everything_auto_install($o->{raw_X}, $o->do_pkgs, $o->{X},
 			  { allowFB          => $o->{allowFB},
 			    allowNVIDIA_rpms => install_any::allowNVIDIA_rpms($o->{packages}),
 			  });
-    $o->configureXAfter;
+    configureXAfter($o);
 }
 sub configureXAfter {
     my ($o) = @_;
-- 
cgit v1.2.1