From 662a5c39e020c053151a4974427cfff64166c111 Mon Sep 17 00:00:00 2001
From: Guillaume Cottenceau <gc@mandriva.com>
Date: Thu, 20 Feb 2003 19:34:55 +0000
Subject: oops i didn't understand the internals of wait_message hence breaking
 it. hopes that will fix.

---
 perl-install/install_steps_interactive.pm | 8 ++++----
 perl-install/interactive.pm               | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 49641703a..db7351ca3 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -340,7 +340,7 @@ sub formatMountPartitions {
         fs::formatMount_all($o->{all_hds}{raids}, $o->{fstab}, $o->{prefix}, sub {
         	my ($msg) = @_;
         	$w ||= $o->wait_message('', $msg);
-        	$w->set_label($msg);
+        	$w->set($msg);
         });
     } sub { 
 	$@ =~ /fsck failed on (\S+)/ or return;
@@ -358,11 +358,11 @@ sub setPackages {
 			     N("Looking for available packages..."));
     install_any::setPackages($o, $rebuild_needed);
 
-    $w->set_label(N("Looking at packages already installed..."));
+    $w->set(N("Looking at packages already installed..."));
     pkgs::selectPackagesAlreadyInstalled($o->{packages}, $o->{prefix});
 
     if ($rebuild_needed) {
-	$w->set_label(N("Finding packages to upgrade..."));
+	$w->set(N("Finding packages to upgrade..."));
 	pkgs::selectPackagesToUpgrade($o->{packages}, $o->{prefix});
     }
 }
@@ -658,7 +658,7 @@ sub installPackages {
 	    $total = $total_;
 	} elsif ($type eq 'inst' && $subtype eq 'start') {
 	    my $p = $data->{depslist}[$id];
-	    $w->set_label(N("Installing package %s\n%d%%", $p->name, $total && 100 * $current / $total));
+	    $w->set(N("Installing package %s\n%d%%", $p->name, $total && 100 * $current / $total));
 	    $current += $p->size;
 	} else { goto $old }
     };
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index 503269535..b06ebdee2 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -437,8 +437,8 @@ sub wait_message {
     push @tempory::objects, $w if $temp;
     my $b = before_leaving { $o->wait_message_endW($w) };
 
-    #- enable access through set_label
-    MDK::Common::Func::add_f4before_leaving(sub { $o->wait_message_nextW([ deref($_[1]) ], $w) }, $b, 'set_label');
+    #- enable access through set
+    MDK::Common::Func::add_f4before_leaving(sub { $o->wait_message_nextW([ deref($_[1]) ], $w) }, $b, 'set');
     $b;
 }
 
-- 
cgit v1.2.1