New callback to set a colour on a message.

2002-03-15  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-callbacks.c (colour_msg): New callback to set a colour on a
	message.

	* folder-browser.c (on_right_click): Setup our popup icons and
	stuff. Also add a submenu for Labels.

	* mail-display.c (pixmap_press): Sync up with the new EPopupMenu
	API. Note: This code can probably now be fixed to use per-item
	closures - yay!

	* mail-accounts.c (construct): Connect to the label GtkEntry's and
	GnomeColorPickers and also to the Restore Defaults button.

	* mail-config.c (mail_config_get_label_name): New function to get
	a label's name.
	(mail_config_set_label_name): New function to set the label name.
	(mail_config_get_label_color): New function to get the label
	color.
	(mail_config_set_label_color): New function to set the label
	color.
	(config_read): Read in the config options for the labels and their
	colors.
	(mail_config_write_on_exit): Save the label options.

svn path=/trunk/; revision=16186

1 files changed, 14 insertions, 7 deletions

diff --git a/mail/mail-accounts.h b/mail/mail-accounts.h
index 8d29746a5b..a294e0d86b 100644
--- a/mail/mail-accounts.h
+++ b/mail/mail-accounts.h
@@ -52,7 +52,7 @@ struct _MailAccountsDialog {
 	GladeXML *gui;
 	
 	const GSList *accounts;
-	gint accounts_row;
+	int accounts_row;
 	
 	/* Accounts page */
 	GtkCList *mail_accounts;
@@ -63,7 +63,7 @@ struct _MailAccountsDialog {
 	GtkButton *mail_able;
 	
 	const GSList *news;
-	gint news_row;
+	int news_row;
 	
 	/* News page */
 	GtkCList *news_accounts;
@@ -90,7 +90,7 @@ struct _MailAccountsDialog {
 	
 	/* Signatures page */
 	GtkWidget *sig_clist;
-
+	
 	GtkWidget *sig_name;
 	GtkWidget *sig_random;
 	GtkWidget *sig_filename;
@@ -99,18 +99,18 @@ struct _MailAccountsDialog {
 	GtkWidget *sig_scrolled;
 	GtkWidget *sig_gtk_html;
 	GtkWidget *sig_preview;
-
+	
 	GtkWidget *sig_add;
 	GtkWidget *sig_delete;
 	GtkWidget *sig_edit;
-
+	
 	GtkWidget *sig_simple_button;
 	GtkWidget *sig_advanced_button;
 	GtkWidget *sig_level_bbox;
 	GtkWidget *sig_advanced_table;
 	gboolean   sig_switch;
-	gint       sig_row;
-
+	int        sig_row;
+	
 	/* Other page */
 	GtkToggleButton *empty_trash;
 	GtkToggleButton *filter_log;
@@ -121,6 +121,13 @@ struct _MailAccountsDialog {
 	GtkToggleButton *notify_play_sound;
 	GnomeFileEntry *notify_sound_file;
 	
+	/* Colors/Labels */
+	struct {
+		GtkEntry *name;
+		GnomeColorPicker *color;
+	} labels[5];
+	GtkButton *restore_labels;
+	
 	/* PGP page */
 	GnomeFileEntry *pgp_path;