X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=lib%2Fmessage.cc;h=68c020017ea8c87882d11048d3b6e558c302b3df;hb=50340bcb78586dc63b5e0914563665b30e8f88d0;hp=cb313326270e6bc3b0ba5813a5491269e5a62ebb;hpb=a8a270522231b186493ecd97d56a1343382d51d8;p=notmuch

diff --git a/lib/message.cc b/lib/message.cc
index cb313326..68c02001 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -26,7 +26,7 @@
 
 #include <gmime/gmime.h>
 
-struct visible _notmuch_message {
+struct _notmuch_message {
     notmuch_database_t *notmuch;
     Xapian::docid doc_id;
     int frozen;
@@ -946,6 +946,14 @@ notmuch_message_get_filenames (notmuch_message_t *message)
     return _notmuch_filenames_create (message, message->filename_list);
 }
 
+int
+notmuch_message_count_files (notmuch_message_t *message)
+{
+    _notmuch_message_ensure_filename_list (message);
+
+    return _notmuch_string_list_length (message->filename_list);
+}
+
 notmuch_bool_t
 notmuch_message_get_flag (notmuch_message_t *message,
 			  notmuch_message_flag_t flag)
@@ -1037,7 +1045,7 @@ _notmuch_message_set_header_values (notmuch_message_t *message,
     if (date == NULL || *date == '\0') {
 	time_value = 0;
     } else {
-	time_value = g_mime_utils_header_decode_date (date, NULL);
+	time_value = g_mime_utils_header_decode_date_unix (date);
 	/*
 	 * Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=779923
 	 */
@@ -1129,7 +1137,7 @@ _notmuch_message_delete (notmuch_message_t *message)
     query = notmuch_query_create (notmuch, query_string);
     if (query == NULL)
 	return NOTMUCH_STATUS_OUT_OF_MEMORY;
-    status = notmuch_query_count_messages_st (query, &count);
+    status = notmuch_query_count_messages (query, &count);
     if (status) {
 	notmuch_query_destroy (query);
 	return status;
@@ -1843,7 +1851,7 @@ _notmuch_message_ensure_property_map (notmuch_message_t *message)
 	const char *key;
 	char *value;
 
-	value = index(node->string, '=');
+	value = strchr(node->string, '=');
 	if (!value)
 	    INTERNAL_ERROR ("malformed property term");