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

* 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.
This commit is contained in:
Marcus Brinkmann 2002-01-22 16:36:08 +00:00
parent 4da57b04cb
commit 498ba7818c
3 changed files with 11 additions and 2 deletions

View File

@ -1,3 +1,12 @@
2002-01-22 Marcus Brinkmann <marcus@g10code.de>
* 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 <marcus@g10code.de>
* gpgme.h (GpgmePassphraseCb): Change type of R_HD from void* to

View File

@ -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 = \

View File

@ -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);