diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2002-09-16 10:21:21 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2002-09-16 10:21:21 +0000 |
| commit | 074de4bedb25fe246817ad6a8f8039681442ddcf (patch) | |
| tree | fa78b37be1a3e535a40de3eac6e479d87df8cfa6 | |
| parent | f12a9634c8df853a47daffd4c8ea0a0a7b52377d (diff) | |
| download | drakx-074de4bedb25fe246817ad6a8f8039681442ddcf.tar drakx-074de4bedb25fe246817ad6a8f8039681442ddcf.tar.gz drakx-074de4bedb25fe246817ad6a8f8039681442ddcf.tar.bz2 drakx-074de4bedb25fe246817ad6a8f8039681442ddcf.tar.xz drakx-074de4bedb25fe246817ad6a8f8039681442ddcf.zip | |
fix die wizcancel in non wizard mode
| -rw-r--r-- | perl-install/drakxtools.spec | 5 | ||||
| -rw-r--r-- | perl-install/my_gtk.pm | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/drakxtools.spec b/perl-install/drakxtools.spec index 5c1366247..df7ba9ed9 100644 --- a/perl-install/drakxtools.spec +++ b/perl-install/drakxtools.spec @@ -1,7 +1,7 @@ Summary: The drakxtools (XFdrake, diskdrake, keyboarddrake, mousedrake...) Name: drakxtools Version: 1.1.9 -Release: 47mdk +Release: 48mdk Url: http://www.linux-mandrake.com/en/drakx.php3 Source0: %name-%version.tar.bz2 License: GPL @@ -288,6 +288,9 @@ file /etc/sysconfig/harddrake2/previous_hw | fgrep -q perl && %_datadir/harddrak %config(noreplace) %_sysconfdir/logrotate.d/drakxtools-http %changelog +* Mon Sep 16 2002 Guillaume Cottenceau <gc@mandrakesoft.com> 1.1.9-48mdk +- fix die wizcancel in non wizard mode (dams sucks?) + * Fri Sep 13 2002 Daouda LO <daouda@mandrakesoft.com> 1.1.9-47mdk - obsoletes drakfloppy diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm index 4f2eb40aa..e2ce4fa1b 100644 --- a/perl-install/my_gtk.pm +++ b/perl-install/my_gtk.pm @@ -204,7 +204,7 @@ sub _create_window($$) { $w->set_title($title); $w->signal_connect(expose_event => sub { eval { $interactive::objects[-1]{rwindow} == $w and $w->window->XSetInputFocus } }) if $my_gtk::force_focus || $o->{force_focus}; - $w->signal_connect(delete_event => sub { $w->destroy; die 'wizcancel' }); + $w->signal_connect(delete_event => sub { if ($::isWizard) { $w->destroy; die 'wizcancel' } else { Gtk->main_quit } }); $w->set_uposition(@{$my_gtk::force_position || $o->{force_position}}) if $my_gtk::force_position || $o->{force_position}; my $focusing; |