aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-local.c
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2001-10-09 11:08:29 +0800
committerDan Winship <danw@src.gnome.org>2001-10-09 11:08:29 +0800
commiteb6606cf3fdf33198a5ab5d9b388155c012f5da5 (patch)
treef2399da09111128c2a6d2d79fc918f1b5e329127 /mail/mail-local.c
parent5931b31034fb4d19482e517f6d8e5508fa1da908 (diff)
downloadgsoc2013-evolution-eb6606cf3fdf33198a5ab5d9b388155c012f5da5.tar.gz
gsoc2013-evolution-eb6606cf3fdf33198a5ab5d9b388155c012f5da5.tar.zst
gsoc2013-evolution-eb6606cf3fdf33198a5ab5d9b388155c012f5da5.zip
Update for folder_flags.
* mail-local.c (mlf_set_folder, mlf_unset_folder): Update for folder_flags. * folder-browser-ui.c (folder_browser_ui_add_list): Check CAMEL_FOLDER_IS_TRASH flag rather than checking CAMEL_IS_VTRASH_FOLDER. * folder-browser.c (folder_browser_toggle_hide_deleted): Likewise * message-list.c (message_list_set_folder): Likewise. (message_list_set_hidedeleted): Remove redundant trash check. svn path=/trunk/; revision=13510
Diffstat (limited to 'mail/mail-local.c')
-rw-r--r--mail/mail-local.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/mail/mail-local.c b/mail/mail-local.c
index 6f1c92f2a8..2661572c4a 100644
--- a/mail/mail-local.c
+++ b/mail/mail-local.c
@@ -422,8 +422,7 @@ mlf_unset_folder (MailLocalFolder *mlf)
mlf->real_store = NULL;
folder->permanent_flags = 0;
- folder->has_summary_capability = 0;
- folder->has_search_capability = 0;
+ folder->folder_flags = 0;
}
static gboolean
@@ -448,14 +447,13 @@ mlf_set_folder(MailLocalFolder *mlf, guint32 flags, CamelException *ex)
if (mlf->real_folder == NULL)
return FALSE;
- if (mlf->real_folder->has_summary_capability) {
+ if (mlf->real_folder->folder_flags & CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY) {
folder->summary = mlf->real_folder->summary;
camel_object_ref((CamelObject *)mlf->real_folder->summary);
}
folder->permanent_flags = mlf->real_folder->permanent_flags;
- folder->has_summary_capability = mlf->real_folder->has_summary_capability;
- folder->has_search_capability = mlf->real_folder->has_search_capability;
+ folder->folder_flags = mlf->real_folder->folder_flags;
camel_object_hook_event((CamelObject *)mlf->real_folder, "message_changed", mlf_proxy_message_changed, mlf);
camel_object_hook_event((CamelObject *)mlf->real_folder, "folder_changed", mlf_proxy_folder_changed, mlf);