From 9931336d2dfbaf44aeb54b7e31164b91718e7769 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 5 Jun 2015 12:26:41 -0400 Subject: [PATCH] win32: Return proper icon names 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. --- gio/gcontenttype-win32.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/gio/gcontenttype-win32.c b/gio/gcontenttype-win32.c index 24a02ed8a..cc8bd825f 100644 --- a/gio/gcontenttype-win32.c +++ b/gio/gcontenttype-win32.c @@ -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);