summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2008-05-28 03:08:59 (GMT)
committerColin Walters <walters@verbum.org>2008-05-28 03:08:59 (GMT)
commit681f3ae573b2e00dad5c1193a044a994fc50cf38 (patch)
treedca8f59e65c9d4491b707ab7161561f72e899688
parenteef148bdc0f602b0fba09a851c1ca6b55b8bb71c (diff)
downloaddbus-glib-681f3ae573b2e00dad5c1193a044a994fc50cf38.tar.gz
dbus-glib-681f3ae573b2e00dad5c1193a044a994fc50cf38.tar.xz
Bug 13060: Remove NameOwnerChange matches on unref (Kimmo Hämäläinen)
-rw-r--r--dbus/dbus-gproxy.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/dbus/dbus-gproxy.c b/dbus/dbus-gproxy.c
index b0904a2..5d21b0e 100644
--- a/dbus/dbus-gproxy.c
+++ b/dbus/dbus-gproxy.c
@@ -905,6 +905,9 @@ dbus_g_proxy_manager_register (DBusGProxyManager *manager,
NULL);
/* FIXME - for now we listen for all NameOwnerChanged; once
* Anders' detail patch lands we should add individual rules
+ *
+ * NOTE: if you change this, be sure to change the matching
+ * call to dbus_bus_remove_match in dbus_g_proxy_manager_unregister.
*/
dbus_bus_add_match (manager->connection,
"type='signal',sender='" DBUS_SERVICE_DBUS
@@ -1061,6 +1064,17 @@ dbus_g_proxy_manager_unregister (DBusGProxyManager *manager,
{
g_hash_table_destroy (manager->proxy_lists);
manager->proxy_lists = NULL;
+
+ /*
+ * NOTE: if you change this, be sure to change the matching
+ * call to dbus_bus_add_match in dbus_g_proxy_manager_register.
+ */
+ dbus_bus_remove_match (manager->connection,
+ "type='signal',sender='" DBUS_SERVICE_DBUS
+ "',path='" DBUS_PATH_DBUS
+ "',interface='" DBUS_INTERFACE_DBUS
+ "',member='NameOwnerChanged'",
+ NULL);
}
g_free (tri);