Commit 0a7d1084 authored by Olivier Brunel's avatar Olivier Brunel Committed by Matthias Clasen

gthemedicon: Fallback to non-symbolic icons

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=708163Signed-off-by: Olivier Brunel's avatarOlivier Brunel <jjk@jjacky.com>

https://bugzilla.gnome.org/show_bug.cgi?id=710254
parent 1e1e2d1f
......@@ -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
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment