diff options
| author | Lennart Poettering <lennart@poettering.net> | 2007-09-06 20:06:02 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2007-09-06 20:06:02 +0000 |
| commit | b1fd53b20ba77dab903eb4d83e2b9d1a8d99f2b6 (patch) | |
| tree | eb18fcd68966da565d4f45f0fedbecc9ce7f8497 /src/modules/dbus-util.c | |
| parent | a0d19c0d13e61d1f713637cba445911cb8cfef68 (diff) | |
explicitly test for the availability of dbus_watch_get_unix_fd() before using it. The previous version-based check didn't work anyway since the constants checked for weren't set.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1772 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/modules/dbus-util.c')
| -rw-r--r-- | src/modules/dbus-util.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/modules/dbus-util.c b/src/modules/dbus-util.c index 360f7827..9078ec72 100644 --- a/src/modules/dbus-util.c +++ b/src/modules/dbus-util.c @@ -96,7 +96,7 @@ static void handle_io_event(PA_GCC_UNUSED pa_mainloop_api *ea, pa_io_event *e, i unsigned int flags = 0; DBusWatch *watch = userdata; -#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) +#if HAVE_DBUS_WATCH_GET_UNIX_FD pa_assert(fd == dbus_watch_get_unix_fd(watch)); #else pa_assert(fd == dbus_watch_get_fd(watch)); @@ -141,14 +141,15 @@ static dbus_bool_t add_watch(DBusWatch *watch, void *data) { pa_assert(watch); pa_assert(c); - ev = c->mainloop->io_new(c->mainloop, -#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 1) - dbus_watch_get_unix_fd(watch), + ev = c->mainloop->io_new( + c->mainloop, +#if HAVE_DBUS_WATCH_GET_UNIX_FD + dbus_watch_get_unix_fd(watch), #else - dbus_watch_get_fd(watch), + dbus_watch_get_fd(watch), #endif - get_watch_flags(watch), handle_io_event, watch); - + get_watch_flags(watch), handle_io_event, watch); + dbus_watch_set_data(watch, ev, NULL); return TRUE; |