luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-05-08 15:06:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

glocalfileinfo: don't special-case directory icons

Browse Source 
As of e6af432, g_content_type_get_symbolic_icon() returns non-symbolic
fallbacks. Thus, we can't append another symbolic icon to the fallbacks.

The special case was a bit of a hack anyway. It was only applied to
themed icons and there was no generic fallback for mime types that are
not folders.

https://bugzilla.gnome.org/show_bug.cgi?id=726046
This commit is contained in:
Lars Uebernickel 2014-03-10 19:46:23 +01:00 committed by Lars Uebernickel
parent 25f36d8e5e
commit 8c78fb827b
1 changed files with 2 additions and 8 deletions

10
gio/glocalfileinfo.c

@ -1639,7 +1639,6 @@ get_icon_name (const char *path,
static GIcon * static GIcon *
get_icon (const char *path, get_icon (const char *path,
const char *content_type, const char *content_type,
gboolean is_folder,
gboolean use_symbolic) gboolean use_symbolic)
{ {
GIcon *icon = NULL; GIcon *icon = NULL;
@ -1660,11 +1659,6 @@ get_icon (const char *path,
icon = g_content_type_get_symbolic_icon (content_type); icon = g_content_type_get_symbolic_icon (content_type);
else else
icon = g_content_type_get_icon (content_type); icon = g_content_type_get_icon (content_type);
if (G_IS_THEMED_ICON (icon) && is_folder)
{
g_themed_icon_append_name (G_THEMED_ICON (icon), use_symbolic ? "folder-symbolic" : "folder");
}
} }
return icon; return icon;
@ -1852,7 +1846,7 @@ _g_local_file_info_get (const char *basename,
GIcon *icon; GIcon *icon;
/* non symbolic icon */ /* non symbolic icon */
icon = get_icon (path, content_type, S_ISDIR (statbuf.st_mode), FALSE); icon = get_icon (path, content_type, FALSE);
if (icon != NULL) if (icon != NULL)
{ {
g_file_info_set_icon (info, icon); g_file_info_set_icon (info, icon);
@ -1860,7 +1854,7 @@ _g_local_file_info_get (const char *basename,
} }
/* symbolic icon */ /* symbolic icon */
icon = get_icon (path, content_type, S_ISDIR (statbuf.st_mode), TRUE); icon = get_icon (path, content_type, TRUE);
if (icon != NULL) if (icon != NULL)
{ {
g_file_info_set_symbolic_icon (info, icon); g_file_info_set_symbolic_icon (info, icon);