diff options
| -rw-r--r-- | src/modules/module-console-kit.c | 16 | ||||
| -rw-r--r-- | src/modules/module-hal-detect.c | 27 |
2 files changed, 18 insertions, 25 deletions
diff --git a/src/modules/module-console-kit.c b/src/modules/module-console-kit.c index 4f3ed8dd..805f5eef 100644 --- a/src/modules/module-console-kit.c +++ b/src/modules/module-console-kit.c @@ -313,8 +313,10 @@ int pa__init(pa_module*m) { goto fail; } - dbus_bus_add_match(pa_dbus_connection_get(connection), "type='signal',sender='org.freedesktop.ConsoleKit', interface='org.freedesktop.ConsoleKit.Seat'", &error); - if (dbus_error_is_set(&error)) { + if (pa_dbus_add_matches( + pa_dbus_connection_get(connection), &error, + "type='signal',sender='org.freedesktop.ConsoleKit',interface='org.freedesktop.ConsoleKit.Seat',member='SessionAdded'", + "type='signal',sender='org.freedesktop.ConsoleKit',interface='org.freedesktop.ConsoleKit.Seat',member='SessionRemoved'", NULL) < 0) { pa_log_error("Unable to subscribe to ConsoleKit signals: %s: %s", error.name, error.message); goto fail; } @@ -354,14 +356,12 @@ void pa__done(pa_module *m) { } if (u->connection) { - DBusError error; - dbus_error_init(&error); - - dbus_bus_remove_match(pa_dbus_connection_get(u->connection), "type='signal',sender='org.freedesktop.ConsoleKit', interface='org.freedesktop.ConsoleKit.Seat'", &error); - dbus_error_free(&error); + pa_dbus_remove_matches( + pa_dbus_connection_get(u->connection), + "type='signal',sender='org.freedesktop.ConsoleKit',interface='org.freedesktop.ConsoleKit.Seat',member='SessionAdded'", + "type='signal',sender='org.freedesktop.ConsoleKit',interface='org.freedesktop.ConsoleKit.Seat',member='SessionRemoved'", NULL); dbus_connection_remove_filter(pa_dbus_connection_get(u->connection), filter_cb, u); - pa_dbus_connection_unref(u->connection); } diff --git a/src/modules/module-hal-detect.c b/src/modules/module-hal-detect.c index d3b351a4..8b1f0b2d 100644 --- a/src/modules/module-hal-detect.c +++ b/src/modules/module-hal-detect.c @@ -773,18 +773,15 @@ int pa__init(pa_module*m) { goto fail; } - dbus_bus_add_match(pa_dbus_connection_get(u->connection), "type='signal',sender='org.freedesktop.Hal', interface='org.freedesktop.Hal.Device.AccessControl'", &error); - if (dbus_error_is_set(&error)) { + if (pa_dbus_add_matches( + pa_dbus_connection_get(u->connection), &error, + "type='signal',sender='org.freedesktop.Hal',interface='org.freedesktop.Hal.Device.AccessControl',member='ACLAdded'", + "type='signal',sender='org.freedesktop.Hal',interface='org.freedesktop.Hal.Device.AccessControl',member='ACLRemoved'", + "type='signal',interface='org.pulseaudio.Server',member='DirtyGiveUpMessage'", NULL) < 0) { pa_log_error("Unable to subscribe to HAL ACL signals: %s: %s", error.name, error.message); goto fail; } - dbus_bus_add_match(pa_dbus_connection_get(u->connection), "type='signal',interface='org.pulseaudio.Server'", &error); - if (dbus_error_is_set(&error)) { - pa_log_error("Unable to subscribe to PulseAudio signals: %s: %s", error.name, error.message); - goto fail; - } - pa_log_info("Loaded %i modules.", n); pa_modargs_free(ma); @@ -825,17 +822,13 @@ void pa__done(pa_module *m) { } if (u->connection) { - DBusError error; - dbus_error_init(&error); - - dbus_bus_remove_match(pa_dbus_connection_get(u->connection), "type='signal',sender='org.freedesktop.Hal', interface='org.freedesktop.Hal.Device.AccessControl'", &error); - dbus_error_free(&error); - - dbus_bus_remove_match(pa_dbus_connection_get(u->connection), "type='signal',interface='org.pulseaudio.Server'", &error); - dbus_error_free(&error); + pa_dbus_remove_matches( + pa_dbus_connection_get(u->connection), + "type='signal',sender='org.freedesktop.Hal',interface='org.freedesktop.Hal.Device.AccessControl',member='ACLAdded'", + "type='signal',sender='org.freedesktop.Hal',interface='org.freedesktop.Hal.Device.AccessControl',member='ACLRemoved'", + "type='signal',interface='org.pulseaudio.Server',member='DirtyGiveUpMessage'", NULL); dbus_connection_remove_filter(pa_dbus_connection_get(u->connection), filter_cb, u); - pa_dbus_connection_unref(u->connection); } |