* cosmetics / minor

guile/mu-guile-message.c

@@ -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))
 			ecdata.ctype = MU_MSG_CONTACT_TYPE_FROM;
 		else
-			/* FIXME: raise error */
-			g_return_val_if_reached (SCM_UNDEFINED);
+			return mu_guile_error (FUNC_NAME, 0,
+					       "invalid contact type",
+					       SCM_UNDEFINED);
 	}
 
 	ecdata.lst = SCM_EOL;

guile/mu.scm

@@ -60,7 +60,6 @@
     mu:contact->string
     ;;
     mu:for-each-contact
-
     ;;
     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)
   "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'
-to get the corresponding type of contacts, or #t to get all. Returns a
-list of <mu-contact> objects."
+while contact type is either `mu:contact:to', `mu:contact:cc',
+`mu:contact:from' or `mu:contact:bcc' to get the corresponding type of
+contacts, or #t to get all.
+
+Returns a list of <mu-contact> objects."
   (map (lambda (pair) ;; a pair (na . addr)
 	 (make <mu:contact>  #:name (car pair) #:email (cdr pair)))
     (mu:c:get-contacts (slot-ref msg 'msg) contact-type)))

lib/mu-msg-iter.cc

@@ -132,7 +132,6 @@ mu_msg_iter_new (XapianEnquire *enq, size_t maxnum,
 				      sortfield, revert ? true : false);
 
 	} catch (const Xapian::DatabaseModifiedError &dbmex) {
-
 		mu_util_g_set_error (err, MU_ERROR_XAPIAN_MODIFIED,
 				     "database was modified; please reopen");
 		return 0;
@@ -161,7 +160,8 @@ mu_msg_iter_get_msg_floating (MuMsgIter *iter)
 		docp = new Xapian::Document(iter->cursor().get_document());
 
 		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)
 			MU_HANDLE_G_ERROR(err);
 

lib/mu-query.cc

@@ -282,8 +282,8 @@ mu_query_new (MuStore *store, GError **err)
 
 	try {
 		return new MuQuery (store);
-
 	} MU_XAPIAN_CATCH_BLOCK_G_ERROR_RETURN (err, MU_ERROR_XAPIAN, 0);
+
 	return 0;
 }