f0/eba8e6e70d6b1a9ac55ff883f82d688a39aa00

   1 Return-Path: <amdragon@mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 96CD9431FC9\r
   6         for <notmuch@notmuchmail.org>; Sun,  3 Jun 2012 09:58:15 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id C+5GBi3bDK0Z for <notmuch@notmuchmail.org>;\r
  16         Sun,  3 Jun 2012 09:58:14 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU\r
  18         [18.7.68.34])\r
  19         by olra.theworths.org (Postfix) with ESMTP id A6C4C431FAF\r
  20         for <notmuch@notmuchmail.org>; Sun,  3 Jun 2012 09:58:14 -0700 (PDT)\r
  21 X-AuditID: 12074422-b7f1f6d00000090b-65-4fcb97a6d750\r
  22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
  23         by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id A7.47.02315.6A79BCF4; Sun,  3 Jun 2012 12:58:14 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q53GwEBT012637; \r
  27         Sun, 3 Jun 2012 12:58:14 -0400\r
  28 Received: from drake.dyndns.org\r
  29         (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  30         [209.6.116.242]) (authenticated bits=0)\r
  31         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  32         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q53GwDMh004206\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Sun, 3 Jun 2012 12:58:13 -0400 (EDT)\r
  35 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  36         (envelope-from <amdragon@mit.edu>)\r
  37         id 1SbE7k-00037x-7R; Sun, 03 Jun 2012 12:57:52 -0400\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH 3/4] lib: Only synchronize maildir flags for messages in\r
  41         maildirs\r
  42 Date: Sun,  3 Jun 2012 12:57:35 -0400\r
  43 Message-Id: <1338742656-11640-4-git-send-email-amdragon@mit.edu>\r
  44 X-Mailer: git-send-email 1.7.10\r
  45 In-Reply-To: <1338742656-11640-1-git-send-email-amdragon@mit.edu>\r
  46 References: <1338742656-11640-1-git-send-email-amdragon@mit.edu>\r
  47 X-Brightmail-Tracker:\r
  48  H4sIAAAAAAAAA+NgFtrIIsWRmVeSWpSXmKPExsUixCmqrLts+ml/gzWXFSyu35zJ7MDo8WzV\r
  49         LeYAxigum5TUnMyy1CJ9uwSujO2nlQp62Svu/bjL2MB4gbWLkZNDQsBE4tS3U8wQtpjEhXvr\r
  50         2boYuTiEBPYxStzfMJMRwlnPKHFu/xUWCOchk8Sbt6+YIZy5jBLXV1xiA+lnE9CQ2LZ/OSOI\r
  51         LSIgLbHz7mygHRwczAJqEn+6VEDCwgKBEsvmbQRbzSKgKnGs4QJYOa+Ag8Tnq3+YIM6Ql3h6\r
  52         v48NpJVTwFGi94AJSFgIqORDwxX2CYz8CxgZVjHKpuRW6eYmZuYUpybrFicn5uWlFuma6uVm\r
  53         luilppRuYgSFDLuL0g7GnweVDjEKcDAq8fB+mnXKX4g1say4MvcQoyQHk5Io77Spp/2F+JLy\r
  54         UyozEosz4otKc1KLDzFKcDArifB22gHleFMSK6tSi/JhUtIcLErivGs0d/sLCaQnlqRmp6YW\r
  55         pBbBZGU4OJQkeM9PA2oULEpNT61Iy8wpQUgzcXCCDOcBGg5Ww1tckJhbnJkOkT/FqCglznsN\r
  56         JCEAksgozYPrhcX0K0ZxoFeEeV+CVPEA0wFc9yugwUxAgw0OnwQZXJKIkJJqYEw/ufbMi++M\r
  57         CREri95ZzJzafWquWHulTnrsMSG2i8/WZ99tNGiwtDt+XYQzW2ODcqBg4CEuQYHp4XvaLTjs\r
  58         3jd97s1uP3R+343edK9ZMlEXBLfuvNQxUX/u3Zv5P1smJs/9tPvjMrVZBwRLakJO3J/Ll/c1\r
  59         VURsa4VpLfu9e5csy589e/ftZakSS3FGoqEWc1FxIgCHwv7QxAIAAA==\r
  60 X-BeenThere: notmuch@notmuchmail.org\r
  61 X-Mailman-Version: 2.1.13\r
  62 Precedence: list\r
  63 List-Id: "Use and development of the notmuch mail system."\r
  64         <notmuch.notmuchmail.org>\r
  65 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  66         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  67 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  68 List-Post: <mailto:notmuch@notmuchmail.org>\r
  69 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  70 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  71         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  72 X-List-Received-Date: Sun, 03 Jun 2012 16:58:15 -0000\r
  73 \r
  74 ---\r
  75  lib/message.cc |    6 +++++-\r
  76  1 file changed, 5 insertions(+), 1 deletion(-)\r
  77 \r
  78 diff --git a/lib/message.cc b/lib/message.cc\r
  79 index ed96477..bbac2ff 100644\r
  80 --- a/lib/message.cc\r
  81 +++ b/lib/message.cc\r
  82 @@ -1074,7 +1074,7 @@ notmuch_message_maildir_flags_to_tags (notmuch_message_t *message)\r
  83      const char *flags;\r
  84      notmuch_status_t status;\r
  85      notmuch_filenames_t *filenames;\r
  86 -    const char *filename;\r
  87 +    const char *filename, *dir;\r
  88      char *combined_flags = talloc_strdup (message, "");\r
  89      unsigned i;\r
  90      int seen_maildir_info = 0;\r
  91 @@ -1084,6 +1084,10 @@ notmuch_message_maildir_flags_to_tags (notmuch_message_t *message)\r
  92          notmuch_filenames_move_to_next (filenames))\r
  93      {\r
  94         filename = notmuch_filenames_get (filenames);\r
  95 +       dir = _filename_is_in_maildir (filename);\r
  96 +\r
  97 +       if (! dir)\r
  98 +           continue;\r
  99  \r
 100         flags = strstr (filename, ":2,");\r
 101         if (! flags)\r
 102 -- \r
 103 1.7.10\r
 104 \r