From 4dd9866ad98490d1423b19a475c36cde402f3785 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Mon, 24 Feb 2003 07:37:48 +0000
Subject: first attempt at making printerdrake to behave smoother when embedded
 in the mcc

---
 perl-install/interactive/gtk.pm      |  1 +
 perl-install/printer/printerdrake.pm |  5 ++---
 perl-install/standalone/harddrake2   | 11 ++++-------
 3 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index 5aeef16a9..867f34b92 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -696,6 +696,7 @@ sub ask_from__add_modify_removeW {
 
 sub wait_messageW($$$) {
     my ($o, $title, $messages) = @_;
+    local $::isEmbedded = 0; # to prevent sub window embedding
 
     my @l = map { Gtk2::Label->new(scalar warp_text($_)) } @$messages;
     my $w = ugtk2->new($title, %$o, grab => 1, if__($::main_window, transient => $::main_window));
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index b0fb6b58b..77607404e 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -520,7 +520,6 @@ sub first_time_dialog {
     my ($printer, $in, $upNetwork) = @_;
     return 1 if printer::default::get_spooler() || $::isInstall;
 
-    # Wait message
     my $w = $in->wait_message(N("Printerdrake"), N("Checking your system..."));
 
     # Auto-detect local printers   
@@ -3291,13 +3290,13 @@ sub install_spooler {
     # "lpr" conflicts with "LPRng", remove either "LPRng" or remove "lpr"
     my $packages = $spoolers{$spooler}{packages2rm};
     if ($packages && files_exist($packages->[1])) {
-        $w->set(N("Printerdrake"), N("Removing %s ..."), $spoolers{$packages->[0]}{short_name});
+        $w = $in->wait_message(N("Printerdrake"), N("Removing %s ..."), $spoolers{$packages->[0]}{short_name});
         $in->do_pkgs->remove_nodeps($packages->[0]);
     }
 
     $packages = $spoolers{$spooler}{packages2add};
     if ($packages && !files_exist(@{$packages->[1]})) {
-        $w->set(N("Printerdrake"), N("Installing %s ..."), $spoolers{$spooler}{short_name});
+        $w = $in->wait_message(N("Printerdrake"), N("Installing %s ..."), $spoolers{$spooler}{short_name});
         $in->do_pkgs->install(@{$packages->[0]});
     }
 
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index 8ed52485a..c6041c284 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -118,14 +118,11 @@ my @menu_items =
          }
      }
      );
-my ($sig_id, $wait);
+
 $in = 'interactive'->vnew('su', 'default');
 
-{
-    local $::isEmbedded = 0; # to prevent sub window embedding
-    $wait = $in->wait_message(N("Please wait"), N("Detection in progress"));
-    gtkflush();
-}
+my $wait = $in->wait_message(N("Please wait"), N("Detection in progress"));
+gtkflush();
 
 %options = getVarsFromSh($conffile);
 
@@ -141,7 +138,7 @@ unless ($::isEmbedded) {
     ($menubar, $factory) = create_factory_menu($w->{rwindow}, @menu_items);
 }
 my $tree_model = Gtk2::TreeStore->new(Gtk2::GType->OBJECT, Gtk2::GType->STRING);
-my $statusbar;
+my ($statusbar, $sig_id);
 $w->{window}->add(gtkpack_(0, Gtk2::VBox->new(0, 0),
                            if_(!$::isEmbedded, 0, $menubar),
                            1, create_hpaned(gtkadd(new Gtk2::Frame(N("Detected hardware")), 
-- 
cgit v1.2.1