Fix to decode header values, (primarily subject).

Use GMime function to decode message-header values according to
RFC 2047.

diff --git a/message-file.c b/message-file.c
index 0b39dc43e5dc13f127d7e99de4d8258a4c965acf..0cb85d84a9c6c86d8d9fde1a2856f9beac293821 100644 (file)
--- a/message-file.c
+++ b/message-file.c
@@ -22,6 +22,8 @@
 
 #include "notmuch-private.h"
 
 
 #include "notmuch-private.h"
 

+#include <gmime/gmime.h>
+

 #include <glib.h> /* GHashTable */
 
 typedef struct {
 #include <glib.h> /* GHashTable */
 
 typedef struct {


@@ -213,9 +215,15 @@ notmuch_message_file_get_header (notmuch_message_file_t *message,
                                 const char *header_desired)
 {
     int contains;
                                 const char *header_desired)
 {
     int contains;

-    char *header, *value;
+    char *header, *decoded_value;

     const char *s, *colon;
     int match;
     const char *s, *colon;
     int match;

+    static int initialized = 0;
+
+    if (! initialized) {
+       g_mime_init (0);
+       initialized = 1;
+    }

 
     message->parsing_started = 1;
 
 
     message->parsing_started = 1;
 


@@ -224,10 +232,10 @@ notmuch_message_file_get_header (notmuch_message_file_t *message,
     else
        contains = g_hash_table_lookup_extended (message->headers,
                                                 header_desired, NULL,
     else
        contains = g_hash_table_lookup_extended (message->headers,
                                                 header_desired, NULL,

-                                                (gpointer *) &value);
+                                                (gpointer *) &decoded_value);

 
 

-    if (contains && value)
-       return value;
+    if (contains && decoded_value)
+       return decoded_value;

 
     if (message->parsing_finished)
        return NULL;
 
     if (message->parsing_finished)
        return NULL;


@@ -309,12 +317,12 @@ notmuch_message_file_get_header (notmuch_message_file_t *message,
        else
            match = (strcasecmp (header, header_desired) == 0);
 
        else
            match = (strcasecmp (header, header_desired) == 0);
 

-       value = xstrdup (message->value.str);
+       decoded_value = g_mime_utils_header_decode_text (message->value.str);

 
 

-       g_hash_table_insert (message->headers, header, value);
+       g_hash_table_insert (message->headers, header, decoded_value);

 
        if (match)
 
        if (match)

-           return value;
+           return decoded_value;

     }
 
     if (message->line)
     }
 
     if (message->line)