From d45d56a6ba455ee9b12af4d2c8c448392d74d1b4 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 21 Jun 2007 01:19:39 +0100
Subject: [PATCH] Avoid using deprecated dbus_watch_get_fd()

---
 _dbus_bindings/mainloop.c | 8 +++++++-
 configure.ac              | 6 ++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/_dbus_bindings/mainloop.c b/_dbus_bindings/mainloop.c
index 9d7de07..7b94f13 100644
--- a/_dbus_bindings/mainloop.c
+++ b/_dbus_bindings/mainloop.c
@@ -20,8 +20,14 @@
  *
  */
 
+#include "config.h"
+
 #include "dbus_bindings-internal.h"
 
+#ifndef HAVE_DBUS_WATCH_GET_UNIX_FD
+#   define dbus_watch_get_unix_fd dbus_watch_get_fd
+#endif
+
 /* Watch ============================================================ */
 
 PyDoc_STRVAR(Watch_tp_doc,
@@ -51,7 +57,7 @@ Watch_fileno(Watch *self, PyObject *unused UNUSED)
         PyErr_SetString(PyExc_ValueError, "FD watch is no longer valid");
         return NULL;
     }
-    fd = dbus_watch_get_fd(self->watch);
+    fd = dbus_watch_get_unix_fd(self->watch);
     DBG("Watch at %p (wrapping DBusWatch at %p) has fileno %d", self,
         self->watch, fd);
     return PyInt_FromLong(fd);
diff --git a/configure.ac b/configure.ac
index 02330cb..4c34a2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -124,6 +124,12 @@ AM_CONDITIONAL([ENABLE_DOCS], [test "$enable_html_docs" != no])
 PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.93])
 PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= 0.70])
 
+dnl avoid deprecated stuff if possible
+AC_CHECK_LIB([dbus-1], [dbus_watch_get_unix_fd],
+             [AC_DEFINE([HAVE_DBUS_WATCH_GET_UNIX_FD], [],
+                        [Define if libdbus-1 has dbus_watch_get_unix_fd])],
+             [:], [$DBUS_LIBS])
+
 dnl add required cflags ...
 JH_ADD_CFLAG([-Wall])
 JH_ADD_CFLAG([-Wextra])
-- 
2.11.4.GIT