summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-11-18 15:19:07 +0000
committerThierry Vignaud <tv@mandriva.org>2009-11-18 15:19:07 +0000
commitedf9951966c96840798deb2ef2f697c9b39edaf6 (patch)
tree9cb2cceae190ed546f194153f4c0677f68bedda2 /perl-install
parent6df4a6ae0abf4770107fbc4ee902f62cdd6821d5 (diff)
downloaddrakx-edf9951966c96840798deb2ef2f697c9b39edaf6.tar
drakx-edf9951966c96840798deb2ef2f697c9b39edaf6.tar.gz
drakx-edf9951966c96840798deb2ef2f697c9b39edaf6.tar.bz2
drakx-edf9951966c96840798deb2ef2f697c9b39edaf6.tar.xz
drakx-edf9951966c96840798deb2ef2f697c9b39edaf6.zip
hide Gtk+ "close" button when displaying first time wizard that now has
a HTML "close" button again (backported from trunk)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS2
-rwxr-xr-xperl-install/standalone/display_help4
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index c9afb0379..9ad64bcb5 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -4,6 +4,8 @@
o fix handling hdX/sdX devices (#53107)
- display_help:
o handle window.close() events (#55099)
+ o hide Gtk+ "close" button when displaying first time wizard that
+ now has a HTML "close" button again
Version 12.77 - 30 October 2009
diff --git a/perl-install/standalone/display_help b/perl-install/standalone/display_help
index 1d626d24d..db51ad09c 100755
--- a/perl-install/standalone/display_help
+++ b/perl-install/standalone/display_help
@@ -58,11 +58,11 @@ gtkadd($w->{rwindow},
1, create_scrolled_window(gtkset_border_width($view, 5), [ 'never', 'automatic' ]),
#1, gtknew('ScrolledWindow', child => $view, border_width => 5, h_policy => 'never');
0, Gtk2::HSeparator->new,
- #if_($_firsttime, # We have JavaScritp issues for now, so let's keep the "close" button:
+ if_(!$is_firstime,
0, gtkpack(create_hbox('end'),
gtknew('Button', text => N("Close"), clicked => sub { Gtk2->main_quit })
),
- #),
+ ),
),
);