[evolution-patches] [PATCH] Fix font used for contact printing

[Jeremy Katz <katzj redhat com>]

The attached patch fixes printing of contacts in CJK locales by not
hardcoding the font to Helvetica (which doesn't have a good match for
those locales), instead using the more generic Sans alias.

Does this look reasonable?

Jeremy

? autom4te.cache
? addressbook/backend/ebook/Evolution-Composer-common.c
? addressbook/backend/ebook/Evolution-Composer-skels.c
? addressbook/backend/ebook/Evolution-Composer-stubs.c
? addressbook/backend/ebook/Evolution-Composer.h
? camel/camel-tcp-stream-openssl-old.c
? help/C/evolution-1.4-C.omf.out
? help/C/omf_timestamp
? libical/src/libical/icalyacc.output
? mail/foo
Index: addressbook/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1435.2.1
diff -u -u -r1.1435.2.1 ChangeLog
--- addressbook/ChangeLog	17 Jul 2003 16:58:01 -0000	1.1435.2.1
+++ addressbook/ChangeLog	22 Jul 2003 19:01:21 -0000
@@ -1,3 +1,9 @@
+2003-07-22  Akira TAGOH  <katzj redhat com>
+
+	* printing/e-contact-print-envelope.c (ecpe_print): Use 'Sans'
+	instead of 'Helvetica' for the font name.
+	* printing/e-contact-print.c (e_contact_build_style): Likewise.
+
 2003-06-30  Dan Winship  <danw ximian com>
 
 	* gui/widgets/e-addressbook-view.c (e_addressbook_view_dispose):
Index: addressbook/printing/e-contact-print-envelope.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/printing/e-contact-print-envelope.c,v
retrieving revision 1.15
diff -u -u -r1.15 e-contact-print-envelope.c
--- addressbook/printing/e-contact-print-envelope.c	9 May 2003 15:02:46 -0000	1.15
+++ addressbook/printing/e-contact-print-envelope.c	22 Jul 2003 19:01:21 -0000
@@ -147,9 +147,9 @@
 	address = e_card_simple_get(card, E_CARD_SIMPLE_FIELD_ADDRESS_BUSINESS);
 	linelist = ecpe_break(address);
 	if (as_return)
-		font = gnome_font_find ("Helvetica", 9);
+		font = gnome_font_find ("Sans", 9);
 	else
-		font = gnome_font_find ("Helvetica", 12);
+		font = gnome_font_find ("Sans", 12);
 	ecpe_linelist_dimensions(font, address, linelist, NULL, &y);
 	if (as_return) {
 		x = 36;
Index: addressbook/printing/e-contact-print.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/printing/e-contact-print.c,v
retrieving revision 1.36
diff -u -u -r1.36 e-contact-print.c
--- addressbook/printing/e-contact-print.c	14 Jun 2003 01:11:48 -0000	1.36
+++ addressbook/printing/e-contact-print.c	22 Jul 2003 19:01:21 -0000
@@ -889,8 +889,8 @@
 	style->letter_tabs = TRUE;
 	style->letter_headings = FALSE;
 
-	style->headings_font = gnome_font_find_closest_from_weight_slant ("Helvetica", GNOME_FONT_BOLD, FALSE, 8);
-	style->body_font = gnome_font_find_closest_from_weight_slant ("Helvetica", GNOME_FONT_BOOK, FALSE, 6);
+	style->headings_font = gnome_font_find_closest_from_weight_slant ("Sans", GNOME_FONT_BOLD, FALSE, 8);
+	style->body_font = gnome_font_find_closest_from_weight_slant ("Sans", GNOME_FONT_BOOK, FALSE, 6);
 
 	style->print_using_grey = TRUE;
 	style->paper_type = 0;
@@ -914,13 +914,13 @@
 #endif
 	style->orientation_portrait = FALSE;
 
-	style->header_font = gnome_font_find_closest_from_weight_slant ("Helvetica", GNOME_FONT_BOOK, FALSE, 6);
+	style->header_font = gnome_font_find_closest_from_weight_slant ("Sans", GNOME_FONT_BOOK, FALSE, 6);
 
 	style->left_header = g_strdup("");
 	style->center_header = g_strdup("");
 	style->right_header = g_strdup("");
 
-	style->footer_font = gnome_font_find_closest_from_weight_slant ("Helvetica", GNOME_FONT_BOOK, FALSE, 6);
+	style->footer_font = gnome_font_find_closest_from_weight_slant ("Sans", GNOME_FONT_BOOK, FALSE, 6);
 
 	style->left_footer = g_strdup("");
 	style->center_footer = g_strdup("");