[PATCH 2/2] Remove the pipe symbol in the author list when the last author matches

diff --git a/41/559b8233e2f9a342dc88605aca61fb1c709d66 b/41/559b8233e2f9a342dc88605aca61fb1c709d66
new file mode 100644 (file)
index 0000000..77d94ab
--- /dev/null
+++ b/41/559b8233e2f9a342dc88605aca61fb1c709d66
@@ -0,0 +1,75 @@
+Return-Path: <hohndel@gr8dns.org>\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 7012A4196F3\r
+       for <notmuch@notmuchmail.org>; Thu, 22 Apr 2010 21:42:37 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.9\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.9 tagged_above=-999 required=5\r
+       tests=[BAYES_00=-1.9] autolearn=ham\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 nE3ahVC6VokB for <notmuch@notmuchmail.org>;\r
+       Thu, 22 Apr 2010 21:42:36 -0700 (PDT)\r
+Received: from mail.hohndel.org (mail.hohndel.org [65.23.157.147])\r
+       by olra.theworths.org (Postfix) with ESMTP id 22030431FC1\r
+       for <notmuch@notmuchmail.org>; Thu, 22 Apr 2010 21:42:36 -0700 (PDT)\r
+Received: by mail.hohndel.org (Postfix, from userid 112)\r
+       id 325EA340FC; Fri, 23 Apr 2010 00:42:35 -0400 (EDT)\r
+Received: from x200.gr8dns.org (unknown [65.23.157.147])\r
+       by mail.hohndel.org (Postfix) with ESMTP id 1D3A1340F4;\r
+       Fri, 23 Apr 2010 00:42:32 -0400 (EDT)\r
+Received: by x200.gr8dns.org (Postfix, from userid 500)\r
+       id BA8B8C0458; Thu, 22 Apr 2010 21:42:31 -0700 (PDT)\r
+From: Dirk Hohndel <hohndel@infradead.org>\r
+To: <notmuch@notmuchmail.org>\r
+Subject: [PATCH 2/2] Remove the pipe symbol in the author list when the last\r
+       author matches\r
+Date: Thu, 22 Apr 2010 21:42:15 -0700\r
+Message-Id: <1271997735-17560-3-git-send-email-hohndel@infradead.org>\r
+X-Mailer: git-send-email 1.6.6.1\r
+In-Reply-To: <1271997735-17560-2-git-send-email-hohndel@infradead.org>\r
+References: <1271997735-17560-1-git-send-email-hohndel@infradead.org>\r
+       <1271997735-17560-2-git-send-email-hohndel@infradead.org>\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, 23 Apr 2010 04:42:37 -0000\r
+\r
+this fixes the bug exposed by the tests for this feature\r
+\r
+Signed-off-by: Dirk Hohndel <hohndel@infradead.org>\r
+---\r
+ lib/thread.cc |    4 ++++\r
+ 1 files changed, 4 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/lib/thread.cc b/lib/thread.cc\r
+index 4e389c5..1dda220 100644\r
+--- a/lib/thread.cc\r
++++ b/lib/thread.cc\r
+@@ -140,6 +140,10 @@ _thread_move_matched_author (notmuch_thread_t *thread,\r
+       }\r
+     } else {\r
+       thread->nonmatched_authors += author_len;\r
++      /* so now all authors are matched - let's remove the '|' */\r
++      lastpipe = strchr(thread->authors,'|');\r
++      if (lastpipe)\r
++          *lastpipe = ',';     \r
+     }\r
+     return;\r
+ }\r
+-- \r
+1.6.6.1\r
+\r