evolution-data-server r10005 - branches/gnome-2-24/camel

[sragavan svn gnome org]

Author: sragavan
Date: Fri Jan 30 09:38:32 2009
New Revision: 10005
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=10005&view=rev

Log:
2009-01-30  Srinivasa Ragavan  <sragavan novell com>

	* camel-vee-folder.c: (vf_getv): Fix some implicit warnings
	* camel-vee-summary.c:
	(camel_vee_summary_load_check_unread_vfolder):
	* camel-vee-summary.h:


Modified:
   branches/gnome-2-24/camel/ChangeLog
   branches/gnome-2-24/camel/camel-vee-folder.c
   branches/gnome-2-24/camel/camel-vee-summary.c
   branches/gnome-2-24/camel/camel-vee-summary.h

Modified: branches/gnome-2-24/camel/camel-vee-folder.c
==============================================================================
--- branches/gnome-2-24/camel/camel-vee-folder.c	(original)
+++ branches/gnome-2-24/camel/camel-vee-folder.c	Fri Jan 30 09:38:32 2009
@@ -1998,7 +1998,7 @@
 		case CAMEL_FOLDER_ARG_VISIBLE:
 
 			if (vf->expression && vf->priv->unread_vfolder == -1)
-				camel_vee_summary_load_check_unread_vfolder (vf);
+				camel_vee_summary_load_check_unread_vfolder ((CamelVeeSummary *)folder->summary);
 		
 			/* This is so we can get the values atomically, and also so we can calculate them only once */
 			if (unread == -1) {

Modified: branches/gnome-2-24/camel/camel-vee-summary.c
==============================================================================
--- branches/gnome-2-24/camel/camel-vee-summary.c	(original)
+++ branches/gnome-2-24/camel/camel-vee-summary.c	Fri Jan 30 09:38:32 2009
@@ -172,12 +172,13 @@
 }
 
 void
-camel_vee_summary_load_check_unread_vfolder (CamelVeeFolder *vf)
+camel_vee_summary_load_check_unread_vfolder (CamelVeeSummary *vs)
 {
-	static only_once = FALSE;
+	static int only_once = FALSE;
 	static char *exp = NULL;
 	char *meta;
 	gboolean hacked_unread_folder = FALSE;
+	CamelVeeFolder *vf = (CamelVeeFolder *) ((CamelFolderSummary *)vs)->folder;
 
 	/* HACK: Ugliest of all hacks. Its virtually not possible now
 	 * to maintain counts and the non matching uids of unread vfolder here.

Modified: branches/gnome-2-24/camel/camel-vee-summary.h
==============================================================================
--- branches/gnome-2-24/camel/camel-vee-summary.h	(original)
+++ branches/gnome-2-24/camel/camel-vee-summary.h	Fri Jan 30 09:38:32 2009
@@ -62,6 +62,7 @@
 
 CamelVeeMessageInfo * camel_vee_summary_add(CamelVeeSummary *s, CamelFolderSummary *summary, const char *uid, const char hash[8]);
 GPtrArray * camel_vee_summary_get_ids (CamelVeeSummary *summary, char hash[8]);
+void camel_vee_summary_load_check_unread_vfolder  (CamelVeeSummary *vs);
 
 G_END_DECLS