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

[sragavan svn gnome org]

Author: sragavan
Date: Thu Jun  5 08:14:35 2008
New Revision: 8926
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8926&view=rev

Log:
Completed lifecycle and adding the changes to camel-folder.c


Modified:
   branches/camel-db-summary/camel/camel-folder-summary.c
   branches/camel-db-summary/camel/camel-folder.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 08:14:35 2008
@@ -1704,7 +1704,6 @@
 		int i;
 
 		end = MIN(end+1, s->uids->len);
-		infos = g_malloc((end-start)*sizeof(infos[0]));
 
 		for (i=start;i<end;i++) {
 			const char *uid= s->uids->pdata[i];

Modified: branches/camel-db-summary/camel/camel-folder.c
==============================================================================
--- branches/camel-db-summary/camel/camel-folder.c	(original)
+++ branches/camel-db-summary/camel/camel-folder.c	Thu Jun  5 08:14:35 2008
@@ -351,6 +351,7 @@
 				int j;
 				CamelMessageInfo *info;
 
+				#warning "Make direct calls to DB"
 				/* TODO: Locking? */
 				unread = 0;
 				count = camel_folder_summary_count (folder->summary);
@@ -441,7 +442,7 @@
 		g_ptr_array_free(array, TRUE);
 		break; }
 	case CAMEL_FOLDER_ARG_INFO_ARRAY:
-		camel_folder_summary_array_free(folder->summary, val);
+		g_ptr_array_free((GPtrArray *)val, TRUE);
 		break;
 	case CAMEL_FOLDER_ARG_PROPERTIES:
 		g_slist_free(val);
@@ -1206,7 +1207,7 @@
 {
 	g_assert(folder->summary != NULL);
 
-	camel_folder_summary_array_free(folder->summary, summary);
+	g_ptr_array_free (summary, TRUE);
 }