diff options
| author | Alexander Larsson <alexl@redhat.com> | 2008-12-01 09:39:10 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2008-12-01 09:39:10 +0000 |
| commit | b1133cc662259843b6ec5c314b389f9a5cc9d84a (patch) | |
| tree | bc6b54570b9ea6c3e7fd5e1feb3a5ddd31cde899 /daemon/gvfsbackendsmbbrowse.c | |
| parent | f8875b2649a0f85624e0da7df96fa6d47840c4a9 (diff) | |
| download | gvfs-b1133cc662259843b6ec5c314b389f9a5cc9d84a.tar.gz | |
Make mounts/backends have a GIcon not a icon name
2008-12-01 Alexander Larsson <alexl@redhat.com>
* client/gdaemonmount.c:
* common/gmounttracker.[ch]:
* daemon/gvfsbackend.[ch]:
Make mounts/backends have a GIcon not a icon name
* daemon/gvfsbackendsftp.c:
Support /etc/favicon.png
* daemon/gvfsbackendsmbbrowse.c:
Simplify some code with the new GIcon support
Patch from David Zeuthen (#557540)
svn path=/trunk/; revision=2113
Diffstat (limited to 'daemon/gvfsbackendsmbbrowse.c')
| -rw-r--r-- | daemon/gvfsbackendsmbbrowse.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/daemon/gvfsbackendsmbbrowse.c b/daemon/gvfsbackendsmbbrowse.c index 3ae0c87e..88411964 100644 --- a/daemon/gvfsbackendsmbbrowse.c +++ b/daemon/gvfsbackendsmbbrowse.c @@ -1067,7 +1067,6 @@ try_query_info (GVfsBackend *backend, GFileAttributeMatcher *matcher) { GVfsBackendSmbBrowse *op_backend = G_VFS_BACKEND_SMB_BROWSE (backend); - const char *icon_name; GIcon *icon; if (is_root (filename)) @@ -1075,13 +1074,9 @@ try_query_info (GVfsBackend *backend, g_file_info_set_file_type (info, G_FILE_TYPE_DIRECTORY); g_file_info_set_name (info, "/"); g_file_info_set_display_name (info, g_vfs_backend_get_display_name (backend)); - icon_name = g_vfs_backend_get_icon_name (backend); - if (icon_name) - { - icon = g_themed_icon_new (icon_name); - g_file_info_set_icon (info, icon); - g_object_unref (icon); - } + icon = g_vfs_backend_get_icon (backend); + if (icon != NULL) + g_file_info_set_icon (info, icon); g_vfs_job_succeeded (G_VFS_JOB (job)); return TRUE; |