dont add folders to folders_out here, only in get_folders_add_folders.

2004-04-05  Not Zed  <NotZed@Ximian.com>

        * providers/imap/camel-imap-store.c (get_folders): dont add
        folders to folders_out here, only in get_folders_add_folders.

        * camel-store.c (camel_folder_info_build): simplify 'list append'
        since we have next pointer at the head of the struct.

        * providers/imap/camel-imap-store.c (create_folder): fixed
        "containes" spelling count.
        (get_folder_online): "
        (get_folders_add_folders): duh, add the folder info to the
        folders_out array.

svn path=/trunk/; revision=25310

3 files changed, 21 insertions, 13 deletions

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 513ac5449f..d8610fcf18 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,17 @@
+2004-04-05  Not Zed  <NotZed@Ximian.com>
+
+	* providers/imap/camel-imap-store.c (get_folders): dont add
+	folders to folders_out here, only in get_folders_add_folders.
+
+	* camel-store.c (camel_folder_info_build): simplify 'list append'
+	since we have next pointer at the head of the struct.
+
+	* providers/imap/camel-imap-store.c (create_folder): fixed
+	"containes" spelling count.
+	(get_folder_online): "
+	(get_folders_add_folders): duh, add the folder info to the
+	folders_out array.
+
 2004-04-02  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* camel-folder.c (camel_folder_get_deleted_message_count): New
diff --git a/camel/camel-store.c b/camel/camel-store.c
index e7d1f41651..9f4a0f9c7f 100644
--- a/camel/camel-store.c
+++ b/camel/camel-store.c
@@ -1021,14 +1021,10 @@ camel_folder_info_build (GPtrArray *folders, const char *namespace,
 				g_hash_table_insert (hash, pname, pfi);
 				g_ptr_array_add (folders, pfi);
 			}
-			tail = pfi->child;
-			if (tail == NULL) {
-				pfi->child = fi;
-			} else {
-				while (tail->next)
-					tail = tail->next;
-				tail->next = fi;
-			}
+			tail = (CamelFolderInfo *)&pfi->child;
+			while (tail->next)
+				tail = tail->next;
+			tail->next = fi;
 			fi->parent = pfi;
 		} else if (!top)
 			top = fi;
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index 20fcf9aa17..163e8f0360 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -1798,8 +1798,7 @@ get_folder_online (CamelStore *store, const char *folder_name, guint32 flags, Ca
 		if (*c != '\0') {
 			CAMEL_SERVICE_UNLOCK (imap_store, connect_lock);
 			camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID_PATH,
-					      _("The folder name \"%s\" is invalid because "
-						"it containes the character \"%c\""),
+					      _("The folder name \"%s\" is invalid because it contains the character \"%c\""),
 					      folder_name, *c);
 			return NULL;
 		}
@@ -2087,8 +2086,7 @@ create_folder (CamelStore *store, const char *parent_name,
 	
 	if (*c != '\0') {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID_PATH,
-				      _("The folder name \"%s\" is invalid because "
-					"it containes the character \"%c\""),
+				      _("The folder name \"%s\" is invalid because it contains the character \"%c\""),
 				      folder_name, *c);
 		return NULL;
 	}
@@ -2589,6 +2587,7 @@ get_folders_add_folders(GSList *p, int recurse, GHashTable *infos, GPtrArray *fo
 			g_hash_table_insert(infos, fi->full_name, fi);
 			if (recurse)
 				p = g_slist_prepend(p, fi);
+			g_ptr_array_add(folders_out, fi);
 		} else {
 			d(printf(" old folder '%s', old flags %08x  new flags %08x\n", fi->full_name, oldfi->flags, fi->flags));
 
@@ -2696,7 +2695,6 @@ get_folders(CamelStore *store, const char *top, guint32 flags, CamelException *e
 			fi = q->data;
 
 			q = g_slist_remove_link(q, q);
-			g_ptr_array_add(folders_out, fi);
 
 			d(printf("Checking parent folder '%s'\n", fi->full_name));