diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-06-02 22:10:54 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-06-09 01:14:47 +0800 |
| commit | 7428fc93d58921bab9968a999172b843af2a2244 (patch) | |
| tree | e40e4c00469ef986fb734d93eb86ed2d699762b6 /mail/mail-folder-cache.c | |
| parent | a6e485712f2785680ee2dd2084a9d4d70152ffec (diff) | |
| download | gsoc2013-evolution-7428fc93d58921bab9968a999172b843af2a2244.tar gsoc2013-evolution-7428fc93d58921bab9968a999172b843af2a2244.tar.gz gsoc2013-evolution-7428fc93d58921bab9968a999172b843af2a2244.tar.bz2 gsoc2013-evolution-7428fc93d58921bab9968a999172b843af2a2244.tar.lz gsoc2013-evolution-7428fc93d58921bab9968a999172b843af2a2244.tar.xz gsoc2013-evolution-7428fc93d58921bab9968a999172b843af2a2244.tar.zst gsoc2013-evolution-7428fc93d58921bab9968a999172b843af2a2244.zip | |
Miscellaneous mail cleanups.
Diffstat (limited to 'mail/mail-folder-cache.c')
| -rw-r--r-- | mail/mail-folder-cache.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c index 8b951ce380..2107b2c100 100644 --- a/mail/mail-folder-cache.c +++ b/mail/mail-folder-cache.c @@ -262,16 +262,26 @@ update_1folder (MailFolderCache *self, folder = mfi->folder; if (folder) { - gboolean is_drafts = FALSE, is_outbox = FALSE; - - d(printf("update 1 folder '%s'\n", folder->full_name)); - if ((self->priv->count_trash && (CAMEL_IS_VTRASH_FOLDER (folder))) - || (is_drafts = em_utils_folder_is_drafts (folder)) - || (is_outbox = em_utils_folder_is_outbox (folder)) - || (self->priv->count_sent && em_utils_folder_is_sent (folder))) { + gboolean folder_is_sent; + gboolean folder_is_drafts; + gboolean folder_is_outbox; + gboolean folder_is_vtrash; + gboolean special_case; + + folder_is_sent = em_utils_folder_is_sent (folder); + folder_is_drafts = em_utils_folder_is_drafts (folder); + folder_is_outbox = em_utils_folder_is_outbox (folder); + folder_is_vtrash = CAMEL_IS_VTRASH_FOLDER (folder); + + special_case = + (self->priv->count_trash && folder_is_vtrash) || + (self->priv->count_sent && folder_is_sent) || + folder_is_drafts || folder_is_outbox; + + if (special_case) { d(printf(" total count\n")); unread = camel_folder_get_message_count (folder); - if (is_drafts || is_outbox) { + if (folder_is_drafts || folder_is_outbox) { guint32 junked = 0; if ((deleted = camel_folder_get_deleted_message_count (folder)) > 0) |