[evolution-patches] Patch for #73216

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

Dear rodo,

Here is the patch for #73216
the related URL is:
http://bugzilla.ximian.com/show_bug.cgi?id=73216

Will you please help me to review it?

Thanks a lot.

Yours,
Mengjie


Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/ChangeLog,v
retrieving revision 1.2099
diff -u -p -r1.2099 ChangeLog
--- ChangeLog	28 Feb 2005 15:36:25 -0000	1.2099
+++ ChangeLog	3 Mar 2005 11:00:30 -0000
@@ -1,3 +1,9 @@
+2005-03-03  Mengjie Yu  <meng-jie yu sun com>
+
+	* gtkhtml.c: (gtk_html_set_color):we should pass the insertion_color.
+
+	Fixes: #73216 
+
 2005-02-28  Radek Doulik  <rodo novell com>
 
 	* htmltext.c (html_text_direction_pango_to_html): new helper
Index: gtkhtml.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/gtkhtml.c,v
retrieving revision 1.592
diff -u -p -r1.592 gtkhtml.c
--- gtkhtml.c	28 Feb 2005 15:36:25 -0000	1.592
+++ gtkhtml.c	3 Mar 2005 11:00:50 -0000
@@ -4191,7 +4191,7 @@ gtk_html_set_color (GtkHTML *html, HTMLC
 	g_return_if_fail (GTK_IS_HTML (html));
 
 	if (html_engine_set_color (html->engine, color))
-		g_signal_emit (html, signals [INSERTION_COLOR_CHANGED], 0, html->engine->insertion_font_style);
+		g_signal_emit (html, signals [INSERTION_COLOR_CHANGED], 0, html->engine->insertion_color);
 }
 
 void

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/ChangeLog,v
retrieving revision 1.490
diff -u -p -r1.490 ChangeLog
--- ChangeLog	31 Jan 2005 19:45:17 -0000	1.490
+++ ChangeLog	3 Mar 2005 11:15:44 -0000
@@ -1,3 +1,10 @@
+2005-03-03  Mengjie Yu  <meng-jie yu sun com>
+
+	* toolbar.c: (insertion_color_changed_cb), (setup_gi_color_combo):
+	we should connect to the insertion_color_changed signal and handle it.
+
+	Fixes #73216
+
 2005-01-31  Hans Petter Jansson  <hpj novell com>
 
 	* spell.[ch]: Renamed to spellchecker.[ch] since the old name would
Index: toolbar.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/toolbar.c,v
retrieving revision 1.71
diff -u -p -r1.71 toolbar.c
--- toolbar.c	20 Jan 2005 10:20:23 -0000	1.71
+++ toolbar.c	3 Mar 2005 11:15:46 -0000
@@ -286,6 +286,13 @@ load_done (GtkHTML *html, GtkHTMLControl
 		g_signal_connect (cd->html, "realize", G_CALLBACK (realize_engine), cd);
 }
 
+static void
+insertion_color_changed_cb (GtkHTML *widget, GdkColor *color, GtkHTMLControlData *cd)
+{
+	gi_color_combo_set_color ((GiColorCombo *) cd->combo, color);
+}
+
+
 static GtkWidget *
 setup_gi_color_combo (GtkHTMLControlData *cd)
 {
@@ -299,7 +306,8 @@ setup_gi_color_combo (GtkHTMLControlData
         g_signal_connect (cd->html, "load_done", G_CALLBACK (load_done), cd);
 
 	cd->combo = gi_color_combo_new (NULL, _("Automatic"), &color->color, color_group_fetch ("toolbar_text", cd));
-        g_signal_connect (cd->combo, "color_changed", G_CALLBACK (color_changed), cd);
+	g_signal_connect (cd->combo, "color_changed", G_CALLBACK (color_changed), cd);
+	g_signal_connect (cd->html, "insertion_color_changed", G_CALLBACK (insertion_color_changed_cb), cd);
 
 	gtk_widget_show_all (cd->combo);
 	return cd->combo;