Previously, we would output:
'On Thu, 25 Feb 2010 14:32:54 +0100, Sebastian Spaeth <Sebastian at SSpaeth.de>
wrote:' now it is:
'On 2010-02-25, Sebastian Spaeth wrote:'
In case we don't find a '<' (as indicator for 'Realname <email>'), we still use
the whole from address.
Signed-off-by: Sebastian Spaeth <Sebastian at SSpaeth.de>
---
This probably shows my lack of C skills quite nicely but it does the job for me.
notmuch-reply.c | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/notmuch-reply.c b/notmuch-reply.c
index 98f6442..929572f 100644
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -288,9 +288,12 @@ notmuch_reply_format_default(void *ctx, notmuch_config_t
*config, notmuch_query_
GMimeMessage *reply;
notmuch_messages_t *messages;
notmuch_message_t *message;
- const char *subject, *from_addr = NULL;
+ const char *subject, *from_addr = NULL, *short_from;
const char *in_reply_to, *orig_references, *references;
char *reply_headers;
+ time_t date;
+ struct tm *datetm;
+ char *datestr;
for (messages = notmuch_query_search_messages (query);
notmuch_messages_has_more (messages);
@@ -346,10 +349,21 @@ notmuch_reply_format_default(void *ctx, notmuch_config_t
*config, notmuch_query_
g_object_unref (G_OBJECT (reply));
reply = NULL;
+ date = notmuch_message_get_date(message);
+ datetm = gmtime( &date );
+ datestr = talloc_array(ctx, char, 11);
+ strftime(datestr, 11, "%Y-%m-%d", datetm);
+
+ /* If from contains '<' (not as first char),
+ * only use the preceding real name */
+ short_from = talloc_strdup(ctx, from_addr);
+ if (strstr(short_from, "<") > short_from) {
+ *(strstr(short_from, "<")-1) = 0;
+ }
+
printf ("On %s, %s wrote:\n",
- notmuch_message_get_header (message, "date"),
- notmuch_message_get_header (message, "from"));
+ datestr,
+ short_from);
show_message_body (notmuch_message_get_filename (message), reply_part);
--
1.6.3.3
