evolution-data-server r8964 - in branches/camel-db-summary/camel: . providers/imap

[psankar svn gnome org]

Author: psankar
Date: Tue Jun 10 13:46:00 2008
New Revision: 8964
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8964&view=rev

Log:
Free the uids gptrarray and its contents on clear of summary

Populate IMAP cache by checking for loaded_infos



Modified:
   branches/camel-db-summary/camel/camel-folder-summary.c
   branches/camel-db-summary/camel/providers/imap/camel-imap-message-cache.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	Tue Jun 10 13:46:00 2008
@@ -1603,12 +1603,10 @@
 		return;
 	}
 
-	for (i = 0; i < s->uids->len; i++)
-		 g_free (s->uids->pdata[i]);
 
 	camel_db_clear_folder_summary (cdb, folder_name, NULL);
-	#warning "free the to-be-lost memory"
-	g_ptr_array_set_size(s->uids, 0);
+	g_ptr_array_free (s->uids, TRUE);
+	s->uids = g_ptr_array_new ();
 
 	g_hash_table_destroy(s->loaded_infos);
 	s->loaded_infos = g_hash_table_new(g_str_hash, g_str_equal);

Modified: branches/camel-db-summary/camel/providers/imap/camel-imap-message-cache.c
==============================================================================
--- branches/camel-db-summary/camel/providers/imap/camel-imap-message-cache.c	(original)
+++ branches/camel-db-summary/camel/providers/imap/camel-imap-message-cache.c	Tue Jun 10 13:46:00 2008
@@ -179,7 +179,7 @@
 		else
 			uid = g_strdup (dname);
 
-		if (g_hash_table_lookup (summary->uids, uid))
+		if (summary->loaded_infos && g_hash_table_lookup (summary->loaded_infos, uid))
 			cache_put (cache, uid, dname, NULL);
 
 		/*