[tracker/tracker-store-queue] Those commit callbacks where just wrong

[Philip Van Hoof <pvanhoof src gnome org>]

commit f0db03a33a46665ecebc841251a30a4e2ac59851
Author: Philip Van Hoof <philip codeminded be>
Date:   Thu May 21 21:34:31 2009 +0200

    Those commit callbacks where just wrong
---
 .../evolution/tracker-evolution-registrar.c        |   16 +---
 src/plugins/kmail/tracker-kmail-registrar.c        |   17 +----
 src/tracker-store/tracker-resources.c              |   88 ++++----------------
 3 files changed, 19 insertions(+), 102 deletions(-)

diff --git a/src/plugins/evolution/tracker-evolution-registrar.c b/src/plugins/evolution/tracker-evolution-registrar.c
index 0e4b870..40188f7 100644
--- a/src/plugins/evolution/tracker-evolution-registrar.c
+++ b/src/plugins/evolution/tracker-evolution-registrar.c
@@ -270,17 +270,6 @@ get_email_and_fullname (const gchar *line, gchar **email, gchar **fullname)
 }
 
 static void
-commit_callback(gpointer user_data)
-{
-	TrackerEvolutionRegistrar *object = user_data;
-	TrackerEvolutionRegistrarPrivate *priv;
-
-	priv = TRACKER_EVOLUTION_REGISTRAR_GET_PRIVATE (object);
-
-	priv->batch_count = 0;
-}
-
-static void
 insert_callback (GError *error, gpointer user_data)
 {
 	TrackerEvolutionRegistrar *object = user_data;
@@ -289,9 +278,8 @@ insert_callback (GError *error, gpointer user_data)
 	priv = TRACKER_EVOLUTION_REGISTRAR_GET_PRIVATE (object);
 
 	if (++priv->batch_count >= TRACKER_STORE_TRANSACTION_MAX) {
-		tracker_store_queue_batch_commit (commit_callback,
-		                                  g_object_ref (object),
-		                                  (GDestroyNotify) g_object_unref);
+		tracker_store_queue_batch_commit (NULL, NULL, NULL);
+		priv->batch_count = 0;
 	}
 
 }
diff --git a/src/plugins/kmail/tracker-kmail-registrar.c b/src/plugins/kmail/tracker-kmail-registrar.c
index 1abec7f..9143558 100644
--- a/src/plugins/kmail/tracker-kmail-registrar.c
+++ b/src/plugins/kmail/tracker-kmail-registrar.c
@@ -154,18 +154,6 @@ get_email_and_fullname (const gchar *line, gchar **email, gchar **fullname)
 	}
 }
 
-
-static void
-commit_callback(gpointer user_data)
-{
-	TrackerKMailRegistrar *object = user_data;
-	TrackerKMailRegistrarPrivate *priv;
-
-	priv = TRACKER_KMAIL_REGISTRAR_GET_PRIVATE (object);
-
-	priv->batch_count = 0;
-}
-
 static void
 insert_callback (GError *error, gpointer user_data)
 {
@@ -175,9 +163,8 @@ insert_callback (GError *error, gpointer user_data)
 	priv = TRACKER_KMAIL_REGISTRAR_GET_PRIVATE (object);
 
 	if (++priv->batch_count >= TRACKER_STORE_TRANSACTION_MAX) {
-		tracker_store_queue_batch_commit (commit_callback,
-		                                  g_object_ref (object),
-		                                  (GDestroyNotify) g_object_unref);
+		tracker_store_queue_batch_commit (NULL, NULL, NULL);
+		priv->batch_count = 0;
 	}
 
 }
diff --git a/src/tracker-store/tracker-resources.c b/src/tracker-store/tracker-resources.c
index b56d620..f6bc986 100644
--- a/src/tracker-store/tracker-resources.c
+++ b/src/tracker-store/tracker-resources.c
@@ -244,31 +244,6 @@ tracker_resources_delete (TrackerResources	     *self,
 
 }
 
-
-
-static void
-s_turtle_commit_callback (gpointer user_data)
-{
-	TrackerResources *object = user_data;
-	TrackerResourcesPrivate *priv;
-
-	priv = TRACKER_RESOURCES_GET_PRIVATE (object);
-
-	priv->batch_count = 0;
-}
-
-static void
-turtle_commit_callback (gpointer user_data)
-{
-	TrackerResources *object = user_data;
-	TrackerResourcesPrivate *priv;
-
-	priv = TRACKER_RESOURCES_GET_PRIVATE (object);
-
-	priv->batch_count = 0;
-	priv->batch_mode = FALSE;
-}
-
 static void
 turtle_update_callback (GError *error, gpointer user_data)
 {
@@ -278,9 +253,8 @@ turtle_update_callback (GError *error, gpointer user_data)
 	priv = TRACKER_RESOURCES_GET_PRIVATE (object);
 
 	if (++priv->batch_count >= TRACKER_STORE_TRANSACTION_MAX) {
-		tracker_store_queue_batch_commit (s_turtle_commit_callback,
-		                                  g_object_ref (object),
-		                                  (GDestroyNotify) g_object_unref);
+		tracker_store_queue_batch_commit (NULL, NULL, NULL);
+		priv->batch_count = 0;
 	}
 }
 
