rpms/control-center/devel slab-icon-names.patch, NONE, 1.1 control-center.spec, 1.388, 1.389

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/control-center/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5281

Modified Files:
	control-center.spec 
Added Files:
	slab-icon-names.patch 
Log Message:
more icon name fixup


slab-icon-names.patch:

--- NEW FILE slab-icon-names.patch ---
diff -up libslab/bookmark-agent.c.icon-names libslab/bookmark-agent.c
--- libslab/bookmark-agent.c.icon-names	2008-07-28 00:08:35.000000000 -0400
+++ libslab/bookmark-agent.c	2008-07-28 00:09:58.000000000 -0400
@@ -1144,7 +1144,7 @@ create_dir_item (BookmarkAgent *this, co
 	if (! strcmp (uri, "HOME")) {
 		uri_new = g_filename_to_uri (g_get_home_dir (), NULL, NULL);
 		name    = _("Home");
-		icon    = "gnome-fs-home";
+		icon    = "user-home";
 	}
 	else if (! strcmp (uri, "DOCUMENTS")) {
 		path = g_build_filename (g_get_home_dir (), "Documents", NULL);
@@ -1156,7 +1156,7 @@ create_dir_item (BookmarkAgent *this, co
 		path = g_build_filename (g_get_home_dir (), "Desktop", NULL);
 		name = _("Desktop");
 		uri_new = g_filename_to_uri (path, NULL, NULL);
-		icon = "gnome-fs-desktop";
+		icon = "user-desktop";
 		g_free (path);
 	}
 	else if (! strcmp (uri, "file:///")) {
diff -up libslab/directory-tile.c.icon-names libslab/directory-tile.c
--- libslab/directory-tile.c.icon-names	2008-07-28 00:12:30.000000000 -0400
+++ libslab/directory-tile.c	2008-07-28 00:12:49.000000000 -0400
@@ -332,7 +332,7 @@ load_image (DirectoryTile *tile)
 	if (priv->icon_name)
 		icon_name = priv->icon_name;
 	else
-		icon_name = "gnome-fs-directory";
+		icon_name = "folder";
 
 	priv->image_is_broken = slab_load_image (
 		GTK_IMAGE (NAMEPLATE_TILE (tile)->image), GTK_ICON_SIZE_DND, icon_name);
diff -up libslab/document-tile.c.icon-names libslab/document-tile.c
--- libslab/document-tile.c.icon-names	2008-07-28 00:12:59.000000000 -0400
+++ libslab/document-tile.c	2008-07-28 00:13:19.000000000 -0400
@@ -437,7 +437,7 @@ load_image (DocumentTile *tile)
 		if (priv->force_icon_name)
 			icon_id = priv->force_icon_name;
 		else
-			icon_id = "gnome-fs-regular";
+			icon_id = "text-x-preview";
 		free_icon_id = FALSE;
 
 		goto exit;


Index: control-center.spec
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -r1.388 -r1.389
--- control-center.spec	27 Jul 2008 22:40:18 -0000	1.388
+++ control-center.spec	28 Jul 2008 04:19:18 -0000	1.389
@@ -22,7 +22,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.23.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -39,6 +39,8 @@
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=544922 
 Patch21: icon-names.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=545075 
+Patch22: slab-icon-names.patch
 
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: control-center-2.23.2-passwd.patch
@@ -165,6 +167,7 @@
 %patch8 -p1 -b .gtkmarshal
 %patch10 -p0 -b .libcanberra
 %patch21 -p1 -b .icon-names
+%patch22 -p0 -b .slab-icon-names
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -334,6 +337,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Mon Jul 28 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.5-6
+- Use standard icon names in more places
+
 * Sun Jul 27 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.5-5
 - Fix up gconf schema installation