Comments and documentation no longer need to refer to GMime 2.6, so clean them all up. Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net> --- 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 _______________________________________________ notmuch mailing list notmuch@notmuchmail.org https://notmuchmail.org/mailman/listinfo/notmuch