aboutsummaryrefslogtreecommitdiffstats
path: root/camel/providers
diff options
context:
space:
mode:
Diffstat (limited to 'camel/providers')
-rw-r--r--camel/providers/imap4/camel-imap4-folder.c2
-rw-r--r--camel/providers/imap4/camel-imap4-summary.c4
2 files changed, 4 insertions, 2 deletions
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