diff options
| author | Bastien Nocera <hadess@hadess.net> | 2008-12-09 19:51:37 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@src.gnome.org> | 2008-12-09 19:51:37 +0000 |
| commit | 9f6f4f974ef5a16bbad3c03bcbbf23ca27e3bf79 (patch) | |
| tree | f8d3259198ae498c119ef35914f6be04d35fe66f | |
| parent | f6634514bca965de79c124e4fddbf4b7ddb8bcf5 (diff) | |
| download | gvfs-9f6f4f974ef5a16bbad3c03bcbbf23ca27e3bf79.tar.gz | |
Fix icon for the root directory of an obexftp server (Closes: #542687)
2008-12-09 Bastien Nocera <hadess@hadess.net>
* daemon/gvfsbackendobexftp.c (_query_file_info_helper): Fix icon
for the root directory of an obexftp server (Closes: #542687)
svn path=/trunk/; revision=2128
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | daemon/gvfsbackendobexftp.c | 9 |
2 files changed, 13 insertions, 1 deletions
@@ -1,5 +1,10 @@ 2008-12-09 Bastien Nocera <hadess@hadess.net> + * daemon/gvfsbackendobexftp.c (_query_file_info_helper): Fix icon + for the root directory of an obexftp server (Closes: #542687) + +2008-12-09 Bastien Nocera <hadess@hadess.net> + * monitor/gphoto2/Makefile.am: * monitor/gphoto2/ggphoto2volumemonitor.c (get_stores_for_camera), (update_cameras): For each camera discovered, create shadow mounts diff --git a/daemon/gvfsbackendobexftp.c b/daemon/gvfsbackendobexftp.c index 772ceb12..8d326096 100644 --- a/daemon/gvfsbackendobexftp.c +++ b/daemon/gvfsbackendobexftp.c @@ -376,7 +376,14 @@ _query_file_info_helper (GVfsBackend *backend, g_file_info_set_file_type (info, G_FILE_TYPE_DIRECTORY); g_file_info_set_content_type (info, "inode/directory"); g_file_info_set_name (info, "/"); - g_vfs_backend_set_icon_name (backend, op_backend->icon_name); + if (op_backend->icon_name) { + GIcon *icon; + + g_vfs_backend_set_icon_name (backend, op_backend->icon_name); + icon = g_themed_icon_new (op_backend->icon_name); + g_file_info_set_icon (info, icon); + g_object_unref (icon); + } display = g_strdup_printf (_("%s on %s"), "/", op_backend->display_name); g_file_info_set_display_name (info, display); g_free (display); |