2e/e0034f71dabbf47d85b63bca7db01ca5aef3d4

   1 Return-Path: <bart@jukie.net>\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 BD4EC431FAE\r
   6         for <notmuch@notmuchmail.org>; Fri, 27 Nov 2009 18:22:03 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 Received: from olra.theworths.org ([127.0.0.1])\r
   9         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  10         with ESMTP id YlQuSbV1ya5t for <notmuch@notmuchmail.org>;\r
  11         Fri, 27 Nov 2009 18:22:01 -0800 (PST)\r
  12 Received: from tau.jukie.net (tau.jukie.net [216.239.93.128])\r
  13         by olra.theworths.org (Postfix) with ESMTP id 50728431FC3\r
  14         for <notmuch@notmuchmail.org>; Fri, 27 Nov 2009 18:22:01 -0800 (PST)\r
  15 Received: from localhost.localdomain (oxygen.jukie.net [10.10.10.8])\r
  16         by tau.jukie.net (Postfix) with ESMTP id D42FBC0090C;\r
  17         Fri, 27 Nov 2009 21:22:00 -0500 (EST)\r
  18 From: Bart Trojanowski <bart@jukie.net>\r
  19 To: notmuch@notmuchmail.org\r
  20 Date: Fri, 27 Nov 2009 21:20:09 -0500\r
  21 Message-Id: <1259374809-28752-1-git-send-email-bart@jukie.net>\r
  22 X-Mailer: git-send-email 1.6.4.4.2.gc2f148\r
  23 In-Reply-To: <87iqcvbgaw.fsf@yoom.home.cworth.org>\r
  24 References: <87iqcvbgaw.fsf@yoom.home.cworth.org>\r
  25 Cc: Bart Trojanowski <bart@jukie.net>\r
  26 Subject: [notmuch] [PATCH] correct message flag enum value so that it\r
  27         matches the type\r
  28 X-BeenThere: notmuch@notmuchmail.org\r
  29 X-Mailman-Version: 2.1.12\r
  30 Precedence: list\r
  31 List-Id: "Use and development of the notmuch mail system."\r
  32         <notmuch.notmuchmail.org>\r
  33 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  34         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  35 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  36 List-Post: <mailto:notmuch@notmuchmail.org>\r
  37 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  38 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  39         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  40 X-List-Received-Date: Sat, 28 Nov 2009 02:22:03 -0000\r
  41 \r
  42 As per Carl's request, this patch corrects the only value defined under\r
  43 the notmuch_message_flag_t enum typedef to match the name of the type.\r
  44 \r
  45 Signed-off-by: Bart Trojanowski <bart@jukie.net>\r
  46 ---\r
  47  lib/notmuch.h  |    2 +-\r
  48  lib/thread.cc  |    2 +-\r
  49  notmuch-show.c |    2 +-\r
  50  3 files changed, 3 insertions(+), 3 deletions(-)\r
  51 \r
  52 diff --git a/lib/notmuch.h b/lib/notmuch.h\r
  53 index e4f3992..60834fb 100644\r
  54 --- a/lib/notmuch.h\r
  55 +++ b/lib/notmuch.h\r
  56 @@ -711,7 +711,7 @@ notmuch_message_get_filename (notmuch_message_t *message);\r
  57  \r
  58  /* Message flags */\r
  59  typedef enum _notmuch_message_flag {\r
  60 -    NOTMUCH_MSG_FLAG_MATCHING_SEARCH,\r
  61 +    NOTMUCH_MESSAGE_FLAG_MATCH,\r
  62  } notmuch_message_flag_t;\r
  63  \r
  64  /* Get a value of a flag for the email corresponding to 'message'. */\r
  65 diff --git a/lib/thread.cc b/lib/thread.cc\r
  66 index 9e4cb5c..321937b 100644\r
  67 --- a/lib/thread.cc\r
  68 +++ b/lib/thread.cc\r
  69 @@ -148,7 +148,7 @@ _thread_add_matched_message (notmuch_thread_t *thread,\r
  70                             notmuch_message_get_message_id (message), NULL,\r
  71                             (void **) &hashed_message)) {\r
  72         notmuch_message_set_flag (hashed_message,\r
  73 -                       NOTMUCH_MSG_FLAG_MATCHING_SEARCH, 1);\r
  74 +                                 NOTMUCH_MESSAGE_FLAG_MATCH, 1);\r
  75      }\r
  76  }\r
  77  \r
  78 diff --git a/notmuch-show.c b/notmuch-show.c\r
  79 index f189e94..13c91e4 100644\r
  80 --- a/notmuch-show.c\r
  81 +++ b/notmuch-show.c\r
  82 @@ -158,7 +158,7 @@ show_message (void *ctx, notmuch_message_t *message, int indent)\r
  83      printf ("\fmessage{ id:%s depth:%d match:%d filename:%s\n",\r
  84             notmuch_message_get_message_id (message),\r
  85             indent,\r
  86 -           notmuch_message_get_flag (message, NOTMUCH_MSG_FLAG_MATCHING_SEARCH),\r
  87 +           notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH),\r
  88             notmuch_message_get_filename (message));\r
  89  \r
  90      printf ("\fheader{\n");\r
  91 -- \r
  92 1.6.4.4.2.gc2f148\r
  93 \r