[tracker/tracker-0.12: 10/202] tracker-miner-fs, tracker-writeback: Remove all dbus-glib occurrences

[Martyn James Russell <mr src gnome org>]

commit 1da5b92dafa808d6b8f1b8aa7f502a23d9b81589
Author: Martyn Russell <martyn lanedo com>
Date:   Mon Sep 12 10:18:20 2011 +0100

    tracker-miner-fs, tracker-writeback: Remove all dbus-glib occurrences
    
    This fixes GB#658645.

 src/miners/fs/tracker-power-hal.c         |    2 --
 src/tracker-writeback/tracker-main.c      |    2 --
 tests/libtracker-miner/miners-mock.c      |    8 +++-----
 tests/libtracker-miner/thumbnailer-mock.c |    4 +---
 tests/tracker-steroids/tracker-test.c     |   14 --------------
 5 files changed, 4 insertions(+), 26 deletions(-)
---
diff --git a/src/miners/fs/tracker-power-hal.c b/src/miners/fs/tracker-power-hal.c
index b943552..a989cb5 100644
--- a/src/miners/fs/tracker-power-hal.c
+++ b/src/miners/fs/tracker-power-hal.c
@@ -26,8 +26,6 @@
 
 #include <libhal.h>
 
-#include <dbus/dbus-glib-lowlevel.h>
-
 #include <libtracker-common/tracker-log.h>
 #include <libtracker-common/tracker-utils.h>
 #include <libtracker-common/tracker-marshal.h>
diff --git a/src/tracker-writeback/tracker-main.c b/src/tracker-writeback/tracker-main.c
index 14c70f2..f55c4c7 100644
--- a/src/tracker-writeback/tracker-main.c
+++ b/src/tracker-writeback/tracker-main.c
@@ -22,8 +22,6 @@
 #include <stdlib.h>
 #include <locale.h>
 
-#include <dbus/dbus-glib.h>
-
 #include <glib/gi18n.h>
 
 #include <libtracker-common/tracker-log.h>
diff --git a/tests/libtracker-miner/miners-mock.c b/tests/libtracker-miner/miners-mock.c
index 5c211a3..4afd2da 100644
--- a/tests/libtracker-miner/miners-mock.c
+++ b/tests/libtracker-miner/miners-mock.c
@@ -17,17 +17,15 @@
  * 02110-1301, USA.
  */
 
+#include <string.h>
+
 #include <glib-object.h>
 #include <gobject/gvaluecollector.h>
-#if 0
-#include <dbus/dbus-glib.h>
-#endif
+
 #include "empty-gobject.h"
 #include "miners-mock.h"
 #include "tracker-miner-mock.h"
 
-#include <string.h>
-
 GHashTable *miners = NULL;
 
 void
diff --git a/tests/libtracker-miner/thumbnailer-mock.c b/tests/libtracker-miner/thumbnailer-mock.c
index 79c7cd5..880f56f 100644
--- a/tests/libtracker-miner/thumbnailer-mock.c
+++ b/tests/libtracker-miner/thumbnailer-mock.c
@@ -19,9 +19,7 @@
 
 #include <glib-object.h>
 #include <gobject/gvaluecollector.h>
-#if 0
-#include <dbus/dbus-glib.h>
-#endif
+
 #include "empty-gobject.h"
 #include "thumbnailer-mock.h"
 
diff --git a/tests/tracker-steroids/tracker-test.c b/tests/tracker-steroids/tracker-test.c
index ae0ff52..9db50f2 100644
--- a/tests/tracker-steroids/tracker-test.c
+++ b/tests/tracker-steroids/tracker-test.c
@@ -68,16 +68,6 @@ insert_test_data ()
 	g_free (longName);
 }
 
-static void
-set_force_dbus_glib (gboolean force)
-{
-	if (force) {
-		g_setenv ("TRACKER_BUS_BACKEND", "dbus-glib", TRUE);
-	} else {
-		g_unsetenv ("TRACKER_BUS_BACKEND");
-	}
-}
-
 /*
  * I comment that part out because I don't know how anonymous node hashing
  * works, but if we know two SparqlUpdate calls are going to return the same
@@ -160,12 +150,10 @@ query_and_compare_results (const char *query)
 	TrackerSparqlCursor *cursor_fd;
 	GError *error = NULL;
 
-	set_force_dbus_glib (TRUE);
 	cursor_glib = tracker_sparql_connection_query (connection, query, NULL, &error);
 
 	g_assert_no_error (error);
 
-	set_force_dbus_glib (FALSE);
 	cursor_fd = tracker_sparql_connection_query (connection, query, NULL, &error);
 
 	g_assert_no_error (error);
@@ -469,9 +457,7 @@ async_query_cb (GObject      *source_object,
 	g_assert_no_error (error);
 	g_assert (cursor_fd != NULL);
 
-	set_force_dbus_glib (TRUE);
 	cursor_glib = tracker_sparql_connection_query (connection, data->query, NULL, &error);
-	set_force_dbus_glib (FALSE);
 
 	g_assert_no_error (error);
 	g_assert (cursor_glib != NULL);