From ba6955be2155d15022590d6a58b29a04517de754 Mon Sep 17 00:00:00 2001
From: djcb <djcb@djcbsoftware.nl>
Date: Tue, 25 Dec 2012 17:34:57 +0200
Subject: [PATCH] * small updates for mu_query API changes

---
 mu/mu-cmd-find.c           |  7 +++++--
 mu/mu-cmd-server.c         | 12 +++---------
 mu/tests/test-mu-threads.c |  2 +-
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/mu/mu-cmd-find.c b/mu/mu-cmd-find.c
index 03da09ed..18a08474 100644
--- a/mu/mu-cmd-find.c
+++ b/mu/mu-cmd-find.c
@@ -123,8 +123,6 @@ run_query (MuQuery *xapian, const gchar *query, MuConfig *opts,  GError **err)
 	}
 
 	qflags = MU_QUERY_FLAG_NONE;
-	if (opts->threads)
-		qflags |= MU_QUERY_FLAG_THREADS;
 	if (opts->reverse)
 		qflags |= MU_QUERY_FLAG_DESCENDING;
 	if (opts->skip_dups)
@@ -574,7 +572,12 @@ output_query_results (MuMsgIter *iter, MuConfig *opts, GError **err)
 		msg = get_message (iter, opts->after);
 		if (!msg)
 			break;
+		/* { */
+		/* 	const char* thread_id; */
+		/* 	thread_id = mu_msg_iter_get_thread_id (iter); */
+		/* 	g_print ("%s ", thread_id ? thread_id : "<none>"); */
 
+		/* } */
 		rv = output_func (msg, iter, opts, err);
 		if (!rv)
 			break;
diff --git a/mu/mu-cmd-server.c b/mu/mu-cmd-server.c
index e7c983cb..072660c7 100644
--- a/mu/mu-cmd-server.c
+++ b/mu/mu-cmd-server.c
@@ -652,7 +652,7 @@ cmd_contacts (ServerContext *ctx, GSList *args, GError **err)
 
 
 static unsigned
-print_sexps (MuMsgIter *iter, gboolean threads, unsigned maxnum)
+print_sexps (MuMsgIter *iter, unsigned maxnum)
 {
 	unsigned u;
 	u = 0;
@@ -665,8 +665,7 @@ print_sexps (MuMsgIter *iter, gboolean threads, unsigned maxnum)
 		if (mu_msg_is_readable (msg)) {
 			char *sexp;
 			const MuMsgIterThreadInfo* ti;
-
-			ti = threads ? mu_msg_iter_get_thread_info (iter) : NULL;
+			ti   = mu_msg_iter_get_thread_info (iter);
 			sexp = mu_msg_to_sexp (msg, mu_msg_iter_get_docid (iter),
 					       ti, MU_MSG_OPTION_HEADERS_ONLY);
 			print_expr ("%s", sexp);
@@ -863,9 +862,6 @@ get_find_params (GSList *args, MuMsgFieldId *sortfield,
 	/* flags */
 	*qflags = MU_QUERY_FLAG_NONE;
 
-	if (get_bool_from_args (args, "threads", TRUE, NULL))
-		*qflags |= MU_QUERY_FLAG_THREADS;
-
 	/* maximum number of results */
 	maxnumstr = get_string_from_args (args, "maxnum", TRUE, NULL);
 	*maxnum = maxnumstr ? atoi (maxnumstr) : 0;
@@ -923,9 +919,7 @@ cmd_find (ServerContext *ctx, GSList *args, GError **err)
 	 * will ensure that the output of two finds will not be
 	 * mixed. */
 	print_expr ("(:erase t)");
-	foundnum = print_sexps (iter,
-				qflags & MU_QUERY_FLAG_THREADS,
-				maxnum > 0 ? maxnum : G_MAXINT32);
+	foundnum = print_sexps (iter, maxnum);
 	print_expr ("(:found %u)", foundnum);
 	mu_msg_iter_destroy (iter);
 
diff --git a/mu/tests/test-mu-threads.c b/mu/tests/test-mu-threads.c
index b39723a6..acbc52db 100644
--- a/mu/tests/test-mu-threads.c
+++ b/mu/tests/test-mu-threads.c
@@ -71,7 +71,7 @@ run_and_get_iter (const char *xpath, const char *query)
 	g_assert (query);
 
 	iter = mu_query_run (mquery, query, MU_MSG_FIELD_ID_DATE,
-			     -1, MU_QUERY_FLAG_THREADS, NULL);
+			     -1, MU_QUERY_FLAG_NONE, NULL);
 	mu_query_destroy (mquery);
 	g_assert (iter);