Applied fixes for bug 798.
authorWerner Koch <wk@gnupg.org>
Mon, 9 Jul 2007 07:36:40 +0000 (07:36 +0000)
committerWerner Koch <wk@gnupg.org>
Mon, 9 Jul 2007 07:36:40 +0000 (07:36 +0000)
ChangeLog
THANKS
configure.ac
doc/pinentry.texi
gtk+-2/pinentry-gtk-2.c

index 8174e24..0317297 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-07-09  Werner Koch  <wk@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@g10code.com>
 
        Released 0.7.3.
diff --git a/THANKS b/THANKS
index b1ef4ef..b51b894 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -1,3 +1,4 @@
+Alon Bar-Lev            alon.barlev@gmail.com
 Albrecht Dress         albrecht.dress@arcor.de
 Alexander Zangerl       az at snafu.priv.at
 Michael Nottebrock      michaelnottebrock at gmx.net
index edd8a99..5c445d4 100644 (file)
@@ -116,11 +116,17 @@ dnl Checks for libsecmem.
 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
index 7721d23..e697f36 100644 (file)
@@ -62,7 +62,7 @@ section entitled ``Copying''.
 @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{}.
 
index a085933..69b6e3e 100644 (file)
@@ -207,10 +207,10 @@ create_window (int confirm_mode)
   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);