[pulseaudio-commits] r1750 - /branches/lennart/src/modules/dbus-util.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Sun Sep  2 22:51:25 2007
New Revision: 1750

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1750&root=3Dpulseaudio&vi=
ew=3Drev
Log:
fix build for dbus < 1.1.1, re #126, patch from Marc-Andre Lureau

Modified:
    branches/lennart/src/modules/dbus-util.c

Modified: branches/lennart/src/modules/dbus-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/modules/db=
us-util.c?rev=3D1750&root=3Dpulseaudio&r1=3D1749&r2=3D1750&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/modules/dbus-util.c (original)
+++ branches/lennart/src/modules/dbus-util.c Sun Sep  2 22:51:25 2007
@@ -96,7 +96,11 @@
     unsigned int flags =3D 0;
     DBusWatch *watch =3D userdata;
 =

+#if (DBUS_VERSION_MAJOR =3D=3D 1 && DBUS_VERSION_MINOR =3D=3D 1 && DBUS_VE=
RSION_MICRO >=3D 1) || (DBUS_VERSION_MAJOR =3D=3D 1 && DBUS_VERSION_MAJOR >=
 1) || (DBUS_VERSION_MAJOR > 1) =

     pa_assert(fd =3D=3D dbus_watch_get_unix_fd(watch));
+#else
+    pa_assert(fd =3D=3D dbus_watch_get_fd(watch));
+#endif
 =

     if (!dbus_watch_get_enabled(watch)) {
         pa_log_warn("Asked to handle disabled watch: %p %i", (void*) watch=
, fd);
@@ -137,7 +141,13 @@
     pa_assert(watch);
     pa_assert(c);
 =

-    ev =3D c->mainloop->io_new(c->mainloop, dbus_watch_get_unix_fd(watch),=
 get_watch_flags(watch), handle_io_event, watch);
+    ev =3D c->mainloop->io_new(c->mainloop, =

+#if (DBUS_VERSION_MAJOR =3D=3D 1 && DBUS_VERSION_MINOR =3D=3D 1 && DBUS_VE=
RSION_MICRO >=3D 1) || (DBUS_VERSION_MAJOR =3D=3D 1 && DBUS_VERSION_MAJOR >=
 1) || (DBUS_VERSION_MAJOR > 1) =

+			     dbus_watch_get_unix_fd(watch), =

+#else
+			     dbus_watch_get_fd(watch), =

+#endif
+			     get_watch_flags(watch), handle_io_event, watch);
 =

     dbus_watch_set_data(watch, ev, NULL);
 =