2004-11-24 [colin] 0.9.12cvs172.1

	* src/plugins/pgpmime/pgpmime.c
		Sync with HEAD

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 42997b55f1e290676a7355948e2cace4d7f142eb..5dedc2ba4bece1dfece9624cc2e0e43a17f2ff32 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-11-24 [colin]     0.9.12cvs172.1
+
+       * src/plugins/pgpmime/pgpmime.c
+               Sync with HEAD
+
 2004-11-24 [colin]     0.9.12cvs171.1
 
        * src/plugins/pgpmime/pgpmime.c

diff --git a/PATCHSETS b/PATCHSETS
index e9e6d1e1367f1304fa5650ff1a9e516217cb24b4..454e14a0f55908ca32dc2a54ea24da33655ab3ab 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -261,3 +261,4 @@
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/partial_download.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/partial_download.h; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpmime/plugin.c; ) > 0.9.12cvs168.1.patchset
 ( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpmime/plugin.c; cvs diff -u -r 1.4.2.1 -r 1.4.2.2 src/plugins/trayicon/Makefile.am; cvs diff -u -r 0 -r 1 src/plugins/trayicon/newmarkedmail.xpm; cvs diff -u -r 1.14.2.12 -r 1.14.2.13 src/plugins/trayicon/trayicon.c; cvs diff -u -r 0 -r 1 src/plugins/trayicon/unreadmarkedmail.xpm; ) > 0.9.12cvs169.1.patchset
 ( cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/plugins/pgpmime/pgpmime.c; ) > 0.9.12cvs171.1.patchset
+( cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/plugins/pgpmime/pgpmime.c; ) > 0.9.12cvs172.1.patchset

diff --git a/configure.ac b/configure.ac
index 30230a027ec6c511d4b9058c586685b18d0ced31..e1e423920b676c23f162e0afecb4e87dd3ab9d36 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=171
+EXTRA_VERSION=172
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/src/plugins/pgpmime/pgpmime.c b/src/plugins/pgpmime/pgpmime.c
index 60aabebf96c9b118155f0720136c1f75e08d63df..fcab880ef53659d7b12cb852c7ccaa22fb201b2d 100644 (file)
--- a/src/plugins/pgpmime/pgpmime.c
+++ b/src/plugins/pgpmime/pgpmime.c
@@ -453,8 +453,10 @@ gboolean pgpmime_sign(MimeInfo *mimeinfo, PrefsAccount *account)
        gpgme_new(&ctx);
        gpgme_set_textmode(ctx, 1);
        gpgme_set_armor(ctx, 1);
-       if (!sgpgme_setup_signers(ctx, account))
+       if (!sgpgme_setup_signers(ctx, account)) {
+               gpgme_release(ctx);
                return FALSE;
+       }
 
        if (!getenv("GPG_AGENT_INFO")) {
                info.c = ctx;