X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fmessage-file.c;h=4d9af89fe44dd5923cee743572149f4cf2c22f46;hp=99505c117b9d9d9bba1efe91dc701a11dbba3bf5;hb=9a31cbd3867b286fb7c26533d1d8589d49e879cc;hpb=d3fdb76c8d5e1535ead0086821775cf7809d6e1c

diff --git a/lib/message-file.c b/lib/message-file.c
index 99505c11..4d9af89f 100644
--- a/lib/message-file.c
+++ b/lib/message-file.c
@@ -111,7 +111,7 @@ _notmuch_message_file_open_ctx (void *ctx, const char *filename)
     message->headers = g_hash_table_new_full (strcase_hash,
 					      strcase_equal,
 					      free,
-					      free);
+					      g_free);
 
     message->parsing_started = 0;
     message->parsing_finished = 0;
@@ -329,7 +329,7 @@ notmuch_message_file_get_header (notmuch_message_file_t *message,
 	/* we treat the Received: header special - we want to concat ALL of 
 	 * the Received: headers we encounter.
 	 * for everything else we return the first instance of a header */
-	if (is_received) {
+	if (strcasecmp(header, "received") == 0) {
 	    if (header_sofar == NULL) {
 		/* first Received: header we encountered; just add it */
 		g_hash_table_insert (message->headers, header, decoded_value);
@@ -337,11 +337,11 @@ notmuch_message_file_get_header (notmuch_message_file_t *message,
 		/* we need to add the header to those we already collected */
 		newhdr = strlen(decoded_value);
 		hdrsofar = strlen(header_sofar);
-		combined_header = xmalloc(hdrsofar + newhdr + 2);
+		combined_header = g_malloc(hdrsofar + newhdr + 2);
 		strncpy(combined_header,header_sofar,hdrsofar);
 		*(combined_header+hdrsofar) = ' ';
 		strncpy(combined_header+hdrsofar+1,decoded_value,newhdr+1);
-		free (decoded_value);
+		g_free (decoded_value);
 		g_hash_table_insert (message->headers, header, combined_header);
 	    }
 	} else {
@@ -350,7 +350,7 @@ notmuch_message_file_get_header (notmuch_message_file_t *message,
 		g_hash_table_insert (message->headers, header, decoded_value);
 	    } else {
 		free (header);
-		free (decoded_value);
+		g_free (decoded_value);
 		decoded_value = header_sofar;
 	    }
 	}