[evolution-patches] #67083, header label line wrapping

[Changwoo Ryu <cwryu debian org>]

Here are patches for #67083.

Both evolution and gtkhtml need to be patched.  One is adding "nowrap"
attribute the header label cells in evolution, the other is fixing the
nowrap attribute support in gtkhtml.

-- 
Changwoo Ryu <cwryu debian org>

Index: mail/em-format-html.c
===================================================================
--- mail/em-format-html.c	(.../upstream/2.0.1-compact)	(revision 108)
+++ mail/em-format-html.c	(.../patches/003-67083-header-label-nowrap/2.0.1-1)	(revision 108)
@@ -1439,9 +1439,9 @@
 				fmt = "<tr><td>%s: %s</td></tr>";
 		} else {
 			if (flags & EM_FORMAT_HEADER_BOLD)
-				fmt = "<tr><th align=\"right\" valign=\"top\">%s:<b>&nbsp;</b></th><td>%s</td></tr>";
+				fmt = "<tr><th align=\"right\" valign=\"top\" nowrap>%s:<b>&nbsp;</b></th><td>%s</td></tr>";
 			else
-				fmt = "<tr><td align=\"right\" valign=\"top\">%s:<b>&nbsp;</b></td><td>%s</td></tr>";
+				fmt = "<tr><td align=\"right\" valign=\"top\" nowrap>%s:<b>&nbsp;</b></td><td>%s</td></tr>";
 		}
 	}
 

Index: src/htmltablecell.c
===================================================================
--- src/htmltablecell.c	(.../upstream/3.2.2)	(revision 104)
+++ src/htmltablecell.c	(.../patches/001-67083-table-cell-nowrap/3.2.2)	(revision 104)
@@ -134,7 +134,7 @@
 		HTMLPainter *painter)
 {
 	if (HTML_TABLE_CELL (o)->no_wrap)
-		return MAX ((* HTML_OBJECT_CLASS (parent_class)->calc_min_width) (o, painter),
+		return MAX ((* HTML_OBJECT_CLASS (parent_class)->calc_preferred_width) (o, painter),
 			    o->flags & HTML_OBJECT_FLAG_FIXEDWIDTH
 			    ? HTML_TABLE_CELL (o)->fixed_width * html_painter_get_pixel_size (painter)
 			    : 0);

Attachment: signature.asc
Description: This is a digitally signed message part