alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* some refactoring for line35

Browse Source
This commit is contained in:
djcb
2012-09-14 10:06:14 +03:00
parent 7a40bfab38
commit 6a4b094ac9
2 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,6 +151,21 @@ accumulate_text (MuMsg *msg, MuMsgPart *part, GString **gstrp)
accumulate_text_part (msg, part, gstrp); accumulate_text_part (msg, part, gstrp);
} }
static char*
get_text_from_mime_msg (MuMsg *msg, GMimeMessage *mmsg, MuMsgOptions opts,
unsigned index)
{
GString *gstr;
gstr = g_string_sized_new (4096);
handle_children (msg, mmsg, opts, index,
(MuMsgPartForeachFunc)accumulate_text,
&gstr);
return g_string_free (gstr, FALSE);
}
char* char*
mu_msg_part_get_text (MuMsg *msg, MuMsgPart *self, MuMsgOptions opts) mu_msg_part_get_text (MuMsg *msg, MuMsgPart *self, MuMsgOptions opts)
{ {
@ -173,24 +188,17 @@ mu_msg_part_get_text (MuMsg *msg, MuMsgPart *self, MuMsgOptions opts)
} }
mime_msg = NULL; mime_msg = NULL;
if (GMIME_IS_MESSAGE_PART (mobj)) if (GMIME_IS_MESSAGE_PART (mobj))
mime_msg = g_mime_message_part_get_message mime_msg = g_mime_message_part_get_message
((GMimeMessagePart*)mobj); ((GMimeMessagePart*)mobj);
else if (GMIME_IS_MESSAGE (mobj)) else if (GMIME_IS_MESSAGE (mobj))
mime_msg = (GMimeMessage*)mobj; mime_msg = (GMimeMessage*)mobj;
else
if (mime_msg) {
GString *gstr;
gstr = g_string_sized_new (4096);
handle_children (msg, mime_msg, opts, self->index,
(MuMsgPartForeachFunc)accumulate_text,
&gstr);
return g_string_free (gstr, FALSE);
} else {
g_warning ("%s: cannot get text for %s",
__FUNCTION__, G_OBJECT_TYPE_NAME (mobj));
return NULL; return NULL;
}
return get_text_from_mime_msg (msg, mime_msg,
opts, self->index);
} }

18
mu/mu-cmd.c
View File

@ -520,7 +520,7 @@ show_usage (void)
typedef MuError (*store_func) (MuStore *, MuConfig *, GError **err); typedef MuError (*store_func) (MuStore *, MuConfig *, GError **err);
MuError static MuError
with_store (store_func func, MuConfig *opts, gboolean read_only, with_store (store_func func, MuConfig *opts, gboolean read_only,
GError **err) GError **err)
{ {
@ -563,6 +563,7 @@ MuError
mu_cmd_execute (MuConfig *opts, GError **err) mu_cmd_execute (MuConfig *opts, GError **err)
{ {
MuError merr; MuError merr;
g_return_val_if_fail (opts, MU_ERROR_INTERNAL); g_return_val_if_fail (opts, MU_ERROR_INTERNAL);
if (!check_params(opts, err)) if (!check_params(opts, err))
@ -579,20 +580,15 @@ mu_cmd_execute (MuConfig *opts, GError **err)
case MU_CONFIG_CMD_EXTRACT: merr = mu_cmd_extract (opts, err); break; case MU_CONFIG_CMD_EXTRACT: merr = mu_cmd_extract (opts, err); break;
case MU_CONFIG_CMD_FIND: case MU_CONFIG_CMD_FIND:
merr = with_store (mu_cmd_find, opts, TRUE, err); merr = with_store (mu_cmd_find, opts, TRUE, err); break;
break;
case MU_CONFIG_CMD_INDEX: case MU_CONFIG_CMD_INDEX:
merr = with_store (mu_cmd_index, opts, FALSE, err); merr = with_store (mu_cmd_index, opts, FALSE, err); break;
break;
case MU_CONFIG_CMD_ADD: case MU_CONFIG_CMD_ADD:
merr = with_store (mu_cmd_add, opts, FALSE, err); merr = with_store (mu_cmd_add, opts, FALSE, err); break;
break;
case MU_CONFIG_CMD_REMOVE: case MU_CONFIG_CMD_REMOVE:
merr = with_store (mu_cmd_remove, opts, FALSE, err); merr = with_store (mu_cmd_remove, opts, FALSE, err); break;
break;
case MU_CONFIG_CMD_SERVER: case MU_CONFIG_CMD_SERVER:
merr = with_store (mu_cmd_server, opts, FALSE, err); merr = with_store (mu_cmd_server, opts, FALSE, err); break;
break;
default: default:
show_usage (); show_usage ();
mu_util_g_set_error (err, MU_ERROR_IN_PARAMETERS, mu_util_g_set_error (err, MU_ERROR_IN_PARAMETERS,