From 6a1a952d1fb90bfd1fdc75c5c544e434b4908265 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Mon, 5 Apr 2004 05:06:45 +0000 Subject: dont add folders to folders_out here, only in get_folders_add_folders. 2004-04-05 Not Zed * 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 --- camel/providers/imap/camel-imap-store.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'camel/providers/imap/camel-imap-store.c') 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)); -- cgit v1.2.3