diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-01-29 03:31:42 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-01-29 03:31:42 +0100 |
| commit | 4a06af6081c0fc081ad6ca136880a61ebe1c4e01 (patch) | |
| tree | 622e26afd574bb5fa4f81613cdc6dfd205209d3f /src/modules/module-console-kit.c | |
| parent | 509535d240506bc35881fe8d254f0bce28aed4c8 (diff) | |
make use of new functions pa_dbus_add_matches/pa_dbus_remove_matches
Diffstat (limited to 'src/modules/module-console-kit.c')
| -rw-r--r-- | src/modules/module-console-kit.c | 16 |
1 files changed, 8 insertions, 8 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); } |