rpms/pinentry/devel 0001-Fix-pinentry-gtk-2-SIGSEGV-when-unfocusing-with-g-ar.patch, NONE, 1.1 pinentry.spec, 1.28, 1.29

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/pinentry/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21990/devel

Modified Files:
	pinentry.spec 
Added Files:
	0001-Fix-pinentry-gtk-2-SIGSEGV-when-unfocusing-with-g-ar.patch 
Log Message:
* Sun Apr 18 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.7.6-5
- pinentry-gtk -g segfaults on focus change (#520236)


0001-Fix-pinentry-gtk-2-SIGSEGV-when-unfocusing-with-g-ar.patch:
 pinentry-gtk-2.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE 0001-Fix-pinentry-gtk-2-SIGSEGV-when-unfocusing-with-g-ar.patch ---
>From 977d49018cebcc37d0b667713ad422f80ba9c8d2 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Fri, 16 Apr 2010 16:17:04 +0200
Subject: [PATCH] Fix pinentry-gtk-2 SIGSEGV when unfocusing with -g argument

gdk_window_set_transient_for cannot be used with parent = NULL to
unset transient hint (unlike gtk_ version which can). Replacement
code is taken from gtk_window_transient_parent_unrealized

Applied cleanly at least over 0.8.0 and 0.7.6

More info see: https://bugzilla.redhat.com/show_bug.cgi?id=520236
---
 gtk+-2/pinentry-gtk-2.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/gtk+-2/pinentry-gtk-2.c b/gtk+-2/pinentry-gtk-2.c
index 7cd7616..fdd5822 100644
--- a/gtk+-2/pinentry-gtk-2.c
+++ b/gtk+-2/pinentry-gtk-2.c
@@ -145,7 +145,8 @@ ungrab_keyboard (GtkWidget *win, GdkEvent *event, gpointer data)
 {
   gdk_keyboard_ungrab (gdk_event_get_time (event));
   /* Unmake window transient for the root window.  */
-  gdk_window_set_transient_for (win->window, NULL);
+  gdk_property_delete (win->window,
+                       gdk_atom_intern_static_string ("WM_TRANSIENT_FOR"));
 }
 
 
-- 
1.6.6.1


Index: pinentry.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pinentry/devel/pinentry.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- pinentry.spec	16 Sep 2009 18:06:22 -0000	1.28
+++ pinentry.spec	18 Apr 2010 16:51:23 -0000	1.29
@@ -10,7 +10,7 @@
 
 Name:    pinentry
 Version: 0.7.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Collection of simple PIN or passphrase entry dialogs
 
 Group:   Applications/System
@@ -23,6 +23,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 # borrowed from opensuse
 Source10: pinentry-wrapper
 
+## Upstreamable patches
+# from gpa-devel list, archives seem 404'd atm
+Patch50: 0001-Fix-pinentry-gtk-2-SIGSEGV-when-unfocusing-with-g-ar.patch
+
 BuildRequires: gtk2-devel
 BuildRequires: libcap-devel
 BuildRequires: ncurses-devel
@@ -83,6 +87,8 @@ Support for Qt4 is new, and a bit experi
 %prep
 %setup -q
 
+%patch50 -p1 -b .rhbug_520236
+
 # hack around auto* madness, lack of proper support for moc
 %if %{?_enable_pinentry_qt4:1}
 pushd qt4
@@ -165,6 +171,9 @@ fi
 
 
 %changelog
+* Sun Apr 18 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.7.6-5
+- pinentry-gtk -g segfaults on focus change (#520236)
+
 * Wed Sep 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.6-4
 - Errors installing with --excludedocs (#515925)