New function to return a cached list of labels.

2003-01-31  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-config.c (mail_config_get_labels): New function to return a
	cached list of labels.
	(mail_config_get_label_color_by_name): New convenience function to
	search the cached labels.
	(mail_config_get_label_color_by_index): Same.
	(mail_config_init): Cache the labels and also listen for changes
	to them in the gconf db.
	(config_cache_labels): Internal function to cache the labels.

	* folder-browser.c (on_right_click): Fixed the label colours in
	the menu by using the cached linked list of labels.

	* mail-preferences.c (colorpicker_set_color): Now takes a string
	argument allowing us to get rid of converting a string into an rgb
	guint32 all over the place when trying to set defaults, since we
	now store colors in gconf as strings.
	(mail_preferences_construct): Use the cached labels (they are
	already parsed for us).

svn path=/trunk/; revision=19694

1 files changed, 5 insertions, 7 deletions

diff --git a/mail/mail-config.h b/mail/mail-config.h
index ba253cccdb..e66c729c80 100644
--- a/mail/mail-config.h
+++ b/mail/mail-config.h
@@ -83,10 +83,10 @@ typedef enum {
 
 typedef struct {
 	char *name;
-	guint32 color;
-	char *string;
+	char *colour;
 } MailConfigLabel;
 
+#define LABEL_DEFAULTS_NUM 5
 extern MailConfigLabel label_defaults[5];
 
 /* signatures */
@@ -103,11 +103,9 @@ void mail_config_write_on_exit (void);
 gboolean mail_config_is_configured            (void);
 gboolean mail_config_is_corrupt               (void);
 
-const char *mail_config_get_label_name  (int label);
-void        mail_config_set_label_name  (int label, const char *name);
-guint32     mail_config_get_label_color (int label);
-void        mail_config_set_label_color (int label, guint32 color);
-const char *mail_config_get_label_color_string (int label);
+GSList *mail_config_get_labels (void);
+const char *mail_config_get_label_color_by_name (const char *name);
+const char *mail_config_get_label_color_by_index (int index);
 
 void mail_config_service_set_save_passwd (EAccountService *service, gboolean save_passwd);