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

[psankar svn gnome org]

Author: psankar
Date: Mon Jun  9 05:47:22 2008
New Revision: 8952
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8952&view=rev

Log:
break declaration and definition inside a loop


Modified:
   branches/camel-db-summary/camel/camel-folder-summary.c
   branches/camel-db-summary/camel/camel-folder-thread.c
   branches/camel-db-summary/camel/camel-vee-summary.c
   branches/camel-db-summary/camel/camel-vtrash-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	Mon Jun  9 05:47:22 2008
@@ -438,8 +438,11 @@
 	CAMEL_SUMMARY_LOCK(s, summary_lock);
 
 	g_ptr_array_set_size(res, s->uids->len);
-	for (i=0;i<s->uids->len;i++)
-		res->pdata[i] = g_ptr_array_index(s->uids, i);
+	for (i=0;i<s->uids->len;i++) {
+		char *uid;
+		uid = g_ptr_array_index(s->uids, i);
+		res->pdata[i] = uid; 
+	}
 	
 
 	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
@@ -1288,12 +1291,15 @@
 #endif
 
 	/* Summary always holds a ref for the loaded infos */
-	//camel_message_info_ref(info); //FIXME: Check how things are loaded.
+	camel_message_info_ref(info); //FIXME: Check how things are loaded.
 	#warning "FIXME: SHould we ref it or redesign it later on"
+
+	d (g_print ("\n summary add: [%s]\n", camel_message_info_uid (info)));
+
 	/* The uid array should have its own memory. We will unload the infos when not reqd.*/
 	g_ptr_array_add (s->uids, g_strdup(camel_message_info_uid(info)));
 	
-	g_hash_table_insert (s->loaded_infos, camel_message_info_uid (info), info);
+	g_hash_table_insert (s->loaded_infos, g_strdup (camel_message_info_uid (info)), info);
 	s->flags |= CAMEL_SUMMARY_DIRTY;
 
 	CAMEL_SUMMARY_UNLOCK(s, summary_lock);

Modified: branches/camel-db-summary/camel/camel-folder-thread.c
==============================================================================
--- branches/camel-db-summary/camel/camel-folder-thread.c	(original)
+++ branches/camel-db-summary/camel/camel-folder-thread.c	Mon Jun  9 05:47:22 2008
@@ -623,7 +623,8 @@
 
 	for (i = 0 ; i < fsummary->len ; i++) {
 		CamelMessageInfo *info ;
-		char *uid = fsummary->pdata[i];
+		char *uid ;
+		uid = fsummary->pdata[i];
 
 		if (wanted == NULL || g_hash_table_lookup(wanted, uid) != NULL) {
 			info = camel_folder_get_message_info (folder, uid);

Modified: branches/camel-db-summary/camel/camel-vee-summary.c
==============================================================================
--- branches/camel-db-summary/camel/camel-vee-summary.c	(original)
+++ branches/camel-db-summary/camel/camel-vee-summary.c	Mon Jun  9 05:47:22 2008
@@ -258,7 +258,7 @@
 
 	camel_folder_summary_add (&s->summary, (CamelMessageInfo *) mi);
 
-	g_print ("Adding to vee summary : [%s]\n", ((CamelMessageInfo *) mi)->uid);
+	d (g_print ("Adding to vee summary : [%s]\n", ((CamelMessageInfo *) mi)->uid));
 
 	return mi;
 }

Modified: branches/camel-db-summary/camel/camel-vtrash-folder.c
==============================================================================
--- branches/camel-db-summary/camel/camel-vtrash-folder.c	(original)
+++ branches/camel-db-summary/camel/camel-vtrash-folder.c	Mon Jun  9 05:47:22 2008
@@ -133,6 +133,7 @@
 		case CAMEL_FOLDER_ARG_DELETED:
 		case CAMEL_FOLDER_ARG_JUNKED:
 		case CAMEL_FOLDER_ARG_VISIBLE:
+		break;
 			/* This is so we can get the values atomically, and also so we can calculate them only once */
 			if (unread == -1) {
 				int j;
@@ -430,9 +431,9 @@
 	vinfo = (CamelVeeMessageInfo *)camel_folder_summary_uid(((CamelFolder *)vf)->summary, vuid);
 	if (vinfo == NULL) {
 		camel_vee_summary_add((CamelVeeSummary *)((CamelFolder *)vf)->summary, binfo->summary, uid, hash);
-		camel_folder_change_info_add_uid(((CamelVeeFolder *)vf)->changes, vuid);
+		//camel_folder_change_info_add_uid(((CamelVeeFolder *)vf)->changes, vuid);
 	} else {
-		camel_folder_change_info_change_uid(((CamelVeeFolder *)vf)->changes, vuid);
+		//camel_folder_change_info_change_uid(((CamelVeeFolder *)vf)->changes, vuid);
 		camel_message_info_free(vinfo);
 	}
 }
@@ -511,7 +512,8 @@
 	infos = camel_folder_get_summary(sub);
 	for (i=0;i<infos->len;i++) {
 		CamelMessageInfo *info;
-		char *uid = infos->pdata[i];
+		char *uid ;
+		uid = infos->pdata[i];
 		info = camel_folder_summary_uid (sub->summary, uid);
 		if ((camel_message_info_flags(info) & ((CamelVTrashFolder *)vf)->bit))
 			vtrash_uid_added((CamelVTrashFolder *)vf, uid, info, hash);