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