From 3da516f91734b73b972e5fef503c1e6f121d8187 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Dec 24 2012 13:38:20 +0000
Subject: Fix crash upon escaping from generic dialogs (#889897).


---

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 b34ea12..e4fae42 100644
--- a/geeqie.spec
+++ b/geeqie.spec
@@ -3,7 +3,7 @@
 Summary: Image browser and viewer
 Name: geeqie
 Version: 1.0
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: GPLv2+
 Group: User Interface/X
 # svn + autogen
@@ -34,6 +34,9 @@ Patch7: geeqie-1.0-ui_pathsel.patch
 Patch8: geeqie-1.0-LDFLAGS.patch
 # in upstream bug tracker
 Patch9: geeqie-1.0-fix-fullscreen.patch
+# bz 889897
+# reproducible with 1.1
+Patch10: geeqie-1.0-double_generic_dialog_close.patch
 
 BuildRequires: gtk2-devel
 BuildRequires: lcms-devel
@@ -81,6 +84,7 @@ done
 %patch7 -p1 -b .ui_pathsel
 %patch8 -p1 -b .LDFLAGS
 %patch9 -p1 -b .fix-fullscreen
+%patch10 -p1 -b .fix-dialog-close
 
 
 %build
@@ -130,6 +134,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Mon Dec 24 2012 Michael Schwendt <mschwendt@fedoraproject.org> - 1.0-21
+- Fix crash upon escaping from generic dialogs (#889897).
+
 * Thu Nov 22 2012 Michael Schwendt <mschwendt@fedoraproject.org> - 1.0-20
 - Merge a patch to fix fullscreen mode.