gmime-cleanup: remove GMime 2.6 variant codeblocks

[notmuch] / util / gmime-extra.c

diff --git a/util/gmime-extra.c b/util/gmime-extra.c
index 8590c55d184b747799f7a30b545963e748f5de10..4b577a5b1cc7457fa11e128615a2ddff3580467d 100644 (file)
--- a/util/gmime-extra.c
+++ b/util/gmime-extra.c
@@ -1,4 +1,5 @@
 #include "gmime-extra.h"
+#include <string.h>
 
 GMimeStream *
 g_mime_stream_stdout_new()
@@ -30,50 +31,35 @@ g_string_talloc_strdup (void *ctx, char *g_string)
     return new_str;
 }
 
-#if (GMIME_MAJOR_VERSION < 3)
-
-char *
-g_mime_message_get_date_string (void *ctx, GMimeMessage *message)
-{
-    char *date = g_mime_message_get_date_as_string (message);
-    return g_string_talloc_strdup (ctx, date);
-}
-
-InternetAddressList *
-g_mime_message_get_from (GMimeMessage *message)
-{
-    return internet_address_list_parse_string (g_mime_message_get_sender (message));
-}
-
 const char *
-g_mime_message_get_from_string (GMimeMessage *message) {
-    return  g_mime_message_get_sender (message);
+g_mime_certificate_get_valid_userid (GMimeCertificate *cert)
+{
+    /* output user id only if validity is FULL or ULTIMATE. */
+    const char *uid = g_mime_certificate_get_user_id (cert);
+    if (uid == NULL)
+       return uid;
+    GMimeValidity validity = g_mime_certificate_get_id_validity (cert);
+    if (validity == GMIME_VALIDITY_FULL || validity == GMIME_VALIDITY_ULTIMATE)
+       return uid;
+    return NULL;
 }
 
-InternetAddressList *
-g_mime_message_get_reply_to_list (GMimeMessage *message)
-{
-    const char *reply_to;
+const char*
+g_mime_certificate_get_fpr16 (GMimeCertificate *cert) {
+    const char *fpr = g_mime_certificate_get_fingerprint (cert);
+    if (!fpr || strlen (fpr) < 16)
+       return fpr;
 
-    reply_to = g_mime_message_get_reply_to (message);
-    if (reply_to && *reply_to)
-       return internet_address_list_parse_string (reply_to);
-    else
-       return NULL;
+    return fpr + (strlen (fpr) - 16);
 }
 
-/**
- * return talloc allocated reply-to string
- */
 char *
-g_mime_message_get_reply_to_string (void *ctx, GMimeMessage *message)
+g_mime_message_get_address_string (GMimeMessage *message, GMimeAddressType type)
 {
-    return talloc_strdup(ctx, g_mime_message_get_reply_to (message));
+    InternetAddressList *list = g_mime_message_get_addresses (message, type);
+    return internet_address_list_to_string (list, NULL, 0);
 }
 
-
-#else /* GMime >= 3.0 */
-
 char *
 g_mime_message_get_date_string (void *ctx, GMimeMessage *message)
 {
@@ -105,5 +91,44 @@ g_mime_message_get_reply_to_string (void *ctx, GMimeMessage *message)
     return g_string_talloc_strdup (ctx, internet_address_list_to_string (list, NULL, 0));
 }
 
+void
+g_mime_parser_set_scan_from (GMimeParser *parser, gboolean flag)
+{
+    g_mime_parser_set_format (parser, flag ? GMIME_FORMAT_MBOX : GMIME_FORMAT_MESSAGE);
+}
+
+/* In GMime 3.0, status GOOD and VALID both imply something about the
+ * validity of the UIDs attached to the signing key. This forces us to
+ * use following somewhat relaxed definition of a "good" signature to
+ * preserve current notmuch semantics.
+ */
+
+gboolean
+g_mime_signature_status_good (GMimeSignatureStatus status) {
+    return ((status  & (GMIME_SIGNATURE_STATUS_RED | GMIME_SIGNATURE_STATUS_ERROR_MASK)) == 0);
+}
+
+gboolean
+g_mime_signature_status_bad (GMimeSignatureStatus status) {
+    return (status & GMIME_SIGNATURE_STATUS_RED);
+}
 
-#endif
+gboolean
+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;
+}