luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-26 05:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

gio: do not add an icon name already in the list.

Browse Source 
This may happen when creating an icon with several icon name whereas one
is already a variant of a previous one.
This commit is contained in:
Jehan 2018-06-07 16:16:02 +02:00
parent 9290044265
commit 5fb6d788a5
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gio/gthemedicon.c
View File

@ -156,6 +156,12 @@ g_themed_icon_constructed (GObject *object)
gchar *name; gchar *name;
gboolean is_symbolic; gboolean is_symbolic;
if (g_list_find_custom (names, themed->names[i], (GCompareFunc) g_strcmp0) ||
g_list_find_custom (variants, themed->names[i], (GCompareFunc) g_strcmp0))
/* The icon name was already added and is higher in priority.
* There is no need to re-add it. */
continue;
is_symbolic = g_str_has_suffix (themed->names[i], "-symbolic"); is_symbolic = g_str_has_suffix (themed->names[i], "-symbolic");
if (is_symbolic) if (is_symbolic)
{ {