From ac1d1b2ed892417edd8fff004a6515c58fa83bc2 Mon Sep 17 00:00:00 2001 From: djcb Date: Thu, 13 Sep 2012 21:12:12 +0300 Subject: [PATCH] * cosmetics --- lib/mu-msg-part.c | 8 +++----- mu/mu-cmd.c | 39 ++++++++++++++++++--------------------- mu4e/mu4e-utils.el | 2 +- 3 files changed, 22 insertions(+), 27 deletions(-) diff --git a/lib/mu-msg-part.c b/lib/mu-msg-part.c index a267db49..915251fc 100644 --- a/lib/mu-msg-part.c +++ b/lib/mu-msg-part.c @@ -84,7 +84,7 @@ check_match (MuMsg *msg, MuMsgPart *part, MatchData *mdata) mdata->index = part->index; } -int +static int get_matching_part_index (MuMsg *msg, MuMsgOptions opts, MuMsgPartMatchFunc func, gpointer user_data) { @@ -166,7 +166,8 @@ mu_msg_part_get_text (MuMsg *msg, MuMsgPart *self, MuMsgOptions opts) 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 */ } @@ -326,7 +327,6 @@ static gboolean handle_mime_object (MuMsg *msg, unsigned index, MuMsgPartForeachFunc func, gpointer user_data); - /* call 'func' with information about this MIME-part */ static gboolean handle_encrypted_part (MuMsg *msg, @@ -465,10 +465,8 @@ struct _ForeachData { MuMsgOptions opts; }; - typedef struct _ForeachData ForeachData; - static void each_child (GMimeObject *parent, GMimeObject *part, ForeachData *fdata) diff --git a/mu/mu-cmd.c b/mu/mu-cmd.c index 075797c7..02f935ca 100644 --- a/mu/mu-cmd.c +++ b/mu/mu-cmd.c @@ -87,7 +87,7 @@ get_attach_str (MuMsg *msg) 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 print_field (const char* field, const char *val, gboolean color) @@ -157,6 +157,7 @@ view_msg_plain (MuMsg *msg, MuConfig *opts) gboolean color; color = !opts->nocolor; + print_field ("From", mu_msg_get_from (msg), color); print_field ("To", mu_msg_get_to (msg), color); print_field ("Cc", mu_msg_get_cc (msg), color); @@ -294,7 +295,6 @@ mu_cmd_mkdir (MuConfig *opts, GError **err) } - static gboolean check_file_okay (const char *path, gboolean cmd_add) { @@ -312,14 +312,6 @@ check_file_okay (const char *path, gboolean cmd_add) return TRUE; } -gboolean -check_add_params (MuConfig *opts, GError **err) -{ - - return TRUE; -} - - MuError 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) { 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 */ case MU_CONFIG_CMD_HELP: return MU_OK; - 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_VIEW: merr = mu_cmd_view (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_CFIND: merr = mu_cmd_cfind (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_VERIFY: merr = mu_cmd_verify (opts, err); break; + case MU_CONFIG_CMD_EXTRACT: merr = mu_cmd_extract (opts, err); break; 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: - 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: - 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: - 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: - merr = with_store (mu_cmd_server, opts, FALSE, err); break; + merr = with_store (mu_cmd_server, opts, FALSE, err); + break; default: show_usage (); mu_util_g_set_error (err, MU_ERROR_IN_PARAMETERS, diff --git a/mu4e/mu4e-utils.el b/mu4e/mu4e-utils.el index 6971d6f4..cc08b65f 100644 --- a/mu4e/mu4e-utils.el +++ b/mu4e/mu4e-utils.el @@ -496,7 +496,7 @@ point in eiter the headers buffer or the view buffer." (defun mu4e-last-query () "Get the most recent query or nil if there is none." (when (buffer-live-p mu4e~headers-buffer) - (with-current-buffer mu4e~headers-buffer + (with-current-buffer mu4e~headers-buffer mu4e~headers-last-query))) (defun mu4e-select-other-view ()