diff options
| -rw-r--r-- | gpgmeplug/ChangeLog | 7 | ||||
| -rw-r--r-- | gpgmeplug/Makefile.am | 2 | ||||
| -rw-r--r-- | gpgmeplug/gpgmeplug.c | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/gpgmeplug/ChangeLog b/gpgmeplug/ChangeLog index fec61269..d9d91ff9 100644 --- a/gpgmeplug/ChangeLog +++ b/gpgmeplug/ChangeLog @@ -1,3 +1,10 @@ +2002-02-01 Marcus Brinkmann <[email protected]> + + * 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 <[email protected]> * gpgme-openpgp.c: New file. diff --git a/gpgmeplug/Makefile.am b/gpgmeplug/Makefile.am index bb28d05a..78422a03 100644 --- 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 3450a2cb..d653a52e 100644 --- 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; } |