diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-09-17 11:07:12 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-09-17 11:07:12 +0000 |
| commit | 278293b4a0048eee20c3232d50d03b8a6e3a33b2 (patch) | |
| tree | b3c7608fbf76681ef9640946e6da3fb8c0b4a59d /perl-install | |
| parent | ff0952cd83a650f8460dc29d563b3d84ab00e9cc (diff) | |
| download | drakx-278293b4a0048eee20c3232d50d03b8a6e3a33b2.tar drakx-278293b4a0048eee20c3232d50d03b8a6e3a33b2.tar.gz drakx-278293b4a0048eee20c3232d50d03b8a6e3a33b2.tar.bz2 drakx-278293b4a0048eee20c3232d50d03b8a6e3a33b2.tar.xz drakx-278293b4a0048eee20c3232d50d03b8a6e3a33b2.zip | |
- fix blocking wait_message (when they pop) (#33676, #33670)
the fix is quite ugly: don't use banner when we pop and have a "child"
but the code was buggy anyway, the "child" was dropped, replaced by the banner
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/mygtk2.pm | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index e96ea9fa2..08f1f208a 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,4 @@ +- fix blocking wait_message (when they pop) (#33676, #33670) - advertising: restore support for $title in .pl files (wrongly dropped in 10.4.195) - localization: o fix installing packages according to desktop diff --git a/perl-install/mygtk2.pm b/perl-install/mygtk2.pm index 660b5fa85..2278a8b93 100644 --- a/perl-install/mygtk2.pm +++ b/perl-install/mygtk2.pm @@ -589,7 +589,7 @@ sub _gtk__MagicWindow { my $provided_banner = delete $opts->{banner}; if ($pop_it) { - $sub_child = gtknew('VBox', children_tight => [ $provided_banner ]) if $provided_banner; + $sub_child ||= gtknew('VBox', children_tight => [ $provided_banner ]) if $provided_banner; $opts->{child} = $::isInstall ? gtknew('Frame', shadow_type => 'out', child => gtknew('Frame', shadow_type => 'none', border_width => 3, child => $sub_child)) : |