Lookup the label colour based on the label token, not an integer.

2002-07-15  Not Zed  <NotZed@Ximian.com>

        * message-list.c (ml_tree_value_at): Lookup the label colour based
        on the label token, not an integer.

        * folder-browser.c (on_right_click): Lookup the label name from
        the filter type.  Sigh, a bunch of other code should do similar
        but i'm going to leave it as integers.
        (set_msg_label): Set the label directly.

svn path=/trunk/; revision=17473

3 files changed, 19 insertions, 17 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index e0b40785f3..97a2dc0f27 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -33,6 +33,14 @@
 
 2002-07-15  Not Zed  <NotZed@Ximian.com>
 
+	* message-list.c (ml_tree_value_at): Lookup the label colour based
+	on the label token, not an integer.
+
+	* folder-browser.c (on_right_click): Lookup the label name from
+	the filter type.  Sigh, a bunch of other code should do similar
+	but i'm going to leave it as integers.
+	(set_msg_label): Set the label directly.
+
 	* mail-vfolder.c (vfolder_editor_clicked): Set the vfolder_editor
 	variable to null before we close the dialogue, otherwise the close
 	destroys it and reverts the file.
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index efae51d74a..605b33d751 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -49,6 +49,7 @@
 #include "filter/vfolder-context.h"
 #include "filter/filter-option.h"
 #include "filter/filter-input.h"
+#include "filter/filter-label.h"
 
 #include "mail-search-dialogue.h"
 #include "e-util/e-sexp.h"
@@ -1606,7 +1607,7 @@ colour_closures_free (GPtrArray *closures)
 
 struct _label_data {
 	FolderBrowser *fb;
-	int label;
+	const char *label;
 };
 
 static void
@@ -1614,22 +1615,13 @@ set_msg_label (GtkWidget *widget, gpointer user_data)
 {
 	struct _label_data *data = user_data;
 	GPtrArray *uids;
-	char *label;
 	int i;
-	
-	if (data->label != -1)
-		label = g_strdup_printf ("%d", data->label);
-	else
-		label = NULL;
-	
+
 	uids = g_ptr_array_new ();
 	message_list_foreach (data->fb->message_list, enumerate_msg, uids);
-	for (i = 0; i < uids->len; i++) {
-		camel_folder_set_message_user_tag (data->fb->folder, uids->pdata[i], "label", label);
-	}
+	for (i = 0; i < uids->len; i++)
+		camel_folder_set_message_user_tag (data->fb->folder, uids->pdata[i], "label", data->label);
 	g_ptr_array_free (uids, TRUE);
-	
-	g_free (label);
 }
 
 static void
@@ -2024,9 +2016,9 @@ on_right_click (ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event
 	g_ptr_array_add (closures, label_menu[0].closure);
 	gtk_object_ref (GTK_OBJECT (fb));
 	((struct _label_data *) label_menu[0].closure)->fb = fb;
-	((struct _label_data *) label_menu[0].closure)->label = -1;
+	((struct _label_data *) label_menu[0].closure)->label = NULL;
 	
-	for (i = 0; i < 5; i++) {
+	for (i = 0; i < filter_label_count(); i++) {
 		struct _label_data *closure;
 		GdkPixmap *pixmap;
 		GdkColormap *map;
@@ -2052,7 +2044,7 @@ on_right_click (ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event
 		closure = g_new (struct _label_data, 1);
 		gtk_object_ref (GTK_OBJECT (fb));
 		closure->fb = fb;
-		closure->label = i;
+		closure->label = filter_label_label(i);
 		
 		g_ptr_array_add (closures, closure);
 		
diff --git a/mail/message-list.c b/mail/message-list.c
index a96b2ed473..3175c4e5b1 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -37,6 +37,8 @@
 #include <e-util/ename/e-name-western.h>
 #include <e-util/e-memory.h>
 
+#include "filter/filter-label.h"
+
 #include "mail-config.h"
 #include "message-list.h"
 #include "mail-mt.h"
@@ -987,7 +989,7 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, int col, void *model_data)
 		label = camel_tag_get ((CamelTag **) &msg_info->user_tags, "label");
 		if (colour == NULL) {
 			if (label != NULL) {
-				colour = mail_config_get_label_color_string (atoi (label));
+				colour = mail_config_get_label_color_string (filter_label_index(label));
 			} else if (msg_info->flags & CAMEL_MESSAGE_FLAGGED) {
 				/* FIXME: extract from the xpm somehow. */
 				colour = "#A7453E";