From 1a7414dd6d0e30811a3c01df7c23713499398314 Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <djcb@djcbsoftware.nl>
Date: Mon, 12 Sep 2011 20:34:48 +0300
Subject: [PATCH] * mu-cmd-*: minor, updates for API changes

---
 src/mu-cmd-cfind.c |  5 ++++-
 src/mu-cmd-find.c  | 13 ++++---------
 src/mu-cmd-index.c |  1 -
 src/mu-cmd.c       |  4 ++--
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/mu-cmd-cfind.c b/src/mu-cmd-cfind.c
index 6a59caf7..1dbf1686 100644
--- a/src/mu-cmd-cfind.c
+++ b/src/mu-cmd-cfind.c
@@ -172,7 +172,10 @@ run_cmd_cfind (const char* pattern, MuConfigFormat format,
 	gboolean rv;
 	MuContacts *contacts;
 	size_t num;
-	ECData ecdata = {format, color};
+	ECData ecdata;
+
+	ecdata.format = format;
+	ecdata.color  = color;
 
 	contacts = mu_contacts_new (mu_runtime_path(MU_RUNTIME_PATH_CONTACTS));
 	if (!contacts) {
diff --git a/src/mu-cmd-find.c b/src/mu-cmd-find.c
index a161849d..306b4d29 100644
--- a/src/mu-cmd-find.c
+++ b/src/mu-cmd-find.c
@@ -544,13 +544,10 @@ display_field (MuMsg *msg, MuMsgFieldId mfid)
 static void
 print_summary (MuMsg *msg)
 {
-	GError *err;
 	char *summ;
 
 	const guint SUMMARY_LEN = 5; /* summary based on first 5
 				      * lines */
-	err = NULL;
-
 	summ = mu_str_summarize (mu_msg_get_body_text(msg), SUMMARY_LEN);
 	g_print ("Summary: %s\n", summ ? summ : "<none>");
 	g_free (summ);
@@ -713,9 +710,11 @@ output_sexp (MuMsgIter *iter, gboolean threads,
 		if (!include_unreadable && !mu_msg_is_readable (msg))
 			continue;
 
-		ti = threads ? mu_msg_iter_get_thread_info (iter) : NULL;
+		ti   = threads ? mu_msg_iter_get_thread_info (iter) : NULL;
+		sexp = mu_msg_to_sexp (msg,
+				       mu_msg_iter_get_docid (iter),
+				       ti, TRUE);
 
-		sexp = mu_msg_to_sexp (msg, ti, TRUE);
 		fputs (sexp, stdout);
 		g_free (sexp);
 
@@ -763,11 +762,7 @@ output_xml (MuMsgIter *iter, gboolean include_unreadable, GError **err)
 
 	for (myiter = iter, count = 0; !mu_msg_iter_is_done (myiter);
 	     mu_msg_iter_next (myiter)) {
-
-		GError *err;
 		MuMsg *msg;
-
-		err = NULL;
 		msg = mu_msg_iter_get_msg_floating (iter); /* don't unref */
 		if (!msg)
 			return FALSE;
diff --git a/src/mu-cmd-index.c b/src/mu-cmd-index.c
index fc90db02..470f8edc 100644
--- a/src/mu-cmd-index.c
+++ b/src/mu-cmd-index.c
@@ -39,7 +39,6 @@
 
 static gboolean MU_CAUGHT_SIGNAL;
 
-
 static void
 sig_handler (int sig)
 {
diff --git a/src/mu-cmd.c b/src/mu-cmd.c
index f9a73b42..f647e211 100644
--- a/src/mu-cmd.c
+++ b/src/mu-cmd.c
@@ -48,7 +48,7 @@ view_msg_sexp (MuMsg *msg)
 {
 	char *sexp;
 
-	sexp = mu_msg_to_sexp (msg, NULL, FALSE);
+	sexp = mu_msg_to_sexp (msg, 0, NULL, FALSE);
 	fputs (sexp, stdout);
 	g_free (sexp);
 
@@ -409,7 +409,7 @@ mu_cmd_add (MuStore *store, MuConfig *opts, GError **err)
 		src = opts->params[i];
 
 		if (!check_file_okay (src, TRUE) ||
-		    !mu_store_store_path (store, src)) {
+		    mu_store_add_path (store, src, err) == MU_STORE_INVALID_DOCID) {
 			MU_WRITE_LOG ("failed to add %s", src);
 			allok = FALSE;
 		}