From 25af5ad1dabeb27c2d9adf269190a131103e70bf Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 28 May 2018 17:19:59 +0200 Subject: [PATCH] Revert "Return folder as icon for directories" 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 90025254fd0047d61fe5c1de84b905da842c43f0. https://gitlab.gnome.org/GNOME/glib/issues/1073 --- gio/glocalfileinfo.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/gio/glocalfileinfo.c b/gio/glocalfileinfo.c index 801695ad0..86bbb225b 100644 --- a/gio/glocalfileinfo.c +++ b/gio/glocalfileinfo.c @@ -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)