luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-06-09 14:20:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

gdbusdaemon: Simplify name listing code using only arrays

Browse Source
This commit is contained in:
Marco Trevisan (Treviño) 2022-12-14 05:19:21 +01:00
parent 52900ed6b0
commit 3cad948f46
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gio/gdbusdaemon.c
View File

@ -1087,29 +1087,13 @@ handle_list_names (_GFreedesktopDBus *object,
{ {
GDBusDaemon *daemon = G_DBUS_DAEMON (object); GDBusDaemon *daemon = G_DBUS_DAEMON (object);
GPtrArray *array; GPtrArray *array;
GList *clients, *names, *l; GPtrArray *clients, *names;
array = g_ptr_array_new (); clients = g_hash_table_get_values_as_ptr_array (daemon->clients);
array = g_steal_pointer (&clients);
clients = g_hash_table_get_values (daemon->clients); names = g_hash_table_get_values_as_ptr_array (daemon->names);
for (l = clients; l != NULL; l = l->next) g_ptr_array_extend_and_steal (array, g_steal_pointer (&names));
{
Client *client = l->data;
g_ptr_array_add (array, client->id);
}
g_list_free (clients);
names = g_hash_table_get_values (daemon->names);
for (l = names; l != NULL; l = l->next)
{
Name *name = l->data;
g_ptr_array_add (array, name->name);
}
g_list_free (names);
g_ptr_array_add (array, NULL); g_ptr_array_add (array, NULL);