2002-02-01 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Fri, 1 Feb 2002 20:28:35 +0000 (20:28 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Fri, 1 Feb 2002 20:28:35 +0000 (20:28 +0000)
* Makefile.am (EXTRA_gpgme_openpgp_la_SOURCES): New variable.
(EXTRA_gpgme_smime_la_SOURCES): Likewise.

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

gpgmeplug/ChangeLog
gpgmeplug/Makefile.am
gpgmeplug/gpgmeplug.c

index fec6126..d9d91ff 100644 (file)
@@ -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.
index bb28d05..78422a0 100644 (file)
@@ -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
index 3450a2c..d653a52 100644 (file)
@@ -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;
 }