aboutsummaryrefslogtreecommitdiffstats
path: root/camel/providers/imap
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@helixcode.com>2000-08-04 07:07:18 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2000-08-04 07:07:18 +0800
commitc263dfffeb657f822c44eb709cf3b3d187584ce2 (patch)
treee2fd807c96b58ad7c68224d17243779329e9ecff /camel/providers/imap
parent2b60e44890dc2bb86310e4d6699372c3c5ac2833 (diff)
downloadgsoc2013-evolution-c263dfffeb657f822c44eb709cf3b3d187584ce2.tar
gsoc2013-evolution-c263dfffeb657f822c44eb709cf3b3d187584ce2.tar.gz
gsoc2013-evolution-c263dfffeb657f822c44eb709cf3b3d187584ce2.tar.bz2
gsoc2013-evolution-c263dfffeb657f822c44eb709cf3b3d187584ce2.tar.lz
gsoc2013-evolution-c263dfffeb657f822c44eb709cf3b3d187584ce2.tar.xz
gsoc2013-evolution-c263dfffeb657f822c44eb709cf3b3d187584ce2.tar.zst
gsoc2013-evolution-c263dfffeb657f822c44eb709cf3b3d187584ce2.zip
Only call imap_get_summary_internal if the folder can hold messages
2000-08-03 Jeffrey Stedfast <fejj@helixcode.com> * providers/imap/camel-imap-folder.c (camel_imap_folder_new): Only call imap_get_summary_internal if the folder can hold messages * providers/nntp/camel-nntp-provider.c (camel_provider_module_init): Initialize the service_cache for the news/nntp providers svn path=/trunk/; revision=4519
Diffstat (limited to 'camel/providers/imap')
-rw-r--r--camel/providers/imap/camel-imap-folder.c6
-rw-r--r--camel/providers/imap/camel-imap-utils.c11
2 files changed, 10 insertions, 7 deletions
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index e6f051a75a..ca99da671c 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -192,8 +192,10 @@ camel_imap_folder_new (CamelStore *parent, char *folder_name, CamelException *ex
folder->can_hold_messages = FALSE;
imap_get_subfolder_names_internal (folder, ex);
- imap_get_summary_internal (folder, ex);
-
+
+ if (folder->can_hold_messages)
+ imap_get_summary_internal (folder, ex);
+
return folder;
}
diff --git a/camel/providers/imap/camel-imap-utils.c b/camel/providers/imap/camel-imap-utils.c
index 648201891b..c440d6c165 100644
--- a/camel/providers/imap/camel-imap-utils.c
+++ b/camel/providers/imap/camel-imap-utils.c
@@ -428,19 +428,20 @@ stresexptree (ESExpTerm *node)
if (str) {
if (r_str) {
if (l_str)
- node_str = g_strdup_printf ("(%s (%s)) %s", str, r_str, l_str);
+ node_str = g_strdup_printf ("%s %s %s", str, r_str, l_str);
else
- node_str = g_strdup_printf ("(%s %s)", str, r_str);
+ node_str = g_strdup_printf ("%s %s", str, r_str);
} else {
if (l_str)
- node_str = g_strdup_printf ("(%s) %s", str, l_str);
+ node_str = g_strdup_printf ("%s %s", str, l_str);
else
- node_str = g_strdup_printf ("(%s)", str);
+ node_str = g_strdup_printf ("%s", str);
}
} else {
+
if (r_str) {
if (l_str)
- node_str = g_strdup_printf ("(%s) %s", r_str, l_str);
+ node_str = g_strdup_printf ("%s %s", r_str, l_str);
else
node_str = g_strdup_printf ("%s", r_str);
} else {