summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-11-23 14:26:41 +0000
committerOlivier Blin <oblin@mandriva.org>2005-11-23 14:26:41 +0000
commitcffa15111fb73a3334e2e7f8fd653adcd16857cf (patch)
tree18fc6d2466f2c96eb14d1d6a9e8d2d538c2adba9
parent4887676c4a179a7c571e30c317a76d6282ba72f1 (diff)
downloaddrakx-backup-do-not-use-cffa15111fb73a3334e2e7f8fd653adcd16857cf.tar
drakx-backup-do-not-use-cffa15111fb73a3334e2e7f8fd653adcd16857cf.tar.gz
drakx-backup-do-not-use-cffa15111fb73a3334e2e7f8fd653adcd16857cf.tar.bz2
drakx-backup-do-not-use-cffa15111fb73a3334e2e7f8fd653adcd16857cf.tar.xz
drakx-backup-do-not-use-cffa15111fb73a3334e2e7f8fd653adcd16857cf.zip
make dialog variable local, to avoid crappy workarounds that don't even work
-rwxr-xr-xperl-install/standalone/drakfont5
1 files changed, 1 insertions, 4 deletions
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index 8a0d7277f..987107807 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -106,7 +106,6 @@ my @application;
my @install;
my @uninstall;
my $interactive;
-my $dialog;
my $pbar;
my $pbar1;
my $pbar2;
@@ -623,7 +622,7 @@ sub exitdialog() { Gtk2->main_quit }
sub dialog {
my ($title, $widgets, $buttons, $o_main_loop) = @_;
- $dialog = _create_dialog($title, { transient => $window1->{real_window} });
+ my $dialog = _create_dialog($title, { transient => $window1->{real_window} });
$dialog->signal_connect(delete_event => \&exitdialog);
gtkpack_($dialog->vbox, @$widgets);
gtkpack($dialog->action_area, @$buttons) if $buttons;
@@ -658,8 +657,6 @@ sub advanced_install() {
gtksignal_connect(Gtk2::Button->new(N("Remove Selected")), clicked => \&list_remove),
gtksignal_connect($button = gtkset_sensitive(Gtk2::Button->new(N("Install fonts")), 0),
clicked => sub {
- $dialog->destroy;
- undef $dialog;
import_status() if @install;
}),
gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => \&exitdialog),