diff options
| author | Debarshi Ray <debarshir@gnome.org> | 2018-05-29 17:14:24 +0200 |
|---|---|---|
| committer | Ondrej Holy <oholy@redhat.com> | 2018-08-14 08:13:53 +0000 |
| commit | c0699c2e3c702b9efd610f4bf364ace9c70a273a (patch) | |
| tree | a78d79726144bed601c252e6073042ea9a754bff /daemon/gvfsbackendnfs.c | |
| parent | 9f465f555a6abc7bb03c9b7582f5c58cfe0b7b6c (diff) | |
| download | gvfs-c0699c2e3c702b9efd610f4bf364ace9c70a273a.tar.gz | |
Remove workaround for directory / folder iconswip/rishi/issue-2
https://gitlab.gnome.org/GNOME/gvfs/issues/2
Diffstat (limited to 'daemon/gvfsbackendnfs.c')
| -rw-r--r-- | daemon/gvfsbackendnfs.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/daemon/gvfsbackendnfs.c b/daemon/gvfsbackendnfs.c index 566fda78..b7888cca 100644 --- a/daemon/gvfsbackendnfs.c +++ b/daemon/gvfsbackendnfs.c @@ -472,7 +472,6 @@ static void set_name_info (GFileInfo *info, const char *mimetype, const char *basename, - gboolean is_directory, GFileAttributeMatcher *matcher) { char *free_mimetype = NULL; @@ -514,16 +513,8 @@ set_name_info (GFileInfo *info, GIcon *icon = NULL; GIcon *symbolic_icon = NULL; - if (is_directory) - { - icon = g_themed_icon_new ("folder"); - symbolic_icon = g_themed_icon_new ("folder-symbolic"); - } - else if (mimetype) - { - icon = g_content_type_get_icon (mimetype); - symbolic_icon = g_content_type_get_symbolic_icon (mimetype); - } + icon = g_content_type_get_icon (mimetype); + symbolic_icon = g_content_type_get_symbolic_icon (mimetype); if (icon == NULL) icon = g_themed_icon_new ("text-x-generic"); @@ -1691,7 +1682,6 @@ enumerate_stat_cb (int err, set_name_info (new_info, mimetype, g_file_info_get_name (info), - S_ISDIR (st->nfs_mode), handle->op_job->attribute_matcher); g_file_info_set_is_symlink (new_info, TRUE); @@ -1882,7 +1872,6 @@ enumerate_cb (int err, struct nfs_context *ctx, void *data, void *private_data) set_name_info (info, mimetype, d->name, - type == G_FILE_TYPE_DIRECTORY, op_job->attribute_matcher); if ((g_file_attribute_matcher_matches (op_job->attribute_matcher, @@ -2090,7 +2079,6 @@ stat_cb (int err, struct nfs_context *ctx, void *data, void *private_data) set_name_info (info, mimetype, basename, - S_ISDIR (st->nfs_mode), op_job->attribute_matcher); g_free (basename); |