add patch from upstream for compatibility with libdbus 1.0

This commit is contained in:
Dafydd Harries 2008-01-04 12:44:08 +00:00
parent 64a26fb93a
commit f4b43d6959

View File

@ -0,0 +1,16 @@
Index: avahi-common/dbus-watch-glue.c
===================================================================
--- avahi-common/dbus-watch-glue.c (revision 1517)
+++ avahi-common/dbus-watch-glue.c (revision 1528)
@@ -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_MINOR > 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)))