From 8c498e8cd21be55fd3bc58981ee86b47ed386026 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Dec 24 2012 13:37:05 +0000
Subject: Fix crash upon escaping from generic dialogs.


---

diff --git a/geeqie-1.0-double_generic_dialog_close.patch b/geeqie-1.0-double_generic_dialog_close.patch
new file mode 100644
index 0000000..b3d5cda
--- /dev/null
+++ b/geeqie-1.0-double_generic_dialog_close.patch
@@ -0,0 +1,17 @@
+diff -Nurb --strip-trailing-cr geeqie-1.0-orig/src/ui_utildlg.c geeqie-1.0/src/ui_utildlg.c
+--- geeqie-1.0-orig/src/ui_utildlg.c	2010-02-17 22:21:19.000000000 +0100
++++ geeqie-1.0/src/ui_utildlg.c	2012-12-24 14:24:27.115586025 +0100
+@@ -86,11 +86,12 @@
+ static gboolean generic_dialog_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+ {
+ 	GenericDialog *gd = data;
++	gboolean auto_close = gd->auto_close;
+ 
+ 	if (event->keyval == GDK_Escape)
+ 		{
+ 		if (gd->cancel_cb) gd->cancel_cb(gd, gd->data);
+-		if (gd->auto_close) generic_dialog_click_cb(widget, data);
++		if (auto_close) generic_dialog_click_cb(widget, data);
+ 		return TRUE;
+ 		}
+ 	return FALSE;
diff --git a/geeqie.spec b/geeqie.spec
index 64e0436..61f257b 100644
--- a/geeqie.spec
+++ b/geeqie.spec
@@ -3,7 +3,7 @@
 Summary: Image browser and viewer
 Name: geeqie
 Version: 1.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: User Interface/X
 Source: http://downloads.sf.net/sourceforge/geeqie/%{name}-%{upstreamversion}.tar.gz
@@ -15,6 +15,8 @@ Patch0: geeqie-1.1-LDFLAGS.patch
 Patch1: geeqie-1.1-bar_keywords.c.diff
 # in upstream bug tracker
 Patch2: geeqie-1.0-fix-fullscreen.patch
+# bz 889897
+Patch3: geeqie-1.0-double_generic_dialog_close.patch
 
 BuildRequires: gtk2-devel
 BuildRequires: lcms-devel
@@ -57,6 +59,7 @@ done
 %patch0 -p1 -b .LDFLAGS
 %patch1 -p1 -b .keywords
 %patch2 -p1 -b .fix-fullscreen
+%patch3 -p1 -b .fix-dialog-close
 
 
 %build
@@ -105,6 +108,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Mon Dec 24 2012 Michael Schwendt <mschwendt@fedoraproject.org> - 1.1-5
+- Fix crash upon escaping from generic dialogs.
+
 * Thu Dec 13 2012 Michael Schwendt <mschwendt@fedoraproject.org> - 1.1-4
 - Build with --disable-tiff, as the custom libtiff loader crashes
   for some images as mentioned on geeqie-devel list.