From 4f381554411ef019d79492f1751543f145604bcf Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 12 Feb 2013 10:42:54 +0100 Subject: [PATCH] Add public function gpgme_get_pinentry_mode. * src/gpgme.c (gpgme_get_pinentry_mode): New. --- NEWS | 1 + src/gpgme.c | 10 ++++++++++ src/gpgme.def | 1 + src/gpgme.h.in | 3 +++ src/libgpgme.vers | 1 + 5 files changed, 16 insertions(+) diff --git a/NEWS b/NEWS index 7499b14f..16902721 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,7 @@ Noteworthy changes in version 1.3.3 (unreleased) gpgme_io_writen NEW. gpgme_set_global_flag NEW. gpgme_set_pinentry_mode NEW. + gpgme_get_pinentry_mode NEW. gpgme_pinentry_mode_t NEW. GPGME_PINENTRY_MODE_DEFAULT NEW. GPGME_PINENTRY_MODE_ASK NEW. diff --git a/src/gpgme.c b/src/gpgme.c index 76c13b16..281ba9cf 100644 --- a/src/gpgme.c +++ b/src/gpgme.c @@ -539,6 +539,16 @@ gpgme_set_pinentry_mode (gpgme_ctx_t ctx, gpgme_keylist_mode_t mode) } +/* Get the pinentry mode of CTX. */ +gpgme_pinentry_mode_t +gpgme_get_pinentry_mode (gpgme_ctx_t ctx) +{ + TRACE1 (DEBUG_CTX, "gpgme_get_pinentry_mode", ctx, + "ctx->pinentry_mode=%u", (unsigned int)ctx->pinentry_mode); + return ctx->pinentry_mode; +} + + /* This function sets a callback function to be used to pass a passphrase to gpg. */ void diff --git a/src/gpgme.def b/src/gpgme.def index ccee05af..3a6e0e3e 100644 --- a/src/gpgme.def +++ b/src/gpgme.def @@ -207,6 +207,7 @@ EXPORTS gpgme_io_writen @157 gpgme_set_pinentry_mode @158 + gpgme_get_pinentry_mode @159 ; END diff --git a/src/gpgme.h.in b/src/gpgme.h.in index 4ec2367b..9d9a5562 100644 --- a/src/gpgme.h.in +++ b/src/gpgme.h.in @@ -875,6 +875,9 @@ gpgme_keylist_mode_t gpgme_get_keylist_mode (gpgme_ctx_t ctx); gpgme_error_t gpgme_set_pinentry_mode (gpgme_ctx_t ctx, gpgme_pinentry_mode_t mode); +/* Get the pinentry mode of CTX. */ +gpgme_pinentry_mode_t gpgme_get_pinentry_mode (gpgme_ctx_t ctx); + /* Set the passphrase callback function in CTX to CB. HOOK_VALUE is passed as first argument to the passphrase callback function. */ void gpgme_set_passphrase_cb (gpgme_ctx_t ctx, diff --git a/src/libgpgme.vers b/src/libgpgme.vers index c178af9d..358b63c7 100644 --- a/src/libgpgme.vers +++ b/src/libgpgme.vers @@ -85,6 +85,7 @@ GPGME_1.1 { gpgme_io_writen; gpgme_set_pinentry_mode; + gpgme_get_pinentry_mode; };