summaryrefslogtreecommitdiffstats
path: root/perl-install/my_gtk.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-09-12 23:40:48 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-09-12 23:40:48 +0000
commit2d92149a58246b77fc9427fbdd354baba4982a86 (patch)
tree485d2fa71681bf82ed4909b8b9bef56237a06608 /perl-install/my_gtk.pm
parentbffb022e14866052364fb547cefd6cd6be87b14c (diff)
downloaddrakx-2d92149a58246b77fc9427fbdd354baba4982a86.tar
drakx-2d92149a58246b77fc9427fbdd354baba4982a86.tar.gz
drakx-2d92149a58246b77fc9427fbdd354baba4982a86.tar.bz2
drakx-2d92149a58246b77fc9427fbdd354baba4982a86.tar.xz
drakx-2d92149a58246b77fc9427fbdd354baba4982a86.zip
no_comment
Diffstat (limited to 'perl-install/my_gtk.pm')
-rw-r--r--perl-install/my_gtk.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm
index 2d9c65a2a..e59a1404c 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -45,7 +45,8 @@ sub new {
sub main($;$) {
my ($o, $f) = @_;
gtkset_mousecursor_normal();
- my $idle = Gtk->timeout_add(1000, sub { gtkset_mousecursor_normal() });
+ my $timeout = Gtk->timeout_add(1000, sub { log::l("gtkset_mousecursor_normal"); gtkset_mousecursor_normal(); 1 });
+ my $b = before_leaving { Gtk->timeout_remove($timeout) };
$o->show;
do {
@@ -240,7 +241,7 @@ sub create_okcancel {
$ok ||= $::isWizard ? _("Next ->") : _("Ok");
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 $b2 = !$one && gtksignal_connect($w->{cancel} = new Gtk::Button($cancel || _("Cancel")), "clicked" => $w->{cancel_clicked} || sub { undef $w->{retval}; Gtk->main_quit });
my @l = grep { $_ } $::isStandalone ? ($b2, $b1) : ($b1, $b2);
$_->can_default($::isStandalone) foreach @l;