summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-08-27 19:29:35 +0000
committerThierry Vignaud <tv@mandriva.org>2008-08-27 19:29:35 +0000
commitbfbd03b2b117ced6791a70be7cc07ee7cc144a59 (patch)
tree5b5fda50a21ef140c5945917470204eaacca7f74
parenta6ddf60c9562929a7d9da2d972dc5395f075ebfc (diff)
downloaddrakx-bfbd03b2b117ced6791a70be7cc07ee7cc144a59.tar
drakx-bfbd03b2b117ced6791a70be7cc07ee7cc144a59.tar.gz
drakx-bfbd03b2b117ced6791a70be7cc07ee7cc144a59.tar.bz2
drakx-bfbd03b2b117ced6791a70be7cc07ee7cc144a59.tar.xz
drakx-bfbd03b2b117ced6791a70be7cc07ee7cc144a59.zip
(create_widget) restore support for advanced_messages (regression introduced in
r244088: "(create_widget) popup advanced settings in dialogs")
-rw-r--r--perl-install/interactive/gtk.pm11
1 files changed, 10 insertions, 1 deletions
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index 87b28a685..a33d48138 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -11,6 +11,7 @@ use common;
use mygtk2;
use ugtk2 qw(:helpers :wrappers :create);
use Gtk2::Gdk::Keysyms;
+use feature qw(state);
my $forgetTime = 1000; #- in milli-seconds
@@ -422,7 +423,15 @@ sub create_widget {
my $box = create_widgets_block($o, $children, $update, $ignore_ref);
$w = gtknew('HBox', children_tight => [
gtknew('Install_Button', text => $e->{text},
- clicked => sub { ask_fromW($o, { title => N("Advanced") }, $e->{children}) }
+ clicked => sub {
+ state $done;
+ if (!$done) {
+ unshift @{$e->{children}},
+ { type => 'only_label', no_indent => 1, val => \$e->{message} } if $e->{message};
+ $done = 1;
+ }
+
+ ask_fromW($o, { title => N("Advanced") }, $e->{children}) }
)
]);
} elsif ($e->{type} =~ /list/) {