From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 1B96B6DE1450 for ; Wed, 1 May 2019 22:17:19 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.274 X-Spam-Level: X-Spam-Status: No, score=-0.274 tagged_above=-999 required=5 tests=[AWL=-0.073, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0khUoeIxtFIQ for ; Wed, 1 May 2019 22:17:18 -0700 (PDT) Received: from che.mayfirst.org (che.mayfirst.org [162.247.75.118]) by arlo.cworth.org (Postfix) with ESMTPS id B43EA6DE10B8 for ; Wed, 1 May 2019 22:17:12 -0700 (PDT) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/simple; d=fifthhorseman.net; i=@fifthhorseman.net; q=dns/txt; s=2019; t=1556774230; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=mDNid8Ekw7AfNldkctzKszbU2tCmA9xiE5YFufhR83U=; b=cPJ78JJtzsyR9qFOCyAwHwSRaksySE2WRFbBuSP4gyhhd68WAJqI00io lQ8XZt0aI1wfth32eru2oRlAMhIuDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fifthhorseman.net; i=@fifthhorseman.net; q=dns/txt; s=2019rsa; t=1556774230; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=mDNid8Ekw7AfNldkctzKszbU2tCmA9xiE5YFufhR83U=; b=GQK/5nvebCt3qPRf9sSLVdk4S3aCab8nnOHpI4rpK6p+rmF0rw7k/GQx AIAekesGohyZnvMDDxx8Ek0/Lk2UhwnKDlXMD3v4hAj2DjNSUHvTxdawFV PG52sbGEaoOE4XWOb/izS8WAuURhhdqAx3gcIGs8lSs1bonxyjmlTsXXOV IUiVEjjlLDLAAtYizza6CeyFExoL3b4yEzpyJy0JwjalQ2q7DBnFQxSA+Z glwb/t/447mdF+hb2kL+Ng4+TvxJ4CJPCZgsUY9/Zpc7wv3xQLeg5xXTUM d1oAzWano1ooFQZefDVnVjkYA/0N8f5vzAYv+OGoPp9xSCVhzHUocw== Received: from fifthhorseman.net (unknown [IPv6:2001:470:1f07:60d:4864:1fff:fe17:5aa8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by che.mayfirst.org (Postfix) with ESMTPSA id 97A7DF9AC for ; Thu, 2 May 2019 01:17:10 -0400 (EDT) Received: by fifthhorseman.net (Postfix, from userid 1000) id 5B2E120CD6; Thu, 2 May 2019 01:17:04 -0400 (EDT) From: Daniel Kahn Gillmor To: Notmuch Mail Subject: [PATCH 07/16] gmime-cleanup: drop g_mime_2_6_unref Date: Thu, 2 May 2019 01:16:44 -0400 Message-Id: <20190502051653.8502-8-dkg@fifthhorseman.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190502051653.8502-1-dkg@fifthhorseman.net> References: <20190501104643.5836-1-david@tethera.net> <20190502051653.8502-1-dkg@fifthhorseman.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 May 2019 05:17:19 -0000 signed-off-by: Daniel Kahn Gillmor --- lib/index.cc | 1 - notmuch-reply.c | 2 -- util/gmime-extra.h | 1 - 3 files changed, 4 deletions(-) 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 9fd6e9c7..f6ec3c07 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) /** -- 2.20.1