From: Paul Mangan Date: Sun, 23 Jan 2011 08:40:26 +0000 (+0000) Subject: 2011-01-23 [paul] 3.7.8cvs42 X-Git-Tag: REL_3_7_9~37 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=b73f55066422614a992765b374db5dbf23804b57 2011-01-23 [paul] 3.7.8cvs42 * manual/advanced.xml * src/prefs_common.c * src/prefs_common.h * src/textview.c fix bug #2350, 'Make displaying localized date/time in message view optional'. This introduces a new hidden option (why do more?), 'msgview_date_format', which defaults to OFF, maintaining the current and expected behaviour. --- diff --git a/ChangeLog b/ChangeLog index 7c52b610c..b4d2e4996 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2011-01-23 [paul] 3.7.8cvs42 + + * manual/advanced.xml + * src/prefs_common.c + * src/prefs_common.h + * src/textview.c + fix bug #2350, 'Make displaying localized date/time in + message view optional'. + This introduces a new hidden option (why do more?), + 'msgview_date_format', which defaults to OFF, maintaining + the current and expected behaviour. + 2011-01-21 [colin] 3.7.8cvs41 * src/procmime.c diff --git a/PATCHSETS b/PATCHSETS index 6953c05a1..56de36d15 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4115,3 +4115,4 @@ ( cvs diff -u -r 1.18.2.63 -r 1.18.2.64 src/plugins/spamassassin/spamassassin.c; ) > 3.7.8cvs39.patchset ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 claws-mail.desktop; ) > 3.7.8cvs40.patchset ( cvs diff -u -r 1.49.2.136 -r 1.49.2.137 src/procmime.c; ) > 3.7.8cvs41.patchset +( cvs diff -u -r 1.1.2.54 -r 1.1.2.55 manual/advanced.xml; cvs diff -u -r 1.204.2.198 -r 1.204.2.199 src/prefs_common.c; cvs diff -u -r 1.103.2.130 -r 1.103.2.131 src/prefs_common.h; cvs diff -u -r 1.96.2.229 -r 1.96.2.230 src/textview.c; ) > 3.7.8cvs42.patchset diff --git a/configure.ac b/configure.ac index 5b60cd9bb..cf519de4a 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=7 MICRO_VERSION=8 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=41 +EXTRA_VERSION=42 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/manual/advanced.xml b/manual/advanced.xml index f7b5785c4..537895db2 100644 --- a/manual/advanced.xml +++ b/manual/advanced.xml @@ -654,6 +654,15 @@ + + msgview_date_format + + + 0 or 1. Use the same user-defined date format in the Message + View as is used in the Message List. Default is 0, turned off. + + + outgoing_fallback_to_ascii diff --git a/src/prefs_common.c b/src/prefs_common.c index fcb9a9b41..65026e31f 100644 --- a/src/prefs_common.c +++ b/src/prefs_common.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2009 Hiroyuki Yamamoto and the Claws Mail team + * Copyright (C) 1999-2011 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -446,6 +446,8 @@ static PrefParam param[] = { NULL, NULL, NULL}, {"date_format", N_("%y/%m/%d(%a) %H:%M"), &prefs_common.date_format, P_STRING, NULL, NULL, NULL}, + {"msgview_date_format", "FALSE", &prefs_common.msgview_date_format, P_BOOL, + NULL, NULL, NULL}, {"bold_unread", "TRUE", &prefs_common.bold_unread, P_BOOL, NULL, NULL, NULL}, diff --git a/src/prefs_common.h b/src/prefs_common.h index 81dc1c083..0f9430a05 100644 --- a/src/prefs_common.h +++ b/src/prefs_common.h @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2009 Hiroyuki Yamamoto and the Claws Mail team + * Copyright (C) 1999-2011 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -215,6 +215,7 @@ struct _PrefsCommon gboolean swap_from; gboolean use_addr_book; gchar *date_format; + gboolean *msgview_date_format; gboolean use_stripes_everywhere; gboolean use_stripes_in_summaries; /* overrides if use_stripes_everywhere is set to TRUE */ diff --git a/src/textview.c b/src/textview.c index f1c1e8cc5..261213875 100644 --- a/src/textview.c +++ b/src/textview.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2009 Hiroyuki Yamamoto and the Claws Mail team + * Copyright (C) 1999-2011 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -2178,7 +2178,8 @@ static void textview_show_header(TextView *textview, GPtrArray *headers) procheader_headername_equal(header->name, "Cc")) unfold_line(header->body); - if (procheader_headername_equal(header->name, "Date")) { + if (procheader_headername_equal(header->name, "Date") && + prefs_common.msgview_date_format) { gchar hbody[80]; procheader_date_parse(hbody, header->body, sizeof(hbody));