aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2009-09-05 05:39:59 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-09-05 05:39:59 +0800
commit35929a37e7428d8a04415a665e3b5b6369d9fd24 (patch)
tree963c69b894ebc67eb64c3aee9e6cd2e6c4a19619
parent83152f074a2283d22b602ac698f7576efe70ad4c (diff)
downloadgsoc2013-evolution-35929a37e7428d8a04415a665e3b5b6369d9fd24.tar.gz
gsoc2013-evolution-35929a37e7428d8a04415a665e3b5b6369d9fd24.tar.zst
gsoc2013-evolution-35929a37e7428d8a04415a665e3b5b6369d9fd24.zip
Bug 594002 - Stuck mail activities when error occurs
-rw-r--r--mail/mail-mt.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index 6c25d7ab8e..011697b76a 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -147,12 +147,12 @@ end_event_callback (CamelObject *o, EActivity *activity, gpointer error)
shell = e_shell_get_default ();
shell_backend = e_shell_get_backend_by_name (shell, "mail");
- if (error == NULL) {
+ if (activity != NULL) {
e_activity_complete (activity);
g_object_unref (activity);
- } else {
- if (activity != NULL)
- g_object_unref (activity);
+ }
+
+ if (error != NULL) {
activity = e_alert_activity_new_warning (error);
e_shell_backend_add_activity (shell_backend, activity);
g_object_unref (activity);