2002-02-01 Marcus Brinkmann <marcus@g10code.de>

	* Makefile.am (EXTRA_gpgme_openpgp_la_SOURCES): New variable.
	(EXTRA_gpgme_smime_la_SOURCES): Likewise.

	* gpgmeplug.c (passphrase_cb): Fix type of third argument.

diff --git a/gpgmeplug/ChangeLog b/gpgmeplug/ChangeLog
index fec6126955d13a15958e04b8cbd8ca39a376f1c2..d9d91ff947f1aebae97d34e91a906c1ed1eb2dd6 100644 (file)
--- a/gpgmeplug/ChangeLog
+++ b/gpgmeplug/ChangeLog
@@ -1,3 +1,10 @@
+2002-02-01  Marcus Brinkmann  <marcus@g10code.de>
+
+       * Makefile.am (EXTRA_gpgme_openpgp_la_SOURCES): New variable.
+       (EXTRA_gpgme_smime_la_SOURCES): Likewise.
+
+       * gpgmeplug.c (passphrase_cb): Fix type of third argument.
+
 2002-01-16  Marcus Brinkmann  <marcus@g10code.de>
 
        * gpgme-openpgp.c: New file.

diff --git a/gpgmeplug/Makefile.am b/gpgmeplug/Makefile.am
index bb28d05a6a30f45a03db761a180cdfff32258422..78422a03454fa3768dfb5be62366677babdc6cfc 100644 (file)
--- a/gpgmeplug/Makefile.am
+++ b/gpgmeplug/Makefile.am
@@ -29,9 +29,11 @@ INCLUDES = -I$(top_srcdir)/gpgme
 pkglib_LTLIBRARIES = gpgme-openpgp.la gpgme-smime.la
 
 gpgme_openpgp_la_SOURCES = cryptplug.h gpgme-openpgp.c
+EXTRA_gpgme_openpgp_la_SOURCES = gpgmeplug.c
 gpgme_openpgp_la_LIBADD = ../gpgme/libgpgme.la
 gpgme_openpgp_la_LDFLAGS = -module -avoid-version
 
 gpgme_smime_la_SOURCES = cryptplug.h gpgme-smime.c
+EXTRA_gpgme_smime_la_SOURCES = gpgmeplug.c
 gpgme_smime_la_LIBADD = ../gpgme/libgpgme.la
 gpgme_smime_la_LDFLAGS = -module -avoid-version

diff --git a/gpgmeplug/gpgmeplug.c b/gpgmeplug/gpgmeplug.c
index 3450a2cb81662a13aff7495a17729df38d25fe54..d653a52eed66b9ca9b253eb02b2a464c51a316a5 100644 (file)
--- a/gpgmeplug/gpgmeplug.c
+++ b/gpgmeplug/gpgmeplug.c
@@ -183,7 +183,7 @@ struct passphrase_cb_info_s {
     int did_it;
 };
 static const char *
-passphrase_cb (void *opaque, const char *desc, void *r_hd)
+passphrase_cb (void *opaque, const char *desc, void **r_hd)
 {
     return tmpPassphrase;
 }