mirror of https://github.com/djcb/mu.git
* cosmetics / minor
This commit is contained in:
parent
b467fadc5c
commit
bc90df6c53
|
@ -296,8 +296,9 @@ SCM_DEFINE (get_contacts, "mu:c:get-contacts", 2, 0, 0,
|
||||||
else if (scm_is_eq (CONTACT_TYPE, SYMB_CONTACT_FROM))
|
else if (scm_is_eq (CONTACT_TYPE, SYMB_CONTACT_FROM))
|
||||||
ecdata.ctype = MU_MSG_CONTACT_TYPE_FROM;
|
ecdata.ctype = MU_MSG_CONTACT_TYPE_FROM;
|
||||||
else
|
else
|
||||||
/* FIXME: raise error */
|
return mu_guile_error (FUNC_NAME, 0,
|
||||||
g_return_val_if_reached (SCM_UNDEFINED);
|
"invalid contact type",
|
||||||
|
SCM_UNDEFINED);
|
||||||
}
|
}
|
||||||
|
|
||||||
ecdata.lst = SCM_EOL;
|
ecdata.lst = SCM_EOL;
|
||||||
|
|
|
@ -60,7 +60,6 @@
|
||||||
mu:contact->string
|
mu:contact->string
|
||||||
;;
|
;;
|
||||||
mu:for-each-contact
|
mu:for-each-contact
|
||||||
|
|
||||||
;;
|
;;
|
||||||
mu:contacts
|
mu:contacts
|
||||||
;;
|
;;
|
||||||
|
@ -180,9 +179,11 @@ store. MAXRESULTS specifies the maximum of messages to return, or
|
||||||
|
|
||||||
(define-method (mu:contacts (msg <mu:message>) contact-type)
|
(define-method (mu:contacts (msg <mu:message>) contact-type)
|
||||||
"Get all contacts for MSG of the given CONTACT-TYPE. MSG is of type <mu-message>,
|
"Get all contacts for MSG of the given CONTACT-TYPE. MSG is of type <mu-message>,
|
||||||
while contact type is either `mu:to', `mu:cc', `mu:from' or `mu:bcc'
|
while contact type is either `mu:contact:to', `mu:contact:cc',
|
||||||
to get the corresponding type of contacts, or #t to get all. Returns a
|
`mu:contact:from' or `mu:contact:bcc' to get the corresponding type of
|
||||||
list of <mu-contact> objects."
|
contacts, or #t to get all.
|
||||||
|
|
||||||
|
Returns a list of <mu-contact> objects."
|
||||||
(map (lambda (pair) ;; a pair (na . addr)
|
(map (lambda (pair) ;; a pair (na . addr)
|
||||||
(make <mu:contact> #:name (car pair) #:email (cdr pair)))
|
(make <mu:contact> #:name (car pair) #:email (cdr pair)))
|
||||||
(mu:c:get-contacts (slot-ref msg 'msg) contact-type)))
|
(mu:c:get-contacts (slot-ref msg 'msg) contact-type)))
|
||||||
|
|
|
@ -132,7 +132,6 @@ mu_msg_iter_new (XapianEnquire *enq, size_t maxnum,
|
||||||
sortfield, revert ? true : false);
|
sortfield, revert ? true : false);
|
||||||
|
|
||||||
} catch (const Xapian::DatabaseModifiedError &dbmex) {
|
} catch (const Xapian::DatabaseModifiedError &dbmex) {
|
||||||
|
|
||||||
mu_util_g_set_error (err, MU_ERROR_XAPIAN_MODIFIED,
|
mu_util_g_set_error (err, MU_ERROR_XAPIAN_MODIFIED,
|
||||||
"database was modified; please reopen");
|
"database was modified; please reopen");
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -161,7 +160,8 @@ mu_msg_iter_get_msg_floating (MuMsgIter *iter)
|
||||||
docp = new Xapian::Document(iter->cursor().get_document());
|
docp = new Xapian::Document(iter->cursor().get_document());
|
||||||
|
|
||||||
err = NULL;
|
err = NULL;
|
||||||
msg = iter->set_msg (mu_msg_new_from_doc((XapianDocument*)docp, &err));
|
msg = iter->set_msg (mu_msg_new_from_doc((XapianDocument*)docp,
|
||||||
|
&err));
|
||||||
if (!msg)
|
if (!msg)
|
||||||
MU_HANDLE_G_ERROR(err);
|
MU_HANDLE_G_ERROR(err);
|
||||||
|
|
||||||
|
|
|
@ -282,8 +282,8 @@ mu_query_new (MuStore *store, GError **err)
|
||||||
|
|
||||||
try {
|
try {
|
||||||
return new MuQuery (store);
|
return new MuQuery (store);
|
||||||
|
|
||||||
} MU_XAPIAN_CATCH_BLOCK_G_ERROR_RETURN (err, MU_ERROR_XAPIAN, 0);
|
} MU_XAPIAN_CATCH_BLOCK_G_ERROR_RETURN (err, MU_ERROR_XAPIAN, 0);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue