diff options
| author | Milan Crha <mcrha@redhat.com> | 2010-11-30 00:05:45 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-06-30 00:41:05 +0800 |
| commit | 4cc404e6ebb9602d787c32cd176bf51506fc7f9e (patch) | |
| tree | aa0e0eeb35ae7352c8058d988bdcd5f15a2c2cf3 | |
| parent | 4db00fa9f7d00245fd2000ac5305416b160bd1d2 (diff) | |
| download | gsoc2013-evolution-4cc404e6ebb9602d787c32cd176bf51506fc7f9e.tar gsoc2013-evolution-4cc404e6ebb9602d787c32cd176bf51506fc7f9e.tar.gz gsoc2013-evolution-4cc404e6ebb9602d787c32cd176bf51506fc7f9e.tar.bz2 gsoc2013-evolution-4cc404e6ebb9602d787c32cd176bf51506fc7f9e.tar.lz gsoc2013-evolution-4cc404e6ebb9602d787c32cd176bf51506fc7f9e.tar.xz gsoc2013-evolution-4cc404e6ebb9602d787c32cd176bf51506fc7f9e.tar.zst gsoc2013-evolution-4cc404e6ebb9602d787c32cd176bf51506fc7f9e.zip | |
Bug #620609 - Empty trash at exit doesn't work
| -rw-r--r-- | mail/e-mail-backend.c | 8 |
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 ()) |