** Fix for bug #420462

svn path=/trunk/; revision=7941

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 4946f33..292384b 100644 (file)
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-13  Srinivasa Ragavan  <sragavan@novell.com>
+
+       ** Fix for bug #420462
+
+       * camel-store.c: (camel_folder_info_build): If the FolderInfo doesn't
+       have a child, unset the NO_CHILDREN flag.
+
 2007-08-12  Rob Bradford  <rob@openedhand.com>
 
        * camel-text-index.c: (camel_text_index_new):

diff --git a/camel/camel-store.c b/camel/camel-store.c
index cb04452..b69134d 100644 (file)
--- a/camel/camel-store.c
+++ b/camel/camel-store.c
@@ -991,6 +991,10 @@ camel_folder_info_build (GPtrArray *folders, const char *namespace,
        tail = top;
        for (i = 0; i < folders->len; i++) {
                fi = folders->pdata[i];
+
+               if (fi->child)
+                       fi->flags &= ~CAMEL_FOLDER_NOCHILDREN;
+
                if (fi->parent || fi == top)
                        continue;
                if (tail == NULL) {

diff --git a/camel/providers/imap/ChangeLog b/camel/providers/imap/ChangeLog
index 96863cc..50dcf67 100644 (file)
--- a/camel/providers/imap/ChangeLog
+++ b/camel/providers/imap/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-13  Srinivasa Ragavan  <sragavan@novell.com>
+
+       ** Fix for bug #420462
+
+       * camel-imap-store.c: (get_folder_info_offline): Create all folders
+       with NO_CHILDREN flag and when filling FolderInfos depending on child
+       status uncheck it.
+
 2007-08-09  Sankar P  <psankar@novell.com>
 
        * camel-imap-folder.c: (parse_fetch_response):

diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index 3d6b199..2f26156 100644 (file)
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -2853,6 +2853,8 @@ get_folder_info_offline (CamelStore *store, const char *top,
                        } else {
                                fill_fi((CamelStore *)imap_store, fi, 0);
                        }
+                       if (!fi->child)
+                               fi->flags |= CAMEL_FOLDER_NOCHILDREN;
                        g_ptr_array_add (folders, fi);
                }
                camel_store_summary_info_free((CamelStoreSummary *)imap_store->summary, si);