[evolution-data-server] Bug #553796 - Unable to Reset Message Color

[Milan Crha <mcrha src gnome org>]

commit 50482960be6ff898c853d69928e1f84719f0c376
Author: Milan Crha <mcrha redhat com>
Date:   Tue Feb 7 14:35:17 2012 +0100

    Bug #553796 - Unable to Reset Message Color

 camel/camel-filter-driver.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/camel/camel-filter-driver.c b/camel/camel-filter-driver.c
index 45b2541..78fa167 100644
--- a/camel/camel-filter-driver.c
+++ b/camel/camel-filter-driver.c
@@ -694,11 +694,16 @@ do_color (struct _CamelSExp *f,
 
 	d(fprintf (stderr, "setting color tag\n"));
 	if (argc > 0 && argv[0]->type == CAMEL_SEXP_RES_STRING) {
+		const gchar *color = argv[0]->value.string;
+
+		if (color && !*color)
+			color = NULL;
+
 		if (p->source && p->uid && camel_folder_has_summary_capability (p->source))
-			camel_folder_set_message_user_tag (p->source, p->uid, "color", argv[0]->value.string);
+			camel_folder_set_message_user_tag (p->source, p->uid, "color", color);
 		else
-			camel_message_info_set_user_tag(p->info, "color", argv[0]->value.string);
-		camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Set color to %s", argv[0]->value.string);
+			camel_message_info_set_user_tag(p->info, "color", color);
+		camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Set color to %s", color ? color : "None");
 	}
 
 	return NULL;