[tracker/fixed-cursor] tracker-store: squash

[Philip Van Hoof <pvanhoof src gnome org>]

commit 39e704f58985effaea67abc23fe1c34d4a76ccea
Author: Philip Van Hoof <philip codeminded be>
Date:   Mon Apr 26 15:34:39 2010 +0200

    tracker-store: squash

 src/tracker-store/tracker-resources.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/src/tracker-store/tracker-resources.c b/src/tracker-store/tracker-resources.c
index a48d136..f32bb7d 100644
--- a/src/tracker-store/tracker-resources.c
+++ b/src/tracker-store/tracker-resources.c
@@ -87,7 +87,6 @@ typedef struct {
 typedef struct {
 	DBusGMethodInvocation *context;
 	guint request_id;
-	DBusMessage *reply;
 } TrackerDBusMethodInfo;
 
 typedef struct {
@@ -243,13 +242,16 @@ query_inthread (TrackerDBCursor *cursor, GError *error, gpointer user_data)
 	GError *loop_error = NULL;
 	guint length = 0;
 	gboolean cont;
+	static GStaticMutex dbus_mutex = G_STATIC_MUTEX_INIT;
 
 	if (error) {
 		ptr->error = g_error_copy (error);
 		return ptr;
 	}
 
-	reply = info->reply;
+	g_static_mutex_lock (&dbus_mutex);
+	reply = dbus_g_method_get_reply (info->context);
+	g_static_mutex_unlock (&dbus_mutex);
 
 	dbus_message_iter_init_append (reply, &iter);
 
@@ -334,7 +336,6 @@ tracker_resources_sparql_query (TrackerResources         *self,
 
 	info->request_id = request_id;
 	info->context = context;
-	info->reply = dbus_g_method_get_reply (context);
 
 	sender = dbus_g_method_get_sender (context);