diff options
| -rw-r--r-- | camel/ChangeLog | 6 | ||||
| -rw-r--r-- | camel/providers/local/camel-mbox-store.c | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 174b44bd3d..2dcb06243d 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,5 +1,11 @@ 2003-12-10 Jeffrey Stedfast <fejj@ximian.com> + * providers/local/camel-mbox-store.c (get_folder_info): Use + CAMEL_FODLER_NOCHILDREN rather than NOINFERIORS because + NOINFERIORS means the folder cannot contain subfolders. However, + our mbox structure always allows subfolders. + (scan_dir): Same. + * camel-store.h: Add a CAMEL_FOLDER_NOCHILDREN flag. * providers/imap/camel-imap-store.c (get_folders): Same as below. diff --git a/camel/providers/local/camel-mbox-store.c b/camel/providers/local/camel-mbox-store.c index ffce19171f..0a6dfe0200 100644 --- a/camel/providers/local/camel-mbox-store.c +++ b/camel/providers/local/camel-mbox-store.c @@ -608,7 +608,7 @@ scan_dir (CamelStore *store, GHashTable *visited, CamelFolderInfo *parent, const g_free (full_name); if (S_ISDIR (st.st_mode)) { - fi->flags = (fi->flags & ~CAMEL_FOLDER_NOINFERIORS) | CAMEL_FOLDER_CHILDREN; + fi->flags = (fi->flags & ~CAMEL_FOLDER_NOCHILDREN) | CAMEL_FOLDER_CHILDREN; } else { fi->unread_message_count = unread; fi->flags &= ~CAMEL_FOLDER_NOSELECT; @@ -630,7 +630,7 @@ scan_dir (CamelStore *store, GHashTable *visited, CamelFolderInfo *parent, const if (S_ISDIR (st.st_mode)) fi->flags = CAMEL_FOLDER_NOSELECT; else - fi->flags = CAMEL_FOLDER_NOINFERIORS; + fi->flags = CAMEL_FOLDER_NOCHILDREN; if (tail == NULL) folders = fi; @@ -741,7 +741,7 @@ get_folder_info (CamelStore *store, const char *top, guint32 flags, CamelExcepti if (fi->child) fi->flags |= CAMEL_FOLDER_CHILDREN; else - fi->flags |= CAMEL_FOLDER_NOINFERIORS; + fi->flags |= CAMEL_FOLDER_NOCHILDREN; g_free (subdir); |