From: David Bremner <david@tethera.net>
Date: Wed, 17 May 2017 01:59:54 +0000 (-0300)
Subject: lib: wrap use of g_mime_utils_header_decode_date
X-Git-Tag: 0.25_rc0~22
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=c040464a7c8f339d15f691113b8f5fd901229bcb;hp=fd6e4a99535cb5142381803bc4ea4f4f79d8d459;ds=sidebyside

lib: wrap use of g_mime_utils_header_decode_date

This changes return type in gmime 3.0
---

diff --git a/lib/message.cc b/lib/message.cc
index b330dcce..f78e5a9d 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -1037,7 +1037,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
 	 */
diff --git a/util/gmime-extra.c b/util/gmime-extra.c
index 350f75ea..3c50a293 100644
--- a/util/gmime-extra.c
+++ b/util/gmime-extra.c
@@ -99,6 +99,11 @@ g_mime_signature_status_error (GMimeSignatureError error) {
     return (error != GMIME_SIGNATURE_ERROR_NONE);
 }
 
+time_t
+g_mime_utils_header_decode_date_unix (const char *date) {
+    return g_mime_utils_header_decode_date (date, NULL);
+}
+
 #else /* GMime >= 3.0 */
 
 char *
@@ -166,5 +171,19 @@ g_mime_signature_status_error (GMimeSignatureStatus status) {
     return (status & GMIME_SIGNATURE_STATUS_ERROR_MASK);
 }
 
+gint64
+g_mime_utils_header_decode_date_unix (const char *date) {
+    GDateTime* parsed_date = g_mime_utils_header_decode_date (date);
+    time_t ret;
+
+    if (parsed_date) {
+	ret = g_date_time_to_unix (parsed_date);
+	g_date_time_unref (parsed_date);
+    } else {
+	ret = 0;
+    }
+
+    return ret;
+}
 
 #endif
diff --git a/util/gmime-extra.h b/util/gmime-extra.h
index 6b74724e..d744c4e4 100644
--- a/util/gmime-extra.h
+++ b/util/gmime-extra.h
@@ -94,4 +94,6 @@ gboolean g_mime_signature_status_good (GMimeSignatureStatus status);
 gboolean g_mime_signature_status_bad (GMimeSignatureStatus status);
 
 gboolean g_mime_signature_status_error (GMimeSignatureError status);
+
+gint64 g_mime_utils_header_decode_date_unix (const char *date);
 #endif