rpms/gtkhtml38/devel print-font-gtkhtml3.8-fix.patch, NONE, 1.1 gtkhtml38.spec, 1.3, 1.4

[Bill Nottingham (notting)]

Author: notting

Update of /cvs/extras/rpms/gtkhtml38/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3825

Modified Files:
	gtkhtml38.spec 
Added Files:
	print-font-gtkhtml3.8-fix.patch 
Log Message:
- add patch for setting font when printing (#239205,
<paul at andreassen.com.au>)

Resolves: bug #239205


print-font-gtkhtml3.8-fix.patch:

--- NEW FILE print-font-gtkhtml3.8-fix.patch ---
Index: gtkhtml-3.10.3/src/htmlprinter.c
===================================================================
--- gtkhtml-3.10.3.orig/src/htmlprinter.c	2006-05-06 15:42:08.000000000 +1000
+++ gtkhtml-3.10.3/src/htmlprinter.c	2007-04-15 21:58:17.102328192 +1000
@@ -790,6 +790,7 @@ html_printer_new (GtkWidget *widget, Gno
 
 	font_map = gnome_print_pango_get_default_font_map ();
 	painter->pango_context = gnome_print_pango_create_context (font_map);
+	gnome_print_pango_update_context(painter->pango_context, context);
 	
 	return HTML_PAINTER (new);
 }
Index: gtkhtml-3.10.3/src/htmltext.c
===================================================================
--- gtkhtml-3.10.3.orig/src/htmltext.c	2006-07-29 17:11:05.000000000 +1000
+++ gtkhtml-3.10.3/src/htmltext.c	2007-04-15 21:59:01.014652504 +1000
@@ -1214,12 +1214,16 @@ html_text_prepare_attrs (HTMLText *text,
 			pango_attr_list_insert (attrs, attr);
 		}
 	} else {
-		if (fabs (painter->font_manager.magnification - 1.0) > 0.001) {
-			attr = pango_attr_size_new (painter->font_manager.var_size*painter->font_manager.magnification);
+		if (painter->font_manager.variable.face != NULL) {
+			attr = pango_attr_family_new (painter->font_manager.variable.face);
 			attr->start_index = 0;
 			attr->end_index = text->text_bytes;
 			pango_attr_list_insert (attrs, attr);
 		}
+		attr = pango_attr_size_new (painter->font_manager.var_size*painter->font_manager.magnification);
+		attr->start_index = 0;
+		attr->end_index = text->text_bytes;
+		pango_attr_list_insert (attrs, attr);
 		pango_attr_list_splice (attrs, text->attr_list, 0, 0);
 	}
 


Index: gtkhtml38.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkhtml38/devel/gtkhtml38.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtkhtml38.spec	11 Apr 2007 20:42:35 -0000	1.3
+++ gtkhtml38.spec	20 Jun 2007 21:08:07 -0000	1.4
@@ -23,6 +23,7 @@
 Patch2: gtkhtml-3.3.2-imcommit.patch
 Patch3: gtkhtml-fix-indic-navigation-129212.patch
 Patch4: gtkhtml-3.10.0-im-too-late.patch
+Patch5: print-font-gtkhtml3.8-fix.patch
 
 # Gnome.org bug #353424.
 Patch6: gtkhtml-3.11.92-chain-finalize.patch
@@ -72,6 +73,7 @@
 %patch1 -p1 -b .crash
 %patch3 -p1 -b .fix-129212
 %patch4 -p1 -b .im-too-late
+%patch5 -p1 -b .print
 %patch6 -p1 -b .chain-finalize
 
 %build
@@ -118,6 +120,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Jun 20 2007 Bill Nottingham <notting at redhat.com> - 3.12.3-5
+- add patch for setting font when printing (#239205, <paul at andreassen.com.au>)
+
 * Wed Apr 11 2007 Bill Nottingham <notting at redhat.com> - 3.12.3-4
 - remove Provides: re rpm 'feature' (#236009)