[gmime] Fixed for real this time.. I hope?



commit 534d223c94c1773b1cda44adc5bc9e9f955caedd
Author: Jeffrey Stedfast <jestedfa microsoft com>
Date:   Wed Mar 15 22:01:17 2017 -0400

    Fixed for real this time.. I hope?

 gmime/gmime-param.c |    9 ++++-----
 tests/test-mime.c   |    4 ----
 2 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/gmime/gmime-param.c b/gmime/gmime-param.c
index 33f9584..55d08c8 100644
--- a/gmime/gmime-param.c
+++ b/gmime/gmime-param.c
@@ -731,13 +731,12 @@ g_mime_param_list_encode (GMimeParamList *list, gboolean fold, GString *str)
                                        used = 1;
                                }
                                
-                               g_string_append_printf (str, "%s*%d%s=", param->name,
-                                                       i++, encoded ? "*" : "");
+                               g_string_append_printf (str, "%s*%d*=", param->name, i++);
                                
-                               if (encoded || !quote)
-                                       g_string_append_len (str, inptr, (size_t) (ptr - inptr));
-                               else
+                               if (quote)
                                        g_string_append_len_quoted (str, inptr, (size_t) (ptr - inptr));
+                               else
+                                       g_string_append_len (str, inptr, (size_t) (ptr - inptr));
                                
                                used += (str->len - here);
                                
diff --git a/tests/test-mime.c b/tests/test-mime.c
index 83a4dd5..08f4c13 100644
--- a/tests/test-mime.c
+++ b/tests/test-mime.c
@@ -556,8 +556,6 @@ test_rfc2184 (GMimeParserOptions *options)
        size_t n;
        guint i;
 
-       verbose = 4;
-       
        for (i = 0; i < G_N_ELEMENTS (rfc2184); i++) {
                params = g_mime_param_list_new ();
                g_mime_param_list_set_parameter (params, "filename", rfc2184[i].input);
@@ -612,8 +610,6 @@ test_rfc2184 (GMimeParserOptions *options)
                
                g_string_free (str, TRUE);
        }
-
-       verbose = 1;
 }
 
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]