rpms/avahi/OLPC-2 avahi-0.6.22-dbus-watch.patch,NONE,1.1

[Dafydd Harries (daf)]

Author: daf

Update of /cvs/pkgs/rpms/avahi/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31975

Added Files:
	avahi-0.6.22-dbus-watch.patch 
Log Message:
add patch from upstream for compatibility with libdbus 1.0


avahi-0.6.22-dbus-watch.patch:

--- NEW FILE avahi-0.6.22-dbus-watch.patch ---
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)))