rpms/file-roller/devel broken-icon-lookup.patch, NONE, 1.1 file-roller.spec, 1.122, 1.123
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Fri Jul 11 14:47:14 UTC 2008
Author: mclasen
Update of /cvs/extras/rpms/file-roller/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10875
Modified Files:
file-roller.spec
Added Files:
broken-icon-lookup.patch
Log Message:
fix broken icon lookup
broken-icon-lookup.patch:
--- NEW FILE broken-icon-lookup.patch ---
diff -up file-roller-2.23.3/src/gtk-utils.c.broken-icon-lookup file-roller-2.23.3/src/gtk-utils.c
--- file-roller-2.23.3/src/gtk-utils.c.broken-icon-lookup 2008-07-11 10:40:38.000000000 -0400
+++ file-roller-2.23.3/src/gtk-utils.c 2008-07-11 10:40:46.000000000 -0400
@@ -807,13 +807,7 @@ get_icon_pixbuf (GtkIconTheme *icon_them
icon_info = gtk_icon_theme_choose_icon (icon_theme, (const char **)icon_names, size, 0);
if (icon_info == NULL) {
- GIcon *default_icon;
-
- default_icon = g_content_type_get_icon ("gnome-fs-regular");
- pixbuf = get_icon_pixbuf (icon_theme, G_THEMED_ICON (default_icon), size);
- g_object_unref (default_icon);
-
- return pixbuf;
+ icon_info = gtk_icon_theme_lookup_icon (icon_theme, "folder", size, GTK_ICON_LOOKUP_USE_BUILTIN);
}
pixbuf = gtk_icon_info_load_icon (icon_info, &error);
Index: file-roller.spec
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- file-roller.spec 18 Jun 2008 04:33:15 -0000 1.122
+++ file-roller.spec 11 Jul 2008 14:46:28 -0000 1.123
@@ -11,7 +11,7 @@
Summary: File Roller is a tool for viewing and creating archives
Name: file-roller
Version: 2.23.3
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: Applications/Archiving
URL: http://download.gnome.org/sources/file-roller/
@@ -41,6 +41,9 @@
Requires: GConf2
+# http://bugzilla.gnome.org/show_bug.cgi?id=542541
+Patch0: broken-icon-lookup.patch
+
# The context menu API changed in 2.2.0:
Conflicts: nautilus < 2.2.0
@@ -50,6 +53,7 @@
%prep
%setup -q
+%patch0 -p1 -b .broken-icon-lookup
autoreconf
@@ -128,6 +132,9 @@
%{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
%changelog
+* Fri Jul 11 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.3-2
+- Fix icon lookup
+
* Wed Jun 18 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.3-1
- Update to 2.23.3
More information about the fedora-extras-commits
mailing list