diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 1999-11-09 17:57:05 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 1999-11-09 17:57:05 +0000 |
| commit | ece0a28a0aeea4c28976b3c842cb53aa6bc5fb39 (patch) | |
| tree | 4f36fe88e46c9c10836cfa0f472acde825c15b7e | |
| parent | 9b554e8541426af3c0221ae977317d07ea3d3f59 (diff) | |
| download | drakx-backup-do-not-use-ece0a28a0aeea4c28976b3c842cb53aa6bc5fb39.tar drakx-backup-do-not-use-ece0a28a0aeea4c28976b3c842cb53aa6bc5fb39.tar.gz drakx-backup-do-not-use-ece0a28a0aeea4c28976b3c842cb53aa6bc5fb39.tar.bz2 drakx-backup-do-not-use-ece0a28a0aeea4c28976b3c842cb53aa6bc5fb39.tar.xz drakx-backup-do-not-use-ece0a28a0aeea4c28976b3c842cb53aa6bc5fb39.zip | |
*** empty log message ***
| -rw-r--r-- | perl-install/interactive.pm | 5 | ||||
| -rw-r--r-- | perl-install/interactive_gtk.pm | 2 | ||||
| -rw-r--r-- | perl-install/my_gtk.pm | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm index a67cf7893..9bdb53042 100644 --- a/perl-install/interactive.pm +++ b/perl-install/interactive.pm @@ -151,12 +151,13 @@ sub ask_from_entries_ref($$$$;$%) { $o->ask_from_entries_refW($title, $message, $l, $val_hash, %callback) } -sub wait_message($$$) { - my ($o, $title, $message) = @_; +sub wait_message($$$;$) { + my ($o, $title, $message, $temp) = @_; $message = ref $message ? $message : [ $message ]; my $w = $o->wait_messageW($title, [ _("Please wait"), @$message ]); + push @tempory::objects, $w if $temp; my $b = before_leaving { $o->wait_message_endW($w) }; #- enable access through set diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive_gtk.pm index d4978a026..40b97be7c 100644 --- a/perl-install/interactive_gtk.pm +++ b/perl-install/interactive_gtk.pm @@ -226,7 +226,7 @@ sub kill { my ($o) = @_; $o->{before_killing} ||= 0; - while (my $e = shift @tempory::objects) { $e->DESTROY } + while (my $e = shift @tempory::objects) { $e->destroy } while (@interactive::objects > $o->{before_killing}) { my $w = pop @interactive::objects; $w->destroy; diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm index 7a21e168d..dcd11e130 100644 --- a/perl-install/my_gtk.pm +++ b/perl-install/my_gtk.pm @@ -31,7 +31,7 @@ sub new { Gtk->init; my $o = bless { %opts }, $type; $o->_create_window($title); - while (my $e = shift @tempory::objects) { $e->DESTROY } + while (my $e = shift @tempory::objects) { $e->destroy } push @interactive::objects, $o unless $opts{no_interactive_objects}; top(@grabbed)->grab_remove if @grabbed; |