aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2010-11-30 00:05:45 +0800
committerMilan Crha <mcrha@redhat.com>2010-11-30 00:05:45 +0800
commit30427e119ae1d6b26fb92ee5e3e2abe614c7668e (patch)
tree38c7994e75ee3cc6e13f331709de540bfd3b035e
parentf5562e96973341002675d504ab8245cd9ec3f3f4 (diff)
downloadgsoc2013-evolution-30427e119ae1d6b26fb92ee5e3e2abe614c7668e.tar
gsoc2013-evolution-30427e119ae1d6b26fb92ee5e3e2abe614c7668e.tar.gz
gsoc2013-evolution-30427e119ae1d6b26fb92ee5e3e2abe614c7668e.tar.bz2
gsoc2013-evolution-30427e119ae1d6b26fb92ee5e3e2abe614c7668e.tar.lz
gsoc2013-evolution-30427e119ae1d6b26fb92ee5e3e2abe614c7668e.tar.xz
gsoc2013-evolution-30427e119ae1d6b26fb92ee5e3e2abe614c7668e.tar.zst
gsoc2013-evolution-30427e119ae1d6b26fb92ee5e3e2abe614c7668e.zip
Bug #620609 - Empty trash at exit doesn't work
-rw-r--r--mail/e-mail-backend.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index de3945b0e2..8c47d1a497 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -257,6 +257,9 @@ mail_backend_prepare_for_quit_cb (EShell *shell,
mail_vfolder_shutdown ();
+ /* Cancel all pending activities. */
+ mail_cancel_all ();
+
if (delete_junk)
e_mail_store_foreach (
(GHFunc) mail_backend_delete_junk, backend);
@@ -266,10 +269,7 @@ mail_backend_prepare_for_quit_cb (EShell *shell,
e_mail_store_foreach ((GHFunc) mail_backend_final_sync, &sync_data);
- /* Cancel all activities. */
- mail_cancel_all ();
-
- /* Now we poll until all activities are actually cancelled.
+ /* Now we poll until all activities are actually cancelled or finished.
* Reffing the activity delays quitting; the reference count
* acts like a counting semaphore. */
if (mail_msg_active ())