aboutsummaryrefslogtreecommitdiffstats
path: root/camel/providers
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2004-04-05 13:06:45 +0800
committerMichael Zucci <zucchi@src.gnome.org>2004-04-05 13:06:45 +0800
commit6a1a952d1fb90bfd1fdc75c5c544e434b4908265 (patch)
tree8dbb9bc8c3b049392bcf9f529cfead4196e9ac3c /camel/providers
parent1f6875b2710499f147b62a08ffb9429aa67995da (diff)
downloadgsoc2013-evolution-6a1a952d1fb90bfd1fdc75c5c544e434b4908265.tar
gsoc2013-evolution-6a1a952d1fb90bfd1fdc75c5c544e434b4908265.tar.gz
gsoc2013-evolution-6a1a952d1fb90bfd1fdc75c5c544e434b4908265.tar.bz2
gsoc2013-evolution-6a1a952d1fb90bfd1fdc75c5c544e434b4908265.tar.lz
gsoc2013-evolution-6a1a952d1fb90bfd1fdc75c5c544e434b4908265.tar.xz
gsoc2013-evolution-6a1a952d1fb90bfd1fdc75c5c544e434b4908265.tar.zst
gsoc2013-evolution-6a1a952d1fb90bfd1fdc75c5c544e434b4908265.zip
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
Diffstat (limited to 'camel/providers')
-rw-r--r--camel/providers/imap/camel-imap-store.c8
1 files changed, 3 insertions, 5 deletions
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));