Minor doc fixes

diff --git a/trunk/THANKS b/trunk/THANKS
index 48729fdfce86c7ad62f8c64b68c6be0f5e04c607..f318f6cbb578aa999cd2cf05b5d5b839b0f5f334 100644 (file)
--- a/trunk/THANKS
+++ b/trunk/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/trunk/configure.ac b/trunk/configure.ac
index ed96ed93f925c2f297691f5f208cad931aecc912..d28a7a6100c494e564dc2f7a897b2a6e5c230035 100644 (file)
--- a/trunk/configure.ac
+++ b/trunk/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/trunk/doc/ChangeLog b/trunk/doc/ChangeLog
index 72b31b8f3485e929b83adb4d8b80c368aed26338..eaa1f69bf7abdb46c7730f8d38cc214409a0e283 100644 (file)
--- a/trunk/doc/ChangeLog
+++ b/trunk/doc/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-08  Werner Koch  <wk@gnupg.org>
+
+       * gpgme.texi (Detailed Results): Import does also return info.
+
 2002-03-06  Marcus Brinkmann  <marcus@g10code.de>
 
        * gpgme.texi (Encrypting a Plaintext): Document symmetric

diff --git a/trunk/doc/gpgme.texi b/trunk/doc/gpgme.texi
index 855f0d498ad4771242bfda59e77b78652f2c8b86..573742f3eb34d3c1e492cb08fb08c7459cba4488 100644 (file)
--- a/trunk/doc/gpgme.texi
+++ b/trunk/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/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index 53fa09906c44c3faab0638984583e7b5aeef4f91..619e802f3cc0fe9ee245fd74bec9c74768a7fd17 100644 (file)
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-08  Werner Koch  <wk@gnupg.org>
+
+       * util.h [!HAVE_FOPENCOOKIE]: Fixed type.  Thanks to Frank Heckenbach.
+
 2002-03-07  Werner Koch  <wk@gnupg.org>
 
        * gpgme.h (gpgme_op_keylist_ext_start): Add prototype.

diff --git a/trunk/gpgme/util.h b/trunk/gpgme/util.h
index 045c8bfe57888d572ac44400f89fae592b4b832c..170f7fe5dfa9c4fc554cd13aa645726d11717094 100644 (file)
--- a/trunk/gpgme/util.h
+++ b/trunk/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,