luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 23:16:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

gdbusobjectmanagerclient: Simplify g-name-owner changes code

Browse Source 
We can avoid further copies and unneeded ref/unrefs.
This commit is contained in:
Marco Trevisan (Treviño) 2022-12-14 04:57:28 +01:00
parent 0e56d2f5db
commit 1eb7f3177d
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gio/gdbusobjectmanagerclient.c
View File

@ -1355,13 +1355,11 @@ on_notify_g_name_owner (GObject *object,
if (g_strcmp0 (old_name_owner, new_name_owner) != 0) if (g_strcmp0 (old_name_owner, new_name_owner) != 0)
{ {
GList *l; GPtrArray *proxies;
GList *proxies;
/* remote manager changed; nuke all local proxies */ /* remote manager changed; nuke all local proxies */
proxies = g_hash_table_get_values (manager->priv->map_object_path_to_object_proxy); proxies = g_hash_table_steal_all_values (
g_list_foreach (proxies, (GFunc) g_object_ref, NULL); manager->priv->map_object_path_to_object_proxy);
g_hash_table_remove_all (manager->priv->map_object_path_to_object_proxy);
g_mutex_unlock (&manager->priv->lock); g_mutex_unlock (&manager->priv->lock);
@ -1371,12 +1369,13 @@ on_notify_g_name_owner (GObject *object,
*/ */
g_object_notify (G_OBJECT (manager), "name-owner"); g_object_notify (G_OBJECT (manager), "name-owner");
for (l = proxies; l != NULL; l = l->next) for (guint i = 0; i < proxies->len; ++i)
{ {
GDBusObjectProxy *object_proxy = G_DBUS_OBJECT_PROXY (l->data); GDBusObjectProxy *object_proxy =
G_DBUS_OBJECT_PROXY (g_ptr_array_index (proxies, i));
g_signal_emit_by_name (manager, "object-removed", object_proxy); g_signal_emit_by_name (manager, "object-removed", object_proxy);
} }
g_list_free_full (proxies, g_object_unref); g_clear_pointer (&proxies, g_ptr_array_unref);
/* nuke local filter */ /* nuke local filter */
maybe_unsubscribe_signals (manager); maybe_unsubscribe_signals (manager);