[evolution-patches] Fix for bug 329509 [gtkhtml]

[Rohini <srohini novell com>]

Hi

Attached fix for Bug 329509 – Evolution Composer Has Scrolling Problems
With Animated Gifs

Please Review.

Thanks,
Rohini


Index: gtkhtml.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/gtkhtml.c,v
retrieving revision 1.617
diff -u -p -r1.617 gtkhtml.c
--- gtkhtml.c	1 Mar 2006 06:04:01 -0000	1.617
+++ gtkhtml.c	3 Mar 2006 07:13:56 -0000
@@ -366,22 +366,38 @@ idle_handler (gpointer data)
 {
 	GtkHTML *html;
 	HTMLEngine *engine;
+	gboolean count = FALSE;
+	GList *p;
 
 	html = GTK_HTML (data);
 	engine = html->engine;
 
+	for (p = engine->draw_queue->elems; p != NULL; p = p->next) {
+		HTMLObject *obj = HTML_OBJECT (p->data);
+			
+		if (HTML_IS_IMAGE (obj)) {
+			if (!HTML_IMAGE(obj)->animation_active) {
+				count = TRUE;
+				break;
+			}
+		}
+				
+	}
+
 	if (html->engine->thaw_idle_id == 0 && !html_engine_frozen (html->engine))
 		html_engine_flush_draw_queue (engine);
 
-	gtk_html_adjust_cursor_position (html);
+	if (!count)
+		gtk_html_adjust_cursor_position (html);
 
 	
  	html->priv->idle_handler_id = 0;
-
-	while (html->iframe_parent) {
-		html = GTK_HTML (html->iframe_parent);
-		gtk_html_adjust_cursor_position (html);
+	if (!count) {
+		while (html->iframe_parent) {
+			html = GTK_HTML (html->iframe_parent);
+			gtk_html_adjust_cursor_position (html);
 		
+		}
 	}
 	return FALSE;
 }
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/ChangeLog,v
retrieving revision 1.2170
diff -u -p -r1.2170 ChangeLog
--- ChangeLog	1 Mar 2006 06:04:01 -0000	1.2170
+++ ChangeLog	3 Mar 2006 07:41:28 -0000
@@ -1,3 +1,10 @@
+2006-03-03  Rohini S  <srohini novell com>
+
+	* gtkhtml.c: (idle_handler): Do not reset cursor position when animated
+	images are updated.
+
+	Fixes bug #329509
+
 2006-03-01  Srinivasa Ragavan  <sragavan novell com>
 
 	* gtkhtml.c: (setup_class_properties), (next_uri),