aboutsummaryrefslogtreecommitdiffstats
path: root/camel/providers
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2004-03-30 13:04:54 +0800
committerMichael Zucci <zucchi@src.gnome.org>2004-03-30 13:04:54 +0800
commit37c97d8b096f588ba4d8fbc7182dae0a35719768 (patch)
tree8da1d45359fa5bb3157445c890818ce29c0b0ffe /camel/providers
parent71c5ee30a81ea870329f1c2573cdf6f22cfc7d75 (diff)
downloadgsoc2013-evolution-37c97d8b096f588ba4d8fbc7182dae0a35719768.tar
gsoc2013-evolution-37c97d8b096f588ba4d8fbc7182dae0a35719768.tar.gz
gsoc2013-evolution-37c97d8b096f588ba4d8fbc7182dae0a35719768.tar.bz2
gsoc2013-evolution-37c97d8b096f588ba4d8fbc7182dae0a35719768.tar.lz
gsoc2013-evolution-37c97d8b096f588ba4d8fbc7182dae0a35719768.tar.xz
gsoc2013-evolution-37c97d8b096f588ba4d8fbc7182dae0a35719768.tar.zst
gsoc2013-evolution-37c97d8b096f588ba4d8fbc7182dae0a35719768.zip
added some debug to dump the whole folderinfo tree if store:folder_info is
2004-03-30 Not Zed <NotZed@Ximian.com> * camel-store.c (camel_store_get_folder_info): added some debug to dump the whole folderinfo tree if store:folder_info is set. * providers/imapp/camel-imapp-driver.c: #if 0 out some code, to kill warnings. * camel-url-scanner.c: include ctype.h for isspace (wonder if it should use utf8 funcs?). 2004-03-29 Not Zed <NotZed@Ximian.com> ** See #56146. * providers/imap/camel-imap-store.c (get_folders): check the top-level folders list for duplicates as well. (get_folders_add_folders): split out the folder return merging code from get_folders. Absolute mess of crap to deal with more busted servers. * camel-debug.c (camel_debug_start, camel_debug_end): some helpers to wrap debug output for atomicicity. svn path=/trunk/; revision=25238
Diffstat (limited to 'camel/providers')
-rw-r--r--camel/providers/imap/camel-imap-store.c84
-rw-r--r--camel/providers/imapp/camel-imapp-driver.c2
2 files changed, 64 insertions, 22 deletions
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index 8544988cfa..20fcf9aa17 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -63,15 +63,14 @@
#include "camel-imap-private.h"
#include "camel-private.h"
+#include "camel-debug.h"
+
#define d(x)
/* Specified in RFC 2060 */
#define IMAP_PORT 143
#define SIMAP_PORT 993
-
-extern int camel_verbose_debug;
-
static CamelDiscoStoreClass *parent_class = NULL;
static char imap_tag_prefix = 'A';
@@ -2279,6 +2278,9 @@ get_subscribed_folders (CamelImapStore *imap_store, const char *top, CamelExcept
char *result;
int haveinbox = FALSE;
+ if (camel_debug("imap:folder_info"))
+ printf(" get_subscribed folders\n");
+
folders = g_ptr_array_new ();
names = g_ptr_array_new ();
for (i=0;(si = camel_store_summary_index((CamelStoreSummary *)imap_store->summary, i));i++) {
@@ -2569,6 +2571,49 @@ static int folder_eq(const void *ap, const void *bp)
return g_str_equal(a, b);
}
+static GSList *
+get_folders_add_folders(GSList *p, int recurse, GHashTable *infos, GPtrArray *folders, GPtrArray *folders_out)
+{
+ CamelFolderInfo *oldfi, *fi;
+ int i;
+
+ /* This is a nasty mess, because some servers will return
+ broken results from LIST or LSUB if you use '%'. e.g. you
+ may get (many) duplicate names, and worse, names may have
+ conflicting flags. */
+ for (i=0; i<folders->len; i++) {
+ fi = folders->pdata[i];
+ oldfi = g_hash_table_lookup(infos, fi->full_name);
+ if (oldfi == NULL) {
+ d(printf(" new folder '%s'\n", fi->full_name));
+ g_hash_table_insert(infos, fi->full_name, fi);
+ if (recurse)
+ p = g_slist_prepend(p, fi);
+ } else {
+ d(printf(" old folder '%s', old flags %08x new flags %08x\n", fi->full_name, oldfi->flags, fi->flags));
+
+ /* need to special-case noselect, since it also affects the uri */
+ if ((oldfi->flags & CAMEL_FOLDER_NOSELECT) != 0
+ && (fi->flags & CAMEL_FOLDER_NOSELECT) == 0) {
+ g_free(oldfi->uri);
+ oldfi->uri = fi->uri;
+ fi->uri = NULL;
+ }
+
+ /* some flags are anded together, some are or'd */
+
+ oldfi->flags = (oldfi->flags & fi->flags & (CAMEL_FOLDER_NOSELECT|CAMEL_FOLDER_NOINFERIORS))
+ | ((oldfi->flags | fi->flags) & ~(CAMEL_FOLDER_NOSELECT|CAMEL_FOLDER_NOINFERIORS));
+
+ camel_folder_info_free(fi);
+ }
+ }
+
+ g_ptr_array_set_size(folders, 0);
+
+ return p;
+}
+
static GPtrArray *
get_folders(CamelStore *store, const char *top, guint32 flags, CamelException *ex)
{
@@ -2586,6 +2631,9 @@ get_folders(CamelStore *store, const char *top, guint32 flags, CamelException *e
if (!camel_imap_store_connected (imap_store, ex))
return NULL;
+ if (camel_debug("imap:folder_info"))
+ printf(" get_folders\n");
+
/* allow megalomaniacs to override the max of 10 */
if (imap_max_depth == 0) {
name = getenv("CAMEL_IMAP_MAX_DEPTH");
@@ -2637,10 +2685,7 @@ get_folders(CamelStore *store, const char *top, guint32 flags, CamelException *e
goto fail;
}
- for (i=0; i<folders->len; i++)
- p = g_slist_prepend(p, folders->pdata[i]);
-
- g_ptr_array_set_size(folders, 0);
+ p = get_folders_add_folders(p, TRUE, infos, folders, folders_out);
/* p is a reversed list of pending folders for the next level, q is the list of folders for this */
while (p) {
@@ -2651,10 +2696,9 @@ get_folders(CamelStore *store, const char *top, guint32 flags, CamelException *e
fi = q->data;
q = g_slist_remove_link(q, q);
- g_hash_table_insert(infos, fi->full_name, fi);
g_ptr_array_add(folders_out, fi);
- d(printf("Checking folder '%s'\n", fi->full_name));
+ d(printf("Checking parent folder '%s'\n", fi->full_name));
/* First if we're not recursive mode on the top level, and we know it has or doesn't
or can't have children, no need to go further - a bit ugly */
@@ -2662,6 +2706,7 @@ get_folders(CamelStore *store, const char *top, guint32 flags, CamelException *e
&& (flags & CAMEL_STORE_FOLDER_INFO_RECURSIVE) == 0
&& (fi->flags & (CAMEL_FOLDER_CHILDREN|CAMEL_FOLDER_NOCHILDREN|CAMEL_FOLDER_NOINFERIORS)) != 0) {
/* do nothing */
+ d(printf(" not interested in folder right now ...\n"));
}
/* Otherwise, if this has (or might have) children, scan it */
else if ( (fi->flags & (CAMEL_FOLDER_NOCHILDREN|CAMEL_FOLDER_NOINFERIORS)) == 0
@@ -2677,19 +2722,8 @@ get_folders(CamelStore *store, const char *top, guint32 flags, CamelException *e
if (folders->len > 0)
fi->flags |= CAMEL_FOLDER_CHILDREN;
- for (i=0;i<folders->len;i++) {
- fi = folders->pdata[i];
- if (g_hash_table_lookup(infos, fi->full_name) == NULL) {
- g_hash_table_insert(infos, fi->full_name, fi);
- if ((flags & CAMEL_STORE_FOLDER_INFO_RECURSIVE) && depth<imap_max_depth)
- p = g_slist_prepend(p, fi);
- else
- g_ptr_array_add(folders_out, fi);
- } else {
- camel_folder_info_free(fi);
- }
- }
- g_ptr_array_set_size(folders, 0);
+ p = get_folders_add_folders(p, (flags & CAMEL_STORE_FOLDER_INFO_RECURSIVE) && depth<imap_max_depth,
+ infos, folders, folders_out);
}
}
depth++;
@@ -2719,6 +2753,9 @@ get_folder_info_online (CamelStore *store, const char *top, guint32 flags, Camel
if (top == NULL)
top = "";
+ if (camel_debug("imap:folder_info"))
+ printf("get folder info online\n");
+
CAMEL_SERVICE_LOCK(store, connect_lock);
if ((flags & CAMEL_STORE_FOLDER_INFO_SUBSCRIBED)
@@ -2801,6 +2838,9 @@ get_folder_info_offline (CamelStore *store, const char *top,
GPtrArray *folders;
char *storage_path;
+ if (camel_debug("imap:folder_info"))
+ printf("get folder info offline\n");
+
if (!imap_store->connected &&
!camel_service_connect (CAMEL_SERVICE (store), ex))
return NULL;
diff --git a/camel/providers/imapp/camel-imapp-driver.c b/camel/providers/imapp/camel-imapp-driver.c
index 54c050c675..8028b942bf 100644
--- a/camel/providers/imapp/camel-imapp-driver.c
+++ b/camel/providers/imapp/camel-imapp-driver.c
@@ -430,6 +430,7 @@ camel_imapp_driver_sync(CamelIMAPPDriver *id, gboolean expunge, CamelIMAPPFolder
}
}
+#if 0
static void
fetch_data_free(CamelIMAPPFetch *fd)
{
@@ -440,6 +441,7 @@ fetch_data_free(CamelIMAPPFetch *fd)
g_free(fd->section);
g_free(fd);
}
+#endif
struct _CamelStream * camel_imapp_driver_fetch(CamelIMAPPDriver *id, struct _CamelIMAPPFolder *folder, const char *uid, const char *body)
{