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

* cosmetics

Browse Source
This commit is contained in:
djcb
2012-09-13 21:12:12 +03:00
parent 70c76459a9
commit ac1d1b2ed8
3 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,7 @@ check_match (MuMsg *msg, MuMsgPart *part, MatchData *mdata)
mdata->index = part->index; mdata->index = part->index;
} }
int static int
get_matching_part_index (MuMsg *msg, MuMsgOptions opts, get_matching_part_index (MuMsg *msg, MuMsgOptions opts,
MuMsgPartMatchFunc func, gpointer user_data) MuMsgPartMatchFunc func, gpointer user_data)
{ {
@ -166,7 +166,8 @@ mu_msg_part_get_text (MuMsg *msg, MuMsgPart *self, MuMsgOptions opts)
err = FALSE; err = FALSE;
if (GMIME_IS_PART (mobj)) { if (GMIME_IS_PART (mobj)) {
if (self->part_type & MU_MSG_PART_TYPE_TEXT_PLAIN) 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 else
return NULL; /* non-text MimePart */ return NULL; /* non-text MimePart */
} }
@ -326,7 +327,6 @@ static gboolean handle_mime_object (MuMsg *msg,
unsigned index, MuMsgPartForeachFunc func, unsigned index, MuMsgPartForeachFunc func,
gpointer user_data); gpointer user_data);
/* call 'func' with information about this MIME-part */ /* call 'func' with information about this MIME-part */
static gboolean static gboolean
handle_encrypted_part (MuMsg *msg, handle_encrypted_part (MuMsg *msg,
@ -465,10 +465,8 @@ struct _ForeachData {
MuMsgOptions opts; MuMsgOptions opts;
}; };
typedef struct _ForeachData ForeachData; typedef struct _ForeachData ForeachData;
static void static void
each_child (GMimeObject *parent, GMimeObject *part, each_child (GMimeObject *parent, GMimeObject *part,
ForeachData *fdata) ForeachData *fdata)

39
mu/mu-cmd.c
View File

@ -87,7 +87,7 @@ get_attach_str (MuMsg *msg)
return attach; return attach;
} }
#define color_maybe(C) do{ if (color) fputs ((C),stdout);}while(0) #define color_maybe(C) do { if(color) fputs ((C),stdout);} while(0)
static void static void
print_field (const char* field, const char *val, gboolean color) print_field (const char* field, const char *val, gboolean color)
@ -157,6 +157,7 @@ view_msg_plain (MuMsg *msg, MuConfig *opts)
gboolean color; gboolean color;
color = !opts->nocolor; color = !opts->nocolor;
print_field ("From", mu_msg_get_from (msg), color); print_field ("From", mu_msg_get_from (msg), color);
print_field ("To", mu_msg_get_to (msg), color); print_field ("To", mu_msg_get_to (msg), color);
print_field ("Cc", mu_msg_get_cc (msg), color); print_field ("Cc", mu_msg_get_cc (msg), color);
@ -294,7 +295,6 @@ mu_cmd_mkdir (MuConfig *opts, GError **err)
} }
static gboolean static gboolean
check_file_okay (const char *path, gboolean cmd_add) check_file_okay (const char *path, gboolean cmd_add)
{ {
@ -312,14 +312,6 @@ check_file_okay (const char *path, gboolean cmd_add)
return TRUE; return TRUE;
} }
gboolean
check_add_params (MuConfig *opts, GError **err)
{
return TRUE;
}
MuError MuError
mu_cmd_add (MuStore *store, MuConfig *opts, GError **err) mu_cmd_add (MuStore *store, MuConfig *opts, GError **err)
@ -553,7 +545,7 @@ with_store (store_func func, MuConfig *opts, gboolean read_only,
} }
gboolean static gboolean
check_params (MuConfig *opts, GError **err) check_params (MuConfig *opts, GError **err)
{ {
if (!opts->params||!opts->params[0]) {/* no command? */ if (!opts->params||!opts->params[0]) {/* no command? */
@ -579,22 +571,27 @@ mu_cmd_execute (MuConfig *opts, GError **err)
/* already handled in mu-config.c */ /* already handled in mu-config.c */
case MU_CONFIG_CMD_HELP: return MU_OK; case MU_CONFIG_CMD_HELP: return MU_OK;
case MU_CONFIG_CMD_CFIND: merr = mu_cmd_cfind (opts, err); break; case MU_CONFIG_CMD_CFIND: merr = mu_cmd_cfind (opts, err); break;
case MU_CONFIG_CMD_MKDIR: merr = mu_cmd_mkdir (opts, err); break; case MU_CONFIG_CMD_MKDIR: merr = mu_cmd_mkdir (opts, err); break;
case MU_CONFIG_CMD_VIEW: merr = mu_cmd_view (opts, err); break; case MU_CONFIG_CMD_VIEW: merr = mu_cmd_view (opts, err); break;
case MU_CONFIG_CMD_VERIFY: merr = mu_cmd_verify (opts, err); break; case MU_CONFIG_CMD_VERIFY: merr = mu_cmd_verify (opts, err); break;
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); break; merr = with_store (mu_cmd_find, opts, TRUE, err);
break;
case MU_CONFIG_CMD_INDEX: case MU_CONFIG_CMD_INDEX:
merr = with_store (mu_cmd_index, opts, FALSE, err); break; merr = with_store (mu_cmd_index, opts, FALSE, err);
break;
case MU_CONFIG_CMD_ADD: case MU_CONFIG_CMD_ADD:
merr = with_store (mu_cmd_add, opts, FALSE, err); break; merr = with_store (mu_cmd_add, opts, FALSE, err);
break;
case MU_CONFIG_CMD_REMOVE: case MU_CONFIG_CMD_REMOVE:
merr = with_store (mu_cmd_remove, opts, FALSE, err); break; merr = with_store (mu_cmd_remove, opts, FALSE, err);
break;
case MU_CONFIG_CMD_SERVER: case MU_CONFIG_CMD_SERVER:
merr = with_store (mu_cmd_server, opts, FALSE, err); break; merr = with_store (mu_cmd_server, opts, FALSE, err);
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,

2
mu4e/mu4e-utils.el
View File

@ -496,7 +496,7 @@ point in eiter the headers buffer or the view buffer."
(defun mu4e-last-query () (defun mu4e-last-query ()
"Get the most recent query or nil if there is none." "Get the most recent query or nil if there is none."
(when (buffer-live-p mu4e~headers-buffer) (when (buffer-live-p mu4e~headers-buffer)
(with-current-buffer mu4e~headers-buffer (with-current-buffer mu4e~headers-buffer
mu4e~headers-last-query))) mu4e~headers-last-query)))