rpms/gvfs/devel icon-names.patch,NONE,1.1 gvfs.spec,1.61,1.62

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gvfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17837

Modified Files:
	gvfs.spec 
Added Files:
	icon-names.patch 
Log Message:
use standard icon names


icon-names.patch:

--- NEW FILE icon-names.patch ---
diff -up gvfs-0.99.3/daemon/gvfsbackendburn.c.icon-names gvfs-0.99.3/daemon/gvfsbackendburn.c
--- gvfs-0.99.3/daemon/gvfsbackendburn.c.icon-names	2008-07-27 21:44:52.000000000 -0400
+++ gvfs-0.99.3/daemon/gvfsbackendburn.c	2008-07-27 21:45:38.000000000 -0400
@@ -344,7 +344,7 @@ g_vfs_backend_burn_init (GVfsBackendBurn
   
   /* Translators: This is the name of the backend */
   g_vfs_backend_set_display_name (backend, _("Burn"));
-  g_vfs_backend_set_icon_name (backend, "gnome-fs-client");
+  g_vfs_backend_set_icon_name (backend, "computer");
   g_vfs_backend_set_user_visible (backend, FALSE);
 
   mount_spec = g_mount_spec_new ("burn");
diff -up gvfs-0.99.3/daemon/gvfsbackendcomputer.c.icon-names gvfs-0.99.3/daemon/gvfsbackendcomputer.c
--- gvfs-0.99.3/daemon/gvfsbackendcomputer.c.icon-names	2008-07-27 21:45:52.000000000 -0400
+++ gvfs-0.99.3/daemon/gvfsbackendcomputer.c	2008-07-27 21:46:41.000000000 -0400
@@ -177,7 +177,7 @@ g_vfs_backend_computer_init (GVfsBackend
   GMountSpec *mount_spec;
   
   g_vfs_backend_set_display_name (backend, _("Computer"));
-  g_vfs_backend_set_icon_name (backend, "gnome-fs-client");
+  g_vfs_backend_set_icon_name (backend, "computer");
   g_vfs_backend_set_user_visible (backend, FALSE);
 
   mount_spec = g_mount_spec_new ("computer");
@@ -691,7 +691,7 @@ try_query_info (GVfsBackend *backend,
       g_file_info_set_name (info, "/");
       g_file_info_set_file_type (info, G_FILE_TYPE_DIRECTORY);
       g_file_info_set_display_name (info, _("Computer"));
-      icon = g_themed_icon_new ("gnome-fs-client");
+      icon = g_themed_icon_new ("computer");
       g_file_info_set_icon (info, icon);
       g_object_unref (icon);
       g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE, FALSE);
diff -up gvfs-0.99.3/daemon/gvfsbackenddnssd.c.icon-names gvfs-0.99.3/daemon/gvfsbackenddnssd.c
--- gvfs-0.99.3/daemon/gvfsbackenddnssd.c.icon-names	2008-07-27 21:54:51.000000000 -0400
+++ gvfs-0.99.3/daemon/gvfsbackenddnssd.c	2008-07-27 21:56:35.000000000 -0400
@@ -50,10 +50,10 @@ static struct {
 	char *icon;
 	gpointer handle;
 } dns_sd_types[] = {
-	{"_ftp._tcp", "ftp", "gnome-fs-ftp"},
-	{"_webdav._tcp", "dav", "gnome-fs-share"},
-	{"_webdavs._tcp", "davs", "gnome-fs-share"},
-	{"_sftp-ssh._tcp", "sftp", "gnome-fs-ssh"},
+	{"_ftp._tcp", "ftp", "folder-remote-ftp"},
+	{"_webdav._tcp", "dav", "folder-remote"},
+	{"_webdavs._tcp", "davs", "folder-remote"},
+	{"_sftp-ssh._tcp", "sftp", "folder-remote-ssh"},
 };
 
 static AvahiClient *global_client = NULL;


Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- gvfs.spec	24 Jul 2008 02:09:02 -0000	1.61
+++ gvfs.spec	28 Jul 2008 02:05:14 -0000	1.62
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 0.99.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -33,6 +33,8 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=525779
 Patch3: gvfs-0.2.4-trash-automount.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=545068
+Patch4: icon-names.patch
 
 %description
 The gvfs package provides backend implementations for the gio 
@@ -115,6 +117,7 @@
 %setup -q
 %patch1 -p0 -b .archive-integration
 %patch3 -p1 -b .trash
+%patch4 -p1 -b .icon-names
 
 %build
 
@@ -253,6 +256,9 @@
 
 
 %changelog
+* Sun Jul 27 2008 Matthias Clasen  <mclasen at redhat.com> - 0.99.3-2
+- Use standard icon names
+
 * Wed Jul 23 2008 Matthias Clasen  <mclasen at redhat.com> - 0.99.3-1
 - Update to 0.99.3