evolution-data-server r8922 - branches/camel-db-summary/camel

[psankar svn gnome org]

Author: psankar
Date: Thu Jun  5 04:57:30 2008
New Revision: 8922
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8922&view=rev

Log:
summary_assign_uid should use the new hashtable to check for uid
conflict etc.



Modified:
   branches/camel-db-summary/camel/camel-folder-summary.c

Modified: branches/camel-db-summary/camel/camel-folder-summary.c
==============================================================================
--- branches/camel-db-summary/camel/camel-folder-summary.c	(original)
+++ branches/camel-db-summary/camel/camel-folder-summary.c	Thu Jun  5 04:57:30 2008
@@ -1228,8 +1228,6 @@
 	const char *uid;
 	CamelMessageInfo *mi;
 
-#error "rewrite this with db design"
-	
 	uid = camel_message_info_uid (info);
 
 	if (uid == NULL || uid[0] == 0) {
@@ -1239,13 +1237,13 @@
 
 	CAMEL_SUMMARY_LOCK(s, summary_lock);
 
-	while ((mi = g_hash_table_lookup(s->messages_uid, uid))) {
+	while ((mi = g_hash_table_lookup(s->loaded_infos, uid))) {
 		CAMEL_SUMMARY_UNLOCK(s, summary_lock);
 
 		if (mi == info)
 			return 0;
 
-		d(printf ("Trying to insert message with clashing uid (%s).  new uid re-assigned", camel_message_info_uid(info)));
+		d(printf ("Trying to insert message with clashing uid (%s).  new uid re-assigned", camel_message_info_uid (info)));
 
 		g_free(info->uid);
 		uid = info->uid = camel_folder_summary_next_uid_string(s);