diff options
author | Astone Lin <astone.lin@mediatek.com> | 2010-04-19 06:56:43 -0400 |
---|---|---|
committer | Colin Walters <walters@verbum.org> | 2010-04-19 06:56:43 -0400 |
commit | af0ec6795ea64d6498b83f30ecd94adc4e935e7e (patch) | |
tree | a5f129285e279cb7aee505f054cbb97613157595 | |
parent | fc7114a536571688d48ede025f1357c0e467c879 (diff) |
Allow duplicate object path registrations for different connections
We clearly need to respect the connection when comparing registrations,
since it's perfectly valid to have the same one on two different
connections.
-rw-r--r-- | dbus/dbus-gobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dbus/dbus-gobject.c b/dbus/dbus-gobject.c index 3e7914d..5f13f3a 100644 --- a/dbus/dbus-gobject.c +++ b/dbus/dbus-gobject.c @@ -2324,7 +2324,7 @@ dbus_g_connection_register_g_object (DBusGConnection *connection, o = iter->data; /* Silently ignore duplicate registrations */ - if (strcmp (o->object_path, at_path) == 0) + if (strcmp (o->object_path, at_path) == 0 && o->connection == connection) return; } |