summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-12-18 11:48:29 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-12-18 11:48:29 +0000
commit61441f63bdba1521e6ba62f8e8aecf8cd5f73dfd (patch)
treeade67af5d9536e11c3f4e71e5af5fcb476a905d1
parent1c31bb44a2882a2689875ce8de00b6b4b9925415 (diff)
downloaddrakx-backup-do-not-use-61441f63bdba1521e6ba62f8e8aecf8cd5f73dfd.tar
drakx-backup-do-not-use-61441f63bdba1521e6ba62f8e8aecf8cd5f73dfd.tar.gz
drakx-backup-do-not-use-61441f63bdba1521e6ba62f8e8aecf8cd5f73dfd.tar.bz2
drakx-backup-do-not-use-61441f63bdba1521e6ba62f8e8aecf8cd5f73dfd.tar.xz
drakx-backup-do-not-use-61441f63bdba1521e6ba62f8e8aecf8cd5f73dfd.zip
fix spurious previous button at install time on wizards' first steps
-rw-r--r--perl-install/ugtk2.pm7
1 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index b13ab7514..a0757ef82 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -484,7 +484,12 @@ sub create_okcancel {
# @other is a list of extra buttons (usually help (eg: XFdrake/drakx caller) or advanced (eg: interactive caller) button)
# extra buttons have the following structure [ label, handler, is_first ]
local $::isWizard = $::isWizard && !$w->{pop_it};
- my $cancel = defined $o_cancel || defined $o_ok ? $o_cancel : $::isWizard ? N("<- Previous") : N("Cancel");
+ my $cancel;
+ if (defined $o_cancel || defined $o_ok) {
+ $cancel = $o_cancel;
+ } elsif (!$::Wizard_no_previous) {
+ $cancel = $::isWizard ? N("<- Previous") : N("Cancel");
+ }
my $ok = defined $o_ok ? $o_ok : $::isWizard ? ($::Wizard_finished ? N("Finish") : N("Next ->")) : N("Ok");
my $bok = $ok && gtksignal_connect($w->{ok} = Gtk2::Button->new($ok), clicked => $w->{ok_clicked} || sub { $w->{retval} = 1; Gtk2->main_quit });
my $bprev;