rpms/gthumb/devel icon-crash.patch,NONE,1.1 gthumb.spec,1.88,1.89

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gthumb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5751

Modified Files:
	gthumb.spec 
Added Files:
	icon-crash.patch 
Log Message:
Try to fix #453181


icon-crash.patch:

--- NEW FILE icon-crash.patch ---
diff -up gthumb-2.10.8/libgthumb/gtk-utils.c.icon-crash gthumb-2.10.8/libgthumb/gtk-utils.c
--- gthumb-2.10.8/libgthumb/gtk-utils.c.icon-crash	2008-07-18 20:59:17.000000000 -0400
+++ gthumb-2.10.8/libgthumb/gtk-utils.c	2008-07-18 21:10:12.000000000 -0400
@@ -1018,10 +1018,14 @@ panel_find_icon (GtkIconTheme  *icon_the
 						icon_no_extension,
 						size,
 						0);
-	retval = g_strdup (gtk_icon_info_get_filename (icon_info));
-
 	g_free (icon_no_extension);
-	gtk_icon_info_free (icon_info);
+
+        if (icon_info) {
+		retval = g_strdup (gtk_icon_info_get_filename (icon_info));
+		gtk_icon_info_free (icon_info);
+	}
+        else
+       		retval = NULL;
 
 	return retval;
 }


Index: gthumb.spec
===================================================================
RCS file: /cvs/extras/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- gthumb.spec	2 May 2008 18:24:51 -0000	1.88
+++ gthumb.spec	19 Jul 2008 01:13:15 -0000	1.89
@@ -11,7 +11,7 @@
 Summary: Image viewer, editor, organizer
 Name: gthumb
 Version: 2.10.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://gthumb.sourceforge.net
 Source0: http://download.gnome.org/sources/gthumb/2.10/%{name}-%{version}.tar.bz2
 Source1: gthumb-importer
@@ -55,6 +55,7 @@
 Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
 
 Patch0: gthumb-libdir.patch
+Patch1: icon-crash.patch
 
 %description
 gthumb is an application for viewing, editing, and organizing 
@@ -63,6 +64,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .libdir
+%patch1 -p1 -b .icon-crash
 
 %build
 
@@ -138,6 +140,9 @@
 %{_datadir}/icons/hicolor/*
 
 %changelog
+* Fri Jul 18 2008 Matthias Clasen  <mclasen at redhat.com> - 2.10.8-4
+- Try to fix a crash (#453181)
+
 * Fri May  2 2008 David Zeuthen <davidz at redhat.com> - 2.10.8-3
 - Drop x-content patch and provide gthumb-importer and a desktop
   file for it (#444635)