From c45357575f3510cec3411e06eff38d49f5329dc2 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Jul 11 2008 14:46:28 +0000 Subject: fix broken icon lookup --- diff --git a/broken-icon-lookup.patch b/broken-icon-lookup.patch new file mode 100644 index 0000000..72d81f0 --- /dev/null +++ b/broken-icon-lookup.patch @@ -0,0 +1,18 @@ +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); diff --git a/file-roller.spec b/file-roller.spec index 25b7bba..760e5ef 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -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(postun): scrollkeeper 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 @@ such as tar files. %prep %setup -q +%patch0 -p1 -b .broken-icon-lookup autoreconf @@ -128,6 +132,9 @@ fi %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg %changelog +* Fri Jul 11 2008 Matthias Clasen - 2.23.3-2 +- Fix icon lookup + * Wed Jun 18 2008 Matthias Clasen - 2.23.3-1 - Update to 2.23.3