* cosmetics

This commit is contained in:
Dirk-Jan C. Binnema
2011-08-03 23:06:51 +03:00
parent 8e9bf21766
commit 29afe28eb6

View File

@ -92,11 +92,9 @@ struct _MuMsgIter {
GHashTable *_threadhash; GHashTable *_threadhash;
}; };
MuMsgIter* MuMsgIter*
mu_msg_iter_new (XapianEnquire *enq, size_t maxnum, gboolean threads, mu_msg_iter_new (XapianEnquire *enq, size_t maxnum,
MuMsgFieldId sortfield) gboolean threads, MuMsgFieldId sortfield)
{ {
g_return_val_if_fail (enq, NULL); g_return_val_if_fail (enq, NULL);
/* sortfield should be set to .._NONE when we're not threading */ /* sortfield should be set to .._NONE when we're not threading */
@ -117,66 +115,67 @@ mu_msg_iter_new (XapianEnquire *enq, size_t maxnum, gboolean threads,
void void
mu_msg_iter_destroy (MuMsgIter *iter) mu_msg_iter_destroy (MuMsgIter *iter)
{ {
try { delete iter; } MU_XAPIAN_CATCH_BLOCK; try { delete iter; } MU_XAPIAN_CATCH_BLOCK;
} }
MuMsg* MuMsg*
mu_msg_iter_get_msg (MuMsgIter *iter, GError **err) mu_msg_iter_get_msg (MuMsgIter *iter, GError **err)
{ {
Xapian::Document *docp; Xapian::Document *docp;
g_return_val_if_fail (iter, NULL); g_return_val_if_fail (iter, NULL);
g_return_val_if_fail (!mu_msg_iter_is_done(iter), NULL); g_return_val_if_fail (!mu_msg_iter_is_done(iter), NULL);
/* get a new MuMsg based on the current doc */ /* get a new MuMsg based on the current doc */
if (iter->_msg) { if (iter->_msg) {
mu_msg_unref (iter->_msg); mu_msg_unref (iter->_msg);
iter->_msg = NULL; iter->_msg = NULL;
} }
docp = new Xapian::Document(iter->_cursor.get_document()); docp = new Xapian::Document(iter->_cursor.get_document());
iter->_msg = mu_msg_new_from_doc ((XapianDocument*)docp, err); iter->_msg = mu_msg_new_from_doc ((XapianDocument*)docp, err);
if (!iter->_msg) { if (!iter->_msg) {
g_warning ("%s: failed to create MuMsg",__FUNCTION__); g_warning ("%s: failed to create MuMsg",__FUNCTION__);
return NULL; return NULL;
} }
return iter->_msg; return iter->_msg;
} }
gboolean gboolean
mu_msg_iter_reset (MuMsgIter *iter) mu_msg_iter_reset (MuMsgIter *iter)
{ {
g_return_val_if_fail (iter, FALSE); g_return_val_if_fail (iter, FALSE);
try { try {
iter->_cursor = iter->_matches.begin(); iter->_cursor = iter->_matches.begin();
} MU_XAPIAN_CATCH_BLOCK_RETURN (FALSE); } MU_XAPIAN_CATCH_BLOCK_RETURN (FALSE);
return TRUE; return TRUE;
} }
gboolean gboolean
mu_msg_iter_next (MuMsgIter *iter) mu_msg_iter_next (MuMsgIter *iter)
{ {
g_return_val_if_fail (iter, FALSE); g_return_val_if_fail (iter, FALSE);
if (mu_msg_iter_is_done(iter)) if (mu_msg_iter_is_done(iter))
return FALSE; return FALSE;
try { try {
++iter->_cursor; ++iter->_cursor;
return iter->_cursor == iter->_matches.end() ? FALSE:TRUE; return iter->_cursor == iter->_matches.end() ? FALSE:TRUE;
/* try to get a new MuMsg based on the current doc */ /* try to get a new MuMsg based on the current doc */
//return update_msg (iter); //return update_msg (iter);
} MU_XAPIAN_CATCH_BLOCK_RETURN(FALSE); } MU_XAPIAN_CATCH_BLOCK_RETURN(FALSE);
} }
gboolean gboolean
mu_msg_iter_is_done (MuMsgIter *iter) mu_msg_iter_is_done (MuMsgIter *iter)
{ {