rpms/file-roller/devel open-with.patch, NONE, 1.1 file-roller.spec, 1.127, 1.128

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/file-roller/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8149

Modified Files:
	file-roller.spec 
Added Files:
	open-with.patch 
Log Message:
fix a segfault


open-with.patch:

--- NEW FILE open-with.patch ---
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);


Index: file-roller.spec
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- file-roller.spec	8 Aug 2008 18:50:45 -0000	1.127
+++ file-roller.spec	9 Aug 2008 02:25:54 -0000	1.128
@@ -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 @@
 # 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 @@
 %prep
 %setup -q
 %patch0 -p0 -b .folder-icon
+%patch1 -p0 -b .open-with
 
 autoreconf
 
@@ -131,6 +135,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Fri Aug  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.5-3
+- Fix a segfault
+
 * Fri Aug  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.5-2
 - Fix the folder icons