From acc9974f8b0f3d96b067bf7203519cd1af8bcd76 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Fri, 21 Dec 2001 22:45:57 +0000 Subject: Only cancel the selection dialog if it is currently in use, otherwise 2001-12-21 Jeffrey Stedfast * e-msg-composer-select-file.c (composer_hide_cb): Only cancel the selection dialog if it is currently in use, otherwise we'll get an extra gtk_main_quit and the mailer will exit :-( svn path=/trunk/; revision=15207 --- composer/ChangeLog | 6 ++++++ composer/e-msg-composer-attachment.c | 2 +- composer/e-msg-composer-select-file.c | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) (limited to 'composer') diff --git a/composer/ChangeLog b/composer/ChangeLog index a731fc0a2f..f52cc964b3 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,9 @@ +2001-12-21 Jeffrey Stedfast + + * e-msg-composer-select-file.c (composer_hide_cb): Only cancel the + selection dialog if it is currently in use, otherwise we'll get an + extra gtk_main_quit and the mailer will exit :-( + 2001-12-17 Jeffrey Stedfast * e-msg-composer.c (read_file_content): Don't block forever if we diff --git a/composer/e-msg-composer-attachment.c b/composer/e-msg-composer-attachment.c index 046ab1bfdd..fcfc09928d 100644 --- a/composer/e-msg-composer-attachment.c +++ b/composer/e-msg-composer-attachment.c @@ -158,7 +158,7 @@ e_msg_composer_attachment_new (const char *file_name, CamelDataWrapper *wrapper; CamelStream *stream; struct stat statbuf; - gchar *mime_type; + char *mime_type; char *filename; g_return_val_if_fail (file_name != NULL, NULL); diff --git a/composer/e-msg-composer-select-file.c b/composer/e-msg-composer-select-file.c index 593fe256cc..79c2084090 100644 --- a/composer/e-msg-composer-select-file.c +++ b/composer/e-msg-composer-select-file.c @@ -131,7 +131,8 @@ composer_hide_cb (GtkWidget *widget, gpointer user_data) FileSelectionInfo *info; info = (FileSelectionInfo *) user_data; - cancel (info); + if (GTK_WIDGET_VISIBLE (info->widget)) + cancel (info); } /* Setup. */ -- cgit