[svn] pinentry - r230 - in trunk: . gtk+-2

[svn author wk]

Author: wk
Date: 2010-05-07 10:51:07 +0200 (Fri, 07 May 2010)
New Revision: 230

Modified:
   trunk/ChangeLog
   trunk/THANKS
   trunk/gtk+-2/pinentry-gtk-2.c
Log:
MapNotify fix


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-04-26 17:37:27 UTC (rev 229)
+++ trunk/ChangeLog	2010-05-07 08:51:07 UTC (rev 230)
@@ -1,3 +1,9 @@
+2010-05-03  Werner Koch  <wk at g10code.com>
+
+	* gtk+-2/pinentry-gtk-2.c (create_window): Use
+	visibility-notify-event instead of map-event.  Suggested by Ed
+	Marten.
+
 2010-04-26  Werner Koch  <wk at g10code.com>
 
 	* gtk+-2/pinentry-gtk-2.c (grab_failed): New.

Modified: trunk/THANKS
===================================================================
--- trunk/THANKS	2010-04-26 17:37:27 UTC (rev 229)
+++ trunk/THANKS	2010-05-07 08:51:07 UTC (rev 230)
@@ -4,3 +4,4 @@
 Michael Nottebrock      michaelnottebrock at gmx.net
 Peter Eisentraut	peter_e at gmx.net
 Tobias Koenig		tokoe at kde.org
+Ed Marten               edman007x at mac com

Modified: trunk/gtk+-2/pinentry-gtk-2.c
===================================================================
--- trunk/gtk+-2/pinentry-gtk-2.c	2010-04-26 17:37:27 UTC (rev 229)
+++ trunk/gtk+-2/pinentry-gtk-2.c	2010-05-07 08:51:07 UTC (rev 230)
@@ -309,8 +309,15 @@
 	g_signal_connect (G_OBJECT (win),
 			  "realize", G_CALLBACK (make_transient), NULL);
 
+      /* We need to grab the keyboard when its visible! not when its
+         mapped (there is a difference)  */
+      g_object_set (G_OBJECT(win), "events",
+                    GDK_VISIBILITY_NOTIFY_MASK | GDK_STRUCTURE_MASK, NULL);
+
       g_signal_connect (G_OBJECT (win),
-			pinentry->grab ? "map-event" : "focus-in-event",
+			pinentry->grab
+                        ? "visibility-notify-event"
+                        : "focus-in-event",
 			G_CALLBACK (grab_keyboard), NULL);
       g_signal_connect (G_OBJECT (win),
 			pinentry->grab ? "unmap-event" : "focus-out-event",