aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2012-06-18 18:25:35 +0800
committerMilan Crha <mcrha@redhat.com>2012-06-18 18:25:35 +0800
commit0c2a0824be34b35528b261220d6703b33f5d868c (patch)
treeb6f2d03f9d78886838876ad0633e80296b2e9005
parent4ae34107a58a3940ea372c87887fdc05b244a723 (diff)
downloadgsoc2013-evolution-0c2a0824be34b35528b261220d6703b33f5d868c.tar.gz
gsoc2013-evolution-0c2a0824be34b35528b261220d6703b33f5d868c.tar.zst
gsoc2013-evolution-0c2a0824be34b35528b261220d6703b33f5d868c.zip
Bug #678304 - Save Draft prevents Evolution's quit
-rw-r--r--composer/e-msg-composer.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 90ce610eb9..c5a923d518 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -3568,6 +3568,12 @@ msg_composer_save_to_drafts_cb (EMsgComposer *composer,
g_warn_if_fail (message == NULL);
async_context_free (context);
g_error_free (error);
+
+ if (e_msg_composer_is_exiting (composer)) {
+ gtk_window_present (GTK_WINDOW (composer));
+ composer->priv->application_exiting = FALSE;
+ }
+
return;
}
@@ -3579,6 +3585,12 @@ msg_composer_save_to_drafts_cb (EMsgComposer *composer,
error->message, NULL);
async_context_free (context);
g_error_free (error);
+
+ if (e_msg_composer_is_exiting (composer)) {
+ gtk_window_present (GTK_WINDOW (composer));
+ composer->priv->application_exiting = FALSE;
+ }
+
return;
}
@@ -3594,6 +3606,9 @@ msg_composer_save_to_drafts_cb (EMsgComposer *composer,
g_object_unref (message);
+ if (e_msg_composer_is_exiting (composer))
+ g_object_weak_ref (G_OBJECT (context->activity), (GWeakNotify) gtk_widget_destroy, composer);
+
async_context_free (context);
}