aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2013-02-26 16:25:20 +0000
committerWerner Koch <[email protected]>2013-02-26 16:26:44 +0000
commit5090f6f246bfad2eb80f3cc222963f73996d8028 (patch)
tree3c91418c4f2cf1bd11b9841ef1ea5b922492987e
parentw32: Hacks for building with 32 bit mingw64. (diff)
downloadgpgme-5090f6f246bfad2eb80f3cc222963f73996d8028.tar.gz
gpgme-5090f6f246bfad2eb80f3cc222963f73996d8028.zip
Enable FD passing and thus building of the UI-server.
* configure.ac: Make --enable-fd-passing the default. * src/engine-uiserver.c (_gpgme_engine_ops_uiserver): Syntax fix.
-rw-r--r--NEWS17
-rw-r--r--configure.ac4
-rw-r--r--src/engine-uiserver.c2
3 files changed, 20 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 2d6ccf19..abf24df4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,23 @@
Noteworthy changes in version 1.4.0 (unreleased)
------------------------------------------------
+ * New function gpgme_set_global_flag to help debugging on Android.
+
+ * New function gpgme_io_writen as a convenience wrapper around
+ gpgme_io_write.
+
+ * New functions to support the pinentry mode feature of GnuPG 2.1.
+
+ * New macro GPGME_VERSION_NUMBER to allow supporting different API
+ versions without the need for a configure test.
+
+ * Several improvements for gpgme-tool.
+
+ * Better logging of the common "invalid engine" error code.
+
+ * Support for FD passing is now enabled by default. The configure
+ option --disable-fd-passing may be used to disable this.
+
* Interface changes relative to the 1.3.1 release:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
GPGME_VERSION_NUMBER NEW.
diff --git a/configure.ac b/configure.ac
index 0fb326e6..693d403c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -870,9 +870,9 @@ AC_CHECK_MEMBER(struct cmsghdr.cmsg_len,
#include <unistd.h>
])
-use_descriptor_passing=no
+use_descriptor_passing=yes
AC_ARG_ENABLE(fd-passing,
- AC_HELP_STRING([--enable-fd-passing], [use FD passing if supported]),
+ AC_HELP_STRING([--disable-fd-passing], [do not use FD passing]),
use_descriptor_passing=$enableval)
if test "$supports_descriptor_passing" != "yes"; then
diff --git a/src/engine-uiserver.c b/src/engine-uiserver.c
index abdd79ed..a68915a5 100644
--- a/src/engine-uiserver.c
+++ b/src/engine-uiserver.c
@@ -1338,7 +1338,7 @@ struct engine_ops _gpgme_engine_ops_uiserver =
uiserver_set_io_cbs,
uiserver_io_event,
uiserver_cancel,
- NULL /* cancel_op */
+ NULL, /* cancel_op */
NULL, /* passwd */
NULL /* set_pinentry_mode */
};