aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog11
-rw-r--r--camel/camel-store.c9
-rw-r--r--camel/providers/imap/camel-imap-store.c2
3 files changed, 19 insertions, 3 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 6caa8e82b5..4c4e670168 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,16 @@
2001-01-18 Dan Winship <danw@ximian.com>
+ * camel-store.c (camel_folder_info_build): More tweaking... skip
+ separator characters after the namespace character. (Gets rid of
+ the shell folder registration warning some people have had with
+ IMAP)
+
+ * providers/imap/camel-imap-store.c (imap_connect): I'm sure there
+ was some clever reason I was storing the flags of the folder in
+ the hash table rather than just "1", but I don't remember what it
+ was now. Anyway, since we only ever test NULL/non-NULL, store 1,
+ since flags is sometimes 0.
+
* providers/imap/camel-imap-folder.c (imap_update_summary): Oops.
Somewhere in one of the reorgs, the code to add new messages to
the CamelFolderChangeInfo structure got removed. Fix that.
diff --git a/camel/camel-store.c b/camel/camel-store.c
index 05bffcdd97..5b48299231 100644
--- a/camel/camel-store.c
+++ b/camel/camel-store.c
@@ -625,9 +625,12 @@ camel_folder_info_build (GPtrArray *folders, const char *namespace,
for (i = 0; i < folders->len; i++) {
fi = folders->pdata[i];
if (!strncmp (namespace, fi->full_name, nlen))
- g_hash_table_insert (hash, fi->full_name + nlen, fi);
+ name = fi->full_name + nlen;
else
- g_hash_table_insert (hash, fi->full_name, fi);
+ name = fi->full_name;
+ if (*name == separator)
+ name++;
+ g_hash_table_insert (hash, name, fi);
}
/* Now find parents. */
@@ -637,6 +640,8 @@ camel_folder_info_build (GPtrArray *folders, const char *namespace,
name = fi->full_name + nlen;
else
name = fi->full_name;
+ if (*name == separator)
+ name++;
p = strrchr (name, separator);
if (p) {
pname = g_strndup (name, p - name);
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index 9d6412eefa..dd0ba72964 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -414,7 +414,7 @@ imap_connect (CamelService *service, CamelException *ex)
continue;
}
g_hash_table_insert (store->subscribed_folders, name,
- GINT_TO_POINTER (flags));
+ GINT_TO_POINTER (1));
}
camel_imap_response_free (response);