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

[psankar svn gnome org]

Author: psankar
Date: Thu Jun  5 05:15:09 2008
New Revision: 8924
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8924&view=rev

Log:
Fix compiler warnings


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

Modified: branches/camel-db-summary/camel/camel-db.c
==============================================================================
--- branches/camel-db-summary/camel/camel-db.c	(original)
+++ branches/camel-db-summary/camel/camel-db.c	Thu Jun  5 05:15:09 2008
@@ -487,11 +487,11 @@
 	return (ret);
 }
 
-gboolean
+int
 camel_db_delete_uid (CamelDB *cdb, char *folder, char *uid, CamelException *ex)
 {
 	char *tab = sqlite3_mprintf ("DELETE FROM %Q WHERE uid = %Q", folder, uid);
-	gboolean ret;
+	int ret;
 
 	ret = camel_db_command (cdb, tab, ex);
 	sqlite3_free (tab);
@@ -499,6 +499,17 @@
 	return ret;
 }
 
+int
+camel_db_delete_uids (CamelDB *cdb, char *folder, GSList *uids, CamelException *ex)
+{
+	char *tab = sqlite3_mprintf ("DELETE FROM %Q WHERE uid = %Q", folder, uid);
+	int ret;
+
+	ret = camel_db_command (cdb, tab, ex);
+	sqlite3_free (tab);
+
+	return ret;
+}
 
 void
 camel_db_camel_mir_free (CamelMIRecord *record)

Modified: branches/camel-db-summary/camel/camel-db.h
==============================================================================
--- branches/camel-db-summary/camel/camel-db.h	(original)
+++ branches/camel-db-summary/camel/camel-db.h	Thu Jun  5 05:15:09 2008
@@ -103,6 +103,7 @@
 
 gboolean camel_db_delete_folder (CamelDB *cdb, char *folder, CamelException *ex);
 gboolean camel_db_delete_uid (CamelDB *cdb, char *folder, char *uid, CamelException *ex);
+gboolean camel_db_delete_uids (CamelDB *cdb, char *folder, GSList *uids, CamelException *ex);
 
 int camel_db_create_folders_table (CamelDB *cdb, CamelException *ex);
 int camel_db_select (CamelDB *cdb, const char* stmt, CamelDBSelectCB callback, gpointer data, CamelException *ex);

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 05:15:09 2008
@@ -1585,23 +1585,33 @@
 	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
 }
 
-
 static void
 summary_remove_uid (CamelFolderSummary *s, const char *uid)
 {
 	int i;
-	
-#error "remove the uid from summary db"
-	
+	CamelDB *cdb;
+	CamelException ex;// May be this should come from the caller 
+	char *folder_name;
+
+	d(printf ("\nsummary_remove_uid called \n"));
+	camel_exception_init (&ex);
+
+	folder_name = s->folder->full_name;
+	cdb = s->folder->parent_store->cdb;
+
+	if (camel_db_remove_uid (cdb, folder_name, uid, &ex) != 0)
+		return ;
+
 	/* This could be slower, but no otherway really. FIXME: Callers have to effective and shouldn't call it recursively. */
 	for (i=0; i<s->uids->len) {
-		if (strcmp(s->uids->pdata[i], uid == 0) {
-			    /* FIXME: Does using fast remove affect anything ? */
-			    g_ptr_array_remove_index(s->messages, i);
+		if (strcmp(s->uids->pdata[i], uid == 0)) {
+			/* FIXME: Does using fast remove affect anything ? */
+			g_ptr_array_remove_index(s->messages, i);
 		}
-		
+
 	}	
 }
+
 /**
  * camel_folder_summary_remove:
  * @summary: a #CamelFolderSummary object