luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

win32: Return proper icon names

Browse Source 
The code here was returning gtk-directory and similar names as
fallback, with a comment claiming that these are 'builtin gtk'.
But they aren't, anymore, so just return the standard names.
This commit is contained in:
Matthias Clasen 2015-06-05 12:26:41 -04:00
parent c20f3b239c
commit 9931336d2d
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gio/gcontenttype-win32.c
View File

@ -224,19 +224,18 @@ g_content_type_get_icon (const gchar *type)
g_free (key);
}
/* icon-name similar to how it was with gtk-2-12 */
if (name)
if (!name)
{
themed_icon = g_themed_icon_new (name);
}
else
{
/* if not found an icon fall back to gtk-builtins */
name = strcmp (type, "inode/directory") == 0 ? "gtk-directory" :
g_content_type_can_be_executable (type) ? "gtk-execute" : "gtk-file";
/* if no icon found, fall back to standard generic names */
if (strcmp (type, "inode/directory") == 0)
name = "folder";
else if (g_content_type_can_be_executable (type))
name = "system-run";
else
name = "text-x-generic";
g_hash_table_insert (_type_icons, g_strdup (type), g_strdup (name));
themed_icon = g_themed_icon_new_with_default_fallbacks (name);
}
themed_icon = g_themed_icon_new (name);
G_UNLOCK (_type_icons);
return G_ICON (themed_icon);