aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@novell.com>2004-06-08 03:29:09 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2004-06-08 03:29:09 +0800
commit649a9922018d88db9e5100d6d525aa64771eb974 (patch)
tree66244d4b0c2866cb3975d49819a504048adec0c6
parent49e7c0f0699b3b88f757b79d3f156cfde4537692 (diff)
downloadgsoc2013-evolution-649a9922018d88db9e5100d6d525aa64771eb974.tar.gz
gsoc2013-evolution-649a9922018d88db9e5100d6d525aa64771eb974.tar.zst
gsoc2013-evolution-649a9922018d88db9e5100d6d525aa64771eb974.zip
Load the entire summary, not just the summary header. This way when the
2004-06-07 Jeffrey Stedfast <fejj@novell.com> * providers/imap4/camel-imap4-folder.c (camel_imap4_folder_new): Load the entire summary, not just the summary header. This way when the user opens the folder, we don't do a complete re-sync with the server unnecessarily. * providers/imap4/camel-imap4-summary.c (untagged_fetch_all): New info's always have a uid of "", so don't checkagainst NULL. svn path=/trunk/; revision=26239
-rw-r--r--camel/ChangeLog10
-rw-r--r--camel/providers/imap4/camel-imap4-folder.c2
-rw-r--r--camel/providers/imap4/camel-imap4-summary.c4
3 files changed, 14 insertions, 2 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 37e4641a48..702155f0fe 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,13 @@
+2004-06-07 Jeffrey Stedfast <fejj@novell.com>
+
+ * providers/imap4/camel-imap4-folder.c (camel_imap4_folder_new):
+ Load the entire summary, not just the summary header. This way
+ when the user opens the folder, we don't do a complete re-sync
+ with the server unnecessarily.
+
+ * providers/imap4/camel-imap4-summary.c (untagged_fetch_all): New
+ info's always have a uid of "", so don't checkagainst NULL.
+
2004-06-06 Jeffrey Stedfast <fejj@ximian.com>
* providers/imap4/camel-imap4-store.c (imap4_rename_folder):
diff --git a/camel/providers/imap4/camel-imap4-folder.c b/camel/providers/imap4/camel-imap4-folder.c
index 5d40385553..a67d50f816 100644
--- a/camel/providers/imap4/camel-imap4-folder.c
+++ b/camel/providers/imap4/camel-imap4-folder.c
@@ -276,7 +276,7 @@ camel_imap4_folder_new (CamelStore *store, const char *full_name, CamelException
camel_folder_summary_set_filename (folder->summary, path);
g_free (path);
- camel_folder_summary_header_load (folder->summary);
+ camel_folder_summary_load (folder->summary);
if (camel_imap4_engine_select_folder (((CamelIMAP4Store *) store)->engine, folder, ex) == -1) {
camel_object_unref (folder);
diff --git a/camel/providers/imap4/camel-imap4-summary.c b/camel/providers/imap4/camel-imap4-summary.c
index 4c181c4ab4..8ef8d342fa 100644
--- a/camel/providers/imap4/camel-imap4-summary.c
+++ b/camel/providers/imap4/camel-imap4-summary.c
@@ -690,6 +690,7 @@ untagged_fetch_all (CamelIMAP4Engine *engine, CamelIMAP4Command *ic, guint32 ind
GPtrArray *added = fetch->added;
CamelIMAP4MessageInfo *iinfo;
CamelMessageInfo *info;
+ const char *iuid;
char uid[12];
if (index > added->len)
@@ -774,7 +775,8 @@ untagged_fetch_all (CamelIMAP4Engine *engine, CamelIMAP4Command *ic, guint32 ind
goto unexpected;
sprintf (uid, "%u", token->v.number);
- if (camel_message_info_uid (info) != NULL) {
+ iuid = camel_message_info_uid (info);
+ if (iuid != NULL && iuid[0] != '\0') {
if (strcmp (camel_message_info_uid (info), uid) != 0)
fprintf (stderr, "Hmmm, UID mismatch for message %u\n", index);
else