From 316ea7894456aa97e47eb9893488b348cdf9607c Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Sat, 9 Aug 2008 02:25:54 +0000
Subject: [PATCH] fix a segfault

---
 file-roller.spec |  9 ++++++++-
 open-with.patch  | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 open-with.patch

diff --git a/file-roller.spec b/file-roller.spec
index ab64efc..a31982b 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.5
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
 URL:		http://download.gnome.org/sources/file-roller/
@@ -44,7 +44,10 @@ Requires: GConf2
 # The context menu API changed in 2.2.0:
 Conflicts: nautilus < 2.2.0
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=546978
 Patch0: folder-icon.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=547017
+Patch1: open-with.patch
 
 %description
 File Roller is an application for creating and viewing archives files, 
@@ -53,6 +56,7 @@ such as tar files.
 %prep
 %setup -q
 %patch0 -p0 -b .folder-icon
+%patch1 -p0 -b .open-with
 
 autoreconf
 
@@ -131,6 +135,9 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %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
 - Fix the folder icons
 
diff --git a/open-with.patch b/open-with.patch
new file mode 100644
index 0000000..8a554d6
--- /dev/null
+++ b/open-with.patch
@@ -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);