Use 'Sans' instead of 'Helvetica' for the font name. Likewise.

2003-07-22  Akira TAGOH  <tagoh@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.

svn path=/trunk/; revision=21962

3 files changed, 12 insertions, 6 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index d25b269f9f..3e5c46978b 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-22  Akira TAGOH  <tagoh@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-07-23  Dan Winship  <danw@ximian.com>
 
 	* backend/ebook/Makefile.am: use EVO_MARSHAL_RULE
diff --git a/addressbook/printing/e-contact-print-envelope.c b/addressbook/printing/e-contact-print-envelope.c
index 33e7361605..93916744da 100644
--- a/addressbook/printing/e-contact-print-envelope.c
+++ b/addressbook/printing/e-contact-print-envelope.c
@@ -147,9 +147,9 @@ ecpe_print(GnomePrintContext *pc, ECard *ecard, gboolean as_return)
 	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;
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
index b239b87847..f3a065c2a1 100644
--- a/addressbook/printing/e-contact-print.c
+++ b/addressbook/printing/e-contact-print.c
@@ -889,8 +889,8 @@ e_contact_build_style(EContactPrintStyle *style)
 	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 @@ e_contact_build_style(EContactPrintStyle *style)
 #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("");