[evolution-data-server] Bug 610073 - Error while refreshing folder in imapx

[Chenthill Palanisamy <pchen src gnome org>]

commit 86662e821a0df481f72e1ce707f06b55275cbbf5
Author: Chenthill Palanisamy <pchenthill novell com>
Date:   Fri Feb 26 00:02:54 2010 +0530

    Bug 610073 -  Error while refreshing folder in imapx

 camel/camel-folder-summary.c               |    4 ++--
 camel/providers/imapx/camel-imapx-server.c |    6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index 49586e0..85265ac 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -66,7 +66,7 @@
 #define USE_GSLICE 1
 
 /* Make 5 minutes as default cache drop */
-#define SUMMARY_CACHE_DROP 300
+#define SUMMARY_CACHE_DROP 300 
 #define dd(x) if (camel_debug("sync")) x
 
 static pthread_mutex_t info_lock = PTHREAD_MUTEX_INITIALIZER;
@@ -3282,7 +3282,7 @@ message_info_load(CamelFolderSummary *s, FILE *in)
 	camel_file_util_decode_string(in, &cc);
 	camel_file_util_decode_string(in, &mlist);
 
-	mi->uid = uid;
+	mi->uid = camel_pstring_add (uid, TRUE);
 	mi->subject = camel_pstring_add (subject, TRUE);
 	mi->from = camel_pstring_add (from, TRUE);
 	mi->to = camel_pstring_add (to, TRUE);
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index abd7822..bbd03a8 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -1217,7 +1217,7 @@ imapx_untagged(CamelIMAPXServer *imap, CamelException *ex)
 					CamelFlag *server_user_flags;
 					CamelMessageInfoBase *binfo;
 
-					mi->uid = g_strdup(finfo->uid);
+					mi->uid = camel_pstring_strdup (finfo->uid);
 
 					if (!(finfo->got & FETCH_FLAGS))
 					{
@@ -2426,8 +2426,10 @@ imapx_command_append_message_done (CamelIMAPXServer *is, CamelIMAPXCommand *ic)
 			printf("Got appenduid %d %d\n", (gint)ic->status->u.appenduid.uidvalidity, (gint)ic->status->u.appenduid.uid);
 			if (ic->status->u.appenduid.uidvalidity == is->uidvalidity) {
 				CamelFolderChangeInfo *changes;
+				char *uid;
 
-				mi->uid = g_strdup_printf("%u", (guint)ic->status->u.appenduid.uid);
+				uid = g_strdup_printf("%u", (guint)ic->status->u.appenduid.uid);
+				mi->uid = camel_pstring_add (uid, TRUE);
 
 				cur = camel_data_cache_get_filename  (ifolder->cache, "cur", mi->uid, NULL);
 				printf("Moving cache item %s to %s\n", job->u.append_message.path, cur);