[git] GPGME - branch, master, updated. gpgme-1.7.1-36-g16a3020

[by Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, master has been updated
       via  16a30205064914eef578d84d07141b5d51d82838 (commit)
       via  d50bdb269e86db36a443958e3bfc6816a44d468e (commit)
       via  da035768bd9a880becee5d0d553dfe12299f96eb (commit)
      from  05775b52485a0d37033b26d696f36c622a4aa32e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 16a30205064914eef578d84d07141b5d51d82838
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Fri Nov 11 15:16:43 2016 +0900

    doc: Correct deftypefun for gpgme_op_decrypt_verify_start.
    
    * doc/gpgme.texi: Documentationabout gpgme_op_decrypt_verify_start was
    stored under the name gpgme_op_decrypt_verify instead.
    
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index 414de34..801a53f 100644
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -5117,7 +5117,7 @@ secret key could not be retrieved, and passes through any errors that
 are reported by the crypto engine support routines.
 @end deftypefun
 
- at deftypefun gpgme_error_t gpgme_op_decrypt_verify (@w{gpgme_ctx_t @var{ctx}}, @w{gpgme_data_t @var{cipher}}, @w{gpgme_data_t @var{plain}})
+ at deftypefun gpgme_error_t gpgme_op_decrypt_verify_start (@w{gpgme_ctx_t @var{ctx}}, @w{gpgme_data_t @var{cipher}}, @w{gpgme_data_t @var{plain}})
 The function @code{gpgme_op_decrypt_verify_start} initiates a
 @code{gpgme_op_decrypt_verify} operation.  It can be completed by
 calling @code{gpgme_wait} on the context.  @xref{Waiting For

commit d50bdb269e86db36a443958e3bfc6816a44d468e
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Fri Nov 11 14:25:19 2016 +0900

    doc: Correct text about gpgme_cancel_async.
    
    * doc/gpgme.texi: Documentation about gpgme_cancel_async should refer
    to the correct name.
    
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index ee5ba6d..414de34 100644
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -6537,7 +6537,7 @@ case the state of @var{ctx} is not modified).
 
 
 @deftypefun gpgme_ctx_t gpgme_cancel_async (@w{gpgme_ctx_t @var{ctx}})
-The function @code{gpgme_cancel} attempts to cancel a pending
+The function @code{gpgme_cancel_async} attempts to cancel a pending
 operation in the context @var{ctx}.  This can be called by any thread
 at any time after starting an operation on the context, but will not
 take effect immediately.  The actual cancellation happens at the next

commit da035768bd9a880becee5d0d553dfe12299f96eb
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Thu Nov 10 15:47:48 2016 -0800

    core: Non-zero values should set _armor, _textmode, and _online.
    
    * src/gpgme.c (gpgme_set_armor, gpgme_set_textmode,
    gpgme_set_offline): Ensure that non-zero values actually set the
    appropriate internal bit.
    
    --
    
    The documentation for these functions says things like "disabled if
    YES is zero, and enabled otherwise", where YES is an integer.
    However, if you pass an even integer, it will be aliased back to 0
    because the context member variables are declared as single bits.
    
    This should make the implementation match the documentation.
    
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/src/gpgme.c b/src/gpgme.c
index 6d0dbff..443cb76 100644
--- a/src/gpgme.c
+++ b/src/gpgme.c
@@ -504,7 +504,7 @@ gpgme_set_armor (gpgme_ctx_t ctx, int use_armor)
   if (!ctx)
     return;
 
-  ctx->use_armor = use_armor;
+  ctx->use_armor = !!use_armor;
 }
 
 
@@ -531,7 +531,7 @@ gpgme_set_textmode (gpgme_ctx_t ctx, int use_textmode)
   if (!ctx)
     return;
 
-  ctx->use_textmode = use_textmode;
+  ctx->use_textmode = !!use_textmode;
 }
 
 /* Return the state of the textmode flag.  */
@@ -555,7 +555,7 @@ gpgme_set_offline (gpgme_ctx_t ctx, int offline)
   if (!ctx)
     return;
 
-  ctx->offline = offline;
+  ctx->offline = !!offline;
 }
 
 /* Return the state of the offline flag.  */

-----------------------------------------------------------------------

Summary of changes:
 doc/gpgme.texi | 4 ++--
 src/gpgme.c    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org