gvfs r2128 - in trunk: . daemon

[hadess svn gnome org]

Author: hadess
Date: Tue Dec  9 19:51:37 2008
New Revision: 2128
URL: http://svn.gnome.org/viewvc/gvfs?rev=2128&view=rev

Log:
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)



Modified:
   trunk/ChangeLog
   trunk/daemon/gvfsbackendobexftp.c

Modified: trunk/daemon/gvfsbackendobexftp.c
==============================================================================
--- trunk/daemon/gvfsbackendobexftp.c	(original)
+++ trunk/daemon/gvfsbackendobexftp.c	Tue Dec  9 19:51:37 2008
@@ -376,7 +376,14 @@
       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);