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

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Sun Jun 24 18:06:32 2007
New Revision: 1492

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1492&root=3Dpulseaudio&vi=
ew=3Drev
Log:
Make use of dbus_watch_get_unix_fd() instead of dbus_watch_get_fd() because=
 of deprecation of the latter

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=3D1492&root=3Dpulseaudio&r1=3D1491&r2=3D1492&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 Jun 24 18:06:32 2007
@@ -93,7 +93,7 @@
     unsigned int flags =3D 0;
     DBusWatch *watch =3D (DBusWatch*) userdata;
 =

-    assert(fd =3D=3D dbus_watch_get_fd(watch));
+    assert(fd =3D=3D dbus_watch_get_unix_fd(watch));
 =

     if (!dbus_watch_get_enabled(watch)) {
         pa_log_warn("Asked to handle disabled watch: %p %i",
@@ -135,7 +135,7 @@
     pa_io_event *ev;
     pa_core *c =3D (pa_core*) data;
 =

-    ev =3D c->mainloop->io_new(c->mainloop, dbus_watch_get_fd(watch),
+    ev =3D c->mainloop->io_new(c->mainloop, dbus_watch_get_unix_fd(watch),
                              get_watch_flags(watch),
                              handle_io_event, (void*) watch);
     if (NULL =3D=3D ev)