update for lib/utils split

Update sources with the new paths

mu/mu-cmd-cfind.c

@@ -24,12 +24,13 @@
 #include <ctype.h>
 
 #include "mu-cmd.h"
-#include "mu-util.h"
-#include "mu-str.h"
-#include "mu-date.h"
 #include "mu-contacts.hh"
 #include "mu-runtime.h"
 
+#include "utils/mu-util.h"
+#include "utils/mu-str.h"
+#include "utils/mu-date.h"
+
 /**
  * guess the last name for the given name; clearly,
  * this is just a rough guess for setting an initial value.

mu/mu-cmd-extract.c

@@ -29,9 +29,8 @@
 #include "mu-msg.h"
 #include "mu-msg-part.h"
 #include "mu-cmd.h"
-#include "mu-util.h"
-#include "mu-str.h"
-
+#include "utils/mu-util.h"
+#include "utils/mu-str.h"
 
 
 static gboolean

mu/mu-cmd-find.c

@@ -29,8 +29,6 @@
 #include <signal.h>
 
 #include "mu-msg.h"
-#include "mu-str.h"
-#include "mu-date.h"
 #include "mu-maildir.h"
 #include "mu-index.h"
 #include "mu-query.h"
@@ -38,7 +36,10 @@
 #include "mu-bookmarks.h"
 #include "mu-runtime.h"
 
-#include "mu-util.h"
+#include "utils/mu-util.h"
+#include "utils/mu-str.h"
+#include "utils/mu-date.h"
+
 #include "mu-cmd.h"
 #include "mu-threader.h"
 

mu/mu-cmd-index.c

@@ -31,12 +31,13 @@
 #include <signal.h>
 #include <unistd.h>
 
-#include "mu-util.h"
 #include "mu-msg.h"
 #include "mu-index.h"
 #include "mu-store.hh"
 #include "mu-runtime.h"
-#include "mu-log.h"
+
+#include "utils/mu-util.h"
+#include "utils/mu-log.h"
 
 static gboolean MU_CAUGHT_SIGNAL;
 

mu/mu-cmd-script.c

@@ -30,10 +30,11 @@
 #include <errno.h>
 
 #include "mu-cmd.h"
-#include "mu-util.h"
-#include "mu-str.h"
 #include "mu-script.h"
 
+#include "utils/mu-util.h"
+#include "utils/mu-str.h"
+
 #define MU_GUILE_EXT          ".scm"
 #define MU_GUILE_DESCR_PREFIX ";; INFO: "
 

mu/mu-cmd-server.c

@@ -44,7 +44,6 @@
 #endif 	/*PATH_MAX */
 
 #include "mu-runtime.h"
-#include "mu-str.h"
 #include "mu-cmd.h"
 #include "mu-maildir.h"
 #include "mu-query.h"
@@ -53,6 +52,8 @@
 #include "mu-msg-part.h"
 #include "mu-contacts.hh"
 
+#include "utils/mu-str.h"
+
 /* signal handling *****************************************************/
 /*
  * when we receive SIGINT, SIGHUP, SIGTERM, set MU_CAUGHT_SIGNAL to

mu/mu-cmd.c

@@ -31,14 +31,15 @@
 #include "mu-msg.h"
 #include "mu-msg-part.h"
 #include "mu-cmd.h"
-#include "mu-util.h"
-#include "mu-str.h"
-#include "mu-date.h"
 #include "mu-maildir.h"
 #include "mu-contacts.hh"
 #include "mu-runtime.h"
 #include "mu-flags.h"
-#include "mu-log.h"
+
+#include "utils/mu-log.h"
+#include "utils/mu-util.h"
+#include "utils/mu-str.h"
+#include "utils/mu-date.h"
 
 #define VIEW_TERMINATOR '\f' /* form-feed */
 

mu/mu-config.c

@@ -28,7 +28,6 @@
 #include <unistd.h>
 #include <stdio.h>
 
-#include "mu-util.h"
 #include "mu-config.h"
 #include "mu-cmd.h"
 

mu/mu-config.h

@@ -26,7 +26,7 @@
 #include <sys/types.h> /* for mode_t */
 #include <mu-msg-fields.h>
 #include <mu-msg.h>
-#include <mu-util.h>
+#include <utils/mu-util.h>
 
 G_BEGIN_DECLS
 

mu/tests/test-mu-query.c

@@ -33,7 +33,7 @@
 
 #include "test-mu-common.h"
 #include "mu-query.h"
-#include "mu-str.h"
+#include "utils/mu-str.h"
 #include "mu-store.hh"
 
 static char* DB_PATH1 = NULL;

mu/tests/test-mu-threads.c

@@ -32,7 +32,7 @@
 
 #include "test-mu-common.h"
 #include "mu-query.h"
-#include "mu-str.h"
+#include "utils/mu-str.h"
 
 struct _tinfo {
 	const char *threadpath;