summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2001-09-21 19:52:58 +0000
committerJeffrey Stedfast <fejj@src.gnome.org>2001-09-21 19:52:58 +0000
commitaa496f1222869f8c62982897f7d51055f055cd03 (patch)
tree34a67a67fb3046c0e240ea04a5f017de12cfedb8
parentcc641ee19b5a26c96f4d0b7f91a726acf1b3c9d2 (diff)
downloadevolution-data-server-aa496f1222869f8c62982897f7d51055f055cd03.tar.gz
Go back to not using camel_folder_info_build() here because this seems to
2001-09-21 Jeffrey Stedfast <fejj@ximian.com> * providers/imap/camel-imap-store.c (create_folder): Go back to not using camel_folder_info_build() here because this seems to break folder creation (returning nodes from the root path when it shouldn't be?).
-rw-r--r--camel/ChangeLog7
-rw-r--r--camel/providers/imap/camel-imap-store.c15
2 files changed, 18 insertions, 4 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 9ce9e3e9d..550e99f6d 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,10 @@
+2001-09-21 Jeffrey Stedfast <fejj@ximian.com>
+
+ * providers/imap/camel-imap-store.c (create_folder): Go back to
+ not using camel_folder_info_build() here because this seems to
+ break folder creation (returning nodes from the root path when it
+ shouldn't be?).
+
2001-09-21 <NotZed@Ximian.com>
* camel-vee-store.c (vee_get_folder_info): Force a refresh of
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index a632c6f0d..6f058a7c6 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -1118,6 +1118,8 @@ create_folder (CamelStore *store, const char *parent_name,
g_free (full_name);
if (response) {
+ CamelFolderInfo *parent, *fi;
+
camel_imap_response_free (imap_store, response);
/* We have to do this in case we are creating a
@@ -1136,7 +1138,9 @@ create_folder (CamelStore *store, const char *parent_name,
goto exception;
}
- for (i = 1; pathnames[i]; i++) {
+ root = parent = folders->pdata[i];
+
+ for (i = 1; parent && pathnames[i]; i++) {
full_name = imap_concat (imap_store, parent_name, pathnames[i]);
g_free (pathnames[i]);
@@ -1149,13 +1153,16 @@ create_folder (CamelStore *store, const char *parent_name,
if (folders->len != i + 1)
break;
+
+ fi = folders->pdata[i];
+ camel_folder_info_build_path (fi, imap_store->dir_sep);
+ parent->child = fi;
+ fi->parent = parent;
+ parent = fi;
}
g_free (pathnames);
- root = camel_folder_info_build (folders, camel_url_get_param (CAMEL_SERVICE (store)->url, "namespace"),
- imap_store->dir_sep, TRUE);
-
g_ptr_array_free (folders, TRUE);
}