aboutsummaryrefslogtreecommitdiffstats
path: root/camel/providers
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2001-10-09 11:07:39 +0800
committerDan Winship <danw@src.gnome.org>2001-10-09 11:07:39 +0800
commit5931b31034fb4d19482e517f6d8e5508fa1da908 (patch)
tree51e741ef213cd6af06a263b55df3d5c3d45c27bf /camel/providers
parentc5a91116e208aa02e8412ab778b7c959dc089ddd (diff)
downloadgsoc2013-evolution-5931b31034fb4d19482e517f6d8e5508fa1da908.tar.gz
gsoc2013-evolution-5931b31034fb4d19482e517f6d8e5508fa1da908.tar.zst
gsoc2013-evolution-5931b31034fb4d19482e517f6d8e5508fa1da908.zip
replace the ever-growing list of gbooleans with a single guint32 for
* camel-folder.h (struct _CamelFolder): replace the ever-growing list of gbooleans with a single guint32 for flags. * camel-folder.c: Update folder flag setting/checking. * providers/pop3/camel-pop3-folder.c (camel_pop3_folder_init): * providers/nntp/camel-nntp-folder.c (camel_nntp_folder_new): * providers/local/camel-spool-folder.c (spool_init, camel_spool_folder_new): * providers/local/camel-maildir-folder.c (camel_maildir_folder_new): * providers/local/camel-local-folder.c (local_init): * providers/imap/camel-imap-folder.c (camel_imap_folder_init, camel_imap_folder_new): * camel-vtrash-folder.c (camel_vtrash_folder_init): * camel-vee-folder.c (camel_vee_folder_init): * camel-digest-folder.c (camel_digest_folder_init): update folder flag setting. svn path=/trunk/; revision=13509
Diffstat (limited to 'camel/providers')
-rw-r--r--camel/providers/imap/camel-imap-folder.c6
-rw-r--r--camel/providers/local/camel-local-folder.c4
-rw-r--r--camel/providers/local/camel-maildir-folder.c2
-rw-r--r--camel/providers/local/camel-spool-folder.c6
-rw-r--r--camel/providers/nntp/camel-nntp-folder.c4
-rw-r--r--camel/providers/pop3/camel-pop3-folder.c15
6 files changed, 12 insertions, 25 deletions
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index 902c52c3d9..b17ffb55cd 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -143,8 +143,8 @@ camel_imap_folder_init (gpointer object, gpointer klass)
CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (object);
CamelFolder *folder = CAMEL_FOLDER (object);
- folder->has_summary_capability = TRUE;
- folder->has_search_capability = TRUE;
+ folder->folder_flags |= (CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY |
+ CAMEL_FOLDER_HAS_SEARCH_CAPABILITY);
imap_folder->priv = g_malloc0(sizeof(*imap_folder->priv));
#ifdef ENABLE_THREADS
@@ -219,7 +219,7 @@ camel_imap_folder_new (CamelStore *parent, const char *folder_name,
if ((imap_store->parameters & IMAP_PARAM_FILTER_INBOX) &&
!g_strcasecmp (folder_name, "INBOX"))
- folder->filter_recent = TRUE;
+ folder->folder_flags |= CAMEL_FOLDER_FILTER_RECENT;
return folder;
}
diff --git a/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c
index c469c2578b..43622eb23a 100644
--- a/camel/providers/local/camel-local-folder.c
+++ b/camel/providers/local/camel-local-folder.c
@@ -92,8 +92,8 @@ local_init(gpointer object, gpointer klass)
CamelFolder *folder = object;
CamelLocalFolder *local_folder = object;
- folder->has_summary_capability = TRUE;
- folder->has_search_capability = TRUE;
+ folder->folder_flags |= (CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY |
+ CAMEL_FOLDER_HAS_SEARCH_CAPABILITY);
folder->permanent_flags = CAMEL_MESSAGE_ANSWERED |
CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_DRAFT |
diff --git a/camel/providers/local/camel-maildir-folder.c b/camel/providers/local/camel-maildir-folder.c
index 1bd6417e1a..bd7f879038 100644
--- a/camel/providers/local/camel-maildir-folder.c
+++ b/camel/providers/local/camel-maildir-folder.c
@@ -113,7 +113,7 @@ camel_maildir_folder_new(CamelStore *parent_store, const char *full_name, guint3
if (parent_store->flags & CAMEL_STORE_FILTER_INBOX
&& strcmp(full_name, "") == 0)
- folder->filter_recent = TRUE;
+ folder->folder_flags |= CAMEL_FOLDER_FILTER_RECENT;
folder = (CamelFolder *)camel_local_folder_construct((CamelLocalFolder *)folder,
parent_store, full_name, flags, ex);
diff --git a/camel/providers/local/camel-spool-folder.c b/camel/providers/local/camel-spool-folder.c
index 8e8b3758a5..bc715e46bc 100644
--- a/camel/providers/local/camel-spool-folder.c
+++ b/camel/providers/local/camel-spool-folder.c
@@ -106,8 +106,8 @@ spool_init(gpointer object, gpointer klass)
CamelFolder *folder = object;
CamelSpoolFolder *spool_folder = object;
- folder->has_summary_capability = TRUE;
- folder->has_search_capability = TRUE;
+ folder->folder_flags |= (CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY |
+ CAMEL_FOLDER_HAS_SEARCH_CAPABILITY);
folder->permanent_flags = CAMEL_MESSAGE_ANSWERED |
CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_DRAFT |
@@ -227,7 +227,7 @@ camel_spool_folder_new(CamelStore *parent_store, const char *full_name, guint32
if (parent_store->flags & CAMEL_STORE_FILTER_INBOX
&& strcmp(full_name, "INBOX") == 0)
- folder->filter_recent = TRUE;
+ folder->folder_flags |= CAMEL_FOLDER_FILTER_RECENT;
folder = (CamelFolder *)camel_spool_folder_construct((CamelSpoolFolder *)folder,
parent_store, full_name, flags, ex);
diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c
index 0f981be643..8d5e658a3e 100644
--- a/camel/providers/nntp/camel-nntp-folder.c
+++ b/camel/providers/nntp/camel-nntp-folder.c
@@ -261,8 +261,8 @@ camel_nntp_folder_new (CamelStore *parent, const char *folder_name, CamelExcepti
const gchar *root_dir_path;
camel_folder_construct (folder, parent, folder_name, folder_name);
- folder->has_summary_capability = TRUE;
- folder->has_search_capability = TRUE;
+ folder->folder_flags |= (CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY |
+ CAMEL_FOLDER_HAS_SEARCH_CAPABILITY);
root_dir_path = camel_nntp_store_get_toplevel_dir (CAMEL_NNTP_STORE(folder->parent_store));
nntp_folder->summary_file_path = g_strdup_printf ("%s/%s-ev-summary",
diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c
index e5cca11cff..2aaf7dd9fa 100644
--- a/camel/providers/pop3/camel-pop3-folder.c
+++ b/camel/providers/pop3/camel-pop3-folder.c
@@ -81,19 +81,6 @@ camel_pop3_folder_class_init (CamelPop3FolderClass *camel_pop3_folder_class)
camel_folder_class->set_message_flags = pop3_set_message_flags;
}
-static void
-camel_pop3_folder_init (gpointer object)
-{
- CamelFolder *folder = CAMEL_FOLDER (object);
- CamelPop3Folder *pop3_folder = CAMEL_POP3_FOLDER (object);
-
- folder->has_summary_capability = FALSE;
- folder->has_search_capability = FALSE;
-
- pop3_folder->uids = NULL;
- pop3_folder->flags = NULL;
-}
-
CamelType
camel_pop3_folder_get_type (void)
{
@@ -105,7 +92,7 @@ camel_pop3_folder_get_type (void)
sizeof (CamelPop3FolderClass),
(CamelObjectClassInitFunc) camel_pop3_folder_class_init,
NULL,
- (CamelObjectInitFunc) camel_pop3_folder_init,
+ NULL,
(CamelObjectFinalizeFunc) pop3_finalize);
}