aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--camel/ChangeLog19
-rw-r--r--camel/camel-store.c18
-rw-r--r--camel/providers/imap/camel-imap-store.c85
3 files changed, 79 insertions, 43 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 1d77f1341e..6433005cc8 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,9 +1,22 @@
2002-09-30 Jeffrey Stedfast <fejj@ximian.com>
+ Fixes bug #31456.
+
+ * providers/imap/camel-imap-store.c (imap_connect_online): Don't
+ LSUB "" "*", instead get both an LSUB containing the subfolders of
+ the namespace and an LSUB of INBOX (assuming namespace was
+ non-empty). This fix really has nothing to do with bug #31456 but
+ is what should have been done in the first place.
+ (parse_list_response_as_folder_info): Simplify a tad and strip
+ extra leading /'s from fi->path.
+ (imap_build_folder_info): Strip extra leading /'s from fi->path.
+
* camel-store.c (camel_folder_info_build): Don't strip the
- namespace from the fi->full_name when hasing or creating fake
- parent folders. Fixes a bug I found while trying to reproduce bug
- #31456.
+ namespace from the fi->full_name when hashing or creating fake
+ parent folder-infos. Fixes a bug I found while trying to reproduce
+ bug #31456.
+ (camel_folder_info_build_path): Strip off extra leading dir_sep
+ chars from the path.
2002-09-30 Not Zed <NotZed@Ximian.com>
diff --git a/camel/camel-store.c b/camel/camel-store.c
index f7ae7cba78..43528a8353 100644
--- a/camel/camel-store.c
+++ b/camel/camel-store.c
@@ -818,13 +818,19 @@ camel_folder_info_free (CamelFolderInfo *fi)
void
camel_folder_info_build_path (CamelFolderInfo *fi, char separator)
{
- fi->path = g_strdup_printf("/%s", fi->full_name);
+ const char *full_name;
+ char *p;
+
+ full_name = fi->full_name;
+ while (*full_name == separator)
+ full_name++;
+
+ fi->path = g_strdup_printf ("/%s", full_name);
if (separator != '/') {
- char *p;
-
- p = fi->path;
- while ((p = strchr (p, separator)))
- *p = '/';
+ for (p = fi->path; *p; p++) {
+ if (*p == separator)
+ *p = '/';
+ }
}
}
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index 215f15f279..fe0a04f8dc 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -816,26 +816,31 @@ imap_build_folder_info(CamelImapStore *imap_store, const char *folder_name)
CamelURL *url;
const char *name;
CamelFolderInfo *fi;
-
+
fi = g_malloc0(sizeof(*fi));
-
+
fi->full_name = g_strdup(folder_name);
fi->unread_message_count = 0;
-
+
url = camel_url_new (imap_store->base_url, NULL);
g_free (url->path);
url->path = g_strdup_printf ("/%s", folder_name);
fi->url = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);
camel_url_free(url);
+
+ /* strip extranious leading /'s */
+ while (*folder_name == '/')
+ folder_name++;
+
fi->path = g_strdup_printf("/%s", folder_name);
name = strrchr (fi->path, '/');
if (name)
name++;
else
name = fi->path;
-
+
fi->name = g_strdup (name);
-
+
return fi;
}
@@ -1275,25 +1280,33 @@ imap_connect_online (CamelService *service, CamelException *ex)
/* canonicalize the namespace to end with dir_sep */
len = strlen (store->namespace);
if (len && store->namespace[len - 1] != store->dir_sep) {
- gchar *tmp;
+ char *tmp;
tmp = g_strdup_printf ("%s%c", store->namespace, store->dir_sep);
g_free (store->namespace);
store->namespace = tmp;
}
-
+
ns = camel_imap_store_summary_namespace_new(store->summary, store->namespace, store->dir_sep);
camel_imap_store_summary_namespace_set(store->summary, ns);
if (CAMEL_STORE (store)->flags & CAMEL_STORE_SUBSCRIPTIONS) {
GPtrArray *folders;
-
+ char *pattern;
+
/* this pre-fills the summary, and checks that lsub is useful */
- folders = g_ptr_array_new();
- get_folders_online(store, "*", folders, TRUE, ex);
+ folders = g_ptr_array_new ();
+ pattern = g_strdup_printf ("%s*", store->namespace);
+ get_folders_online (store, pattern, folders, TRUE, ex);
+ g_free (pattern);
+
+ /* if we have a namespace, then our LSUB won't include INBOX so LSUB for the INBOX too */
+ if (*store->namespace && !camel_exception_is_set (ex))
+ get_folders_online (store, "INBOX", folders, TRUE, ex);
+
for (i=0;i<folders->len;i++) {
CamelFolderInfo *fi = folders->pdata[i];
-
+
if (fi->flags & (CAMEL_IMAP_FOLDER_MARKED | CAMEL_IMAP_FOLDER_UNMARKED))
store->capabilities |= IMAP_CAPABILITY_useful_lsub;
camel_folder_info_free(fi);
@@ -1308,7 +1321,7 @@ imap_connect_online (CamelService *service, CamelException *ex)
done:
/* save any changes we had */
camel_store_summary_save((CamelStoreSummary *)store->summary);
-
+
CAMEL_SERVICE_UNLOCK (store, connect_lock);
if (camel_exception_is_set (ex))
@@ -1922,18 +1935,18 @@ parse_list_response_as_folder_info (CamelImapStore *imap_store,
const char *response)
{
CamelFolderInfo *fi;
- int flags, i;
- char sep, *dir, *name = NULL, *path;
+ int flags;
+ char sep, *dir, *name = NULL, *path, *p;
CamelURL *url;
CamelImapStoreInfo *si;
guint32 newflags;
-
+
if (!imap_parse_list_response (imap_store, response, &flags, &sep, &dir))
return NULL;
-
+
/* FIXME: should use imap_build_folder_info, note the differences with param setting tho */
path = camel_utf7_utf8(dir);
-
+
/* hack: pokes in value from any list response */
si = camel_imap_store_summary_add_from_full(imap_store->summary, dir, sep?sep:'/');
newflags = (si->info.flags & CAMEL_STORE_INFO_FOLDER_SUBSCRIBED) | (flags & ~CAMEL_STORE_INFO_FOLDER_SUBSCRIBED);
@@ -1941,38 +1954,42 @@ parse_list_response_as_folder_info (CamelImapStore *imap_store,
si->info.flags = newflags;
camel_store_summary_touch((CamelStoreSummary *)imap_store->summary);
}
-
- if (sep && (name = strrchr(path, sep))) {
- if (!*++name) {
+
+ if (sep && sep != '/') {
+ for (p = path; *p; p++) {
+ if (*p == sep)
+ *p = '/';
+ }
+ }
+
+ if ((name = strrchr (path, '/'))) {
+ name++;
+ if (!*name) {
g_free(dir);
g_free(path);
return NULL;
}
} else
name = path;
-
+
fi = g_new0 (CamelFolderInfo, 1);
fi->flags = flags;
- /*fi->full_name = dir;*/
- fi->name = g_strdup(name);
- fi->path = g_strdup_printf("/%s", path);
-
- if (sep && sep != '/') {
- for (i=0;fi->path[i];i++)
- if (fi->path[i] == sep)
- fi->path[i] = '/';
- }
- fi->full_name = g_strdup(fi->path+1);
-
+ fi->name = g_strdup (name);
+ fi->full_name = path;
+
+ while (*path == '/')
+ path++;
+ fi->path = g_strdup_printf ("/%s", path);
+
url = camel_url_new (imap_store->base_url, NULL);
g_free (url->path);
url->path = g_strdup_printf ("/%s", fi->full_name);
-
+
if (flags & CAMEL_FOLDER_NOSELECT || fi->name[0] == 0)
camel_url_set_param (url, "noselect", "yes");
fi->url = camel_url_to_string (url, 0);
camel_url_free (url);
-
+
/* FIXME: redundant */
if (flags & CAMEL_IMAP_FOLDER_UNMARKED)
fi->unread_message_count = -1;
generated by cgit (git 2.34.1) at 2024-11-17 12:00:10 +0800