summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-01-15 12:22:41 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-01-15 12:22:41 +0000
commit63f4f5a992731ab23a58890694177b2a55d0892e (patch)
tree1f33db91c61e5b6de161e8712b114c68b801aede
parent44cf3cfe7d7c7f0c1da888db6011c7e72419a0f6 (diff)
downloaddrakx-63f4f5a992731ab23a58890694177b2a55d0892e.tar
drakx-63f4f5a992731ab23a58890694177b2a55d0892e.tar.gz
drakx-63f4f5a992731ab23a58890694177b2a55d0892e.tar.bz2
drakx-63f4f5a992731ab23a58890694177b2a55d0892e.tar.xz
drakx-63f4f5a992731ab23a58890694177b2a55d0892e.zip
allow passing gtk widgets to ->wait_message
-rw-r--r--perl-install/interactive/gtk.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index 39397d01b..8c4c3b6b4 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -723,7 +723,8 @@ sub ask_from__add_modify_removeW {
sub wait_messageW {
my ($_o, $title, $messages) = @_;
- my @l = map { Gtk2::Label->new(scalar warp_text($_)) } @$messages;
+ my $to_modify;
+ my @l = map { ref $_ ? $_ : ($to_modify = Gtk2::Label->new(scalar warp_text($_))) } @$messages;
my $Window = gtknew('MagicWindow',
title => $title,
@@ -737,7 +738,7 @@ sub wait_messageW {
])
);
$Window->signal_connect(expose_event => sub { $Window->{displayed} = 1; 0 });
- $Window->{wait_messageW} = $l[-1];
+ $Window->{wait_messageW} = $to_modify;
mygtk2::sync($Window) while !$Window->{displayed};
$Window;
}