diff options
| author | damien <damien@mandriva.com> | 2000-09-12 23:37:53 +0000 |
|---|---|---|
| committer | damien <damien@mandriva.com> | 2000-09-12 23:37:53 +0000 |
| commit | bffb022e14866052364fb547cefd6cd6be87b14c (patch) | |
| tree | 5f34b488fd04b38fbd708aef1a2dfca6ebfdf827 | |
| parent | fcd7686cfbdc4534c97fa4c39700e95b9acbd8d6 (diff) | |
| download | drakx-bffb022e14866052364fb547cefd6cd6be87b14c.tar drakx-bffb022e14866052364fb547cefd6cd6be87b14c.tar.gz drakx-bffb022e14866052364fb547cefd6cd6be87b14c.tar.bz2 drakx-bffb022e14866052364fb547cefd6cd6be87b14c.tar.xz drakx-bffb022e14866052364fb547cefd6cd6be87b14c.zip | |
updated
| -rw-r--r-- | perl-install/interactive_gtk.pm | 2 | ||||
| -rw-r--r-- | perl-install/my_gtk.pm | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/draknet | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive_gtk.pm index 610bbfb20..6a89cc481 100644 --- a/perl-install/interactive_gtk.pm +++ b/perl-install/interactive_gtk.pm @@ -64,7 +64,7 @@ sub ask_from_list_with_helpW { $b; } @$l, )), 0, new Gtk::HSeparator, - 0, $w->create_okcancel(), + $::isWizard ? (0, $w->create_okcancel()) : (), ), ); # { diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm index b8831f577..2d9c65a2a 100644 --- a/perl-install/my_gtk.pm +++ b/perl-install/my_gtk.pm @@ -239,7 +239,7 @@ sub create_okcancel { $spread ||= $::isWizard ? "edge" : "spread"; $ok ||= $::isWizard ? _("Next ->") : _("Ok"); - my $b1 = gtksignal_connect($w->{ok} = new Gtk::Button($ok), "clicked" => $w->{ok_clicked} || sub { Gtk->main_quit }); + my $b1 = gtksignal_connect($w->{ok} = new Gtk::Button($ok), "clicked" => $w->{ok_clicked} || sub { $w->{retval} = 1; Gtk->main_quit }); my $b2 = !$one && gtksignal_connect(new Gtk::Button($cancel || _("Cancel")), "clicked" => $w->{cancel_clicked} || sub { $w->{retval} = 0; Gtk->main_quit }); my @l = grep { $_ } $::isStandalone ? ($b2, $b1) : ($b1, $b2); diff --git a/perl-install/standalone/draknet b/perl-install/standalone/draknet index e29734595..02993fd0d 100755 --- a/perl-install/standalone/draknet +++ b/perl-install/standalone/draknet @@ -19,7 +19,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -use lib qw(/usr/lib/libDrakX); +use lib qw(..); #(/usr/lib/libDrakX); use interactive; use netconnect; |