From d901ebf3b91a81043f6a68ff5e43b82ea3b50f29 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Sun, 10 Mar 2002 18:35:33 +0000 Subject: [PATCH] Minor doc fixes --- THANKS | 3 ++- configure.ac | 6 +++--- doc/ChangeLog | 4 ++++ doc/gpgme.texi | 2 +- gpgme/ChangeLog | 4 ++++ gpgme/util.h | 2 +- 6 files changed, 15 insertions(+), 6 deletions(-) diff --git a/THANKS b/THANKS index 48729fd..f318f6c 100644 --- a/THANKS +++ b/THANKS @@ -1,6 +1,7 @@ Alfons Hoogervorst alfons@proteus.demon.nl Enno Cramer uebergeek@web.de +Frank Heckenbach frank@g-n-u.de Jan-Oliver Wagner jan@intevation.de Johannes Poehlmann jhp@caldera.de Jose C. García Sogo jose@jaimedelamo.eu.org @@ -10,7 +11,7 @@ Timo Schulz twoaday@freakmail.de Tommy Reynolds reynolds@redhat.com - Copyright 2001 g10 Code GmbH + Copyright 2001, 2002 g10 Code GmbH This file is free software; as a special exception the author gives unlimited permission to copy and/or distribute it, with or without diff --git a/configure.ac b/configure.ac index ed96ed9..d28a7a6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # configure.in for GPGME # Copyright (C) 2000 Werner Koch (dd9jn) -# Copyright (C) 2001 g10 Code GmbH +# Copyright (C) 2001, 2002 g10 Code GmbH # # This file is part of GPGME. # @@ -26,11 +26,11 @@ # (Interfaces added: AGE++) # (Interfaces removed: AGE=0) # -AC_INIT(gpgme, 0.3.5-cvs, [gnupg-devel@gnupg.org]) +AC_INIT(gpgme, 0.3.5-cvs-2002-03-10, [gnupg-devel@gnupg.org]) LIBGPGME_LT_CURRENT=7 LIBGPGME_LT_AGE=1 LIBGPGME_LT_REVISION=0 -NEED_GPG_VERSION=1.0.6 +NEED_GPG_VERSION=1.0.6d NEED_GPGSM_VERSION=0.3.1 ############################################## AC_PREREQ(2.52) diff --git a/doc/ChangeLog b/doc/ChangeLog index 72b31b8..eaa1f69 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2002-03-08 Werner Koch + + * gpgme.texi (Detailed Results): Import does also return info. + 2002-03-06 Marcus Brinkmann * gpgme.texi (Encrypting a Plaintext): Document symmetric diff --git a/doc/gpgme.texi b/doc/gpgme.texi index 855f0d4..573742f 100644 --- a/doc/gpgme.texi +++ b/doc/gpgme.texi @@ -2370,7 +2370,7 @@ Here is a sample of the information that might be returned: @end example Currently, the only operations that return additional information are -encrypt and sign. @xref{Encrypt}, @xref{Sign}. +encrypt, sign and import. @xref{Encrypt}, @xref{Sign}, @xref(Importing Keys}. The function returns a string or @code{NULL} if no such data is available. diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index 53fa099..619e802 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,3 +1,7 @@ +2002-03-08 Werner Koch + + * util.h [!HAVE_FOPENCOOKIE]: Fixed type. Thanks to Frank Heckenbach. + 2002-03-07 Werner Koch * gpgme.h (gpgme_op_keylist_ext_start): Add prototype. diff --git a/gpgme/util.h b/gpgme/util.h index 045c8bf..170f7fe 100644 --- a/gpgme/util.h +++ b/gpgme/util.h @@ -139,7 +139,7 @@ typedef struct ssize_t (*read)(void*,char*,size_t); ssize_t (*write)(void*,const char*,size_t); int (*seek)(void*,off_t*,int); - int (*close)(coid*); + int (*close)(void*); } _IO_cookie_io_functions_t; typedef _IO_cookie_io_functions_t cookie_io_functions_t; FILE *fopencookie (void *cookie, const char *opentype, -- 2.26.2