notmuch show: Don't show the subject line twice.

[notmuch] / message.cc

diff --git a/message.cc b/message.cc
index 2a9001493721dc5493d643659c36afde4f74028b..28f19a88502dc79ff29210297abfbed4f5ef2562 100644 (file)
--- a/message.cc
+++ b/message.cc
@@ -21,6 +21,8 @@
 #include "notmuch-private.h"
 #include "database-private.h"
 
+#include <gmime/gmime.h>
+
 #include <xapian.h>
 
 struct _notmuch_message {
@@ -257,27 +259,6 @@ notmuch_message_get_header (notmuch_message_t *message, const char *header)
     return notmuch_message_file_get_header (message->message_file, header);
 }
 
-const char *
-notmuch_message_get_all_headers (notmuch_message_t *message)
-{
-    _notmuch_message_ensure_message_file (message);
-    if (message->message_file == NULL)
-       return NULL;
-
-    return notmuch_message_file_get_all_headers (message->message_file);
-}
-
-size_t
-notmuch_message_get_header_size (notmuch_message_t *message)
-{
-    _notmuch_message_ensure_message_file (message);
-    if (message->message_file == NULL)
-       return 0;
-
-    return notmuch_message_file_get_header_size (message->message_file);
-
-}
-
 const char *
 notmuch_message_get_thread_id (notmuch_message_t *message)
 {
@@ -428,7 +409,12 @@ _notmuch_message_set_date (notmuch_message_t *message,
 {
     time_t time_value;
 
-    time_value = notmuch_parse_date (date, NULL);
+    /* GMime really doesn't want to see a NULL date, so protect its
+     * sensibilities. */
+    if (date == NULL)
+       time_value = 0;
+    else
+       time_value = g_mime_utils_header_decode_date (date, NULL);
 
     message->doc.add_value (NOTMUCH_VALUE_TIMESTAMP,
                            Xapian::sortable_serialise (time_value));