[evolution-patches] Fix for #40943

[Larry Ewing <lewing ximian com>]

This fixes http://bugzilla.ximian.com/show_bug.cgi?id=40943 by
commenting out the wanrings about unimplemented features in the cut &
paste of embedded widgets.


--Larry

Index: htmltextarea.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmltextarea.c,v
retrieving revision 1.14
diff -u -p -r1.14 htmltextarea.c
--- htmltextarea.c	5 Nov 2002 19:39:02 -0000	1.14
+++ htmltextarea.c	16 Apr 2003 20:02:53 -0000
@@ -56,7 +56,7 @@ copy (HTMLObject *self,
 	HTML_TEXTAREA (dest)->text = NULL;
 	HTML_TEXTAREA (dest)->default_text = g_strdup (HTML_TEXTAREA (self)->default_text);
 
-	g_warning ("HTMLTextArea::copy is not complte.");
+	/* FIXME g_warning ("HTMLTextArea::copy is not complete."); */
 }
 
 
Index: htmltextinput.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmltextinput.c,v
retrieving revision 1.23
diff -u -p -r1.23 htmltextinput.c
--- htmltextinput.c	16 Dec 2002 18:38:06 -0000	1.23
+++ htmltextinput.c	16 Apr 2003 20:02:53 -0000
@@ -59,7 +59,7 @@ copy (HTMLObject *self,
 	HTML_TEXTINPUT (dest)->password = HTML_TEXTINPUT (self)->password;
 	HTML_TEXTINPUT (dest)->default_text = g_strdup (HTML_TEXTINPUT (self)->default_text);
 
-	g_warning ("HTMLTextInput::copy is not complete");
+	/* g_warning ("HTMLTextInput::copy is not complete"); */
 }
 
 static void
Index: htmlselect.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlselect.c,v
retrieving revision 1.21
diff -u -p -r1.21 htmlselect.c
--- htmlselect.c	19 Jan 2003 00:37:33 -0000	1.21
+++ htmlselect.c	16 Apr 2003 20:02:53 -0000
@@ -76,7 +76,8 @@ copy (HTMLObject *self,
 
 	(* HTML_OBJECT_CLASS (parent_class)->copy) (self,dest);
 
-	g_warning ("HTMLSelect::copy() is broken");
+	
+	/* FIXME g_warning ("HTMLSelect::copy() is not complete."); */
 	d->size =    s->size;
 	d->multi =   s->multi;
 	
Index: htmlembedded.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlembedded.c,v
retrieving revision 1.46
diff -u -p -r1.46 htmlembedded.c
--- htmlembedded.c	15 Jan 2003 17:09:59 -0000	1.46
+++ htmlembedded.c	16 Apr 2003 20:02:53 -0000
@@ -44,7 +44,7 @@ copy (HTMLObject *self,
 {
 	(* HTML_OBJECT_CLASS (parent_class)->copy) (self, dest);
 
-	g_warning ("HTMLEmbedded::copy is broken.");
+	/* FIXME g_warning ("HTMLEmbedded::copy is not complete."); */
 
 	HTML_EMBEDDED (dest)->name = g_strdup (HTML_EMBEDDED (self)->name);
 	HTML_EMBEDDED (dest)->value = g_strdup (HTML_EMBEDDED (self)->value);
@@ -74,7 +74,9 @@ draw (HTMLObject *o,
 		new_x = o->x + tx;
 		new_y = o->y + ty - o->ascent;
 		
-		if (element->widget->parent) {
+		if (!element->widget->parent) {
+			gtk_layout_put (GTK_LAYOUT(element->parent), element->widget, new_x, new_y);
+		} else {
 			if (new_x != element->abs_x || new_y != element->abs_y)
 				gtk_layout_move (GTK_LAYOUT(element->parent), element->widget, new_x, new_y);
 			else if (!GTK_HTML (element->parent)->engine->expose)
@@ -82,10 +84,7 @@ draw (HTMLObject *o,
 		}
 	
 		element->abs_x = new_x;
-		element->abs_y = new_y;
-		
-		if (!element->widget->parent)
-			gtk_layout_put (GTK_LAYOUT(element->parent), element->widget, new_x, new_y);
+		element->abs_y = new_y;		
 	}
 
 	html_painter_draw_embedded (p, element, tx, ty);