rpms/gvfs/F-10 gvfs-obexftp-icon.patch, NONE, 1.1 gvfs.spec, 1.93, 1.94

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/gvfs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4304

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-obexftp-icon.patch 
Log Message:
* Tue Dec 09 2008 - Bastien Nocera <bnocera at redhat.com> - 1.0.3-3
- Fix icon on the root directory of obexftp shares


gvfs-obexftp-icon.patch:

--- NEW FILE gvfs-obexftp-icon.patch ---
Index: daemon/gvfsbackendobexftp.c
===================================================================
--- daemon/gvfsbackendobexftp.c	(revision 2125)
+++ daemon/gvfsbackendobexftp.c	(working copy)
@@ -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);


Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/F-10/gvfs.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- gvfs.spec	5 Dec 2008 13:31:26 -0000	1.93
+++ gvfs.spec	9 Dec 2008 19:55:39 -0000	1.94
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.0.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -32,6 +32,9 @@
 
 Patch2: gvfs-obexftp-updated-apis-3.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=542687
+Patch3: gvfs-obexftp-icon.patch
+
 # http://bugzilla.gnome.org/show_bug.cgi?id=530654
 Patch4: gvfs-1.1.1-reverse-map-fuse-paths.patch
 
@@ -124,6 +127,7 @@
 %setup -q
 %patch1 -p0 -b .archive-integration
 %patch2 -p0 -b .bluez-ods
+%patch3 -p0 -b .root-icon
 %patch4 -p1 -b .reverse-map-fuse-paths.patch
 %patch7 -p0 -b .smb-timestamps
 %patch8 -p0 -b .smb-auth
@@ -265,6 +269,9 @@
 
 
 %changelog
+* Tue Dec 09 2008 - Bastien Nocera <bnocera at redhat.com> - 1.0.3-3
+- Fix icon on the root directory of obexftp shares
+
 * Fri Dec  5 2008 Tomas Bzatek <tbzatek at redhat.com> - 1.0.3-2
 - Added experimental smb-browse auth patch (testing only)