0.9.7claws5

* src/procmime.c
        o be more liberal in what we accept as Content-Type parameters
        o ignore comments after parameters

* src/sgpgme.c
        o only free passphrase when an error occurs

diff --git a/ChangeLog.claws b/ChangeLog.claws
index c6d3f7826478f1f976d12fd47b4fc4e730bc9034..60eb5e864d57c1826433c9403b5dbc0e8214cbf5 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,12 @@
+2003-11-28 [christoph] 0.9.7claws5
+
+       * src/procmime.c
+               o be more liberal in what we accept as Content-Type parameters
+               o ignore comments after parameters
+
+       * src/sgpgme.c
+               o only free passphrase when an error occurs
+
 2003-11-28 [paul]      0.9.7claws4
 
        * src/account.c

diff --git a/configure.ac b/configure.ac
index 99e6b98c559ad2e1bc9c68a2f40cb8ef5361bd34..fa00c30fc47642b06c444a1e648c697c3be99e78 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=7
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=4
+EXTRA_VERSION=5
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/procmime.c b/src/procmime.c
index cbce54dc5de23d27b3e6ce3025dece1b3de080ef..f8ec7cc4eda6e241e90efe406259d9b758619598 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -1080,9 +1080,15 @@ static void procmime_parse_content_type(const gchar *content_type, MimeInfo *mim
 
                parameters_parts = g_strsplit(*strarray, "=", 1);
                if ((parameters_parts[0] != NULL) && (parameters_parts[1] != NULL)) {
+                       gchar *firstspace;
+
+                       g_strstrip(parameters_parts[0]);
+                       g_strstrip(parameters_parts[1]);
                        g_strdown(parameters_parts[0]);
                        if(parameters_parts[1][0] == '"')
                                extract_quote(parameters_parts[1], '"');
+                       else if ((firstspace = strchr(parameters_parts[1], ' ')) != NULL)
+                               *firstspace = '\0';
 
                        g_hash_table_insert(mimeinfo->parameters,
                                            g_strdup(parameters_parts[0]),

diff --git a/src/sgpgme.c b/src/sgpgme.c
index 1fa2761d9366527e286e0eb84a6ddf7e81012577..4f23097be7f8c4869c3613b815c7771f49e982a6 100644 (file)
--- a/src/sgpgme.c
+++ b/src/sgpgme.c
@@ -253,10 +253,10 @@ GpgmeData sgpgme_decrypt(GpgmeData cipher)
        }
 
        err = gpgme_op_decrypt(ctx, cipher, plain);
-       gpgmegtk_free_passphrase();
        gpgme_release(ctx);
 
        if (err != GPGME_No_Error) {
+               gpgmegtk_free_passphrase();
                gpgme_data_release(plain);
                return NULL;
        }