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

Revert "Return folder as icon for directories"

Browse Source 
This workaround is no longer necessary because it was fixed in
shared-mime-info three years ago:
https://bugs.freedesktop.org/show_bug.cgi?id=89150

This reverts commit 90025254fd.

https://gitlab.gnome.org/GNOME/glib/issues/1073
This commit is contained in:
Debarshi Ray 2018-05-28 17:19:59 +02:00
parent ed4ff31567
commit 25af5ad1da
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gio/glocalfileinfo.c
View File

@ -1634,7 +1634,6 @@ _g_local_file_info_get_nostat (GFileInfo *info,
static const char * static const char *
get_icon_name (const char *path, get_icon_name (const char *path,
const char *content_type,
gboolean use_symbolic, gboolean use_symbolic,
gboolean *with_fallbacks_out) gboolean *with_fallbacks_out)
{ {
@ -1679,10 +1678,6 @@ get_icon_name (const char *path,
{ {
name = use_symbolic ? "folder-videos-symbolic" : "folder-videos"; name = use_symbolic ? "folder-videos-symbolic" : "folder-videos";
} }
else if (g_content_type_is_mime_type (content_type,"inode/directory"))
{
name = use_symbolic ? "folder-symbolic" : "folder";
}
else else
{ {
name = NULL; name = NULL;
@ -1703,7 +1698,7 @@ get_icon (const char *path,
const char *icon_name; const char *icon_name;
gboolean with_fallbacks; gboolean with_fallbacks;
icon_name = get_icon_name (path, content_type, use_symbolic, &with_fallbacks); icon_name = get_icon_name (path, use_symbolic, &with_fallbacks);
if (icon_name != NULL) if (icon_name != NULL)
{ {
if (with_fallbacks) if (with_fallbacks)