1 files changed, 13 insertions, 10 deletions

diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv
index 6646a3f37..709c13309 100755
--- a/perl-install/standalone/drakxtv
+++ b/perl-install/standalone/drakxtv
@@ -29,13 +29,15 @@ use detect_devices;
 use lang;
 use log;
 
+$ugtk2::wm_icon = "/usr/share/mcc/themes/default/tv-mdk.png";
+
 my $in = 'interactive'->vnew;
 
 sub scan4channels() {
     # xawtv has been installed by DrakX when/if it's detected a tv
     # card.
 
-    $in->do_pkgs->ensure_is_installed('xawtv', '/usr/bin/scantv');
+    $in->do_pkgs->ensure_binary_is_installed('xawtv', 'scantv');
 
 	   my ($ftable_id, $norm);
         #   this table must be checked on each xawtv release:
@@ -68,7 +70,7 @@ sub scan4channels() {
           );
 
         my $tbl;
-        my $locale = lang::read('', $>);
+        my $locale = lang::read($>);
         $locale->{country} =~ /$_/ and $tbl = $countries{$_} foreach keys %countries;
         if ($tbl) {
             $ftable_id = $tbl->[0];
@@ -84,11 +86,11 @@ sub scan4channels() {
                           [
                            { label => N("TV norm:"), val => \$norm, list => [ "NTSC", "NTSC-JP", "PAL", "PAL-M", "PAL-N", "PAL-NC", "SECAM" ], type => 'combo' },
 					  { label => N("Area:"), val => \$ftable_id, list => [keys %freqtables], format => sub { $freqtables{$_[0]} }, sort => 1 },
-					  { label => N("User :"), val => \$user, list => [ keys %users ], sort => 1 },
+					  { label => N("User:"), val => \$user, list => [ keys %users ], sort => 1 },
 					  ]
 					 )) {
             my $_wait = $in->wait_message(N("Please wait"),
-								 N("Scanning for TV channels in progress ..."));
+								 N("Scanning for TV channels in progress..."));
             # we provide scantv a bogus table (france) which will
             # will be ignored since "All" is selected (because of -a)
 		  $ftable_id = "france -a " if $ftable_id eq -1;
@@ -115,22 +117,23 @@ my @devices = detect_devices::getTVcards();
 push @devices, { driver => 'bttv', description => 'dummy' } if $::testing && !@devices;
 if (@devices) {
     my $not_canceled = 1;
-    my $configured;
+    my $modules_conf;
     # TODO: That need some work for multiples TV cards
     each_index {
 	   if (($< == 0 || $::testing) && (grep { detect_devices::isTVcard($_) } @devices)) {
 		  require harddrake::v4l;
 		  require modules;
-		  modules::mergein_conf() if !$configured;
-		  $configured++;
-		  $not_canceled &&= harddrake::v4l::config($in, $_->{driver});
-		  modules::write_conf();
+
+		  $modules_conf ||= modules::any_conf->read;
+		  $not_canceled &&= harddrake::v4l::config($in, $modules_conf, $_->{driver});
+		  $modules_conf->write;
 	   }
 	   scan4channels() if $not_canceled;
     } @devices
 } else {
     $in->ask_warn(N("No TV Card detected!"), formatAlaTeX(
-											   N("No TV Card has been detected on your machine. Please verify that a Linux-supported Video/TV Card is correctly plugged in.
+                                                          #-PO: keep the double empty lines between sections, this is formatted a la LaTeX
+                                                          N("No TV Card has been detected on your machine. Please verify that a Linux-supported Video/TV Card is correctly plugged in.
 
 
 You can visit our hardware database at: