[tracker/gdbus] Further eradicating dbus-1 and dbus-glib-1 dependencies

[Philip Van Hoof <pvanhoof src gnome org>]

commit edc51508afb2e76fb4f8c7ecea37dfaf3d572450
Author: Philip Van Hoof <philip codeminded be>
Date:   Mon Jan 17 16:36:36 2011 +0100

    Further eradicating dbus-1 and dbus-glib-1 dependencies

 configure.ac                                    |   11 +--
 src/libtracker-miner/Makefile.am                |    3 +-
 src/plugins/evolution/Makefile.am               |    3 -
 tests/functional-tests/ipc/Makefile.am          |   27 +++----
 tests/libtracker-common/Makefile.am             |    6 +-
 tests/libtracker-common/mock-dbus-gproxy.c      |   80 ----------------
 tests/libtracker-common/mock-dbus-gproxy.h      |   73 ---------------
 tests/libtracker-common/mock-dbus.c             |  111 -----------------------
 tests/libtracker-common/mock-thumbnailer-dbus.c |   79 ----------------
 9 files changed, 15 insertions(+), 378 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 48bd91b..2df7c61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -266,8 +266,7 @@ PKG_CHECK_MODULES(LIBTRACKER_FTS, [$LIBTRACKER_FTS_REQUIRED])
 
 # Check requirements for libtracker-miner
 LIBTRACKER_MINER_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
-                           gio-unix-2.0 >= $GLIB_REQUIRED
-                           dbus-1       >= $DBUS_REQUIRED"
+                           gio-unix-2.0 >= $GLIB_REQUIRED"
 
 PKG_CHECK_MODULES(LIBTRACKER_MINER, [$LIBTRACKER_MINER_REQUIRED])
 
