summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-10-05 05:47:15 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-10-05 05:47:15 +0000
commit8d483b425f0a46466e3ee8cdb75fb2924c482001 (patch)
tree7832912d4ce6e030df9b9c12312cbae3847ebde2
parent460f4cff442cc42bdb005cad90cda0a28aafc934 (diff)
downloaddrakx-backup-do-not-use-8d483b425f0a46466e3ee8cdb75fb2924c482001.tar
drakx-backup-do-not-use-8d483b425f0a46466e3ee8cdb75fb2924c482001.tar.gz
drakx-backup-do-not-use-8d483b425f0a46466e3ee8cdb75fb2924c482001.tar.bz2
drakx-backup-do-not-use-8d483b425f0a46466e3ee8cdb75fb2924c482001.tar.xz
drakx-backup-do-not-use-8d483b425f0a46466e3ee8cdb75fb2924c482001.zip
fix closing import dialog (#11052)
-rwxr-xr-xperl-install/standalone/drakfont6
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index 1bf891793..138746f0f 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -587,12 +587,14 @@ sub font_choice() {
my $file_dialog;
$select_font_msg = N("Select the font file or directory and click on 'Add'");
$file_dialog = Gtk2::FileSelection->new(N("File Selection"));
+ $file_dialog->signal_connect(delete_event => sub { print "DESTROY\n"; $file_dialog->response('close') });
$file_dialog->ok_button->signal_connect(clicked => \&file_ok_sel, $file_dialog);
$file_dialog->ok_button->set_label(N("Add"));
- $file_dialog->cancel_button->signal_connect(clicked => sub { $file_dialog->destroy });
+ $file_dialog->cancel_button->signal_connect(clicked => sub { $file_dialog->response('cancel') });
$file_dialog->cancel_button->set_label(N("Close"));
$file_dialog->show;
$file_dialog->run;
+ $file_dialog->destroy;
}
sub file_ok_sel {
@@ -607,7 +609,7 @@ sub file_ok_sel {
$model->append_set(undef, [ 0 => $file_name ]);
}
}
- Gtk2->main;
+ $file_selection->response('ok')
}
sub list_remove() { #- TODO : multi-selection