evolution-data-server r9217 - in trunk/camel: . providers/groupwise providers/imap providers/nntp

[sragavan svn gnome org]

Author: sragavan
Date: Tue Jul 29 04:29:54 2008
New Revision: 9217
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9217&view=rev

Log:
2008-07-28  Srinivasa Ragavan  <sragavan novell com>

	* camel/camel-digest-folder.c: Fix uid/pstring issues.
	* camel/camel-folder-summary.c:
	* camel/camel-folder-summary.h: Make uid const char *
	* camel/camel-vee-summary.c:


Modified:
   trunk/camel/ChangeLog
   trunk/camel/camel-digest-folder.c
   trunk/camel/camel-folder-summary.c
   trunk/camel/camel-folder-summary.h
   trunk/camel/camel-vee-summary.c
   trunk/camel/providers/groupwise/ChangeLog
   trunk/camel/providers/groupwise/camel-groupwise-journal.c
   trunk/camel/providers/imap/ChangeLog
   trunk/camel/providers/imap/camel-imap-folder.c
   trunk/camel/providers/nntp/ChangeLog
   trunk/camel/providers/nntp/camel-nntp-summary.c

Modified: trunk/camel/camel-digest-folder.c
==============================================================================
--- trunk/camel/camel-digest-folder.c	(original)
+++ trunk/camel/camel-digest-folder.c	Tue Jul 29 04:29:54 2008
@@ -30,6 +30,7 @@
 #include "camel-folder-search.h"
 #include "camel-mime-message.h"
 #include "camel-multipart.h"
+#include "camel-string-utils.h"
 
 #define d(x)
 
@@ -181,6 +182,7 @@
 	
 	parts = camel_multipart_get_number (multipart);
 	for (i = 0; i < parts; i++) {
+		char *tmp;
 		part = camel_multipart_get_part (multipart, i);
 		
 		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
@@ -195,8 +197,10 @@
 		}
 		
 		info = camel_folder_summary_info_new_from_message (folder->summary, CAMEL_MIME_MESSAGE (wrapper));
-		g_free(info->uid);
-		info->uid = g_strdup_printf ("%s%d", preuid, i);
+		camel_pstring_free(info->uid);
+		tmp = g_strdup_printf ("%s%d", preuid, i);
+		info->uid = camel_pstring_strdup (tmp);
+		g_free(tmp);
 		camel_folder_summary_add (folder->summary, info);
 	}
 }

Modified: trunk/camel/camel-folder-summary.c
==============================================================================
--- trunk/camel/camel-folder-summary.c	(original)
+++ trunk/camel/camel-folder-summary.c	Tue Jul 29 04:29:54 2008
@@ -1091,7 +1091,7 @@
 		}
 
 		mi->dirty = TRUE;
-		g_hash_table_insert (s->loaded_infos, mi->uid, mi);
+		g_hash_table_insert (s->loaded_infos, (gpointer) mi->uid, mi);
 	}
 
 	

Modified: trunk/camel/camel-folder-summary.h
==============================================================================
--- trunk/camel/camel-folder-summary.h	(original)
+++ trunk/camel/camel-folder-summary.h	Tue Jul 29 04:29:54 2008
@@ -152,7 +152,7 @@
 	CamelFolderSummary *summary;
 
 	guint32 refcount;	/* ??? */
-	char *uid;
+	const char *uid;
 	/*FIXME: Make it work with the CAMEL_MESSADE_DB_DIRTY flag instead of another 4 bytes*/
 	int dirty:1;
 };
@@ -164,7 +164,7 @@
 	CamelFolderSummary *summary;
 
 	guint32 refcount;	/* ??? */
-	char *uid;
+	const char *uid;
 	/*FIXME: Make it work with the CAMEL_MESSADE_DB_DIRTY flag instead of another 4 bytes*/
 	int dirty:1;
 	

Modified: trunk/camel/camel-vee-summary.c
==============================================================================
--- trunk/camel/camel-vee-summary.c	(original)
+++ trunk/camel/camel-vee-summary.c	Tue Jul 29 04:29:54 2008
@@ -44,7 +44,7 @@
 {
 	CamelVeeMessageInfo *mi = (CamelVeeMessageInfo *)info;
 
-	g_free(info->uid);
+	camel_pstring_free(info->uid);
 	camel_object_unref (mi->summary);
 }
 
@@ -60,7 +60,8 @@
 	/* FIXME: We may not need this during CamelDBSummary */
 	camel_object_ref (to->summary);
 	to->info.summary = s;
-	
+	to->info.uid = camel_pstring_strdup(from->info.uid);
+
 	return (CamelMessageInfo *)to;
 }
 

Modified: trunk/camel/providers/groupwise/camel-groupwise-journal.c
==============================================================================
--- trunk/camel/providers/groupwise/camel-groupwise-journal.c	(original)
+++ trunk/camel/providers/groupwise/camel-groupwise-journal.c	Tue Jul 29 04:29:54 2008
@@ -374,7 +374,7 @@
 	camel_object_unref (cache);
 	
 	info = camel_folder_summary_info_new_from_message (folder->summary, message);
-	g_free(info->uid);
+	camel_pstring_free(info->uid);
 	info->uid = camel_pstring_strdup (uid);
 	
 	gw_message_info_dup_to ((CamelMessageInfoBase *) info, (CamelMessageInfoBase *) mi);

Modified: trunk/camel/providers/imap/camel-imap-folder.c
==============================================================================
--- trunk/camel/providers/imap/camel-imap-folder.c	(original)
+++ trunk/camel/providers/imap/camel-imap-folder.c	Tue Jul 29 04:29:54 2008
@@ -706,7 +706,7 @@
 
 	if (check_rescan && !camel_application_is_exiting && !camel_exception_is_set (ex)) {
 		if (check_rescan == -1) {
-			guint32 total, unread, server_total, server_unread;
+			guint32 total, unread, server_total=0, server_unread=0;
 
 			check_rescan = 0;
 			

Modified: trunk/camel/providers/nntp/camel-nntp-summary.c
==============================================================================
--- trunk/camel/providers/nntp/camel-nntp-summary.c	(original)
+++ trunk/camel/providers/nntp/camel-nntp-summary.c	Tue Jul 29 04:29:54 2008
@@ -43,6 +43,7 @@
 #include "camel-nntp-store.h"
 #include "camel-nntp-stream.h"
 #include "camel-nntp-summary.h"
+#include "camel-string-utils.h"
 
 #define w(x)
 #define io(x)
@@ -158,8 +159,9 @@
 
 	mi = (CamelMessageInfoBase *)((CamelFolderSummaryClass *)camel_nntp_summary_parent)->message_info_new_from_header(s, h);
 	if (mi) {
-		g_free(mi->uid);
-		mi->uid = cns->priv->uid;
+		camel_pstring_free(mi->uid);
+		mi->uid = camel_pstring_strdup(cns->priv->uid);
+		g_free(cns->priv->uid);
 		cns->priv->uid = NULL;
 	}