aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/mail-ops.c15
2 files changed, 14 insertions, 6 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index a6a7e45447..8153d6dd35 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-05 Dan Winship <danw@helixcode.com>
+
+ * mail-ops.c (composer_send_cb): Leave the composer window around
+ if the message doesn't get sent.
+
2000-06-05 Matt Loper <matt@helixcode.com>
* folder-browser.c (etable_key): Allow "GDK_KP_Delete", a keypad
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 7911cd660d..0d742bea1f 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -323,7 +323,6 @@ composer_send_cb (EMsgComposer *composer, gpointer data)
}
message = e_msg_composer_get_message (composer);
- gtk_object_destroy (GTK_OBJECT (composer));
camel_mime_message_set_from (message, from);
camel_medium_add_header (CAMEL_MEDIUM (message), "X-Mailer",
@@ -337,11 +336,15 @@ composer_send_cb (EMsgComposer *composer, gpointer data)
camel_service_disconnect (CAMEL_SERVICE (transport), ex);
if (camel_exception_is_set (ex))
mail_exception_dialog ("Could not send message", ex, composer);
- else if (psd) {
- guint32 set;
-
- set = camel_mime_message_get_flags (psd->message);
- camel_mime_message_set_flags (psd->message, psd->flags, ~set);
+ else {
+ gtk_object_destroy (GTK_OBJECT (composer));
+ if (psd) {
+ guint32 set;
+
+ set = camel_mime_message_get_flags (psd->message);
+ camel_mime_message_set_flags (psd->message,
+ psd->flags, ~set);
+ }
}
camel_exception_free (ex);