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

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Sun Sep  2 23:18:46 2007
New Revision: 1752

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1752&root=3Dpulseaudio&vi=
ew=3Drev
Log:
fix dbus version check for dbus_watch_get_unix_fd()

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=3D1752&root=3Dpulseaudio&r1=3D1751&r2=3D1752&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 23:18:46 2007
@@ -96,7 +96,7 @@
     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) =

+#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_MINOR >=
 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));