aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2001-12-22 06:45:57 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2001-12-22 06:45:57 +0800
commitacc9974f8b0f3d96b067bf7203519cd1af8bcd76 (patch)
tree5d55fd9039613b9afdb7932b5cc27e8d60df006a
parent630429ee20bb95d23dd3974f76cf60f3e7ceebda (diff)
downloadgsoc2013-evolution-acc9974f8b0f3d96b067bf7203519cd1af8bcd76.tar.gz
gsoc2013-evolution-acc9974f8b0f3d96b067bf7203519cd1af8bcd76.tar.zst
gsoc2013-evolution-acc9974f8b0f3d96b067bf7203519cd1af8bcd76.zip
Only cancel the selection dialog if it is currently in use, otherwise
2001-12-21 Jeffrey Stedfast <fejj@ximian.com> * 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
-rw-r--r--composer/ChangeLog6
-rw-r--r--composer/e-msg-composer-attachment.c2
-rw-r--r--composer/e-msg-composer-select-file.c3
3 files changed, 9 insertions, 2 deletions
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 <fejj@ximian.com>
+
+ * 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 <fejj@ximian.com>
* 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. */