Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 2D4D5431FAF for ; Wed, 18 Jan 2012 09:35:55 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dlNIcv7vEw1H for ; Wed, 18 Jan 2012 09:35:54 -0800 (PST) Received: from dmz-mailsec-scanner-6.mit.edu (DMZ-MAILSEC-SCANNER-6.MIT.EDU [18.7.68.35]) by olra.theworths.org (Postfix) with ESMTP id B47A5431FAE for ; Wed, 18 Jan 2012 09:35:54 -0800 (PST) X-AuditID: 12074423-b7f9c6d0000008c3-46-4f1702faa838 Received: from mailhub-auth-2.mit.edu ( [18.7.62.36]) by dmz-mailsec-scanner-6.mit.edu (Symantec Messaging Gateway) with SMTP id 7E.B0.02243.AF2071F4; Wed, 18 Jan 2012 12:35:54 -0500 (EST) Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id q0IHZrmS016427; Wed, 18 Jan 2012 12:35:53 -0500 Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91]) (authenticated bits=0) (User authenticated as amdragon@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q0IHZmcJ012538 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); Wed, 18 Jan 2012 12:35:51 -0500 (EST) Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77) (envelope-from ) id 1RnZQ6-0001TS-OH; Wed, 18 Jan 2012 12:35:34 -0500 Date: Wed, 18 Jan 2012 12:35:34 -0500 From: Austin Clements To: Tomi Ollila Subject: Re: [PATCH v2 2/2] Add pseudo-compatibility with gmime 2.6 Message-ID: <20120118173534.GB16740@mit.edu> References: <8739bea9lc.fsf@thor.loria.fr> <1326797453-9405-1-git-send-email-schnouki@schnouki.net> <1326797453-9405-2-git-send-email-schnouki@schnouki.net> <20120117222546.GT16740@mit.edu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprAKsWRmVeSWpSXmKPExsUixG6novuLSdzfYO4RPovrN2cyW7xZOY/V gcnj8NeFLB7PVt1iDmCK4rJJSc3JLEst0rdL4Mr4t+Qua8FLzoqelUtZGxj3sHcxcnBICJhI TPmp0MXICWSKSVy4t56ti5GLQ0hgH6PE5D+z2SGcDYwSs6a+Y4ZwTjJJbJ71GKpsCaNEz8r/ LCD9LAKqEneunmIDsdkENCS27V/OCGKLCKhIPGhbzwpiMwtIS3z73cwEYgsLOEusWX4TrJdX QEei8epEqKFPGSUefv/HBJEQlDg58wkLRLOWxI1/L5lA7gYZtPwfB0iYE6i3eWYHM4gtCrRr ysltbBMYhWYh6Z6FpHsWQvcCRuZVjLIpuVW6uYmZOcWpybrFyYl5ealFumZ6uZkleqkppZsY wYHtoryD8c9BpUOMAhyMSjy8EhtE/YVYE8uKK3MPMUpyMCmJ8qoD40KILyk/pTIjsTgjvqg0 J7X4EKMEB7OSCG/JLTF/Id6UxMqq1KJ8mJQ0B4uSOK+G1js/IYH0xJLU7NTUgtQimKwMB4eS BK8RyFDBotT01Iq0zJwShDQTByfIcB6g4R4gNbzFBYm5xZnpEPlTjLocJ9deOccoxJKXn5cq Jc6bAFIkAFKUUZoHNweWkF4xigO9JcwrBVLFA0xmcJNeAS1hAlnSBPJBcUkiQkqqgbFujmtE doIiu5v+A/vdbpONb131+H9oS87fzwLhyU82bjh3a++X634T9t9JFdl9wWkLo2anm/nD9RLm XN/f6/NYrMj9IXvwz3StX4Xlgo3XOQwFJjlVO13LO38k/v2d624vfs9YJ3w2QzBpcRCj5rGG PQdbqlYwafNvYGG281i1kcHsId9dkQglluKMREMt5qLiRACmGqPjIwMAAA== Cc: notmuch@notmuchmail.org X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 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: Wed, 18 Jan 2012 17:35:55 -0000 Quoth Tomi Ollila on Jan 18 at 10:15 am: > On Tue, 17 Jan 2012 17:25:46 -0500, Austin Clements wrote: > > Quoth Thomas Jost on Jan 17 at 11:50 am: > > > > > > +#ifdef GMIME_26 > > > + /* sig_list may be created in both above cases, so we need to > > > + * cleanly handle it here. */ > > > + if (node->sig_list) { > > > + GMimeSignatureList **proxy = > > > + talloc (node, GMimeSignatureList *); > > > > This doesn't need to be split into two lines. > > > > > + *proxy = node->sig_list; > > > + talloc_set_destructor (proxy, _signature_list_free); > > > + } > > > +#else > > > if (node->verify_attempted && !node->sig_validity) > > > fprintf (stderr, "Failed to verify signed part: %s\n", > > > (err ? err->message : "no error explanation given")); > > > +#endif > > > > I'd rather see the above as a separate #ifdef GMIME_26 and #ifndef > > GMIME_26, since they aren't logical alternates of each other. > > That reminds me that it should then be like GMIME_ATLEAST_26, so > that this might be useful when GMIME > 2.6 is available... Hopefully before GMIME 2.8 comes out, we'll be able to remove all of the GMIME 2.4 compatibility. But GMIME_ATLEAST_26 would be fine, too.