From 9555bb791920e8feace953f90cf908e864451b59 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Mon, 8 Jul 2002 07:45:08 +0000
Subject: various cleanups:  - move all harddrake modules to harddrake
 namespace  - replace two use by require so that it's not done at compil time 
   but at runtime  - there was a missing $ in harddrake::ui.pm

---
 perl-install/harddrake/bttv.pm            |   4 ++--
 perl-install/harddrake/data.pm            |   4 ++--
 perl-install/harddrake/ui.pm              | Bin 9481 -> 9526 bytes
 perl-install/install_steps_interactive.pm |   2 +-
 perl-install/standalone/draknet           |   6 ++----
 perl-install/standalone/harddrake2        |   2 +-
 perl-install/standalone/service_harddrake |   2 +-
 7 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/perl-install/harddrake/bttv.pm b/perl-install/harddrake/bttv.pm
index c9464158e..3c3802609 100644
--- a/perl-install/harddrake/bttv.pm
+++ b/perl-install/harddrake/bttv.pm
@@ -1,4 +1,4 @@
-package bttv;
+package harddrake::bttv;
 
 use strict;
 
@@ -204,7 +204,7 @@ If your card is misdetected, you can force the right tuner and card types here.
 	   my $options = 
 	     'radio=' . ($conf{radio} ? 1 : 0) . ' '.
 	     join(' ', map { if_($conf{$_} ne -1, "$_=$conf{$_}") } qw(card pll tuner gbuffers));
-	   log::l("[harddrake::tv] $options");
+	   log::l("[harddrake::bttv] $options");
 	   standalone::explanations("modified file /etc/modules.conf ($options)");
 	   modules::set_options("bttv", $options) if $options;
 	 }
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index d17b466db..01fa6be00 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -1,4 +1,4 @@
-package data;
+package harddrake::data;
 
 use strict;
 use detect_devices;
@@ -58,7 +58,7 @@ our @tree =
 	 sub { require printerdrake; printerdrake::auto_detect(class_discard->new)  } ],
 	["SCANNER","Scanner", "scanner.png", "$sbindir/scannerdrake",
 	 sub { require scanner; scanner::findScannerUsbport() }],
-	["MOUSE","Mouse", "hw_mouse.png", "$sbindir/mousedrake", sub { use mouse; &mouse::detect()}],
+	["MOUSE","Mouse", "hw_mouse.png", "$sbindir/mousedrake", sub { require mouse; &mouse::detect()}],
 	["JOYSTICK","Joystick", "joystick.png", "", sub {}]
 
 #	["","Ideinterface", "Ideinterface.png", "", "STORAGE_IDE"],
diff --git a/perl-install/harddrake/ui.pm b/perl-install/harddrake/ui.pm
index 3e5a870d5..4da7b556c 100644
Binary files a/perl-install/harddrake/ui.pm and b/perl-install/harddrake/ui.pm differ
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index ae2ec26d7..7fe82508d 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1029,7 +1029,7 @@ sub summary {
      } @sound_cards),
     if_($isa_sound_card, { label => _("Sound card"), clicked => $isa_sound_card }), 
     (map {
-{ label => _("TV card"), val => $_->{description}, clicked => sub { use harddrake::bttv; bttv::config($o) }} 
+{ label => _("TV card"), val => $_->{description}, clicked => sub { require harddrake::bttv; harddrake::bttv::config($o) }} 
      } grep { $_->{driver} eq 'bttv' } detect_devices::probeall()),
 ]);
     install_steps::configureTimezone($o);  #- do not forget it.
diff --git a/perl-install/standalone/draknet b/perl-install/standalone/draknet
index 968273828..083c99230 100755
--- a/perl-install/standalone/draknet
+++ b/perl-install/standalone/draknet
@@ -669,10 +669,8 @@ Create one first by clicking on 'Configure'")),1,1,0);
     $button_ok->signal_connect ( clicked => sub {
 				     $i=0;
 				     foreach (@mask) {
-					 if ($_) {
-					     ${$conf_data[$i]->[1]}=$infos[2*$i+1]->get_text();
-					 }
-					 $i++;
+					    ${$conf_data[$i]->[1]}=$infos[2*$i+1]->get_text() if ($_);
+					    $i++;
 				     }
 				     update();
 				     $button_apply->set_sensitive(1);
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index a23f1e743..da3d09588 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -4,4 +4,4 @@ use strict;
 use lib qw(/usr/lib/libDrakX);
 use harddrake::ui;
 
-ui->run;
+harddrake::ui->run;
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index d0e8ae386..d65d94723 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -43,7 +43,7 @@ my %config;
 
 # For each hw, class, detect device, compare and offer to reconfigure if
 # needed
-foreach (@data::tree) {
+foreach (@harddrake::data::tree) {
     my ($Ident, $item, undef, $configurator, $detector) = @$_;
 
     # No detector ? (should never happen but who know ?)
-- 
cgit v1.2.1