[PATCH 3/4] lib: Only synchronize maildir flags for messages in maildirs

diff --git a/f0/eba8e6e70d6b1a9ac55ff883f82d688a39aa00 b/f0/eba8e6e70d6b1a9ac55ff883f82d688a39aa00
new file mode 100644 (file)
index 0000000..8e7f433
--- /dev/null
+++ b/f0/eba8e6e70d6b1a9ac55ff883f82d688a39aa00
@@ -0,0 +1,104 @@
+Return-Path: <amdragon@mit.edu>\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 96CD9431FC9\r
+       for <notmuch@notmuchmail.org>; Sun,  3 Jun 2012 09:58:15 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 C+5GBi3bDK0Z for <notmuch@notmuchmail.org>;\r
+       Sun,  3 Jun 2012 09:58:14 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU\r
+       [18.7.68.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id A6C4C431FAF\r
+       for <notmuch@notmuchmail.org>; Sun,  3 Jun 2012 09:58:14 -0700 (PDT)\r
+X-AuditID: 12074422-b7f1f6d00000090b-65-4fcb97a6d750\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+       by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id A7.47.02315.6A79BCF4; Sun,  3 Jun 2012 12:58:14 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q53GwEBT012637; \r
+       Sun, 3 Jun 2012 12:58:14 -0400\r
+Received: from drake.dyndns.org\r
+       (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [209.6.116.242]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q53GwDMh004206\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sun, 3 Jun 2012 12:58:13 -0400 (EDT)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1SbE7k-00037x-7R; Sun, 03 Jun 2012 12:57:52 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/4] lib: Only synchronize maildir flags for messages in\r
+       maildirs\r
+Date: Sun,  3 Jun 2012 12:57:35 -0400\r
+Message-Id: <1338742656-11640-4-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To: <1338742656-11640-1-git-send-email-amdragon@mit.edu>\r
+References: <1338742656-11640-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrIIsWRmVeSWpSXmKPExsUixCmqrLts+ml/gzWXFSyu35zJ7MDo8WzV\r
+       LeYAxigum5TUnMyy1CJ9uwSujO2nlQp62Svu/bjL2MB4gbWLkZNDQsBE4tS3U8wQtpjEhXvr\r
+       2boYuTiEBPYxStzfMJMRwlnPKHFu/xUWCOchk8Sbt6+YIZy5jBLXV1xiA+lnE9CQ2LZ/OSOI\r
+       LSIgLbHz7mygHRwczAJqEn+6VEDCwgKBEsvmbQRbzSKgKnGs4QJYOa+Ag8Tnq3+YIM6Ql3h6\r
+       v48NpJVTwFGi94AJSFgIqORDwxX2CYz8CxgZVjHKpuRW6eYmZuYUpybrFicn5uWlFuma6uVm\r
+       luilppRuYgSFDLuL0g7GnweVDjEKcDAq8fB+mnXKX4g1say4MvcQoyQHk5Io77Spp/2F+JLy\r
+       UyozEosz4otKc1KLDzFKcDArifB22gHleFMSK6tSi/JhUtIcLErivGs0d/sLCaQnlqRmp6YW\r
+       pBbBZGU4OJQkeM9PA2oULEpNT61Iy8wpQUgzcXCCDOcBGg5Ww1tckJhbnJkOkT/FqCglznsN\r
+       JCEAksgozYPrhcX0K0ZxoFeEeV+CVPEA0wFc9yugwUxAgw0OnwQZXJKIkJJqYEw/ufbMi++M\r
+       CREri95ZzJzafWquWHulTnrsMSG2i8/WZ99tNGiwtDt+XYQzW2ODcqBg4CEuQYHp4XvaLTjs\r
+       3jd97s1uP3R+343edK9ZMlEXBLfuvNQxUX/u3Zv5P1smJs/9tPvjMrVZBwRLakJO3J/Ll/c1\r
+       VURsa4VpLfu9e5csy589e/ftZakSS3FGoqEWc1FxIgCHwv7QxAIAAA==\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: Sun, 03 Jun 2012 16:58:15 -0000\r
+\r
+---\r
+ lib/message.cc |    6 +++++-\r
+ 1 file changed, 5 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/lib/message.cc b/lib/message.cc\r
+index ed96477..bbac2ff 100644\r
+--- a/lib/message.cc\r
++++ b/lib/message.cc\r
+@@ -1074,7 +1074,7 @@ notmuch_message_maildir_flags_to_tags (notmuch_message_t *message)\r
+     const char *flags;\r
+     notmuch_status_t status;\r
+     notmuch_filenames_t *filenames;\r
+-    const char *filename;\r
++    const char *filename, *dir;\r
+     char *combined_flags = talloc_strdup (message, "");\r
+     unsigned i;\r
+     int seen_maildir_info = 0;\r
+@@ -1084,6 +1084,10 @@ notmuch_message_maildir_flags_to_tags (notmuch_message_t *message)\r
+        notmuch_filenames_move_to_next (filenames))\r
+     {\r
+       filename = notmuch_filenames_get (filenames);\r
++      dir = _filename_is_in_maildir (filename);\r
++\r
++      if (! dir)\r
++          continue;\r
+ \r
+       flags = strstr (filename, ":2,");\r
+       if (! flags)\r
+-- \r
+1.7.10\r
+\r