- Big Move 1: interactive::* hierarchy

27 files changed, 63 insertions, 69 deletions

diff --git a/perl-install/Makefile b/perl-install/Makefile
index 6011abac8..239c4248b 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -7,7 +7,7 @@ include Makefile.config
 
 POFILES   = $(shell ls share/po/*.po)
 MOFILES   = $(POFILES:%.po=%.mo)
-DISTFILES = Makefile Makefile.config Newt apps.net_monitor diskdrake c ddcprobe drakxtools.spec pam.net_monitor serial_probe share/po sbus_probing resize_fat share/diskdrake.rc $(STANDALONEPMS) standalone/icons pixmaps network standalone/interactive_http rpcinfo-flushed.c *.pm security harddrake
+DISTFILES = Makefile Makefile.config Newt apps.net_monitor diskdrake c ddcprobe drakxtools.spec pam.net_monitor serial_probe share/po sbus_probing resize_fat share/diskdrake.rc $(STANDALONEPMS) standalone/icons pixmaps network interactive standalone/interactive_http rpcinfo-flushed.c *.pm security harddrake
 OTHERS     = $(OTHERDIRS) $(OTHERFILES)
 OTHERDIRS  = tools/ddcprobe tools/serial_probe
 OTHERFILES = tools/rpcinfo-flushed.c
@@ -23,7 +23,7 @@ TAGS: $(ALLPMS)
 	@etags -o - $^ /usr/lib/perl5/*/*/MDK/Common/*.pm | ./perl2etags > $@
 
 clean:
-	for i in $(DIRS) share/po; do $(MAKE) -C $$i clean; done
+	for i in $(DIRS) share/po; do $(MAKE) -C $$i clean; done;:
 	rm -rf auto ../drakxtools.tar.bz2
 	find . -name "*~" -o -name ".#*" -o -name "TAGS" -o -name "*.old" | xargs rm -f
 
@@ -34,7 +34,7 @@ check:
 
 localcopy: clean
 	rm -rf standalone/pixmaps
-	$(MAKE) -C ../tools clean
+	$(MAKE) -C ../tools clean || :
 	cd .. ; rm -rf $(PACKAGE)-$(PKGVERSION) ; cp -af perl-install $(PACKAGE)-$(PKGVERSION) ; cp -af $(OTHERS) $(PACKAGE)-$(PKGVERSION)
 	cd
 	find ../$(PACKAGE)-$(PKGVERSION) -name '*.pm' | xargs perl -pi -e 's/\s*use\s+(diagnostics|vars|strict)//g'
diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config
index f7ce06dac..0081767ac 100644
--- a/perl-install/Makefile.config
+++ b/perl-install/Makefile.config
@@ -5,7 +5,7 @@ ARCH := $(patsubst sparc%,sparc,$(ARCH))
 VERSION     = 2.2.10-BOOT                                                                             
 SUDO        = sudo
 SO_FILES    = c/blib/arch/auto/c/c.so                                                                 
-PMS         = *.pm Newt/*.pm c/stuff.pm resize_fat/*.pm sbus_probing/*.pm network/*.pm diskdrake/*.pm harddrake/*.pm commands install2 g_auto_install live_install live_install2 share/advertising/*.pl
+PMS         = *.pm Newt/*.pm c/stuff.pm resize_fat/*.pm sbus_probing/*.pm network/*.pm interactive/*.pm diskdrake/*.pm harddrake/*.pm commands install2 g_auto_install live_install live_install2 share/advertising/*.pl
 STANDALONEPMS_ = diskdrake XFdrake mousedrake printerdrake logdrake keyboarddrake drakconnect drakbackup drakfont drakproxy localedrake net_monitor drakbug_report tinyfirewall drakxconf drakxservices draksec drakboot adduserdrake drakgw drakautoinst livedrake lsnetdrake scannerdrake fileshareset drakxtv drakfloppy harddrake2 drakTermServ service_harddrake service_harddrake.sh drakbug
 STANDALONEPMS = $(STANDALONEPMS_:%=standalone/%)
 ALLPMS	    = $(PMS) $(STANDALONEPMS)
diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools
index 0801446f1..032556e50 100644
--- a/perl-install/Makefile.drakxtools
+++ b/perl-install/Makefile.drakxtools
@@ -26,7 +26,7 @@ $(DIRS):
 	[ ! -e $@/Makefile ] || $(MAKE) -C $@
 
 install:
-	mkdir -p $(BINDEST) $(ETCDEST) $(SBINDEST) $(DATADIR)/{harddrake,pixmaps} $(LIBDEST)/{network,security,harddrake} $(BINX11DEST) $(LIBX11DEST) $(PIXDIR) $(INITDIR)
+	mkdir -p $(BINDEST) $(ETCDEST) $(SBINDEST) $(DATADIR)/{harddrake,pixmaps} $(LIBDEST)/{network,security,harddrake,interactive} $(BINX11DEST) $(LIBX11DEST) $(PIXDIR) $(INITDIR)
 	install -d $(INLIBDEST_DIRS:%=$(LIBDEST)/%)
 	install $(STANDALONEPMS) $(SBINDEST)
 	install -s rpcinfo-flushed ddcprobe/ddcxinfos serial_probe/serial_probe $(SBINDEST)
@@ -35,7 +35,7 @@ install:
 	mv -f $(SBINDEST)/lsnetdrake $(BINDEST)/lsnetdrake
 
 	install -m 644 *.pm $(LIBDEST)
-	for i in network harddrake security; do install -m 644 $$i/*.pm $(LIBDEST)/$$i/;done
+	for i in network harddrake security interactive; do install -m 644 $$i/*.pm $(LIBDEST)/$$i/;done
 	install -m 644 pixmaps/* $(PIXDIR)
 	install -m 644 share/diskdrake.rc $(DATADIR)/$(NAME)
 
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index df67350e9..22864b6f5 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -638,7 +638,7 @@ sub testFinalConfig {
     print F "use lib qw(", join(' ', @INC), ");\n";
     print F q{
         require lang;
-	use interactive_gtk;
+	use interactive::gtk;
         use my_gtk qw(:wrappers);
 
         $::isStandalone = 1;
@@ -664,7 +664,7 @@ sub testFinalConfig {
         -r "} . $::prefix . q{/$background" && -x "} . $::prefix . q{/$qiv" and
             system(($::testing ? "} . $::prefix . q{" : "chroot } . $::prefix . q{/ ") . "$qiv -y $background");
 
-        my $in = interactive_gtk->new;
+        my $in = interactive::gtk->new;
 	$in->exit($in->ask_yesorno('', [ _("Is this the correct setting?"), $text ], 0) ? 0 : 222);
     };
     my $rc = close F;
@@ -858,7 +858,7 @@ sub chooseResolutionsGtk {
 sub chooseResolutions {
     my ($in, $card, $chosen_depth, $chosen_w) = @_;
 
-    return chooseResolutionsGtk($card, $chosen_depth, $chosen_w) if $in->isa('interactive_gtk');
+    return chooseResolutionsGtk($card, $chosen_depth, $chosen_w) if $in->isa('interactive::gtk');
 
     my $best_w;
     my $allowed_depth = allowedDepth($card);
@@ -1379,7 +1379,7 @@ _("I can setup your computer to automatically start the graphical interface (XFr
 Would you like XFree to start when you reboot?"), 1);
 	    any::runlevel($::prefix, $run ? 5 : 3) if !$::testing;
 	}
-	if ($::isStandalone && $in->isa('interactive_gtk')) {
+	if ($::isStandalone && $in->isa('interactive::gtk')) {
 	    if (my $wm = any::running_window_manager()) {
 		if ($in->ask_okcancel('', _("Please relog into %s to activate the changes", ucfirst (lc $wm)), 1)) {
 		    fork and $in->exit;
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 8c49f9570..0cefc1d05 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -161,7 +161,7 @@ struct all_hds {
 sub main {
     my ($in, $all_hds) = @_;
 
-    if ($in->isa('interactive_gtk')) {
+    if ($in->isa('interactive::gtk')) {
 	require diskdrake::hd_gtk;
 	goto &diskdrake::hd_gtk::main;
     }
diff --git a/perl-install/drakxtools.spec b/perl-install/drakxtools.spec
index a682365c1..ebb084715 100644
--- a/perl-install/drakxtools.spec
+++ b/perl-install/drakxtools.spec
@@ -1,7 +1,7 @@
 Summary: The drakxtools (XFdrake, diskdrake, keyboarddrake, mousedrake...)
 Name:    drakxtools
 Version: 1.1.8
-Release: 8mdk
+Release: 9mdk
 Url: http://www.linux-mandrake.com/en/drakx.php3
 Source0: %name-%version.tar.bz2
 License: GPL
@@ -245,6 +245,10 @@ done
 %config(noreplace) %_sysconfdir/logrotate.d/drakxtools-http
 
 %changelog 
+* Tue Jul 23 2002 Thierry Vignaud <tvignaud@mandrakesoft.com> 1.1.8-9mdk
+- reorganization cleanup:
+	move interactive_* into interactive::*
+
 * Sun Jul 21 2002 Pixel <pixel@mandrakesoft.com> 1.1.8-8mdk
 - new snapshot (beware of XFdrake)
 
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 4b701f5a8..2a93b2be1 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -1129,7 +1129,7 @@ sub check_prog {
 
 sub remove_unused {
     $::testing and return;
-    if ($::o->isa('interactive_gtk')) {
+    if ($::o->isa('interactive::gtk')) {
 	unlink glob_("/lib/lib$_*") foreach qw(slang newt);
 	unlink "/usr/bin/perl-install/auto/Newt/Newt.so";
     } else {
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index c27787e38..53f32a45e 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -88,7 +88,7 @@ sub set_help { 1 }
 #------------------------------------------------------------------------------
 sub selectLanguage {
     my ($o) = @_;
-    lang::set($o->{lang}, !$o->isa('interactive_gtk'));
+    lang::set($o->{lang}, !$o->isa('interactive::gtk'));
     $o->{langs} ||= { $o->{lang} => 1 };
 
     log::l("selectLanguage: pack_langs ", lang::pack_langs($o->{langs}));
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index ef4c15d15..c2ec797cd 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -4,14 +4,14 @@ use diagnostics;
 use strict;
 use vars qw(@ISA);
 
-@ISA = qw(install_steps_interactive interactive_gtk);
+@ISA = qw(install_steps_interactive interactive::gtk);
 
 #-######################################################################################
 #- misc imports
 #-######################################################################################
 use pkgs;
 use install_steps_interactive;
-use interactive_gtk;
+use interactive::gtk;
 use common;
 use my_gtk qw(:helpers :wrappers);
 use Gtk;
@@ -113,7 +113,7 @@ sub new($$) {
     $my_gtk::force_center = [ $::rootwidth - $::windowwidth, $::logoheight, $::windowwidth, $::windowheight ];
 
     $o = (bless {}, ref $type || $type)->SUPER::new($o);
-    $o->interactive_gtk::new;
+    $o->interactive::gtk::new;
     $o;
 }
 
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 069764f7d..4f04a8dcb 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -87,7 +87,7 @@ sub selectLanguage {
 
     $o->charsetChanged;
 
-    if ($o->isa('interactive_gtk')) {
+    if ($o->isa('interactive::gtk')) {
 	$o->ask_warn('', formatAlaTeX(
 "If you see this message it is because you chose a language for
 which DrakX does not include a translation yet; however the fact
@@ -406,7 +406,7 @@ Continue at your own risk!"));
 			            \&partition_table::description, \@l) or die "setstep exitInstall\n";
         }
 	install_any::use_root_part($o->{all_hds}, $p, $o->{prefix});
-    } elsif ($::expert && $o->isa('interactive_gtk')) {
+    } elsif ($::expert && $o->isa('interactive::gtk')) {
         install_interactive::partition_with_diskdrake($o, $o->{all_hds});
     } else {
         install_interactive::partitionWizard($o);
diff --git a/perl-install/install_steps_newt.pm b/perl-install/install_steps_newt.pm
index 2292094b0..1204c0729 100644
--- a/perl-install/install_steps_newt.pm
+++ b/perl-install/install_steps_newt.pm
@@ -4,13 +4,13 @@ use diagnostics;
 use strict;
 use vars qw(@ISA);
 
-@ISA = qw(install_steps_interactive interactive_newt);
+@ISA = qw(install_steps_interactive interactive::newt);
 
 #-######################################################################################
 #- misc imports
 #-######################################################################################
 use install_steps_interactive;
-use interactive_newt;
+use interactive::newt;
 use install_any;
 use devices;
 use lang;
@@ -28,7 +28,7 @@ sub banner {
 sub new($$) {
     my ($type, $o) = @_;
 
-    interactive_newt->new;
+    interactive::newt->new;
 
     banner('');
     Newt::PushHelpLine(_("  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "));
@@ -44,7 +44,7 @@ sub enteringStep {
 
 sub exitInstall { 
     &install_steps_interactive::exitInstall;
-    interactive_newt::end;
+    interactive::newt::end;
 }
 
 #-######################################################################################
diff --git a/perl-install/install_steps_stdio.pm b/perl-install/install_steps_stdio.pm
index 518640d29..1c0ea9abc 100644
--- a/perl-install/install_steps_stdio.pm
+++ b/perl-install/install_steps_stdio.pm
@@ -4,10 +4,10 @@ use diagnostics;
 use strict;
 use vars qw(@ISA);
 
-@ISA = qw(install_steps_interactive interactive_stdio);
+@ISA = qw(install_steps_interactive interactive::stdio);
 
 use common;
-use interactive_stdio;
+use interactive::stdio;
 use install_steps_interactive;
 use lang;
 
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index e978e9b6d..e217ecefb 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -73,8 +73,8 @@ sub vnew {
     my ($type, $su, $icon) = @_;
     $su = $su eq "su";
     if ($ENV{INTERACTIVE_HTTP}) {
-	require interactive_http;
-	return interactive_http->new;
+	require interactive::http;
+	return interactive::http->new;
     }
     require c;
     if ($su) {
@@ -89,9 +89,9 @@ sub vnew {
 		exec {'consolehelper'} $0, @ARGV or die _("consolehelper missing");
 	    }
 	}
-	eval { require interactive_gtk };
+	eval { require interactive::gtk };
 	if (!$@) {
-	    my $o = interactive_gtk->new;
+	    my $o = interactive::gtk->new;
 	    if ($icon && $icon ne 'default' && !$::isWizard) { $o->{icon} = $icon } else { undef $o->{icon} }
 	    return $o;
 	}
@@ -107,8 +107,8 @@ sub vnew {
     require 'log.pm';
     undef *log::l;
     *log::l = sub {}; # otherwise, it will bother us :(
-    require interactive_newt;
-    interactive_newt->new;
+    require interactive::newt;
+    interactive::newt->new;
 }
 
 sub enter_console {}
diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive/gtk.pm
index 4a4504997..8c71711ef 100644
--- a/perl-install/interactive_gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -1,4 +1,4 @@
-package interactive_gtk; # $Id$
+package interactive::gtk; # $Id$
 
 use diagnostics;
 use strict;
diff --git a/perl-install/interactive_http.pm b/perl-install/interactive/http.pm
index 18bff77fe..785446c46 100644
--- a/perl-install/interactive_http.pm
+++ b/perl-install/interactive/http.pm
@@ -1,4 +1,4 @@
-package interactive_http; # $Id$
+package interactive::http; # $Id$
 
 use diagnostics;
 use strict;
diff --git a/perl-install/interactive_newt.pm b/perl-install/interactive/newt.pm
index d930b9f29..da18c198a 100644
--- a/perl-install/interactive_newt.pm
+++ b/perl-install/interactive/newt.pm
@@ -1,4 +1,4 @@
-package interactive_newt; # $Id$
+package interactivew::newt; # $Id$
 
 use diagnostics;
 use strict;
diff --git a/perl-install/interactive_stdio.pm b/perl-install/interactive/stdio.pm
index 519f5ccbe..126e1d897 100644
--- a/perl-install/interactive_stdio.pm
+++ b/perl-install/interactive/stdio.pm
@@ -1,4 +1,4 @@
-package interactive_stdio; # $Id$
+package interactivew::stdio; # $Id$
 
 use diagnostics;
 use strict;
diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm
index f158d5142..86541ffe1 100644
--- a/perl-install/printerdrake.pm
+++ b/perl-install/printerdrake.pm
@@ -2572,7 +2572,7 @@ sub main {
 	    #if ((!$::expert) && (!$::isEmbedded) && (!$::isInstall) &&
 	    if ((!$::isEmbedded) && (!$::isInstall) &&
 	    #if ((!$::isInstall) &&
-		($in->isa('interactive_gtk'))) {
+		($in->isa('interactive::gtk'))) {
 		$continue = 1;
 		# Enter wizard mode
 		$::Wizard_pix_up = "wiz_printerdrake.png";
@@ -2915,14 +2915,11 @@ What do you want to modify on this printer?",
 
 	# Delete some variables
 	$printer->{OLD_QUEUE} = "";
-	$printer->{QUEUE} = "";
-	$printer->{TYPE} = "";
-	$printer->{str_type} = "";
+	foreach (qw(QUEUE TYPE str_type DBENTRY ARGS OLD_CHOICE)) {
+		$printer->{$_} = "";
+	}
 	$printer->{currentqueue} = {};
-	$printer->{DBENTRY} = "";
-	$printer->{ARGS} = "";
 	$printer->{complete} = 0;
-	$printer->{OLD_CHOICE} = "";
     }
     # Clean up the $printer data structure for auto-install log
     for my $queue (keys %{$printer->{configured}}) {
@@ -2935,20 +2932,7 @@ What do you want to modify on this printer?",
 	    delete($printer->{configured}{$queue}{queuedata}{menuentry});
 	}
     }
-    delete($printer->{OLD_QUEUE});
-    delete($printer->{QUEUE});
-    delete($printer->{TYPE});
-    delete($printer->{str_type});
-    delete($printer->{currentqueue});
-    delete($printer->{DBENTRY});
-    delete($printer->{ARGS});
-    delete($printer->{complete});
-    delete($printer->{OLD_CHOICE});
-    delete($printer->{NEW});
-    delete($printer->{MORETHANONE});
-    delete($printer->{MANUALMODEL});
-    #use Data::Dumper;
-    #print "###############################################################################\n", Dumper($printer); 
-
+	foreach (qw(Old_queue QUEUE TYPE str_type currentqueue DBENTRY ARGS complete OLD_CHOICE NEW MORETHANONE MANUALMODEL))
+	{ delete $printer->{$_} };
 }
 
diff --git a/perl-install/services.pm b/perl-install/services.pm
index 0ddaaf79a..a4dbc8e3a 100644
--- a/perl-install/services.pm
+++ b/perl-install/services.pm
@@ -252,7 +252,7 @@ sub ask_standalone_gtk {
 
 sub ask {    
     my ($in, $prefix) = @_;
-    !$::isInstall && $in->isa('interactive_gtk') ? &ask_standalone_gtk : &ask_install;
+    !$::isInstall && $in->isa('interactive::gtk') ? &ask_standalone_gtk : &ask_install;
 }
 
 sub doit {
diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake
index 69b84b0dc..97fca7bde 100755
--- a/perl-install/standalone/diskdrake
+++ b/perl-install/standalone/diskdrake
@@ -112,7 +112,7 @@ if ($type eq 'hd') {
       $in->ask_from_listf('', '', \&diskdrake::interactive::format_raw_hd_info, $all_hds->{raw_hds}) or $in->exit(0);
     diskdrake::removable::main($in, $all_hds, $raw_hd);
 } else {
-    $in->ask_warn('', "Sorry only a gtk frontend is available") if !$in->isa('interactive_gtk');
+    $in->ask_warn('', "Sorry only a gtk frontend is available") if !$in->isa('interactive::gtk');
     require diskdrake::smbnfs_gtk;
     diskdrake::smbnfs_gtk::main($in, $all_hds, $type);
 }
diff --git a/perl-install/standalone/drakautoinst b/perl-install/standalone/drakautoinst
index ae7ce1e9a..54e0fd139 100755
--- a/perl-install/standalone/drakautoinst
+++ b/perl-install/standalone/drakautoinst
@@ -89,7 +89,7 @@ my $cfgfile = "$mountdir/auto_inst.cfg";
 eval(cat_($cfgfile));
 my $o_old = $o;
 
-if (!$::isEmbedded && $in->isa('interactive_gtk')) {
+if (!$::isEmbedded && $in->isa('interactive::gtk')) {
     require Gtk;
     init Gtk;
     require my_gtk;
@@ -368,6 +368,9 @@ sub control_buttons {
 
 #-------------------------------------------------
 #- $Log$
+#- Revision 1.19  2002/07/23 10:35:55  tvignaud
+#- - Big Move 1: interactive::* hierarchy
+#-
 #- Revision 1.18  2002/03/06 20:17:51  damien
 #- corrected HASH and ARRAY label
 #-
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index e7e283c0d..174a40847 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -25,7 +25,7 @@ my $in = 'interactive'->vnew('su', 'bootloader');
 
 $::lilo_choice = \&lilo_choice;
 
-if ($in->isa('interactive_gtk')) {
+if ($in->isa('interactive::gtk')) {
     require 'bootlook.pm';
 } else {
     lilo_choice();
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index fdbe4bda4..aceef3f82 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -51,7 +51,7 @@ my @conx_type = ('modem', 'isdn_internal', 'isdn_external', 'adsl', 'cable', 'la
 #$::wizard_xpm = "/usr/share/pixmaps/internet.xpm";
 
 my $in = 'interactive'->vnew('su', 'network');
-!$::isEmbedded && $in->isa('interactive_gtk') and $::isWizard=1;
+!$::isEmbedded && $in->isa('interactive::gtk') and $::isWizard=1;
 $::Wizard_pix_up = "wiz_drakconnect.png";
 $::Wizard_title = "Network & Internet Configuration";
 
diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw
index cc35a1dc2..08119a6a9 100755
--- a/perl-install/standalone/drakgw
+++ b/perl-install/standalone/drakgw
@@ -56,9 +56,9 @@ my $drakgw_setup = "/etc/sysconfig/inet_sharing";
 
 my $in = 'interactive'->vnew('su', 'default');
 
-!$::isEmbedded && $in->isa('interactive_gtk') and $::isWizard=1;
+!$::isEmbedded && $in->isa('interactive::gtk') and $::isWizard=1;
 
-pur_gtk_mode() if $::isEmbedded && $in->isa('interactive_gtk');
+pur_gtk_mode() if $::isEmbedded && $in->isa('interactive::gtk');
 
 sub sys { system(@_) == 0 or log::l("[drakgw] Warning, sys failed for $_[0]") }
 
@@ -611,6 +611,9 @@ Click on Configure to launch the setup wizard.", $setup_state));
 
 #-------------------------------------------------
 #- $Log$
+#- Revision 1.62  2002/07/23 10:35:55  tvignaud
+#- - Big Move 1: interactive::* hierarchy
+#-
 #- Revision 1.61  2002/04/09 08:50:36  gc
 #- time to remove ipchains/2.2 stuff since now ipchains and iptables
 #- packages conflict
diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv
index 16b64ecec..7250ab5f8 100755
--- a/perl-install/standalone/drakxtv
+++ b/perl-install/standalone/drakxtv
@@ -120,8 +120,8 @@ You can install it by typing \"urpmi xawtv\" as root, in a console.")));
 #       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);
-		  # Note that this'll be broken if/when we implement interactive_qt
-		  my $use_X =$in->isa('interactive_gtk') && -x "/usr/X11R6/bin/xvt";
+		  # Note that this'll be broken if/when we implement interactive::qt
+		  my $use_X =$in->isa('interactive::gtk') && -x "/usr/X11R6/bin/xvt";
 		  my $home = $ENV{HOME};
 		  my $i=system ( (($use_X ) ?
 					   "xvt -T '"._("Scanning for TV channels")." ...' -e ":"")
diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake
index 90cb8994c..f8bb9a02e 100755
--- a/perl-install/standalone/mousedrake
+++ b/perl-install/standalone/mousedrake
@@ -58,7 +58,7 @@ $mouse->{XMOUSETYPE} eq $curr_env->{mouse}{XMOUSETYPE} ||
 $::isEmbedded and kill USR2, $::CCPID;
 if (!$mouse || !$::auto) {
     $mouse ||= mouse::fullname2mouse("serial|Generic 2 Button Mouse");
-    if ($::isEmbedded && $in->isa('interactive_gtk')) {
+    if ($::isEmbedded && $in->isa('interactive::gtk')) {
 	require my_gtk;
 	my $time_tag = Gtk->timeout_add(100, sub {
 					    defined $::Plug && defined $::Plug->child or return 1;
@@ -70,7 +70,7 @@ if (!$mouse || !$::auto) {
 				       sub { join '|', map { translate($_) } split '\|', $_[0] },
 				       [ mouse::fullnames ], 
 				       $mouse->{type} . '|' . $mouse->{name});
-    Gtk->timeout_remove($time_tag2) if $::isEmbedded  && $in->isa('interactive_gtk');
+    Gtk->timeout_remove($time_tag2) if $::isEmbedded  && $in->isa('interactive::gtk');
     $name or $::isEmbedded ? do { kill(USR1, $::CCPID); goto begin } : $in->exit(0);
     my $mouse_chosen = mouse::fullname2mouse($name);
     $mouse->{type} eq $mouse_chosen->{type} && $mouse->{name} eq $mouse_chosen->{name} or $mouse = $mouse_chosen;
diff --git a/perl-install/standalone/tinyfirewall b/perl-install/standalone/tinyfirewall
index 3f91a0027..40dbd5f21 100755
--- a/perl-install/standalone/tinyfirewall
+++ b/perl-install/standalone/tinyfirewall
@@ -34,7 +34,7 @@ local $_ = join '', @ARGV;
 
 my $in = 'interactive'->vnew('su', 'default');
 
-$::isEmbedded && $in->isa('interactive_gtk') or goto dd;
+$::isEmbedded && $in->isa('interactive::gtk') or goto dd;
 require Gtk;
 init Gtk;