[evolution-patches] [gtkhtml] #49601 disappearing document

[Radek Doulík <rodo novell com>]

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/ChangeLog,v
retrieving revision 1.2035
diff -u -p -r1.2035 ChangeLog
--- ChangeLog	27 Aug 2004 12:08:27 -0000	1.2035
+++ ChangeLog	2 Sep 2004 19:50:18 -0000
@@ -1,3 +1,21 @@
+2004-09-02  Radek Doulik  <rodo ximian com>
+
+	* htmlrule.c (fit_line): make sure the rule width doesn't exceed
+	max_width
+
+	Fixes #49601
+
+	* htmlprinter.c (process_attrs): get fixed style from pango family
+	attributes
+
+	* htmltextslave.c (draw_normal): add flow style when printing
+
+	* htmltext.c (html_text_change_attrs): make this method public so
+	that we can use it in htmltextslave.c
+	(html_text_calc_text_size): add flow style when printing
+
+	Fixes #63508
+
 2004-08-16  Radek Doulik  <rodo ximian com>
 
 	* htmliframe.c (html_iframe_init): load empty iframe if depth > 10
Index: htmlrule.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlrule.c,v
retrieving revision 1.37
diff -u -p -r1.37 htmlrule.c
--- htmlrule.c	27 May 2004 13:31:05 -0000	1.37
+++ htmlrule.c	2 Sep 2004 19:50:18 -0000
@@ -81,7 +81,7 @@ fit_line (HTMLObject *o,
 {
 	if (!start_of_line)
 		return HTML_FIT_NONE;
-	o->width = width_left;
+	o->width = MIN (width_left, o->max_width);
 
 	if (o->percent == 0) {
 		gint pixel_size = html_painter_get_pixel_size (painter);