diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-07-24 02:21:58 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-07-24 02:21:58 +0200 |
| commit | 49f09d6d0eadd67d75190a9001fe715dc486cd36 (patch) | |
| tree | 7bf884aa215d71e6b8099843897f4f055e4e89ce /src/modules/module-hal-detect.c | |
| parent | 23a3c55c5152977a0f4addcce9f5d4085a8105a4 (diff) | |
fix destruction of dbus modules: make sure we don't leave filter function registered after unreffing the dbus connection
Diffstat (limited to 'src/modules/module-hal-detect.c')
| -rw-r--r-- | src/modules/module-hal-detect.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/modules/module-hal-detect.c b/src/modules/module-hal-detect.c index 19430a3d..ec064961 100644 --- a/src/modules/module-hal-detect.c +++ b/src/modules/module-hal-detect.c @@ -842,8 +842,20 @@ void pa__done(pa_module *m) { if (u->devices) pa_hashmap_free(u->devices, hal_device_free_cb, NULL); - if (u->connection) + 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); + + dbus_connection_remove_filter(pa_dbus_connection_get(u->connection), filter_cb, u); + pa_dbus_connection_unref(u->connection); + } pa_xfree(u); } |