evolution-data-server r9160 - trunk/camel

[sragavan svn gnome org]

Author: sragavan
Date: Mon Jul 21 11:46:23 2008
New Revision: 9160
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9160&view=rev

Log:
Fix info/summaries. Ignore vfolder counts for sometime.


Modified:
   trunk/camel/camel-db.c
   trunk/camel/camel-folder.c
   trunk/camel/camel-vee-folder.c

Modified: trunk/camel/camel-db.c
==============================================================================
--- trunk/camel/camel-db.c	(original)
+++ trunk/camel/camel-db.c	Mon Jul 21 11:46:23 2008
@@ -35,7 +35,7 @@
 #include <glib.h>
 #include <glib/gi18n-lib.h>
 
-#define d(x) 
+#define d(x)
 
 static GStaticRecMutex trans_lock = G_STATIC_REC_MUTEX_INIT;	
 

Modified: trunk/camel/camel-folder.c
==============================================================================
--- trunk/camel/camel-folder.c	(original)
+++ trunk/camel/camel-folder.c	Mon Jul 21 11:46:23 2008
@@ -402,7 +402,7 @@
 					//camel_db_count_junk_not_deleted_message_info (folder->cdb, folder->full_name, &junked_not_deleted, ex);
 					//camel_db_count_visible_message_info (folder->cdb, folder->full_name, &visible, ex);
 				} else {
-					count = camel_folder_summary_count (folder->summary);
+					/* count = camel_folder_summary_count (folder->summary);
 					for (j = 0; j < count; j++) {
 						if ((info = camel_folder_summary_index (folder->summary, j))) {
 							guint32 flags = camel_message_info_flags(info);
@@ -421,10 +421,10 @@
 							camel_message_info_free(info);
 						}
 
-					}
+					}*/
                                         #warning "I added it for vfolders summary storage, does it harm ?"
 					if (unread == -1) {
-						unread = folder->summary->unread_count;
+						//unread = folder->summary->unread_count;
 						/*
 						folder->summary->junk_count = junked;
 						folder->summary->deleted_count = deleted;

Modified: trunk/camel/camel-vee-folder.c
==============================================================================
--- trunk/camel/camel-vee-folder.c	(original)
+++ trunk/camel/camel-vee-folder.c	Mon Jul 21 11:46:23 2008
@@ -1042,7 +1042,7 @@
 		g_hash_table_insert(matchhash, match->pdata[i], GINT_TO_POINTER (1));
 
 	allhash = g_hash_table_new(g_str_hash, g_str_equal);
-	all = camel_folder_get_uids(f);
+	all = camel_folder_summary_array(f->summary);
 	for (i=0;i<all->len;i++)
 		if (g_hash_table_lookup(matchhash, all->pdata[i]) == NULL)
 			g_hash_table_insert(allhash, all->pdata[i], GINT_TO_POINTER (1));
@@ -1153,7 +1153,7 @@
 		g_ptr_array_free(match, TRUE);
 	} else
 		camel_folder_search_free(f, match);
-	camel_folder_free_uids(f, all);
+	camel_folder_free_summary (f, all);
 
 	if (unmatched_changes) {
 		camel_object_trigger_event((CamelObject *)folder_unmatched, "folder_changed", unmatched_changes);