aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2008-03-27 19:04:18 +0800
committerMilan Crha <mcrha@src.gnome.org>2008-03-27 19:04:18 +0800
commit8ef7c0306eb0a66efd1d71232e0cc7413efc87e7 (patch)
tree757b83b99182037760a6ca400c4d9cce56294b1d
parent2759c2e3a72c5c2e8a7b35eb1342221c3813380b (diff)
downloadgsoc2013-evolution-8ef7c0306eb0a66efd1d71232e0cc7413efc87e7.tar.gz
gsoc2013-evolution-8ef7c0306eb0a66efd1d71232e0cc7413efc87e7.tar.zst
gsoc2013-evolution-8ef7c0306eb0a66efd1d71232e0cc7413efc87e7.zip
** Fix for bug #488175
2008-03-27 Milan Crha <mcrha@redhat.com> ** Fix for bug #488175 * message-list.c: (ml_tree_value_at): Colorize follow-up messages same as with due-by flag. svn path=/trunk/; revision=35261
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/message-list.c9
2 files changed, 11 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 5a05bde1e0..1cf028425a 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-27 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #488175
+
+ * message-list.c: (ml_tree_value_at):
+ Colorize follow-up messages same as with due-by flag.
+
2008-03-25 Veerapuram Varadhan <vvaradhan@novell.com>
** Added configurable Proxy settings for Evolution.
diff --git a/mail/message-list.c b/mail/message-list.c
index 3f9a3644ae..374ad3bea0 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -1411,7 +1411,7 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, int col, void *model_data)
return GINT_TO_POINTER (!(flags & CAMEL_MESSAGE_SEEN));
}
case COL_COLOUR: {
- const char *colour, *due_by, *completed;
+ const char *colour, *due_by, *completed, *followup;
char *labels_string = NULL;
int n;
@@ -1425,6 +1425,7 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, int col, void *model_data)
colour = camel_message_info_user_tag(msg_info, "colour");
due_by = camel_message_info_user_tag(msg_info, "due-by");
completed = camel_message_info_user_tag(msg_info, "completed-on");
+ followup = camel_message_info_user_tag(msg_info, "follow-up");
if (colour == NULL) {
if ((n = get_all_labels (msg_info, &labels_string, TRUE)) == 1) {
@@ -1432,12 +1433,10 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, int col, void *model_data)
} else if (camel_message_info_flags(msg_info) & CAMEL_MESSAGE_FLAGGED) {
/* FIXME: extract from the important.xpm somehow. */
colour = "#A7453E";
- } else if ((due_by && *due_by) && !(completed && *completed)) {
+ } else if (((followup && *followup) || (due_by && *due_by)) && !(completed && *completed)) {
time_t now = time (NULL);
- time_t target_date;
- target_date = camel_header_decode_date (due_by, NULL);
- if (now >= target_date)
+ if ((followup && *followup) || now >= camel_header_decode_date (due_by, NULL))
colour = "#A7453E";
}
}