[evolution] Bug 621930 - Error when using Assign Color filter action

[Lucian Langa <lucilanga src gnome org>]

commit 002f4def9f6c04273f42b18156b379b435d9dce0
Author: Lucian Langa <lucilanga gnome org>
Date:   Fri Jun 18 07:57:35 2010 +0300

    Bug 621930  - Error when using Assign Color filter action

 mail/filtertypes.xml |    2 +-
 mail/message-list.c  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/mail/filtertypes.xml b/mail/filtertypes.xml
index a93b887..9a705ab 100644
--- a/mail/filtertypes.xml
+++ b/mail/filtertypes.xml
@@ -928,7 +928,7 @@
  </part>
  <part name="colour">
   <title>Assign Color</title>
-  <code>(set-colour ${colour})</code>
+  <code>(set-color ${colour})</code>
   <input type="colour" name="colour"/>
  </part>
  <part name="score">
diff --git a/mail/message-list.c b/mail/message-list.c
index af5cd4b..f513a80 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -1580,7 +1580,7 @@ ml_tree_value_at_ex (ETreeModel *etm, ETreePath path, gint col, CamelMessageInfo
 		/* To add to the woes, what color to show when the user choose multiple labels ?
 		Don't say that I need to have the new labels [with subject] column visible always */
 
-		colour = camel_message_info_user_tag(msg_info, "colour");
+		colour = camel_message_info_user_tag(msg_info, "color");
 		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");