[evolution-patches] patch fix #71719 "Color Pickers should have different names in Mail Preference."

[Mengjie Yu <Meng-Jie Yu Sun COM>]

hi, Not Zed


This patch is against #71719. "Color Pickers should have different names in Mail Preference."

Please help me to review it.

Very appreciate your hard working.


Yours,
Mengjie

--
Mengjie Yu <meng-jie yu sun com>
meng-jie yu sun com

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3545
diff -u -p -r1.3545 ChangeLog
--- ChangeLog	25 Jan 2005 02:26:33 -0000	1.3545
+++ ChangeLog	25 Jan 2005 09:13:42 -0000
@@ -1,3 +1,9 @@
+2005-01-25  Mengjie Yu  <meng-jie yu sun com>
+
+	* em-mailer-prefs.c: (restore_labels_clicked),
+	(em_mailer_prefs_construct):
+	add a11y names for color pickers.
+
 2005-01-24  Hans Petter Jansson  <hpj novell com>
 
 	* Makefile.am (libevolution_mail_la_LIBADD): Pull in the contact
Index: em-mailer-prefs.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-mailer-prefs.c,v
retrieving revision 1.27
diff -u -p -r1.27 em-mailer-prefs.c
--- em-mailer-prefs.c	3 Dec 2004 03:38:03 -0000	1.27
+++ em-mailer-prefs.c	25 Jan 2005 09:13:51 -0000
@@ -244,10 +244,13 @@ restore_labels_clicked (GtkWidget *widge
 {
 	EMMailerPrefs *prefs = (EMMailerPrefs *) user_data;
 	int i;
+	AtkObject *a11y;
 	
 	for (i = 0; i < 5; i++) {
 		gtk_entry_set_text (prefs->labels[i].name, _(label_defaults[i].name));
 		colorpicker_set_color (prefs->labels[i].color, label_defaults[i].colour);
+		a11y = gtk_widget_get_accessible (prefs->labels[i].color);
+		atk_object_set_name (a11y, _(label_defaults[i].name));
 	}
 }
 
@@ -865,6 +868,7 @@ em_mailer_prefs_construct (EMMailerPrefs
 	while (list != NULL && i < 5) {
 		MailConfigLabel *label;
 		char *widget_name;
+		AtkObject *a11y;
 		
 		label = list->data;
 		
@@ -884,6 +888,9 @@ em_mailer_prefs_construct (EMMailerPrefs
 		colorpicker_set_color (prefs->labels[i].color, label->colour);
 		g_signal_connect (prefs->labels[i].color, "color-set", G_CALLBACK (label_color_set), prefs);
 		
+		a11y = gtk_widget_get_accessible (prefs->labels[i].color);
+		atk_object_set_name (a11y, label->name);
+
 		i++;
 		list = list->next;
 	}