[evolution-patches] The third patch. Fix #70931

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

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/ChangeLog,v
retrieving revision 1.2066
diff -u -p -r1.2066 ChangeLog
--- ChangeLog	30 Dec 2004 09:40:22 -0000	1.2066
+++ ChangeLog	2 Jan 2005 08:32:17 -0000
@@ -1,3 +1,9 @@
+2005-01-02  Mengjie Yu  <meng-jie yu sun com>
+
+	Fixes #70931
+
+	* gtkhtml.c: (button_press_event):check for caret_mode. 
+
 2004-12-27  Radek Doulik  <rodo ximian com>
 
 	* htmlengine.c (html_engine_get_cursor): check for cursor object,
Index: gtkhtml.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/gtkhtml.c,v
retrieving revision 1.585
diff -u -p -r1.585 gtkhtml.c
--- gtkhtml.c	17 Dec 2004 02:30:07 -0000	1.585
+++ gtkhtml.c	2 Jan 2005 08:32:37 -0000
@@ -1728,7 +1728,7 @@ button_press_event (GtkWidget *widget,
 					html_engine_set_focus_object (orig_e, obj, offset);
 				else {
 					html_engine_set_focus_object (orig_e, NULL, 0);
-					if (orig_e->caret_mode)
+					if (orig_e->caret_mode || engine->caret_mode)
 						html_engine_jump_at (engine, x, y);
 				}
 			}