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 0CEF66DE135E for ; Wed, 1 May 2019 22:17:17 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.133 X-Spam-Level: X-Spam-Status: No, score=-0.133 tagged_above=-999 required=5 tests=[AWL=0.068, 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 bQDgHrxTZcOT for ; Wed, 1 May 2019 22:17:16 -0700 (PDT) Received: from che.mayfirst.org (che.mayfirst.org [162.247.75.118]) by arlo.cworth.org (Postfix) with ESMTPS id 0F4F96DE138E for ; Wed, 1 May 2019 22:17:11 -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=N9OMbbvSY3hxSDNZKmC8EC6FwQCk5TF6Femg5EbXoAw=; b=29t7LuCi5RnVUPhd94PYF766G6p/GAffiuL6cEuqhe1xssKlnrZolKEo cpSCCPgcv5ZfzOXrOcLLixmNfLdiAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fifthhorseman.net; i=@fifthhorseman.net; q=dns/txt; s=2019rsa; t=1556774229; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=N9OMbbvSY3hxSDNZKmC8EC6FwQCk5TF6Femg5EbXoAw=; b=LtrMHgkW7/2/Gm+dyGQCkxbpMoaRwU4SxoKlImhXkZOLJj5IfzVVIE0T annx+WGrT4RfvZaQ6M6OAifVKyyHu1BqY0OLOs8zjn6oz6p7MKAyA8wyFT nK32wQX8COYkCJkVUQOwpNNSq/bK0RQdtOnoGkZyYsGODgeapZDeJiml10 xnctXFkGwj6CaqKWAbnPxMi+xN0hMRp/LyD0B8BTazkRgOG90Ek6alwZxV fezRKHCD3rOzZIdieyOR/pcP+XZL0SIzCXxaFt6Yoocej0vfBV7bIkBcw5 gbyDzgjTwLYXWVokClFpjL5wygmNjZoCTXRmYy7tLhO2Swo9VdAo0w== Received: from fifthhorseman.net (ool-6c3a0662.static.optonline.net [108.58.6.98]) (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 87967F9A6 for ; Thu, 2 May 2019 01:17:09 -0400 (EDT) Received: by fifthhorseman.net (Postfix, from userid 1000) id 9208320EC8; Thu, 2 May 2019 01:17:04 -0400 (EDT) From: Daniel Kahn Gillmor To: Notmuch Mail Subject: [PATCH 16/16] gmime-cleanup: strip remaining references to GMime 2.6 Date: Thu, 2 May 2019 01:16:53 -0400 Message-Id: <20190502051653.8502-17-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:17 -0000 Comments and documentation no longer need to refer to GMime 2.6, so clean them all up. Signed-off-by: Daniel Kahn Gillmor --- INSTALL | 2 +- debian/control | 2 +- mime-node.c | 8 ++++---- notmuch-reply.c | 6 ------ notmuch-show.c | 2 +- 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/INSTALL b/INSTALL index 6e6f4799..f1236e71 100644 --- a/INSTALL +++ b/INSTALL @@ -20,7 +20,7 @@ configure stage. Dependencies ------------ -Notmuch depends on four libraries: Xapian, GMime 2.6, +Notmuch depends on four libraries: Xapian, GMime 3.0, Talloc, and zlib which are each described below: Xapian diff --git a/debian/control b/debian/control index 922f6d8c..31d6471c 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 11~), pkg-config, libxapian-dev, - libgmime-3.0-dev (>= 3.0.3~) | libgmime-2.6-dev (>= 2.6.7~), + libgmime-3.0-dev (>= 3.0.3~), libtalloc-dev, libz-dev, python-all (>= 2.6.6-3~), diff --git a/mime-node.c b/mime-node.c index 60589f81..cd3db67d 100644 --- a/mime-node.c +++ b/mime-node.c @@ -149,7 +149,7 @@ DONE: return status; } -/* Signature list destructor (GMime 2.6) */ +/* Signature list destructor */ static int _signature_list_free (GMimeSignatureList **proxy) { @@ -157,7 +157,7 @@ _signature_list_free (GMimeSignatureList **proxy) return 0; } -/* Set up signature list destructor (GMime 2.6) */ +/* Set up signature list destructor */ static void set_signature_list_destructor (mime_node_t *node) { @@ -168,7 +168,7 @@ set_signature_list_destructor (mime_node_t *node) } } -/* Verify a signed mime node (GMime 2.6) */ +/* Verify a signed mime node */ static void node_verify (mime_node_t *node, GMimeObject *part) { @@ -188,7 +188,7 @@ node_verify (mime_node_t *node, GMimeObject *part) g_error_free (err); } -/* Decrypt and optionally verify an encrypted mime node (GMime 2.6) */ +/* Decrypt and optionally verify an encrypted mime node */ static void node_decrypt_and_verify (mime_node_t *node, GMimeObject *part) { diff --git a/notmuch-reply.c b/notmuch-reply.c index 5faae494..7f284229 100644 --- a/notmuch-reply.c +++ b/notmuch-reply.c @@ -323,12 +323,6 @@ add_recipients_from_message (GMimeMessage *reply, GMimeMessage *message, bool reply_all) { - - /* There is a memory leak here with gmime-2.6 because get_sender - * returns a newly allocated list, while the others return - * references to libgmime owned data. This leak will be fixed with - * the transition to gmime-3.0. - */ struct { InternetAddressList * (*get_header)(GMimeMessage *message); GMimeAddressType recipient_type; diff --git a/notmuch-show.c b/notmuch-show.c index ca4329f1..65167c2f 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -406,7 +406,7 @@ format_signature_errors (sprinter_t *sp, GMimeSignature *signature) do_format_signature_errors (sp, key_map, ARRAY_SIZE(key_map), errors); } -/* Signature status sprinter (GMime 2.6) */ +/* Signature status sprinter */ static void format_part_sigstatus_sprinter (sprinter_t *sp, GMimeSignatureList *siglist) { -- 2.20.1