diff options
| author | Stef Walter <stefw@gnome.org> | 2012-10-22 16:42:01 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@gnome.org> | 2012-10-22 16:42:36 +0200 |
| commit | 051d70fc3e95da1f67015c57b3d2358f23c2de26 (patch) | |
| tree | a09a59f1493f8edd49c7543863aad07d7098680b | |
| parent | 408f6ee72fc08697003c1aa811b1657f5c673878 (diff) | |
| download | gnome-keyring-051d70fc3e95da1f67015c57b3d2358f23c2de26.tar.gz | |
Remove libdbus version related ifdef
* Just require dbus 1.1.1 or later.
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | egg/egg-dbus.c | 11 |
2 files changed, 1 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index a41b580e..ce0baf10 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 37776d9a..353f6ce8 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 * |