49 lines
1.8 KiB
Diff
49 lines
1.8 KiB
Diff
Index: daemon/gvfsbackendsftp.c
|
|
===================================================================
|
|
--- daemon/gvfsbackendsftp.c (revision 2074)
|
|
+++ daemon/gvfsbackendsftp.c (revision 2075)
|
|
@@ -1804,11 +1804,7 @@ parse_attributes (GVfsBackendSftp *backe
|
|
if (S_ISDIR(mode))
|
|
icon = g_themed_icon_new ("folder");
|
|
else if (mimetype)
|
|
- {
|
|
icon = g_content_type_get_icon (mimetype);
|
|
- if (G_IS_THEMED_ICON (icon))
|
|
- g_themed_icon_append_name (G_THEMED_ICON (icon), "text-x-generic");
|
|
- }
|
|
|
|
if (icon == NULL)
|
|
icon = g_themed_icon_new ("text-x-generic");
|
|
Index: daemon/gvfsbackendsmb.c
|
|
===================================================================
|
|
--- daemon/gvfsbackendsmb.c (revision 2074)
|
|
+++ daemon/gvfsbackendsmb.c (revision 2075)
|
|
@@ -1381,13 +1381,8 @@ set_info_from_stat (GVfsBackendSmb *back
|
|
else
|
|
{
|
|
content_type = g_content_type_guess (basename, NULL, 0, NULL);
|
|
-
|
|
if (content_type)
|
|
- {
|
|
- icon = g_content_type_get_icon (content_type);
|
|
- if (G_IS_THEMED_ICON (icon))
|
|
- g_themed_icon_append_name (G_THEMED_ICON (icon), "text-x-generic");
|
|
- }
|
|
+ icon = g_content_type_get_icon (content_type);
|
|
}
|
|
|
|
if (content_type)
|
|
Index: daemon/gvfsdaemonutils.c
|
|
===================================================================
|
|
--- daemon/gvfsdaemonutils.c (revision 2074)
|
|
+++ daemon/gvfsdaemonutils.c (revision 2075)
|
|
@@ -276,8 +276,6 @@ gvfs_file_info_populate_content_types (G
|
|
else
|
|
{
|
|
icon = g_content_type_get_icon (mimetype);
|
|
- if (G_IS_THEMED_ICON (icon))
|
|
- g_themed_icon_append_name (G_THEMED_ICON (icon), "text-x-generic");
|
|
}
|
|
|
|
g_file_info_set_icon (info, icon);
|