summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-08-19 09:24:22 +0000
committerThierry Vignaud <tv@mandriva.org>2008-08-19 09:24:22 +0000
commit22dd2219ea776cc40db01e4573a0fca3f66946ce (patch)
tree7dd748d73f5e590a2f6ba0f504b64f0678baead2 /perl-install
parent294f399ae97c94f5fbf68f4293aa89bb6d301a97 (diff)
downloaddrakx-22dd2219ea776cc40db01e4573a0fca3f66946ce.tar
drakx-22dd2219ea776cc40db01e4573a0fca3f66946ce.tar.gz
drakx-22dd2219ea776cc40db01e4573a0fca3f66946ce.tar.bz2
drakx-22dd2219ea776cc40db01e4573a0fca3f66946ce.tar.xz
drakx-22dd2219ea776cc40db01e4573a0fca3f66946ce.zip
(_gtk__Install_Title) fix bogus popup of 'desktop choice' dialog
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/mygtk2.pm20
2 files changed, 12 insertions, 9 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 68b3d46cc..96bd1c28e 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,5 @@
- fix crash with advanced widgets
+- fix bogus popup of 'desktop choice' dialog
Version 11.13 - 18 August 2008
diff --git a/perl-install/mygtk2.pm b/perl-install/mygtk2.pm
index 83aaded6b..c13f3966c 100644
--- a/perl-install/mygtk2.pm
+++ b/perl-install/mygtk2.pm
@@ -387,9 +387,15 @@ sub title1_to_markup {
sub _gtk__Install_Title {
my ($w, $opts) = @_;
- $opts->{widget_name} = 'Banner';
- $opts->{padding} = [ 20, 0 ];
- _gtk__Title2($w, $opts);
+ local $opts->{widget_name} = 'Banner';
+ gtknew('HBox', widget_name => 'Banner', children => [
+ 0, gtknew('Label', padding => [ 6, 0 ]),
+ 1, gtknew('VBox', widget_name => 'Banner', children_tight => [
+ _gtk__Title2($w, $opts),
+ if_($::isInstall, Gtk2::HSeparator->new),
+ ]),
+ 0, gtknew('Label', padding => [ 6, 0 ]),
+ ]);
}
sub _gtk__Title1 {
@@ -660,9 +666,7 @@ sub _gtk__MagicWindow {
my $provided_banner = delete $opts->{banner};
if ($pop_it && $provided_banner) {
- $sub_child = gtknew('VBox', children => [ 0, $provided_banner,
- if_($::isInstall, 0, Gtk2::HSeparator->new),
- if_($sub_child, 1, $sub_child) ]);
+ $sub_child = gtknew('VBox', children => [ 0, $provided_banner, if_($sub_child, 1, $sub_child) ]);
} else {
$sub_child ||= gtknew('VBox');
}
@@ -706,9 +710,7 @@ sub _gtk__MagicWindow {
$w = $::WizardWindow;
- gtkadd($::WizardTable, children_tight => [ $provided_banner,
- if_($::isInstall, Gtk2::HSeparator->new),
- ]) if $provided_banner;
+ gtkadd($::WizardTable, children_tight => [ $provided_banner ]) if $provided_banner;
gtkadd($::WizardTable, children_loose => [ $sub_child ]);
}
bless {