diff options
| author | Marcus Brinkmann <[email protected]> | 2002-01-22 16:36:08 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2002-01-22 16:36:08 +0000 |
| commit | 498ba7818c52711146f7be8c7e250335f1ed5fe3 (patch) | |
| tree | 4026ff1eb96164e574a22a15e56ea7794313eebb | |
| parent | 2002-01-22 Marcus Brinkmann <[email protected]> (diff) | |
| download | gpgme-498ba7818c52711146f7be8c7e250335f1ed5fe3.tar.gz gpgme-498ba7818c52711146f7be8c7e250335f1ed5fe3.zip | |
2002-01-22 Marcus Brinkmann <[email protected]>
* engine-gpgsm.c (_gpgme_gpgsm_release): Call assuan_disconnect,
not assuan_pipe_disconnect.
* Makefile.am (libgpgme_la_LIBADD): Change to link assuan and
jnlib (needed by assuan) statically into libgpgme. Linking a
static library into a shared library this way is not portable.
| -rw-r--r-- | gpgme/ChangeLog | 9 | ||||
| -rw-r--r-- | gpgme/Makefile.am | 2 | ||||
| -rw-r--r-- | gpgme/engine-gpgsm.c | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index 2e3f4f10..1dc060cb 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,5 +1,14 @@ 2002-01-22 Marcus Brinkmann <[email protected]> + * engine-gpgsm.c (_gpgme_gpgsm_release): Call assuan_disconnect, + not assuan_pipe_disconnect. + + * Makefile.am (libgpgme_la_LIBADD): Change to link assuan and + jnlib (needed by assuan) statically into libgpgme. Linking a + static library into a shared library this way is not portable. + +2002-01-22 Marcus Brinkmann <[email protected]> + * gpgme.h (GpgmePassphraseCb): Change type of R_HD from void* to void**. diff --git a/gpgme/Makefile.am b/gpgme/Makefile.am index 8f7343af..e6c1dd75 100644 --- a/gpgme/Makefile.am +++ b/gpgme/Makefile.am @@ -31,7 +31,7 @@ libgpgme_la_LDFLAGS = -version-info \ @LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@ if BUILD_ASSUAN AM_CPPFLAGS = -I$(top_srcdir)/assuan -libgpgme_la_LIBADD = -L../assuan -lassuan +libgpgme_la_LIBADD = ../assuan/libassuan.a ../jnlib/libjnlib.a endif libgpgme_la_SOURCES = \ diff --git a/gpgme/engine-gpgsm.c b/gpgme/engine-gpgsm.c index ea54dd2d..b66ceaa6 100644 --- a/gpgme/engine-gpgsm.c +++ b/gpgme/engine-gpgsm.c @@ -236,7 +236,7 @@ _gpgme_gpgsm_release (GpgsmObject gpgsm) if (gpgsm->message_fd != -1) _gpgme_io_close (gpgsm->message_fd); - assuan_pipe_disconnect (gpgsm->assuan_ctx); + assuan_disconnect (gpgsm->assuan_ctx); xfree (gpgsm->colon.attic.line); xfree (gpgsm->command); |