2004-08-25 [colin] 0.9.12cvs82.1

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

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 0e93ec9fa37423728a8947f819df9f2353ef6336..9bf8bf46b690b2888e1f9ab32799c0cb0e1f46b9 100644 (file)
--- 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
 2004-08-25 [colin]     0.9.12cvs81.1
 
        * src/plugins/pgpmime/pgpmime.c

diff --git a/PATCHSETS b/PATCHSETS
index 36b1d47358ad2dd92f471762fed0f6a68db67012..027a08dba1e011a92edcc6334e2c9e872c6b3898 100644 (file)
--- 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.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 2f40daa40ce2129f2b81f5559c61631094c3194c..57c58d32305cad97be5fbce3bd3b2e8a15a11c86 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=81
+EXTRA_VERSION=82

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/src/plugins/pgpmime/pgpmime.c b/src/plugins/pgpmime/pgpmime.c
index b45b0e02718c391b529153a1e8f1dd2e672f133c..71701e11d1399d9f914d532c10127287fbde2418 100644 (file)
--- 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;
                if (data->ctx)
                        gpgme_release(data->ctx);
                data->ctx = ctx;

-       }
+       } else 
+               gpgme_release(ctx);

 
        
        return decinfo;
 
        
        return decinfo;