alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* mu-query: update for mu-msg-iter updates

Browse Source
This commit is contained in:
djcb
2012-12-16 14:18:22 +02:00
parent 50f5c7affb
commit 9c0ec479f5
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/mu-query.cc
View File

@ -395,17 +395,26 @@ mu_query_run (MuQuery *self, const char* searchexpr, gboolean threads,
MuMsgIter *iter; MuMsgIter *iter;
Xapian::Enquire enq (get_enquire(self, searchexpr, threads, Xapian::Enquire enq (get_enquire(self, searchexpr, threads,
sortfieldid, revert, err)); sortfieldid, revert, err));
MuMsgIterFlags flags;
flags = MU_MSG_ITER_FLAG_NONE;
if (threads)
flags |= MU_MSG_ITER_FLAG_THREADS;
if (revert)
flags |= MU_MSG_ITER_FLAG_REVERT;
/* get the 'real' maxnum if it was specified as < 0 */ /* get the 'real' maxnum if it was specified as < 0 */
maxnum <= 0 ? self->db().get_doccount() : maxnum; maxnum <= 0 ? self->db().get_doccount() : maxnum;
iter = mu_msg_iter_new ( iter = mu_msg_iter_new (
reinterpret_cast<XapianEnquire*>(&enq), reinterpret_cast<XapianEnquire*>(&enq),
maxnum, threads, maxnum,
/* in we were *not* using threads, no further sorting /* in we were *not* using threads, no further sorting
* is needed since Xapian already sorted */ * is needed since Xapian already sorted */
threads ? sortfieldid : MU_MSG_FIELD_ID_NONE, threads ? sortfieldid : MU_MSG_FIELD_ID_NONE,
revert, err); flags,
err);
if (err && *err && (*err)->code == MU_ERROR_XAPIAN_MODIFIED) { if (err && *err && (*err)->code == MU_ERROR_XAPIAN_MODIFIED) {
g_clear_error (err); g_clear_error (err);