From 66dbca1e06af0607a2d0fc6b8d14ef1ebb034f0a Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 8 Jan 2010 20:06:21 +0100 Subject: dbus: remove filter functions only if they were actually set before This fixes an assert when destructing modules that have not been fully initialized. https://bugzilla.redhat.com/show_bug.cgi?id=548525 --- src/modules/module-console-kit.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 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 103f5c48..875852f3 100644 --- a/src/modules/module-console-kit.c +++ b/src/modules/module-console-kit.c @@ -67,6 +67,7 @@ struct userdata { pa_core *core; pa_dbus_connection *connection; pa_hashmap *sessions; + pa_bool_t filter_added; }; static void add_session(struct userdata *u, const char *id) { @@ -300,7 +301,7 @@ int pa__init(pa_module*m) { goto fail; } - m->userdata = u = pa_xnew(struct userdata, 1); + m->userdata = u = pa_xnew0(struct userdata, 1); u->core = m->core; u->module = m; u->connection = connection; @@ -311,6 +312,8 @@ int pa__init(pa_module*m) { goto fail; } + u->filter_added = TRUE; + if (pa_dbus_add_matches( pa_dbus_connection_get(connection), &error, "type='signal',sender='org.freedesktop.ConsoleKit',interface='org.freedesktop.ConsoleKit.Seat',member='SessionAdded'", @@ -359,7 +362,9 @@ void pa__done(pa_module *m) { "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); + if (u->filter_added) + dbus_connection_remove_filter(pa_dbus_connection_get(u->connection), filter_cb, u); + pa_dbus_connection_unref(u->connection); } -- cgit