[tracker/evolution] Fixed comments from juergbi, will be squashed

[Philip Van Hoof <pvanhoof src gnome org>]

commit 4c6b55dfbc151d43c4a7383e30566b22a2760bc6
Author: Philip Van Hoof <philip codeminded be>
Date:   Thu Sep 24 13:33:22 2009 +0200

    Fixed comments from juergbi, will be squashed

 src/plugins/evolution/tracker-evolution-plugin.c |  165 +++++++++++-----------
 1 files changed, 83 insertions(+), 82 deletions(-)
---
diff --git a/src/plugins/evolution/tracker-evolution-plugin.c b/src/plugins/evolution/tracker-evolution-plugin.c
index 0016c1f..57221bc 100644
--- a/src/plugins/evolution/tracker-evolution-plugin.c
+++ b/src/plugins/evolution/tracker-evolution-plugin.c
@@ -391,9 +391,9 @@ add_contact (TrackerSparqlBuilder *sparql, const gchar *predicate, const gchar *
 }
 
 static void
-process_fields (TrackerSparqlBuilder *sparql, gchar *uid, guint flags, 
-                time_t sent, gchar *subject, gchar *from, gchar *to, 
-                gchar *cc, gchar *size, CamelFolder *folder, gchar *uri)
+process_fields (TrackerSparqlBuilder *sparql, const gchar *uid, guint flags, 
+                time_t sent, const gchar *subject, const gchar *from, const gchar *to, 
+                const gchar *cc, const gchar *size, CamelFolder *folder, const gchar *uri)
 {
 	gchar **arr;
 	guint i;
@@ -585,10 +585,11 @@ on_folder_summary_changed (CamelFolder *folder,
 	/* the uid_changed member contains the changed-in-the-summary items */
 
 	if (changes->uid_changed && changes->uid_changed->len > 0) {
-		gboolean found = FALSE;
 		guint y;
 
 		for (i = 0; i < changes->uid_changed->len; i++) {
+			gboolean found = FALSE;
+
 			for (y = 0; y < merged->len; y++) {
 				if (strcmp (merged->pdata[y], changes->uid_changed->pdata[i]) == 0) {
 					found = TRUE;
@@ -602,114 +603,114 @@ on_folder_summary_changed (CamelFolder *folder,
 		}
 	}
 
-	if (merged->len > 0) {
-
-		for (i = 0; i< merged->len; i++) {
-			gchar *subject, *to, *from, *cc, *uid = NULL, *size;
-			time_t sent;
-			guint flags;
-			CamelMessageInfo *linfo;
-			const CamelTag *ctags;
-			const CamelFlag *cflags;
+	for (i = 0; i< merged->len; i++) {
+		const gchar *subject, *to, *from, *cc, *uid = NULL;
+		gchar *size;
+		time_t sent;
+		guint flags;
+		CamelMessageInfo *linfo;
+		const CamelTag *ctags;
+		const CamelFlag *cflags;
 
-			linfo = camel_folder_summary_uid (summary, merged->pdata[i]);
+		linfo = camel_folder_summary_uid (summary, merged->pdata[i]);
 
-			if (linfo) {
-				uid = (gchar *) camel_message_info_uid (linfo);
-			}
+		if (linfo) {
+			uid = (gchar *) camel_message_info_uid (linfo);
+		}
 
-			if (linfo && uid) {
-				gchar *uri;
-				TrackerSparqlBuilder *sparql;
+		if (linfo && uid) {
+			gchar *uri;
+			TrackerSparqlBuilder *sparql;
 
-				subject = (gchar *) camel_message_info_subject (linfo);
-				to =      (gchar *) camel_message_info_to (linfo);
-				from =    (gchar *) camel_message_info_from (linfo);
-				cc =      (gchar *) camel_message_info_cc (linfo);
-				flags =   (guint)   camel_message_info_flags (linfo);
+			subject = camel_message_info_subject (linfo);
+			to      = camel_message_info_to (linfo);
+			from    = camel_message_info_from (linfo);
+			cc      = camel_message_info_cc (linfo);
+			flags   = (guint) camel_message_info_flags (linfo);
 
-				/* Camel returns a time_t, I think a uint64 is the best fit here */
-				sent = camel_message_info_date_sent (linfo);
+			/* Camel returns a time_t, I think a uint64 is the best fit here */
+			sent = camel_message_info_date_sent (linfo);
 
-				/* Camel returns a uint32, so %u */
-				size = g_strdup_printf ("%u", camel_message_info_size (linfo));
+			/* Camel returns a uint32, so %u */
+			size = g_strdup_printf ("%u", camel_message_info_size (linfo));
 
-				/* This is not a path but a URI, don't use the 
-				 * OS's directory separator here */
+			/* This is not a path but a URI, don't use the 
+			 * OS's directory separator here */
 
-				uri = g_strdup_printf ("%s%s/%s", 
-				                       em_uri, 
-				                       camel_folder_get_full_name (folder),
-				                       uid);
+			uri = g_strdup_printf ("%s%s/%s", 
+			                       em_uri, 
+			                       camel_folder_get_full_name (folder),
+			                       uid);
 
-				sparql = tracker_sparql_builder_new_update ();
+			sparql = tracker_sparql_builder_new_update ();
 
-				tracker_sparql_builder_drop_graph (sparql, uri);
+			tracker_sparql_builder_drop_graph (sparql, uri);
 
-				tracker_sparql_builder_insert_open (sparql);
+			tracker_sparql_builder_insert_open (sparql);
 
-				process_fields (sparql, uid, flags, sent, subject, 
-				                from, to, cc, size, folder, uri);
+			process_fields (sparql, uid, flags, sent, subject, 
+			                from, to, cc, size, folder, uri);
 
-				cflags = camel_message_info_user_flags (linfo);
-				while (cflags) {
-					tracker_sparql_builder_subject_iri (sparql, uri);
+			cflags = camel_message_info_user_flags (linfo);
+			while (cflags) {
+				tracker_sparql_builder_subject_iri (sparql, uri);
 
-					tracker_sparql_builder_predicate (sparql, "nao:hasTag");
-					tracker_sparql_builder_object_blank_open (sparql);
+				tracker_sparql_builder_predicate (sparql, "nao:hasTag");
+				tracker_sparql_builder_object_blank_open (sparql);
 
-					tracker_sparql_builder_predicate (sparql, "rdf:type");
-					tracker_sparql_builder_object (sparql, "nao:Tag");
+				tracker_sparql_builder_predicate (sparql, "rdf:type");
+				tracker_sparql_builder_object (sparql, "nao:Tag");
 
-					tracker_sparql_builder_predicate (sparql, "nao:prefLabel");
-					tracker_sparql_builder_object_string (sparql, cflags->name);
-					tracker_sparql_builder_object_blank_close (sparql);
+				tracker_sparql_builder_predicate (sparql, "nao:prefLabel");
+				tracker_sparql_builder_object_string (sparql, cflags->name);
+				tracker_sparql_builder_object_blank_close (sparql);
 
-					cflags = cflags->next;
-				}
+				cflags = cflags->next;
+			}
 
-				ctags = camel_message_info_user_tags (linfo);
-				while (ctags) {
-					tracker_sparql_builder_subject_iri (sparql, uri);
+			ctags = camel_message_info_user_tags (linfo);
+			while (ctags) {
+				tracker_sparql_builder_subject_iri (sparql, uri);
 
-					tracker_sparql_builder_predicate (sparql, "nao:hasProperty");
-					tracker_sparql_builder_object_blank_open (sparql);
+				tracker_sparql_builder_predicate (sparql, "nao:hasProperty");
+				tracker_sparql_builder_object_blank_open (sparql);
 
-					tracker_sparql_builder_predicate (sparql, "rdf:type");
-					tracker_sparql_builder_object (sparql, "nao:Property");
+				tracker_sparql_builder_predicate (sparql, "rdf:type");
+				tracker_sparql_builder_object (sparql, "nao:Property");
 
-					tracker_sparql_builder_predicate (sparql, "nao:propertyName");
-					tracker_sparql_builder_object_string (sparql, ctags->name);
-					
-					tracker_sparql_builder_predicate (sparql, "nao:propertyValue");
-					tracker_sparql_builder_object_string (sparql, ctags->value);
+				tracker_sparql_builder_predicate (sparql, "nao:propertyName");
+				tracker_sparql_builder_object_string (sparql, ctags->name);
+				
+				tracker_sparql_builder_predicate (sparql, "nao:propertyValue");
+				tracker_sparql_builder_object_string (sparql, ctags->value);
 
-					tracker_sparql_builder_object_blank_close (sparql);
-					ctags = ctags->next;
-				}
+				tracker_sparql_builder_object_blank_close (sparql);
+				ctags = ctags->next;
+			}
 
-				tracker_sparql_builder_insert_close (sparql);
+			tracker_sparql_builder_insert_close (sparql);
 
-				send_sparql_update (info->self, tracker_sparql_builder_get_result (sparql));
+			send_sparql_update (info->self, tracker_sparql_builder_get_result (sparql));
 
 /*
-				I saw a crash here, can't figure out why, it was
-				in strcmp of g_object_set (maybe multi-threading
-				of Camel is involved?)
-
-				g_object_set (info->self, "progress", 
-				              (gdouble) (merged->len - i) / merged->len,
-				              "status", _("Updating"), 
-				              NULL);
+			I saw a crash here, can't figure out why, it was
+			in strcmp of g_object_set (maybe multi-threading
+			of Camel is involved?)
+
+			g_object_set (info->self, "progress", 
+			              (gdouble) (merged->len - i) / merged->len,
+			              "status", _("Updating"), 
+			              NULL);
 */
-				g_object_unref (sparql);
 
-				g_free (uri);
-			}
+			g_object_unref (sparql);
 
-			if (linfo)
-				camel_message_info_free (linfo);
+			g_free (size);
+			g_free (uri);
 		}
+
+		if (linfo)
+			camel_message_info_free (linfo);
 	}
 
 	g_ptr_array_free (merged, TRUE);