aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog9
-rw-r--r--camel/camel-store.h4
-rw-r--r--camel/providers/imap/camel-imap-store.c4
-rw-r--r--camel/providers/imap/camel-imap-store.h1
-rw-r--r--camel/providers/imap/camel-imap-utils.c2
5 files changed, 15 insertions, 5 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 51d0f80d52..174b44bd3d 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,12 @@
+2003-12-10 Jeffrey Stedfast <fejj@ximian.com>
+
+ * camel-store.h: Add a CAMEL_FOLDER_NOCHILDREN flag.
+
+ * providers/imap/camel-imap-store.c (get_folders): Same as below.
+
+ * providers/imap/camel-imap-utils.c (imap_parse_list_response):
+ s/CAMEL_IMAP_FOLDER_NOCHILDREN/CAMEL_FOLDER_NOCHILDREN/
+
2003-12-10 Not Zed <NotZed@Ximian.com>
* camel-smime-context.c (sm_verify): also check
diff --git a/camel/camel-store.h b/camel/camel-store.h
index 2b65751aac..30f69d1e67 100644
--- a/camel/camel-store.h
+++ b/camel/camel-store.h
@@ -64,8 +64,10 @@ typedef struct _CamelFolderInfo {
#define CAMEL_FOLDER_NOINFERIORS (1<<1)
/* a folder which has children (not yet fully implemented) */
#define CAMEL_FOLDER_CHILDREN (1<<2)
+/* a folder which does not have any children (not yet fully implemented) */
+#define CAMEL_FOLDER_NOCHILDREN (1<<3)
/* a folder which is subscribed */
-#define CAMEL_FOLDER_SUBSCRIBED (1<<3)
+#define CAMEL_FOLDER_SUBSCRIBED (1<<4)
/* Structure of rename event's event_data */
typedef struct _CamelRenameInfo {
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index 2d6337896f..4b4250da18 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -2507,11 +2507,11 @@ get_folders(CamelStore *store, const char *top, guint32 flags, CamelException *e
or can't have children, no need to go further - a bit ugly */
if ( top == imap_store->namespace
&& (flags & CAMEL_STORE_FOLDER_INFO_RECURSIVE) == 0
- && (fi->flags & (CAMEL_FOLDER_CHILDREN|CAMEL_IMAP_FOLDER_NOCHILDREN|CAMEL_FOLDER_NOINFERIORS)) != 0) {
+ && (fi->flags & (CAMEL_FOLDER_CHILDREN|CAMEL_FOLDER_NOCHILDREN|CAMEL_FOLDER_NOINFERIORS)) != 0) {
/* do nothing */
}
/* Otherwise, if this has (or might have) children, scan it */
- else if ( (fi->flags & (CAMEL_IMAP_FOLDER_NOCHILDREN|CAMEL_FOLDER_NOINFERIORS)) == 0
+ else if ( (fi->flags & (CAMEL_FOLDER_NOCHILDREN|CAMEL_FOLDER_NOINFERIORS)) == 0
|| (fi->flags & CAMEL_FOLDER_CHILDREN) != 0) {
char *n, *real;
diff --git a/camel/providers/imap/camel-imap-store.h b/camel/providers/imap/camel-imap-store.h
index b45fb2110e..7d8a983df6 100644
--- a/camel/providers/imap/camel-imap-store.h
+++ b/camel/providers/imap/camel-imap-store.h
@@ -74,7 +74,6 @@ enum {
/* CamelFolderInfo flags */
#define CAMEL_IMAP_FOLDER_MARKED (1<<16)
#define CAMEL_IMAP_FOLDER_UNMARKED (1<<17)
-#define CAMEL_IMAP_FOLDER_NOCHILDREN (1<<18)
typedef enum {
diff --git a/camel/providers/imap/camel-imap-utils.c b/camel/providers/imap/camel-imap-utils.c
index 879cc23cca..07dcb077eb 100644
--- a/camel/providers/imap/camel-imap-utils.c
+++ b/camel/providers/imap/camel-imap-utils.c
@@ -339,7 +339,7 @@ imap_parse_list_response (CamelImapStore *store, const char *buf, int *flags, ch
else if (!strncasecmp (word, "\\HasChildren", len))
*flags |= CAMEL_FOLDER_CHILDREN;
else if (!strncasecmp (word, "\\HasNoChildren", len))
- *flags |= CAMEL_IMAP_FOLDER_NOCHILDREN;
+ *flags |= CAMEL_FOLDER_NOCHILDREN;
}
word += len;