From dcda69e4592bf42ef2a128ec00db70daf9358c57 Mon Sep 17 00:00:00 2001
From: djcb <djcb@djcbsoftware.nl>
Date: Thu, 23 Aug 2012 00:00:28 +0300
Subject: [PATCH] * lib: don't check for bogus error

---
 lib/mu-msg-part.c     | 8 ++++----
 lib/mu-msg-part.h     | 7 ++++---
 lib/mu-store-write.cc | 6 ++----
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/lib/mu-msg-part.c b/lib/mu-msg-part.c
index 6353aaa3..7d77b638 100644
--- a/lib/mu-msg-part.c
+++ b/lib/mu-msg-part.c
@@ -157,21 +157,21 @@ accumulate_text (MuMsg *msg, MuMsgPart *part, GString **gstrp)
 }
 
 char*
-mu_msg_part_get_text (MuMsg *msg, MuMsgPart *self, MuMsgOptions opts,
-		      gboolean *err)
+mu_msg_part_get_text (MuMsg *msg, MuMsgPart *self, MuMsgOptions opts)
 {
 	GMimeObject  *mobj;
 	GMimeMessage *mime_msg;
+	gboolean err;
 
 	g_return_val_if_fail (msg, NULL);
 	g_return_val_if_fail (self && self->data, NULL);
-	g_return_val_if_fail (err, NULL);
 
 	mobj = (GMimeObject*)self->data;
 
+	err = FALSE;
 	if (GMIME_IS_PART (mobj)) {
 		if (self->part_type & MU_MSG_PART_TYPE_TEXT_PLAIN)
-			return mu_msg_mime_part_to_string ((GMimePart*)mobj, err);
+			return mu_msg_mime_part_to_string ((GMimePart*)mobj, &err);
 		else
 			return NULL; /* non-text MimePart */
 	}
diff --git a/lib/mu-msg-part.h b/lib/mu-msg-part.h
index db8f8ae8..3012644c 100644
--- a/lib/mu-msg-part.h
+++ b/lib/mu-msg-part.h
@@ -92,13 +92,14 @@ char *mu_msg_part_get_filename (MuMsgPart *mpart, gboolean construct_if_needed)
 /**
  * get the text in the MuMsgPart (ie. in its GMimePart)
  *
+ * @param msg a MuMsg
  * @param part a MuMsgPart
- * @param err will receive TRUE if there was an error, FALSE otherwise
+ * @param opts MuMsgOptions
  *
  * @return utf8 string for this MIME part, to be freed by caller
  */
-char* mu_msg_part_get_text (MuMsg *msg, MuMsgPart *part, MuMsgOptions opts,
-			    gboolean *err) G_GNUC_WARN_UNUSED_RESULT;
+char* mu_msg_part_get_text (MuMsg *msg, MuMsgPart *part, MuMsgOptions opts)
+	G_GNUC_WARN_UNUSED_RESULT;
 
 
 /**
diff --git a/lib/mu-store-write.cc b/lib/mu-store-write.cc
index 771ff985..92c46462 100644
--- a/lib/mu-store-write.cc
+++ b/lib/mu-store-write.cc
@@ -388,7 +388,6 @@ struct PartData {
 static void
 maybe_index_text_part (MuMsg *msg, MuMsgPart *part, PartData *pdata)
 {
-	gboolean err;
 	char *txt, *norm;
 	Xapian::TermGenerator termgen;
 
@@ -398,9 +397,8 @@ maybe_index_text_part (MuMsg *msg, MuMsgPart *part, PartData *pdata)
 	    !(part->part_type & MU_MSG_PART_TYPE_MESSAGE))
 		return;
 
-	txt = mu_msg_part_get_text (msg, part, MU_MSG_OPTION_NONE,
-				    &err);
-	if (!txt || err)
+	txt = mu_msg_part_get_text (msg, part, MU_MSG_OPTION_NONE);
+	if (!txt)
 		return;
 
 	termgen.set_document(pdata->_doc);