aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2010-10-06 19:08:41 +0800
committerMilan Crha <mcrha@redhat.com>2010-10-06 19:08:41 +0800
commit1b2fefb086c3e34089beb8b89b22d79005cc7725 (patch)
tree807b93c51872f8da9b4ff41429dba2983074e8e4
parent2d5b4f53ea6b5ac431a5c51382df6f1d4a85c247 (diff)
downloadgsoc2013-evolution-1b2fefb086c3e34089beb8b89b22d79005cc7725.tar
gsoc2013-evolution-1b2fefb086c3e34089beb8b89b22d79005cc7725.tar.gz
gsoc2013-evolution-1b2fefb086c3e34089beb8b89b22d79005cc7725.tar.bz2
gsoc2013-evolution-1b2fefb086c3e34089beb8b89b22d79005cc7725.tar.lz
gsoc2013-evolution-1b2fefb086c3e34089beb8b89b22d79005cc7725.tar.xz
gsoc2013-evolution-1b2fefb086c3e34089beb8b89b22d79005cc7725.tar.zst
gsoc2013-evolution-1b2fefb086c3e34089beb8b89b22d79005cc7725.zip
Bug #630390 - Operation stuck: Generating message list (cancelled)
-rw-r--r--shell/e-shell-backend.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/shell/e-shell-backend.c b/shell/e-shell-backend.c
index aa95a78943..d679c05ed5 100644
--- a/shell/e-shell-backend.c
+++ b/shell/e-shell-backend.c
@@ -320,6 +320,10 @@ e_shell_backend_add_activity (EShellBackend *shell_backend,
g_return_if_fail (E_IS_SHELL_BACKEND (shell_backend));
g_return_if_fail (E_IS_ACTIVITY (activity));
+ /* skip already cancelled activities */
+ if (g_cancellable_is_cancelled (e_activity_get_cancellable (activity)))
+ return;
+
g_queue_push_tail (shell_backend->priv->activities, activity);
/* We reference the backend on every activity to