From edfdef44a45c55d38b3a777634f6a31c9629bb3c Mon Sep 17 00:00:00 2001
From: djcb <djcb@djcbsoftware.nl>
Date: Sun, 13 Oct 2013 19:58:25 +0300
Subject: [PATCH] index: improve error message when file does not seem to be an
 email

---
 lib/mu-index.c    | 15 ++++++++++-----
 lib/mu-msg-file.c |  6 ++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/lib/mu-index.c b/lib/mu-index.c
index cfb7eb17..b8726f17 100644
--- a/lib/mu-index.c
+++ b/lib/mu-index.c
@@ -128,9 +128,9 @@ insert_or_update_maybe (const char *fullpath, const char *mdir,
 			time_t filestamp, MuIndexCallbackData *data,
 			gboolean *updated)
 {
-	MuMsg *msg;
-	GError *err;
-	gboolean rv;
+	MuMsg		*msg;
+	GError		*err;
+	gboolean	 rv;
 
 	*updated = FALSE;
 	if (!needs_index (data, fullpath, filestamp))
@@ -139,8 +139,13 @@ insert_or_update_maybe (const char *fullpath, const char *mdir,
 	err = NULL;
 	msg = mu_msg_new_from_file (fullpath, mdir, &err);
 	if (!msg) {
-		g_warning ("error creating message object: %s",
-			   err ? err->message : "cause unknown");
+		if (!err)
+			g_warning ("error creating message object: %s",
+				   fullpath);
+		else {
+			g_warning ("%s", err->message);
+			g_clear_error (&err);
+		}
 		/* warn, then simply continue */
 		return MU_OK;
 	}
diff --git a/lib/mu-msg-file.c b/lib/mu-msg-file.c
index 08f62464..1e6bd6f3 100644
--- a/lib/mu-msg-file.c
+++ b/lib/mu-msg-file.c
@@ -155,8 +155,7 @@ init_mime_msg (MuMsgFile *self, const char* path, GError **err)
 	g_object_unref (stream);
 	if (!parser) {
 		g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_GMIME,
-			     "%s: cannot create mime parser for %s",
-			     __FUNCTION__, path);
+			     "cannot create mime parser for %s", path);
 		return FALSE;
 	}
 
@@ -164,8 +163,7 @@ init_mime_msg (MuMsgFile *self, const char* path, GError **err)
 	g_object_unref (parser);
 	if (!self->_mime_msg) {
 		g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_GMIME,
-			     "%s: cannot construct mime message for %s",
-			     __FUNCTION__, path);
+			     "message seems invalid, ignoring (%s)", path);
 		return FALSE;
 	}