[tracker] Use a recent version of dbus/dbus-glib and remove SUBJECT_TO_CHANGE use

[Martyn James Russell <mr src gnome org>]

commit d722e3ef21afa05e721369cb75717082f6c3396f
Author: Michael Biebl <mbiebl gmail com>
Date:   Sun Sep 27 15:49:18 2009 +0100

    Use a recent version of dbus/dbus-glib and remove SUBJECT_TO_CHANGE use

 configure.ac                         |    7 ++++---
 data/tracker-client.pc.in            |    2 +-
 src/libtracker-common/tracker-dbus.h |    4 ----
 src/tracker-store/tracker-main.c     |    4 ----
 4 files changed, 5 insertions(+), 12 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 098834f..f2a47dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,7 +127,8 @@ if test "x$have_function" = "xno" ; then
 fi
 
 # Library required versions
-DBUS_REQUIRED=0.60
+DBUS_REQUIRED=1.0
+DBUS_GLIB_REQUIRED=0.80
 GLIB_REQUIRED=2.16.0
 PANGO_REQUIRED=1.0.0
 GTK_REQUIRED=2.16.0
@@ -183,8 +184,8 @@ PKG_CHECK_MODULES(PANGO, [pango >= $PANGO_REQUIRED])
 AC_SUBST(PANGO_CFLAGS)
 AC_SUBST(PANGO_LIBS)
 
-# Check for Dbus 0.50 or higher
-PKG_CHECK_MODULES(DBUS, [dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED])
+# Check for dbus and dbus-glib or higher
+PKG_CHECK_MODULES(DBUS, [dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED])
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
 
diff --git a/data/tracker-client.pc.in b/data/tracker-client.pc.in
index d854f1a..792ab0c 100644
--- a/data/tracker-client.pc.in
+++ b/data/tracker-client.pc.in
@@ -8,5 +8,5 @@ Description: Tracker : Indexer, metadata harvester and metadata database
 Version: @VERSION@
 Requires: glib-2.0 dbus-1 dbus-glib-1
 Libs: -L${libdir} -ltracker-client- TRACKER_API_VERSION@
-Cflags: -DDBUS_API_SUBJECT_TO_CHANGE -I${includedir}/tracker- TRACKER_API_VERSION@
+Cflags: -I${includedir}/tracker- TRACKER_API_VERSION@
 
diff --git a/src/libtracker-common/tracker-dbus.h b/src/libtracker-common/tracker-dbus.h
index 5484e57..ca90559 100644
--- a/src/libtracker-common/tracker-dbus.h
+++ b/src/libtracker-common/tracker-dbus.h
@@ -26,10 +26,6 @@
 #error "only <libtracker-common/tracker-common.h> must be included directly."
 #endif
 
-#ifndef DBUS_API_SUBJECT_TO_CHANGE
-#define DBUS_API_SUBJECT_TO_CHANGE
-#endif
-
 #include <glib/gi18n.h>
 
 #include <dbus/dbus.h>
diff --git a/src/tracker-store/tracker-main.c b/src/tracker-store/tracker-main.c
index f3a897b..336f0c7 100644
--- a/src/tracker-store/tracker-main.c
+++ b/src/tracker-store/tracker-main.c
@@ -19,10 +19,6 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#ifndef DBUS_API_SUBJECT_TO_CHANGE
-#define DBUS_API_SUBJECT_TO_CHANGE
-#endif
-
 #include "config.h"
 
 #include <stdlib.h>