[evolution] Bug #630390 - Operation stuck: Generating message list (cancelled)

[Milan Crha <mcrha src gnome org>]

commit 1b2fefb086c3e34089beb8b89b22d79005cc7725
Author: Milan Crha <mcrha redhat com>
Date:   Wed Oct 6 13:08:41 2010 +0200

    Bug #630390 - Operation stuck: Generating message list (cancelled)

 shell/e-shell-backend.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/shell/e-shell-backend.c b/shell/e-shell-backend.c
index aa95a78..d679c05 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