[gnome-keyring] Remove libdbus version related ifdef

[Stefan Walter <stefw src gnome org>]

commit 051d70fc3e95da1f67015c57b3d2358f23c2de26
Author: Stef Walter <stefw gnome org>
Date:   Mon Oct 22 16:42:01 2012 +0200

    Remove libdbus version related ifdef
    
     * Just require dbus 1.1.1 or later.

 configure.ac   |   10 +---------
 egg/egg-dbus.c |   11 -----------
 2 files changed, 1 insertions(+), 20 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a41b580..ce0baf1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -211,15 +211,7 @@ AC_SUBST(GCR_BASE_LIBS)
 #
 
 DBUS_REQUIRED=1.0
-PKG_CHECK_MODULES([DBUS], dbus-1 >= 1.0)
-
-DBUS_VERSION=`$PKG_CONFIG --modversion dbus-1`
-DBUS_MAJOR_VERSION=`echo $DBUS_VERSION | cut -d. -f1`
-DBUS_MINOR_VERSION=`echo $DBUS_VERSION | cut -d. -f2`
-DBUS_MICRO_VERSION=`echo $DBUS_VERSION | cut -d. -f3`
-DBUS_CFLAGS="$DBUS_CFLAGS -DGKR_DBUS_MAJOR_VERSION=$DBUS_MAJOR_VERSION"
-DBUS_CFLAGS="$DBUS_CFLAGS -DGKR_DBUS_MINOR_VERSION=$DBUS_MINOR_VERSION"
-DBUS_CFLAGS="$DBUS_CFLAGS -DGKR_DBUS_MICRO_VERSION=$DBUS_MICRO_VERSION"
+PKG_CHECK_MODULES([DBUS], dbus-1 >= 1.1.1)
 
 DAEMON_CFLAGS="$DAEMON_CFLAGS $DBUS_CFLAGS"
 DAEMON_LIBS="$DAEMON_LIBS $DBUS_LIBS"
diff --git a/egg/egg-dbus.c b/egg/egg-dbus.c
index 37776d9..353f6ce 100644
--- a/egg/egg-dbus.c
+++ b/egg/egg-dbus.c
@@ -29,17 +29,6 @@
 
 #include <dbus/dbus.h>
 
-/* 
- * dbus_watch_get_unix_fd() is introduced in dbus 1.1.1, deprecating
- * dbus_watch_get_fd(). We still need to use the old function for official
- * GNOME 2.20, anyway. See Bug #465936.
- */
-#define VER_LESS_THAN(MAJOR, MINOR, MICRO, J, N, C) \
-    (MAJOR < J || (MAJOR == J && (MINOR < N || (MINOR == N && MICRO < C))))
-#if VER_LESS_THAN(GKR_DBUS_MAJOR_VERSION, GKR_DBUS_MINOR_VERSION, GKR_DBUS_MICRO_VERSION, 1, 1, 1)
-# define dbus_watch_get_unix_fd dbus_watch_get_fd
-#endif
-
 /* ------------------------------------------------------------------------
  * DBUS GLIB MAIN LOOP INTEGRATION
  *