# HG changeset patch
# User Michael Albinus <michael.albinus@gmx.de>
# Date 1250931404 0
# Node ID b466eba29a017044f6e442d9f0c6f5f9886dab7b
# Parent  d7cfc883ead4ed9f1c4fda22f09219b8f8d884c4
* dbusbind.c (XD_WITH_DBUS_WATCH_GET_UNIX_FD): Remove.  It was
intended as hotfix only.
(xd_add_watch, xd_remove_watch): Use HAVE_DBUS_WATCH_GET_UNIX_FD.

diff -r d7cfc883ead4 -r b466eba29a01 src/dbusbind.c
--- a/src/dbusbind.c	Sat Aug 22 08:54:08 2009 +0000
+++ b/src/dbusbind.c	Sat Aug 22 08:56:44 2009 +0000
@@ -71,16 +71,6 @@
 /* We use "xd_" and "XD_" as prefix for all internal symbols, because
    we don't want to poison other namespaces with "dbus_".  */
 
-/* Since D-Bus 1.1.1, dbus_watch_get_fd() was replaced by
-   dbus_watch_get_unix_fd and dbus_watch_get_socket.  We must check
-   this.  */
-#ifdef DBUS_VERSION
-#define XD_WITH_DBUS_WATCH_GET_UNIX_FD		\
-  ((1 << 16) | (1 << 8) | (1)) <= DBUS_VERSION
-#else
-#define XD_WITH_DBUS_WATCH_GET_UNIX_FD 0
-#endif
-
 /* Raise a signal.  If we are reading events, we cannot signal; we
    throw to xd_read_queued_messages then.  */
 #define XD_SIGNAL1(arg)							\
@@ -752,7 +742,7 @@
   /* We check only for incoming data.  */
   if (dbus_watch_get_flags (watch) & DBUS_WATCH_READABLE)
     {
-#if XD_WITH_DBUS_WATCH_GET_UNIX_FD
+#if HAVE_DBUS_WATCH_GET_UNIX_FD
       /* TODO: Reverse these on Win32, which prefers the opposite. */
       int fd = dbus_watch_get_unix_fd(watch);
       if (fd == -1)
@@ -782,7 +772,7 @@
   /* We check only for incoming data.  */
   if (dbus_watch_get_flags (watch) & DBUS_WATCH_READABLE)
     {
-#if XD_WITH_DBUS_WATCH_GET_UNIX_FD
+#if HAVE_DBUS_WATCH_GET_UNIX_FD
       /* TODO: Reverse these on Win32, which prefers the opposite. */
       int fd = dbus_watch_get_unix_fd(watch);
       if (fd == -1)