Author: lennart
Date: Sun Aug 12 19:16:43 2007
New Revision: 1518

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=1518&root=avahi&view=rev
Log:
use dbus_watch_get_unix_fd() only in dbus >= 1.1.1

Modified:
    trunk/avahi-common/dbus-watch-glue.c

Modified: trunk/avahi-common/dbus-watch-glue.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/avahi-common/dbus-watch-glue.c?rev=1518&root=avahi&r1=1517&r2=1518&view=diff
==============================================================================
--- trunk/avahi-common/dbus-watch-glue.c (original)
+++ trunk/avahi-common/dbus-watch-glue.c Sun Aug 12 19:16:43 2007
@@ -134,7 +134,11 @@
 
         if (!(avahi_watch = poll_api->watch_new(
                   poll_api,
+#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 1)
                   dbus_watch_get_unix_fd(dbus_watch),
+#else
+                  dbus_watch_get_fd(dbus_watch),
+#endif
                   translate_dbus_to_avahi(dbus_watch_get_flags(dbus_watch)),
                   watch_callback,
                   dbus_watch)))