[tracker/evolution] Fixed various comments from juergbi (will squash)

[Philip Van Hoof <pvanhoof src gnome org>]

commit aac41ba03a24134432237bee756596ed49d10c45
Author: Philip Van Hoof <philip codeminded be>
Date:   Thu Sep 24 14:31:28 2009 +0200

    Fixed various comments from juergbi (will squash)

 src/plugins/evolution/tracker-evolution-plugin.c |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/src/plugins/evolution/tracker-evolution-plugin.c b/src/plugins/evolution/tracker-evolution-plugin.c
index 57221bc..6871c20 100644
--- a/src/plugins/evolution/tracker-evolution-plugin.c
+++ b/src/plugins/evolution/tracker-evolution-plugin.c
@@ -351,7 +351,7 @@ send_sparql_commit (TrackerEvolutionPlugin *self, gboolean update)
 }
 
 static void 
-add_contact (TrackerSparqlBuilder *sparql, const gchar *predicate, const gchar *uri, gchar *value)
+add_contact (TrackerSparqlBuilder *sparql, const gchar *predicate, const gchar *uri, const gchar *value)
 {
 	gchar *email_uri, *email = NULL, *fullname = NULL;
 
@@ -471,7 +471,7 @@ process_fields (TrackerSparqlBuilder *sparql, const gchar *uid, guint flags,
 	}
 
 	if (from && g_utf8_validate (from, -1, NULL)) {
-		add_contact (sparql, "nmo:from", uri, arr[i]);
+		add_contact (sparql, "nmo:from", uri, from);
 	}
 
 	if (cc && (arr = g_strsplit (cc, ",", -1)) != NULL) {
@@ -1316,7 +1316,7 @@ register_on_get_folder (gchar *uri, CamelFolder *folder, gpointer user_data)
 	registry->hook_info->hook_id = hook_id;
 
 	g_hash_table_replace (priv->registered_folders,
-	                      &hook_id, 
+	                      GINT_TO_POINTER (hook_id), 
 	                      registry);
 
 	g_hash_table_replace (priv->cached_folders, 
@@ -1348,7 +1348,7 @@ register_walk_folders_in_folder (TrackerEvolutionPlugin *self,
 	g_static_rec_mutex_lock (priv->mutex);
 
 	if (!priv->registered_folders) {
-		priv->registered_folders = g_hash_table_new_full (g_int_hash, g_int_equal,
+		priv->registered_folders = g_hash_table_new_full (g_direct_hash, g_direct_equal,
 		                                                  (GDestroyNotify) NULL,
 		                                                  (GDestroyNotify) folder_registry_free);
 
@@ -1806,7 +1806,7 @@ on_got_folderinfo_register (CamelStore *store,
 	g_static_rec_mutex_lock (priv->mutex);
 
 	if (!priv->registered_stores) {
-		priv->registered_stores = g_hash_table_new_full (g_int_hash, g_int_equal,
+		priv->registered_stores = g_hash_table_new_full (g_direct_hash, g_direct_equal,
 		                                                 (GDestroyNotify) NULL,
 		                                                 (GDestroyNotify) store_registry_free);
 	}
@@ -1817,21 +1817,27 @@ on_got_folderinfo_register (CamelStore *store,
 	                                   CAMEL_CALLBACK (on_folder_created), 
 	                                   registry);
 	registry->hook_id = hook_id;
-	g_hash_table_replace (priv->registered_stores, &hook_id, registry);
+	g_hash_table_replace (priv->registered_stores, 
+	                      GINT_TO_POINTER (hook_id),
+	                      registry);
 
 	registry = store_registry_new (store, account, self);
 	hook_id = camel_object_hook_event (store, "folder_renamed", 
 	                                   CAMEL_CALLBACK (on_folder_renamed), 
 	                                   registry);
 	registry->hook_id = hook_id;
-	g_hash_table_replace (priv->registered_stores, &hook_id, registry);
+	g_hash_table_replace (priv->registered_stores, 
+	                      GINT_TO_POINTER (hook_id),
+	                      registry);
 
 	registry = store_registry_new (store, account, self);
 	hook_id = camel_object_hook_event (store, "folder_deleted", 
 	                                   CAMEL_CALLBACK (on_folder_deleted), 
 	                                   registry);
 	registry->hook_id = hook_id;
-	g_hash_table_replace (priv->registered_stores, &hook_id, registry);
+	g_hash_table_replace (priv->registered_stores, 
+	                      GINT_TO_POINTER (hook_id), 
+	                      registry);
 
 	g_static_rec_mutex_unlock (priv->mutex);