- clean up embedding; since socket automatically emit plug-added gtk+ signal

  when plug is realize, it's just cleaner to centralize/consolidate the child
  embedding in mcc
  this of course, need a newer up-to-date mcc
  what's more, it allows to remove the somewhat mythical
  "$::isEmbedded and kill 'USR2', $::CCPID;"
- keyboarddrake, xfdrake, drakautoinst: goto cleaning btw

10 files changed, 0 insertions, 16 deletions

diff --git a/perl-install/bootlook.pm b/perl-install/bootlook.pm
index c525673f5..9e46180fd 100644
--- a/perl-install/bootlook.pm
+++ b/perl-install/bootlook.pm
@@ -347,7 +347,6 @@ Click on Configure to launch the setup wizard.", $lilogrub),
 $window->show_all();
 $no_bootsplash and $thm_frame->hide();
 gtkflush();
-$::isEmbedded and kill 'USR2', $::CCPID;
 $inmain = 1;
 Gtk2->main;
 Gtk2->exit(0);
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm
index 50fbcc630..7d5be1f41 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -105,7 +105,6 @@ sub new {
 sub main {
     my ($o, $completed, $canceled) = @_;
     gtkset_mousecursor_normal();
-    $::CCPID and kill 'USR2', $::CCPID;
     my $timeout = Gtk->timeout_add(1000, sub { gtkset_mousecursor_normal(); 1 });
     my $_b = MDK::Common::Func::before_leaving { Gtk->timeout_remove($timeout) };
     $o->show;
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index b8a905b75..5a4b923c2 100755
--- a/perl-install/standalone/XFdrake
+++ b/perl-install/standalone/XFdrake
@@ -35,14 +35,11 @@ local $_ = join '', @ARGV;
 my ($configure_this) = grep { !/^-/ } @ARGV;
 $configure_this ||= 'everything';
 
-begin:
 { 
     my $in = 'interactive'->vnew('su', 'X');
 
     modules::mergein_conf('/etc/modules.conf') if -r '/etc/modules.conf';
 
-    $::isEmbedded and kill 'USR2', $::CCPID;
-
     my $rc = do {
 	my $options = { allowNVIDIA_rpms => allowNVIDIA_rpms(), allowFB => listlength(cat_("/proc/fb")) };
 
diff --git a/perl-install/standalone/drakautoinst b/perl-install/standalone/drakautoinst
index 540a2fb82..789f57d3c 100755
--- a/perl-install/standalone/drakautoinst
+++ b/perl-install/standalone/drakautoinst
@@ -33,9 +33,6 @@ $::direct = /-direct/;
 
 my $in = 'interactive'->vnew('su', 'default');
 
-begin:
-$::isEmbedded and kill 'USR2', $::CCPID;
-
 my $imagefile = "/root/drakx/replay_install.img";
 -f $imagefile or $in->ask_warn(N("Error!"), 
 			       N("I can't find needed image file `%s'.", $imagefile), 1), quit_global($in, 0);
@@ -210,7 +207,6 @@ if (!$::isEmbedded && $in->isa('interactive::gtk')) {
 #  	  );
 #    $notebook->set_tab_pos('left');
 #    $::isEmbedded and gtkflush();
-    $::isEmbedded and kill('USR2', $::CCPID);
     $W->main;
 #    $W->destroy();
 }
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index c87812143..2cc60afa1 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -298,7 +298,6 @@ $combo1->entry->signal_connect('changed', sub {
 $window1->{rwindow}->show_all();
 $_->hide foreach $button_internet, $button_lan;
 gtkflush();
-$::isEmbedded and kill 'USR2', $::CCPID;
 my $tag = Gtk2->timeout_add(4000, \&update2);
 $window1->main;
 ugtk2->exit(0);
diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake
index 081ddc5b2..f69005dad 100755
--- a/perl-install/standalone/keyboarddrake
+++ b/perl-install/standalone/keyboarddrake
@@ -19,8 +19,6 @@ if (my ($kb) = grep { !/^-/ } @ARGV) {
 } else {
     $in = 'interactive'->vnew('su', 'keyboard');
 
-  begin:
-    $::isEmbedded and kill 'USR2', $::CCPID;
   choose:
     $keyboard->{KEYBOARD} = $in->ask_from_listf(N("Keyboard"),
 						N("Please, choose your keyboard layout."),
diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake
index 143d3ff1d..9b44ae76d 100755
--- a/perl-install/standalone/logdrake
+++ b/perl-install/standalone/logdrake
@@ -208,7 +208,6 @@ $::isFile and gtkset_size_request($log_text, 400, 500);
 $my_win->{window}->realize;
 $my_win->{window}->show_all();
 search() if $::isFile;
-kill 'USR2', $::CCPID if $::isEmbedded; # special case because logdrake is also embedded for logs
 $my_win->main;
 
 sub quit { ugtk2->exit(0) }
diff --git a/perl-install/standalone/printerdrake b/perl-install/standalone/printerdrake
index 6b42c569f..7d4576656 100755
--- a/perl-install/standalone/printerdrake
+++ b/perl-install/standalone/printerdrake
@@ -38,7 +38,6 @@ my $in = 'interactive'->vnew('su', if_(!$::isEmbedded, 'printer-mdk'));
 
 my $commandline = $_;
 
-$::CCPID and kill 'USR2', $::CCPID;
 exit 0 unless printer::printerdrake::first_time_dialog($printer, $in, 1);
 
 {
diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake
index b1f47fb5c..95facfa73 100755
--- a/perl-install/standalone/scannerdrake
+++ b/perl-install/standalone/scannerdrake
@@ -45,7 +45,6 @@ if (!files_exist('/usr/bin/scanimage',
 			      'xsane-gimp'));
 }
 if ($::Manual) { manual(); quit() }
-$::CCPID and kill 'USR2', $::CCPID;
 my $wait = $in->wait_message(N("Scannerdrake"),
 			     N("Searching for configured scanners ..."));
 my @c = scanner::configured();
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index accdccdae..f2006d853 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -841,7 +841,6 @@ sub new {
 sub main {
     my ($o, $completed, $canceled) = @_;
     gtkset_mousecursor_normal();
-    $::CCPID and $0 !~ /logdrake/ and kill 'USR2', $::CCPID;
     my $timeout = Gtk2->timeout_add(1000, sub { gtkset_mousecursor_normal(); 1 });
     my $_b = MDK::Common::Func::before_leaving { Gtk2->timeout_remove($timeout) };
     $o->show;