@@ -329,11 +303,13 @@ static void
 process_turtle_destroy (gpointer user_data)
 {
 	TrackerResources *object = user_data;
+	TrackerResourcesPrivate *priv;
 
-	tracker_store_queue_batch_commit (turtle_commit_callback,
-	                                  g_object_ref (object),
-	                                  (GDestroyNotify) g_object_unref);
+	priv = TRACKER_RESOURCES_GET_PRIVATE (object);
 
+	tracker_store_queue_batch_commit (NULL, NULL, NULL);
+	priv->batch_count = 0;
+	priv->batch_mode = FALSE;
 	g_object_unref (object);
 }
 
@@ -436,21 +412,6 @@ tracker_resources_sparql_query (TrackerResources	 *self,
 					  destroy_method_info);
 }
 
-
-
-
-static void
-s_update_commit_callback (gpointer user_data)
-{
-	TrackerResources *object = user_data;
-	TrackerResourcesPrivate *priv;
-
-	priv = TRACKER_RESOURCES_GET_PRIVATE (object);
-
-	priv->batch_count = 0;
-	priv->batch_mode = FALSE;
-}
-
 void
 tracker_resources_sparql_update (TrackerResources	 *self,
 				 const gchar	         *update,
@@ -468,9 +429,9 @@ tracker_resources_sparql_update (TrackerResources	 *self,
 	tracker_dbus_async_return_if_fail (update != NULL, context);
 
 	if (priv->batch_mode) {
-		tracker_store_queue_batch_commit (s_update_commit_callback,
-		                                  g_object_ref (self),
-		                                  (GDestroyNotify) g_object_unref);
+		tracker_store_queue_batch_commit (NULL, NULL, NULL);
+		priv->batch_count = 0;
+		priv->batch_mode = FALSE;
 	}
 
 	tracker_dbus_request_new (request_id,
@@ -489,17 +450,6 @@ tracker_resources_sparql_update (TrackerResources	 *self,
 }
 
 static void
-update_commit_callback (gpointer user_data)
-{
-	TrackerResources *object = user_data;
-	TrackerResourcesPrivate *priv;
-
-	priv = TRACKER_RESOURCES_GET_PRIVATE (object);
-
-	priv->batch_count = 0;
-}
-
-static void
 batch_update_callback (GError *error, gpointer user_data)
 {
 	TrackerDBusMethodInfo *info = user_data;
@@ -517,9 +467,8 @@ batch_update_callback (GError *error, gpointer user_data)
 	priv = TRACKER_RESOURCES_GET_PRIVATE (info->self);
 
 	if (++priv->batch_count >= TRACKER_STORE_TRANSACTION_MAX) {
-		tracker_store_queue_batch_commit (update_commit_callback,
-		                                  g_object_ref (info->self),
-		                                  (GDestroyNotify) g_object_unref);
+		tracker_store_queue_batch_commit (NULL, NULL, NULL);
+		priv->batch_count = 0;
 	}
 
 	dbus_g_method_return (info->context);
@@ -570,18 +519,9 @@ static void
 batch_commit_callback (gpointer user_data)
 {
 	TrackerDBusMethodInfo *info = user_data;
-	TrackerResourcesPrivate *priv;
-
-	priv = TRACKER_RESOURCES_GET_PRIVATE (info->self);
-
-	priv->batch_count = 0;
-	priv->batch_mode = FALSE;
 
 	dbus_g_method_return (info->context);
-
 	tracker_dbus_request_success (info->request_id);
-
-	g_object_unref (info->self);
 }
 
 void
@@ -608,11 +548,13 @@ tracker_resources_batch_commit (TrackerResources	 *self,
 
 		info->request_id = request_id;
 		info->context = context;
-		info->self = g_object_ref (self);
 
 		tracker_store_queue_batch_commit (batch_commit_callback, info,
 						  destroy_method_info);
 
+		priv->batch_count = 0;
+		priv->batch_mode = FALSE;
+
 	} else {
 		dbus_g_method_return (context);
 		tracker_dbus_request_success (request_id);