From fcc5b12907852ff71266bfa3fc26b350dac20215 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Wed, 25 Aug 2004 08:46:24 +0000 Subject: [PATCH] 2004-08-25 [colin] 0.9.12cvs82.1 * src/plugins/pgpmime/pgpmime.c Sync with HEAD. --- ChangeLog-gtk2.claws | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/plugins/pgpmime/pgpmime.c | 3 ++- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 0e93ec9fa..9bf8bf46b 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,8 @@ +2004-08-25 [colin] 0.9.12cvs82.1 + + * src/plugins/pgpmime/pgpmime.c + Sync with HEAD. + 2004-08-25 [colin] 0.9.12cvs81.1 * src/plugins/pgpmime/pgpmime.c diff --git a/PATCHSETS b/PATCHSETS index 36b1d4735..027a08dba 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -140,3 +140,4 @@ ( cvs diff -u -r 1.155.2.10 -r 1.155.2.11 src/Makefile.am; cvs diff -u -r 1.115.2.15 -r 1.115.2.16 src/main.c; cvs diff -u -r 1.5.2.1 -r 1.5.2.2 src/setup.c; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 src/setup.h; cvs diff -u -r 1.25.2.5 -r 1.25.2.6 src/stock_pixmap.c; cvs diff -u -r 1.18.2.3 -r 1.18.2.4 src/stock_pixmap.h; cvs diff -u -r 0 -r 1 src/wizard.c; cvs diff -u -r 0 -r 1 src/wizard.h; cvs diff -u -r 0 -r 1 src/pixmaps/sylpheed_icon.xpm; ) > 0.9.12cvs80.2.patchset ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/wizard.c; ) > 0.9.12cvs80.3.patchset ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpmime/pgpmime.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpmime/sgpgme.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpmime/sgpgme.h; ) > 0.9.12cvs81.1.patchset +( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpmime/pgpmime.c; ) > 0.9.12cvs82.1.patchset diff --git a/configure.ac b/configure.ac index 2f40daa40..57c58d323 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=12 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=81 +EXTRA_VERSION=82 EXTRA_RELEASE= EXTRA_GTK2_VERSION=.1 diff --git a/src/plugins/pgpmime/pgpmime.c b/src/plugins/pgpmime/pgpmime.c index b45b0e027..71701e11d 100644 --- a/src/plugins/pgpmime/pgpmime.c +++ b/src/plugins/pgpmime/pgpmime.c @@ -311,7 +311,8 @@ static MimeInfo *pgpmime_decrypt(MimeInfo *mimeinfo) if (data->ctx) gpgme_release(data->ctx); data->ctx = ctx; - } + } else + gpgme_release(ctx); return decinfo; -- 2.25.1