fix a segfault

epel9
Matthias Clasen 17 years ago
parent 67b00acda2
commit 316ea78944

@ -11,7 +11,7 @@
Summary: File Roller is a tool for viewing and creating archives Summary: File Roller is a tool for viewing and creating archives
Name: file-roller Name: file-roller
Version: 2.23.5 Version: 2.23.5
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/Archiving Group: Applications/Archiving
URL: http://download.gnome.org/sources/file-roller/ URL: http://download.gnome.org/sources/file-roller/
@ -44,7 +44,10 @@ Requires: GConf2
# The context menu API changed in 2.2.0: # The context menu API changed in 2.2.0:
Conflicts: nautilus < 2.2.0 Conflicts: nautilus < 2.2.0
# http://bugzilla.gnome.org/show_bug.cgi?id=546978
Patch0: folder-icon.patch Patch0: folder-icon.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=547017
Patch1: open-with.patch
%description %description
File Roller is an application for creating and viewing archives files, File Roller is an application for creating and viewing archives files,
@ -53,6 +56,7 @@ such as tar files.
%prep %prep
%setup -q %setup -q
%patch0 -p0 -b .folder-icon %patch0 -p0 -b .folder-icon
%patch1 -p0 -b .open-with
autoreconf autoreconf
@ -131,6 +135,9 @@ fi
%{_datadir}/icons/hicolor/scalable/apps/file-roller.svg %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
%changelog %changelog
* Fri Aug 8 2008 Matthias Clasen <mclasen@redhat.com> - 2.23.5-3
- Fix a segfault
* Fri Aug 8 2008 Matthias Clasen <mclasen@redhat.com> - 2.23.5-2 * Fri Aug 8 2008 Matthias Clasen <mclasen@redhat.com> - 2.23.5-2
- Fix the folder icons - Fix the folder icons

@ -0,0 +1,14 @@
Index: src/dlg-open-with.c
===================================================================
--- src/dlg-open-with.c (revision 2411)
+++ src/dlg-open-with.c (working copy)
@@ -410,6 +411,9 @@
icon_image = get_icon_pixbuf (theme, G_THEMED_ICON (icon), icon_size);
g_object_unref (icon);
}
+ else {
+ icon_image = NULL;
+ }
gtk_list_store_append (GTK_LIST_STORE (data->app_model),
&iter);
Loading…
Cancel
Save