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

gthemedicon: Fallback to non-symbolic icons

Browse Source 
When doing fallback for symbolic icons, we first shorten the name at dashes
while preserving the -symbolic suffix. But after exhausting that, we should also
try stripping the suffix.

See https://bugzilla.gnome.org/show_bug.cgi?id=708163

Signed-off-by: Olivier Brunel <jjk@jjacky.com>

https://bugzilla.gnome.org/show_bug.cgi?id=710254
This commit is contained in:
Olivier Brunel 2013-10-08 16:11:44 +02:00 committed by Matthias Clasen
parent 1e1e2d1ff7
commit 0a7d1084a5
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gio/gthemedicon.c
View File

@ -187,12 +187,15 @@ g_themed_icon_constructed (GObject *object)
if (is_symbolic)
{
themed->names = g_new (char *, dashes + 1 + 1);
themed->names = g_new (char *, 2 * dashes + 3);
for (i = 0; names[i] != NULL; i++)
themed->names[i] = g_strconcat (names[i], "-symbolic", NULL);
{
themed->names[i] = g_strconcat (names[i], "-symbolic", NULL);
themed->names[dashes + 1 + i] = names[i];
}
themed->names[i] = NULL;
g_strfreev (names);
themed->names[dashes + 1 + i] = NULL;
g_free (names);
}
else
{