diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2009-04-25 22:16:00 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2009-04-25 22:16:00 +0800 |
commit | faf1c14c11f3e6026f786e9587715c10b13c723e (patch) | |
tree | 3dbf5816532cbea2510b4438c7c40d91fc426d3a /mail/mail-folder-cache.c | |
parent | 86fdd3a1cba7c156cfa127322e258f5636b45a99 (diff) | |
download | gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.tar.gz gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.tar.zst gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.zip |
Manual conflict resolution
Diffstat (limited to 'mail/mail-folder-cache.c')
-rw-r--r-- | mail/mail-folder-cache.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c index 5742be8e5d..46a62e4fc2 100644 --- a/mail/mail-folder-cache.c +++ b/mail/mail-folder-cache.c @@ -55,6 +55,7 @@ #include "mail-folder-cache.h" #include "mail-ops.h" #include "mail-session.h" +#include "mail-tools.h" #include "e-mail-shell-module.h" /* For notifications of changes */ @@ -1091,26 +1092,26 @@ int mail_note_get_folder_from_uri(const char *uri, CamelFolder **folderp) return fi.fi != NULL; } -gboolean +gboolean mail_folder_cache_get_folder_info_flags (CamelFolder *folder, int *flags) { char *uri; uri = mail_tools_folder_to_url (folder); - + struct _find_info fi = { uri, NULL, NULL }; if (stores == NULL) return FALSE; - fi.url = camel_url_new(uri, NULL); + fi.url = camel_url_new (uri, NULL); LOCK(info_lock); g_hash_table_foreach(stores, (GHFunc)storeinfo_find_folder_info, &fi); if (flags) { if (fi.fi) { *flags = fi.fi->flags; - } + } } UNLOCK(info_lock); |