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

Merge branch 'wip/rishi/issue-1073' into 'master'

Browse Source 
Revert "Return folder as icon for directories"

See merge request GNOME/glib!36
This commit is contained in:
Emmanuele Bassi 2018-05-29 07:43:56 +00:00
commit 61ccf733cc
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 *
get_icon_name (const char *path,
const char *content_type,
gboolean use_symbolic,
gboolean *with_fallbacks_out)
{
@ -1679,10 +1678,6 @@ get_icon_name (const char *path,
{
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
{
name = NULL;
@ -1703,7 +1698,7 @@ get_icon (const char *path,
const char *icon_name;
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 (with_fallbacks)