From 4a06af6081c0fc081ad6ca136880a61ebe1c4e01 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 29 Jan 2009 03:31:42 +0100 Subject: make use of new functions pa_dbus_add_matches/pa_dbus_remove_matches --- src/modules/module-console-kit.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/modules/module-console-kit.c') 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); } -- cgit