summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2009-04-27 10:47:58 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2009-04-27 10:48:04 +0100
commit03de44461132ed610c3d52133d4b4760f20e4cb2 (patch)
tree1a3536cd02e04ea34175f74930d60249620dda48
parentb6b37871960ee06d9cc589e031ec3d5d6a4a6b92 (diff)
parentf36381131b6f410333a9a823a4fc131ac799394f (diff)
Merge branch '20884-proxy-manager-replace-name-owner'
Reviewed-by: Colin Walters <walters@verbum.org>
-rw-r--r--dbus/dbus-gproxy.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/dbus/dbus-gproxy.c b/dbus/dbus-gproxy.c
index b379c20..572b7fb 100644
--- a/dbus/dbus-gproxy.c
+++ b/dbus/dbus-gproxy.c
@@ -753,9 +753,16 @@ dbus_g_proxy_manager_replace_name_owner (DBusGProxyManager *manager,
names = g_slist_delete_link (names, link);
- if (names == NULL)
- g_hash_table_remove (manager->owner_names, prev_owner);
- }
+ if (names == NULL)
+ {
+ g_hash_table_remove (manager->owner_names, prev_owner);
+ }
+ else
+ {
+ g_hash_table_insert (manager->owner_names,
+ g_strdup (prev_owner), names);
+ }
+ }
}
if (new_owner[0] == '\0')