From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 2 May 2019 13:19:40 +0000 (-0400)
Subject: gmime-cleanup: drop g_mime_2_6_unref
X-Git-Tag: archive/debian/0.29_rc0-1~81
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=591a0787c2dc8fc79d0673ec42a84e6939722f17

gmime-cleanup: drop g_mime_2_6_unref

signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
---

diff --git a/lib/index.cc b/lib/index.cc
index 6b6fbb8f..76830921 100644
--- a/lib/index.cc
+++ b/lib/index.cc
@@ -591,7 +591,6 @@ _notmuch_message_index_file (notmuch_message_t *message,
     addresses = g_mime_message_get_from (mime_message);
     if (addresses) {
 	_index_address_list (message, "from", addresses);
-	g_mime_2_6_unref (addresses);
     }
 
     addresses = g_mime_message_get_all_recipients (mime_message);
diff --git a/notmuch-reply.c b/notmuch-reply.c
index 974df401..fa91c5de 100644
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -285,8 +285,6 @@ static InternetAddressList *get_sender(GMimeMessage *message)
 	 */
 	if (! reply_to_header_is_redundant (message, reply_to_list))
 	    return reply_to_list;
-
-	g_mime_2_6_unref (G_OBJECT (reply_to_list));
     }
 
     return g_mime_message_get_from (message);
diff --git a/util/gmime-extra.h b/util/gmime-extra.h
index d539ec3a..c17fa8fb 100644
--- a/util/gmime-extra.h
+++ b/util/gmime-extra.h
@@ -34,7 +34,6 @@ typedef GMimeAddressType GMimeRecipientType;
 
 typedef GMimeSignatureStatus GMimeSignatureError;
 
-#define g_mime_2_6_unref(obj) /*ignore*/
 #define g_mime_3_unused(arg) unused(arg)
 
 /**