doc/

2002-04-23  Marcus Brinkmann  <[email protected]>

	* gpgme.texi (Passphrase Callback): Document that either return
	argument can be NULL.
	(Progress Meter Callback): Likewise.

gpgme/
2002-04-23  Marcus Brinkmann  <[email protected]>

	* gpgme.c (gpgme_get_progress_cb): Allow either return parameter
	to be NULL.
	(gpgme_get_passphrase_cb): Likewise.

2 files changed, 12 insertions, 0 deletions

diff --git a/doc/ChangeLog b/doc/ChangeLog
index b1257f5e..279e9831 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-23  Marcus Brinkmann  <[email protected]>
+
+	* gpgme.texi (Passphrase Callback): Document that either return
+	argument can be NULL.
+	(Progress Meter Callback): Likewise.
+
 2002-04-22  Marcus Brinkmann  <[email protected]>
 
 	* gpgme.texi (Passphrase Callback): Fix small typo.  Document the
diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index 63bfde7a..cb466681 100644
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -1188,6 +1188,9 @@ is used when a passphrase needs to be provided by the user in
 @var{*passfunc}, and the first argument for this function in
 @var{*hook_value}.  If no passphrase callback is set, or @var{ctx} is
 not a valid pointer, @code{NULL} is returned in both variables.
+
+@var{passfunc} or @var{hook_value} can be @code{NULL}.  In this case,
+the corresponding value will not be returned.
 @end deftypefun
 
 
@@ -1229,6 +1232,9 @@ used to inform the user about the progress made in @var{*progfunc},
 and the first argument for this function in @var{*hook_value}.  If no
 progress callback is set, or @var{ctx} is not a valid pointer,
 @code{NULL} is returned in both variables.
+
+@var{progfunc} or @var{hook_value} can be @code{NULL}.  In this case,
+the corresponding value will not be returned.
 @end deftypefun