From: Colin Leroy <colin@colino.net>
Date: Wed, 24 Nov 2004 16:47:20 +0000 (+0000)
Subject: 2004-11-24 [colin]	0.9.12cvs172.1
X-Git-Tag: gtk2_win32_last_merge~58
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=4e2eb90d5956c5ec52bef09e8a9cd74edd81adf2

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 42997b55f..5dedc2ba4 100644
--- 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 e9e6d1e13..454e14a0f 100644
--- 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 30230a027..e1e423920 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=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 60aabebf9..fcab880ef 100644
--- 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;