[PATCH v3 0/2] gmime 2.6 compatibilty, 3rd iteration

diff --git a/29/98aa9524077a8bd88c753e777a8e1efe8138c2 b/29/98aa9524077a8bd88c753e777a8e1efe8138c2
new file mode 100644 (file)
index 0000000..dd61d60
--- /dev/null
+++ b/29/98aa9524077a8bd88c753e777a8e1efe8138c2
@@ -0,0 +1,97 @@
+Return-Path: <schnouki@schnouki.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 42269431FBC\r
+       for <notmuch@notmuchmail.org>; Thu, 19 Jan 2012 16:06:38 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.1\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.1 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id rQ0FZc7FodvD for <notmuch@notmuchmail.org>;\r
+       Thu, 19 Jan 2012 16:06:37 -0800 (PST)\r
+Received: from ks3536.kimsufi.com (schnouki.net [87.98.217.222])\r
+       by olra.theworths.org (Postfix) with ESMTP id 6B862431FAE\r
+       for <notmuch@notmuchmail.org>; Thu, 19 Jan 2012 16:06:37 -0800 (PST)\r
+Received: from odin.local (nancy.schnouki.net [78.238.0.45])\r
+       by ks3536.kimsufi.com (Postfix) with ESMTPSA id 003EE6C000A;\r
+       Fri, 20 Jan 2012 01:06:29 +0100 (CET)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=schnouki.net;\r
+       s=key-schnouki; t=1327017990;\r
+       bh=FLfHyi90z96+XCeDqUtbsGRH1aGNsakpwuAKjnV9lGM=;\r
+       h=From:To:Subject:Date:Message-Id:In-Reply-To:References;\r
+       b=IZAr3IT73pY1tWmdNiRGipIvPqE0bud8yPoic0bWqTF8ukUbh0ORr+a0SGLxZvkIO\r
+       zC6D8sQmzeaecHHqNearwj2cRLY7QZFbY8YZ7y+WFlTM4Fw1VhsSEUzPsshxNjHGhl\r
+       oRLIkEffcJLzNizg9dMykKs3Rm0ABPFYNUhwbv6w=\r
+From: Thomas Jost <schnouki@schnouki.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 0/2] gmime 2.6 compatibilty, 3rd iteration\r
+Date: Fri, 20 Jan 2012 01:06:25 +0100\r
+Message-Id: <1327017987-3361-1-git-send-email-schnouki@schnouki.net>\r
+X-Mailer: git-send-email 1.7.8.4\r
+In-Reply-To: <87ty3r2rqt.fsf@schnouki.net>\r
+References: <87ty3r2rqt.fsf@schnouki.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 20 Jan 2012 00:06:38 -0000\r
+\r
+Hi list,\r
+\r
+Here's another update of the patches to add gmime 2.6 compatibilty\r
+while still preserving compatibility with gmime 2.4.\r
+\r
+Any comments or review will be much appreciated.\r
+\r
+The changes compared to the previous version ([1] and [2]) are pretty\r
+minor:\r
+- space and indentation fixes\r
+- correctly dereference the instance of GMimeDecryptResult allocated\r
+  by g_mime_decrypt_result_get_signatures()\r
+- remove a useless local variable\r
+- rename the preprocessor constant GMIME_26 to GMIME_ATLEAST_26\r
+- mark one crypto test as broken when using gmime 2.6 (because of a\r
+  bug in gmime [3])\r
+\r
+The first patch is really not specific to gmime so it could probably\r
+be pushed right away.\r
+\r
+Thanks to Austin Clements, Tomi Ollila and Adrian Perez for their\r
+reviews of the previous patches!\r
+\r
+Best regards,\r
+Thomas\r
+\r
+[1] id:"1326797453-9405-1-git-send-email-schnouki@schnouki.net"\r
+[2] id:"1326797453-9405-2-git-send-email-schnouki@schnouki.net"\r
+[3] https://bugzilla.gnome.org/show_bug.cgi?id=668085\r
+\r
+Thomas Jost (2):\r
+  show: don't use hex literals in JSON output\r
+  Add compatibility with gmime 2.6\r
+\r
+ mime-node.c      |   60 +++++++++++++++++++++++++++++++--\r
+ notmuch-client.h |   30 +++++++++++++++-\r
+ notmuch-reply.c  |    7 ++++\r
+ notmuch-show.c   |   97 +++++++++++++++++++++++++++++++++++++++++++++++++++++-\r
+ show-message.c   |    4 ++\r
+ test/crypto      |    2 +\r
+ 6 files changed, 193 insertions(+), 7 deletions(-)\r
+\r
+-- \r
+1.7.8.4\r
+\r