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

[svn author wk]

Author: wk
Date: 2007-07-09 09:36:40 +0200 (Mon, 09 Jul 2007)
New Revision: 167

Modified:
   trunk/ChangeLog
   trunk/THANKS
   trunk/configure.ac
   trunk/doc/pinentry.texi
   trunk/gtk+-2/pinentry-gtk-2.c
Log:
Applied fixes for bug 798.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-07-06 13:39:05 UTC (rev 166)
+++ trunk/ChangeLog	2007-07-09 07:36:40 UTC (rev 167)
@@ -1,3 +1,12 @@
+2007-07-09  Werner Koch  <wk at g10code.com>
+
+	* doc/pinentry.texi: Fixed direntry syntax.
+
+	* configure.ac: Add --without-libcap.  From the Gentoo patch archive.
+
+	* gtk+-2/pinentry-gtk-2.c (create_window): Use expose-event
+	instead of map-event.  From Alon Bar-Lev.
+
 2007-07-06  Werner Koch  <wk at g10code.com>
 
 	Released 0.7.3.

Modified: trunk/THANKS
===================================================================
--- trunk/THANKS	2007-07-06 13:39:05 UTC (rev 166)
+++ trunk/THANKS	2007-07-09 07:36:40 UTC (rev 167)
@@ -1,3 +1,4 @@
+Alon Bar-Lev            alon.barlev at gmail.com
 Albrecht Dress		albrecht.dress at arcor.de
 Alexander Zangerl       az at snafu.priv.at
 Michael Nottebrock      michaelnottebrock at gmx.net

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2007-07-06 13:39:05 UTC (rev 166)
+++ trunk/configure.ac	2007-07-09 07:36:40 UTC (rev 167)
@@ -116,11 +116,17 @@
 GNUPG_CHECK_TYPEDEF(byte, HAVE_BYTE_TYPEDEF)
 GNUPG_CHECK_TYPEDEF(ulong, HAVE_ULONG_TYPEDEF)
 
-AC_PATH_PROG(SETCAP, setcap, :, "$PATH:/sbin:/usr/sbin")
-AC_CHECK_LIB(cap, cap_set_proc, [
-  AC_DEFINE(USE_CAPABILITIES,1,[The capabilities support library is installed])
-  LIBCAP=-lcap
-])
+dnl Check for libcap
+AC_ARG_WITH([libcap], AC_HELP_STRING([--without-libcap],
+            [Disable support for capabilities library]))
+
+if test "x$with_libcap" != "xno"; then
+  AC_PATH_PROG(SETCAP, setcap, :, "$PATH:/sbin:/usr/sbin")
+  AC_CHECK_LIB(cap, cap_set_proc, [
+    AC_DEFINE(USE_CAPABILITIES,1,[The capabilities support library is installed])
+    LIBCAP=-lcap
+  ])
+fi
 AC_SUBST(LIBCAP)
 
 dnl

Modified: trunk/doc/pinentry.texi
===================================================================
--- trunk/doc/pinentry.texi	2007-07-06 13:39:05 UTC (rev 166)
+++ trunk/doc/pinentry.texi	2007-07-09 07:36:40 UTC (rev 167)
@@ -62,7 +62,7 @@
 @ifnottex
 @dircategory GNU Utilities
 @direntry
-* pinentry::               Ask securely for a passphrase or PIN.
+* pinentry: (pinentry).    Ask securely for a passphrase or PIN.
 @end direntry
 This file documents the use and the internals of the @pinentry{}.
 

Modified: trunk/gtk+-2/pinentry-gtk-2.c
===================================================================
--- trunk/gtk+-2/pinentry-gtk-2.c	2007-07-06 13:39:05 UTC (rev 166)
+++ trunk/gtk+-2/pinentry-gtk-2.c	2007-07-09 07:36:40 UTC (rev 167)
@@ -207,10 +207,10 @@
   if (!confirm_mode)
     {
       g_signal_connect (G_OBJECT (win),
-			pinentry->grab ? "map-event" : "focus-in-event",
+			pinentry->grab ? "expose-event" : "focus-in-event",
 			G_CALLBACK (grab_keyboard), NULL);
       g_signal_connect (G_OBJECT (win),
-			pinentry->grab ? "unmap-event" : "focus-out-event",
+			pinentry->grab ? "no-expose-event" : "focus-out-event",
 			G_CALLBACK (ungrab_keyboard), NULL);
     }
   gtk_window_add_accel_group (GTK_WINDOW (win), acc);