@@ -447,14 +446,6 @@ PKG_CHECK_MODULES(TRACKER_NAUTILUS_EXTENSION, [$TRACKER_NAUTILUS_EXTENSION_REQUI
                   [have_tracker_nautilus_extension=yes],
                   [have_tracker_nautilus_extension=no])
 
-# Check for D-Bus requirements (for tests/examples only)
-PKG_CHECK_MODULES(TRACKER_DBUS,
-                  [gio-unix-2.0 >= $GLIB_REQUIRED
-                   dbus-1       >= $DBUS_REQUIRED 
-                   dbus-glib-1  >= $DBUS_GLIB_REQUIRED],
-                  [have_tracker_dbus=yes],
-                  [have_tracker_dbus=no])
-
 # General VALAFLAGS/CFLAGS/LIBS
 BUILD_VALAFLAGS="-g --target-glib=2.26"
 BUILD_CFLAGS="${WARN_CFLAGS} ${GCOV_CFLAGS} -DG_LOG_DOMAIN=\\\"Tracker\\\" -DTRACKER_COMPILATION"
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index 3fad292..f11d17d 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -17,7 +17,6 @@ AM_CPPFLAGS =                                          \
 	-I$(top_srcdir)/src                            \
 	-I$(top_builddir)/src                          \
 	-DSHAREDIR=\""$(datadir)"\"                    \
-	-DDBUS_SERVICES_DIR=\""$(DBUS_SERVICES_DIR)"\" \
 	-DTRACKER_MINERS_DIR=\""$(datadir)/tracker/miners"\" \
 	$(LIBTRACKER_MINER_CFLAGS)
 
@@ -111,4 +110,4 @@ CLEANFILES = $(BUILT_SOURCES)
 EXTRA_DIST =                                           \
 	tracker-marshal.list                           \
 	tracker-miner.vapi                             \
-	tracker-miner.deps
\ No newline at end of file
+	tracker-miner.deps
diff --git a/src/plugins/evolution/Makefile.am b/src/plugins/evolution/Makefile.am
index 66e0b1a..2c5d7bb 100644
--- a/src/plugins/evolution/Makefile.am
+++ b/src/plugins/evolution/Makefile.am
@@ -39,9 +39,6 @@ liborg_freedesktop_Tracker_evolution_plugin_la_LIBADD = \
 
 @INTLTOOL_DESKTOP_RULE@
 
-%-glue.h: %.xml
-	$(DBUSBINDINGTOOL) --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^
-
 BUILT_SOURCES =                                        \
 	$(eplugin_DATA)
 
diff --git a/tests/functional-tests/ipc/Makefile.am b/tests/functional-tests/ipc/Makefile.am
index 6d38272..9c73b9c 100644
--- a/tests/functional-tests/ipc/Makefile.am
+++ b/tests/functional-tests/ipc/Makefile.am
@@ -35,13 +35,11 @@ LDADD =\
 test_busy_handling_SOURCES = \
 	test-busy-handling.vala
 test_busy_handling_CFLAGS = \
-	$(AM_CPPFLAGS) \
-	$(TRACKER_DBUS_CFLAGS)
+	$(AM_CPPFLAGS)
 test_busy_handling_VALAFLAGS = \
 	$(AM_VALAFLAGS)
 test_busy_handling_LDADD = \
-	$(LDADD) \
-	$(TRACKER_DBUS_LIBS)
+	$(LDADD)
 
 test_direct_query_SOURCES = \
 	test-shared-query.vala \
@@ -65,33 +63,30 @@ test_bus_update_SOURCES = \
 test_class_signal_SOURCES = \
 	test-class-signal.vala
 test_class_signal_CFLAGS = \
-	$(AM_CPPFLAGS) \
-	$(TRACKER_DBUS_CFLAGS)
+	$(AM_CPPFLAGS)
+
 test_class_signal_VALAFLAGS = \
 	$(AM_VALAFLAGS)
 test_class_signal_LDADD = \
-	$(LDADD) \
-	$(TRACKER_DBUS_LIBS)
+	$(LDADD)
 
 test_class_signal_performance_SOURCES = \
 	test-class-signal-performance.vala
 test_class_signal_performance_CFLAGS = \
-	$(AM_CPPFLAGS) \
-	$(TRACKER_DBUS_CFLAGS)
+	$(AM_CPPFLAGS)
+
 test_class_signal_performance_VALAFLAGS = \
 	$(AM_VALAFLAGS)
 test_class_signal_performance_LDADD = \
-	$(LDADD) \
-	$(TRACKER_DBUS_LIBS)
+	$(LDADD)
 
 test_class_signal_performance_batch_SOURCES = \
 	test-class-signal-performance-batch.vala
 test_class_signal_performance_batch_CFLAGS = \
-	$(AM_CPPFLAGS) \
-	$(TRACKER_DBUS_CFLAGS)
+	$(AM_CPPFLAGS)
+
 test_class_signal_performance_batch_VALAFLAGS = \
 	$(AM_VALAFLAGS)
 test_class_signal_performance_batch_LDADD = \
-	$(LDADD) \
-	$(TRACKER_DBUS_LIBS)
+	$(LDADD)
 
diff --git a/tests/libtracker-common/Makefile.am b/tests/libtracker-common/Makefile.am
index f6e0467..1083644 100644
--- a/tests/libtracker-common/Makefile.am
+++ b/tests/libtracker-common/Makefile.am
@@ -12,15 +12,13 @@ AM_CPPFLAGS =                                          \
 	$(BUILD_CFLAGS)                                \
 	-I$(top_srcdir)/src                            \
 	-I$(top_srcdir)/tests/common                   \
-	$(LIBTRACKER_COMMON_CFLAGS)                    \
-	$(TRACKER_DBUS_CFLAGS)
+	$(LIBTRACKER_COMMON_CFLAGS)                    
 
 LDADD =                                                \
 	$(top_builddir)/tests/common/libtracker-testcommon.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(BUILD_LIBS)                                  \
-	$(LIBTRACKER_COMMON_LIBS)                      \
-	$(TRACKER_DBUS_LIBS)
+	$(LIBTRACKER_COMMON_LIBS)                      
 
 tracker_dbus_SOURCES =                                 \
 	tracker-dbus-test.c