emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

* lib: don't check for bogus error

This commit is contained in:
djcb 2012-08-23 00:00:28 +03:00
parent d93c0bb3e2
commit dcda69e459
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/mu-msg-part.c
View File

@ -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 */
}

7
lib/mu-msg-part.h
View File

@ -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;
/**

6
lib/mu-store-write.cc
View File

@ -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);