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

[svn author wk]

Author: wk
Date: 2010-05-07 19:26:10 +0200 (Fri, 07 May 2010)
New Revision: 231

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/gtk+-2/pinentry-gtk-2.c
Log:
Fix bug#1162.  This finally allows me to use the pinentry on my kfreebsd laptop without fearing it pops up below other windows and grabs the keyboard.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-05-07 08:51:07 UTC (rev 230)
+++ trunk/ChangeLog	2010-05-07 17:26:10 UTC (rev 231)
@@ -1,3 +1,8 @@
+2010-05-07  Werner Koch  <wk at g10code.com>
+
+	* gtk+-2/pinentry-gtk-2.c (create_window): Keep the window above
+	and make sure it has the focus.  Fixes bug#1162.
+
 2010-05-03  Werner Koch  <wk at g10code.com>
 
 	* gtk+-2/pinentry-gtk-2.c (create_window): Use

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2010-05-07 08:51:07 UTC (rev 230)
+++ trunk/NEWS	2010-05-07 17:26:10 UTC (rev 231)
@@ -3,7 +3,10 @@
 
  * The W32 pinentry now supports WindowsCE.
 
+ * The GTK pinentry now always sticks to the top and properly grabs
+   the keyboard.
 
+
 Noteworthy changes in version 0.8.0 (2010-03-03)
 ------------------------------------------------
 

Modified: trunk/gtk+-2/pinentry-gtk-2.c
===================================================================
--- trunk/gtk+-2/pinentry-gtk-2.c	2010-05-07 08:51:07 UTC (rev 230)
+++ trunk/gtk+-2/pinentry-gtk-2.c	2010-05-07 17:26:10 UTC (rev 231)
@@ -510,9 +510,10 @@
     }
 
   gtk_window_set_position (GTK_WINDOW (win), GTK_WIN_POS_CENTER);
+  gtk_window_set_keep_above (GTK_WINDOW (win), TRUE);
+  gtk_widget_show_all (win);
+  gtk_window_present (GTK_WINDOW (win));  /* Make sure it has the focus.  */
   
-  gtk_widget_show_all(win);
-  
   return win;
 }