debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-22 17:34:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix to decode header values, (primarily subject).

Browse source 
Use GMime function to decode message-header values according to
RFC 2047.
This commit is contained in:
Carl Worth 2009-11-02 14:32:20 -08:00
parent d6615b554e
commit 6a7f4df6f7
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
message-file.c
View file

@ -22,6 +22,8 @@
#include "notmuch-private.h" #include "notmuch-private.h"
#include <gmime/gmime.h>
#include <glib.h> /* GHashTable */ #include <glib.h> /* GHashTable */
typedef struct { typedef struct {
@ -213,9 +215,15 @@ notmuch_message_file_get_header (notmuch_message_file_t *message,
const char *header_desired) const char *header_desired)
{ {
int contains; int contains;
char *header, *value; char *header, *decoded_value;
const char *s, *colon; const char *s, *colon;
int match; 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 else
contains = g_hash_table_lookup_extended (message->headers, contains = g_hash_table_lookup_extended (message->headers,
header_desired, NULL, header_desired, NULL,
(gpointer *) &value); (gpointer *) &decoded_value);
if (contains && value) if (contains && decoded_value)
return value; return decoded_value;
if (message->parsing_finished) if (message->parsing_finished)
return NULL; return NULL;
@ -309,12 +317,12 @@ notmuch_message_file_get_header (notmuch_message_file_t *message,
else else
match = (strcasecmp (header, header_desired) == 0); 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)