aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--THANKS3
-rw-r--r--configure.ac6
-rw-r--r--doc/ChangeLog4
-rw-r--r--doc/gpgme.texi2
-rw-r--r--gpgme/ChangeLog4
-rw-r--r--gpgme/util.h2
6 files changed, 15 insertions, 6 deletions
diff --git a/THANKS b/THANKS
index 48729fdf..f318f6cb 100644
--- a/THANKS
+++ b/THANKS
@@ -1,6 +1,7 @@
Alfons Hoogervorst [email protected]
Enno Cramer [email protected]
+Frank Heckenbach [email protected]
Jan-Oliver Wagner [email protected]
Johannes Poehlmann [email protected]
Jose C. Garc�a Sogo [email protected]
@@ -10,7 +11,7 @@ Timo Schulz [email protected]
Tommy Reynolds [email protected]
- 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 ed96ed93..d28a7a61 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, [[email protected]])
+AC_INIT(gpgme, 0.3.5-cvs-2002-03-10, [[email protected]])
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 72b31b8f..eaa1f69b 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-08 Werner Koch <[email protected]>
+
+ * gpgme.texi (Detailed Results): Import does also return info.
+
2002-03-06 Marcus Brinkmann <[email protected]>
* gpgme.texi (Encrypting a Plaintext): Document symmetric
diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index 855f0d49..573742f3 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 53fa0990..619e802f 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-08 Werner Koch <[email protected]>
+
+ * util.h [!HAVE_FOPENCOOKIE]: Fixed type. Thanks to Frank Heckenbach.
+
2002-03-07 Werner Koch <[email protected]>
* gpgme.h (gpgme_op_keylist_ext_start): Add prototype.
diff --git a/gpgme/util.h b/gpgme/util.h
index 045c8bfe..170f7fe5 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,