1 Return-Path: <bremner@tesseract.cs.unb.ca>
\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 arlo.cworth.org (Postfix) with ESMTP id 487D96DE156A
\r
6 for <notmuch@notmuchmail.org>; Sun, 7 Jun 2015 08:03:38 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at cworth.org
\r
11 X-Spam-Status: No, score=0.228 tagged_above=-999 required=5 tests=[AWL=0.218,
\r
12 T_HEADER_FROM_DIFFERENT_DOMAINS=0.01] autolearn=disabled
\r
13 Received: from arlo.cworth.org ([127.0.0.1])
\r
14 by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id tkd0ekHmbUXx for <notmuch@notmuchmail.org>;
\r
16 Sun, 7 Jun 2015 08:03:36 -0700 (PDT)
\r
17 Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net
\r
19 by arlo.cworth.org (Postfix) with ESMTPS id 5E5166DE1512
\r
20 for <notmuch@notmuchmail.org>; Sun, 7 Jun 2015 08:03:36 -0700 (PDT)
\r
21 Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim
\r
22 4.80) (envelope-from <bremner@tesseract.cs.unb.ca>)
\r
23 id 1Z1c64-0004oN-2g; Sun, 07 Jun 2015 15:02:48 +0000
\r
24 Received: (nullmailer pid 7858 invoked by uid 1000); Sun, 07 Jun 2015
\r
26 From: David Bremner <david@tethera.net>
\r
27 To: notmuch@notmuchmail.org
\r
28 Subject: [PATCH 05/10] lib: note remaining uses of deprecated message search
\r
30 Date: Sun, 7 Jun 2015 17:01:58 +0200
\r
31 Message-Id: <1433689323-7520-6-git-send-email-david@tethera.net>
\r
32 X-Mailer: git-send-email 2.1.4
\r
33 In-Reply-To: <1433689323-7520-1-git-send-email-david@tethera.net>
\r
34 References: <1433689323-7520-1-git-send-email-david@tethera.net>
\r
35 X-BeenThere: notmuch@notmuchmail.org
\r
36 X-Mailman-Version: 2.1.18
\r
38 List-Id: "Use and development of the notmuch mail system."
\r
39 <notmuch.notmuchmail.org>
\r
40 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
41 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
42 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
\r
43 List-Post: <mailto:notmuch@notmuchmail.org>
\r
44 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
45 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
46 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
47 X-List-Received-Date: Sun, 07 Jun 2015 15:03:38 -0000
\r
49 The two remaining cases in the lib seem to require more than a simple
\r
50 replacement of the old call, with the new call plus a check of the
\r
53 lib/database.cc | 2 ++
\r
54 lib/thread.cc | 2 ++
\r
55 2 files changed, 4 insertions(+)
\r
57 diff --git a/lib/database.cc b/lib/database.cc
\r
58 index 78a24f7..15619c3 100644
\r
59 --- a/lib/database.cc
\r
60 +++ b/lib/database.cc
\r
61 @@ -1388,6 +1388,8 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,
\r
62 notmuch_message_t *message;
\r
65 + /* XXX: this should use the _st version, but needs an error
\r
67 for (messages = notmuch_query_search_messages (query);
\r
68 notmuch_messages_valid (messages);
\r
69 notmuch_messages_move_to_next (messages))
\r
70 diff --git a/lib/thread.cc b/lib/thread.cc
\r
71 index 9847cf8..c8e58c3 100644
\r
74 @@ -504,6 +504,8 @@ _notmuch_thread_create (void *ctx,
\r
75 * oldest or newest subject is desired. */
\r
76 notmuch_query_set_sort (thread_id_query, NOTMUCH_SORT_OLDEST_FIRST);
\r
78 + /* XXX: this should use the _st version, but it needs an error path
\r
80 for (messages = notmuch_query_search_messages (thread_id_query);
\r
81 notmuch_messages_valid (messages);
\r
82 notmuch_messages_move_to_next (messages))
\r