rpms/gedit/devel icon-names.patch,NONE,1.1 gedit.spec,1.157,1.158

[Matthias Clasen (mclasen)]

Author: mclasen

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

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


icon-names.patch:

--- NEW FILE icon-names.patch ---
diff -up gedit-2.23.1/plugins/filebrowser/gedit-file-bookmarks-store.c.icon-names gedit-2.23.1/plugins/filebrowser/gedit-file-bookmarks-store.c
--- gedit-2.23.1/plugins/filebrowser/gedit-file-bookmarks-store.c.icon-names	2008-07-09 23:44:16.000000000 -0400
+++ gedit-2.23.1/plugins/filebrowser/gedit-file-bookmarks-store.c	2008-07-09 23:46:42.000000000 -0400
@@ -140,9 +140,9 @@ add_file (GeditFileBookmarksStore * mode
 	}
 
 	if (flags & GEDIT_FILE_BOOKMARKS_STORE_IS_HOME)
-		pixbuf = gedit_file_browser_utils_pixbuf_from_theme ("gnome-fs-home", GTK_ICON_SIZE_MENU);
+		pixbuf = gedit_file_browser_utils_pixbuf_from_theme ("user-home", GTK_ICON_SIZE_MENU);
 	else if (flags & GEDIT_FILE_BOOKMARKS_STORE_IS_DESKTOP)
-		pixbuf = gedit_file_browser_utils_pixbuf_from_theme ("gnome-fs-desktop", GTK_ICON_SIZE_MENU);
+		pixbuf = gedit_file_browser_utils_pixbuf_from_theme ("user-desktop", GTK_ICON_SIZE_MENU);
 	else if (flags & GEDIT_FILE_BOOKMARKS_STORE_IS_ROOT)
 		pixbuf = gedit_file_browser_utils_pixbuf_from_theme ("drive-harddisk", GTK_ICON_SIZE_MENU);
 
@@ -348,7 +348,7 @@ add_bookmark (GeditFileBookmarksStore * 
 				    -1);
 
 		if (!pixbuf) {
-			pixbuf = gedit_file_browser_utils_pixbuf_from_theme ("gnome-fs-directory", GTK_ICON_SIZE_MENU);
+			pixbuf = gedit_file_browser_utils_pixbuf_from_theme ("folder", GTK_ICON_SIZE_MENU);
 
 			if (pixbuf) {			
 				gtk_tree_store_set (GTK_TREE_STORE (model), 
diff -up gedit-2.23.1/plugins/filebrowser/gedit-file-browser-store.c.icon-names gedit-2.23.1/plugins/filebrowser/gedit-file-browser-store.c
--- gedit-2.23.1/plugins/filebrowser/gedit-file-browser-store.c.icon-names	2008-07-09 23:44:32.000000000 -0400
+++ gedit-2.23.1/plugins/filebrowser/gedit-file-browser-store.c	2008-07-09 23:47:11.000000000 -0400
@@ -1995,7 +1995,7 @@ model_add_node_from_dir (GeditFileBrowse
 		}
 		
 		if (node->icon == NULL) {
-			node->icon = gedit_file_browser_utils_pixbuf_from_theme ("gnome-fs-directory", GTK_ICON_SIZE_MENU);
+			node->icon = gedit_file_browser_utils_pixbuf_from_theme ("folder", GTK_ICON_SIZE_MENU);
 		}
 
 		model_add_node (model, node, parent);


Index: gedit.spec
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- gedit.spec	14 May 2008 01:54:04 -0000	1.157
+++ gedit.spec	10 Jul 2008 03:53:08 -0000	1.158
@@ -18,7 +18,7 @@
 Summary:	gEdit is a small but powerful text editor for GNOME
 Name:		gedit
 Version: 	2.23.1
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
 Group:		Applications/Editors
@@ -46,6 +46,9 @@
 # and I needed this patch to make autoconf happy
 Patch2: gedit-2.15.1-python.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=542300
+Patch3: icon-names.patch
+
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -108,6 +111,7 @@
 %endif
 
 %patch2 -p1 -b .python
+%patch3 -p1 -b .icon-names
 
 %build
 autoreconf
@@ -194,6 +198,9 @@
 
 
 %changelog
+* Wed Jul  9 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.1-2
+- Use standard icon names
+
 * Tue May 13 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.1-1
 - Update to 2.23.1