From: Marcus Brinkmann Date: Fri, 1 Feb 2002 20:28:35 +0000 (+0000) Subject: 2002-02-01 Marcus Brinkmann X-Git-Tag: gpgme-1.2.0@1385~1113 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=20b46ef55f8bf6610aec9523891c5ace3aea6d3b;p=gpgme.git 2002-02-01 Marcus Brinkmann * 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/trunk/gpgmeplug/ChangeLog b/trunk/gpgmeplug/ChangeLog index fec6126..d9d91ff 100644 --- a/trunk/gpgmeplug/ChangeLog +++ b/trunk/gpgmeplug/ChangeLog @@ -1,3 +1,10 @@ +2002-02-01 Marcus Brinkmann + + * 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 * gpgme-openpgp.c: New file. diff --git a/trunk/gpgmeplug/Makefile.am b/trunk/gpgmeplug/Makefile.am index bb28d05..78422a0 100644 --- a/trunk/gpgmeplug/Makefile.am +++ b/trunk/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/trunk/gpgmeplug/gpgmeplug.c b/trunk/gpgmeplug/gpgmeplug.c index 3450a2c..d653a52 100644 --- a/trunk/gpgmeplug/gpgmeplug.c +++ b/trunk/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; }