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

* lib: try to reopen database when it got updated from the outside (for guile)

Browse Source
This commit is contained in:
djcb
2012-08-19 09:57:49 +03:00
parent 90674172b9
commit 93171a5b90
4 changed files with 48 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/mu-msg-iter.cc
View File

@ -110,9 +110,12 @@ private:
MuMsg *_msg;
};
MuMsgIter*
mu_msg_iter_new (XapianEnquire *enq, size_t maxnum,
gboolean threads, MuMsgFieldId sortfield, gboolean revert)
gboolean threads, MuMsgFieldId sortfield, gboolean revert,
GError **err)
{
g_return_val_if_fail (enq, NULL);
/* sortfield should be set to .._NONE when we're not threading */
@ -125,7 +128,13 @@ mu_msg_iter_new (XapianEnquire *enq, size_t maxnum,
return new MuMsgIter ((Xapian::Enquire&)*enq, maxnum, threads,
sortfield, revert ? true : false);
} MU_XAPIAN_CATCH_BLOCK_RETURN(NULL);
} catch (const Xapian::DatabaseModifiedError &dbmex) {
mu_util_g_set_error (err, MU_ERROR_XAPIAN_MODIFIED,
"database was modified; please reopen");
return 0;
} MU_XAPIAN_CATCH_BLOCK_G_ERROR_RETURN (err, MU_ERROR_XAPIAN, 0);
}