From 62cff10b765929ee97c093c936f4f2dbdda7a62e Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 10 Jul 2008 03:53:08 +0000 Subject: [PATCH] use standard icon names --- gedit.spec | 9 ++++++++- icon-names.patch | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 icon-names.patch diff --git a/gedit.spec b/gedit.spec index 84a66e4..aa0fc66 100644 --- a/gedit.spec +++ b/gedit.spec @@ -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 @@ Patch1: gedit-2.13.90-libdir.patch # 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 @@ Install gedit-devel if you want to write plug-ins for gEdit. %endif %patch2 -p1 -b .python +%patch3 -p1 -b .icon-names %build autoreconf @@ -194,6 +198,9 @@ fi %changelog +* Wed Jul 9 2008 Matthias Clasen - 1:2.23.1-2 +- Use standard icon names + * Tue May 13 2008 Matthias Clasen - 1:2.23.1-1 - Update to 2.23.1 diff --git a/icon-names.patch b/icon-names.patch new file mode 100644 index 0000000..1eb3753 --- /dev/null +++ b/icon-names.patch @@ -0,0 +1,36 @@ +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);