diff -r -u gnumeric-0.56.orig/src/dialogs/dialog-cell-format.c gnumeric-0.56.patched/src/dialogs/dialog-cell-format.c
--- gnumeric-0.56.orig/src/dialogs/dialog-cell-format.c	Wed Jun 14 01:07:21 2000
+++ gnumeric-0.56.patched/src/dialogs/dialog-cell-format.c	Fri Sep  8 15:39:44 2000
@@ -1158,17 +1158,20 @@
 		return;
 
 	if (state->enable_edit && font_sel->size >= 1.) {
-		GnomeFont const * const gnome_font = gnome_display_font->gnome_font;
-		char const * const family_name = gnome_font->fontmap_entry->familyname;
+	  const GnomeFont *gnome_font = 
+	    gnome_display_font_get_font(gnome_display_font);
+	  char const * const family_name = 
+	    gnome_font_get_family_name(gnome_font);
 
-		mstyle_set_font_name   (state->result, family_name);
-		mstyle_set_font_size   (state->result, font_sel->size);
-		mstyle_set_font_bold   (state->result,
-					gnome_font->fontmap_entry->weight_code >=
-					GNOME_FONT_BOLD);
-		mstyle_set_font_italic (state->result, gnome_font->fontmap_entry->italic);
-
-		fmt_dialog_changed (state);
+	  mstyle_set_font_name   (state->result, family_name);
+	  mstyle_set_font_size   (state->result, font_sel->size);
+	  mstyle_set_font_bold   (state->result,
+				  gnome_font_get_weight_code(gnome_font) >=
+				  GNOME_FONT_BOLD);
+	  mstyle_set_font_italic (state->result, 
+				  gnome_font_is_italic(gnome_font));
+	  
+	  fmt_dialog_changed (state);
 	}
 }
 
diff -r -u gnumeric-0.56.orig/src/global-gnome-font.c gnumeric-0.56.patched/src/global-gnome-font.c
--- gnumeric-0.56.orig/src/global-gnome-font.c	Sun Mar 26 17:14:29 2000
+++ gnumeric-0.56.patched/src/global-gnome-font.c	Fri Sep  8 15:43:38 2000
@@ -27,7 +27,7 @@
 	int i;
 	GList *l, *ll;
 
-	l = gnome_font_family_list (gfc);
+	l = gnome_font_family_list ();
 
 	for (ll = l; ll; ll = ll->next){
 		gnumeric_font_family_list = g_list_insert_sorted (
diff -r -u gnumeric-0.56.orig/src/print.c gnumeric-0.56.patched/src/print.c
--- gnumeric-0.56.orig/src/print.c	Thu Jan  2 04:24:05 1997
+++ gnumeric-0.56.patched/src/print.c	Fri Sep  8 15:48:54 2000
@@ -258,12 +258,12 @@
 print_headers (PrintJobInfo *pj)
 {
 	PrintMargins *pm = &pj->pi->margins;
-	double y;
+	double y = pj->height - pm->header.points - 
+	  gnome_font_get_size(pj->decoration_font);
 	
 	gnome_print_setfont (pj->print_context, pj->decoration_font);
 	gnome_print_setrgbcolor (pj->print_context, 0, 0, 0);
 	
-	y = pj->height - pm->header.points - pj->decoration_font->size;
 	print_hf (pj, pj->pi->header->left_format,   LEFT_HEADER, y);
 	print_hf (pj, pj->pi->header->middle_format, MIDDLE_HEADER, y);
 	print_hf (pj, pj->pi->header->right_format,  RIGHT_HEADER, y);
diff -r -u gnumeric-0.56.orig/src/style.c gnumeric-0.56.patched/src/style.c
--- gnumeric-0.56.orig/src/style.c	Sun Jun 18 15:48:08 2000
+++ gnumeric-0.56.patched/src/style.c	Fri Sep  8 16:08:23 2000
@@ -151,8 +151,10 @@
 		/*
 		 * Worst case scenario
 		 */
-		if (font->dfont->gdk_font == NULL)
-			font->dfont->gdk_font = gdk_font_load ("fixed");
+		/* I don't really know what to do here!!!!!!! 
+		   other words: FIXED ME*/
+/*  		if (gnome_display_font_get_gdk_font(font->dfont) == NULL) */
+/*  		  font->dfont->gdk_font = gdk_font_load ("fixed"); */
 		
 		font->font = gnome_font_new_closest (
 			font_name,
@@ -223,7 +225,7 @@
 {
 	g_return_val_if_fail (sf != NULL, NULL);
 
-	return sf->dfont->gdk_font;
+	return gnome_display_font_get_gdk_font(sf->dfont);
 }
 
 GnomeFont *
@@ -231,7 +233,7 @@
 {
 	g_return_val_if_fail (sf != NULL, NULL);
 
-	return sf->dfont->gnome_font;
+	return gnome_display_font_get_font(sf->dfont);
 }
 
 int
diff -r -u gnumeric-0.56.orig/src/widgets/widget-font-selector.c gnumeric-0.56.patched/src/widgets/widget-font-selector.c
--- gnumeric-0.56.orig/src/widgets/widget-font-selector.c	Wed May 10 21:28:10 2000
+++ gnumeric-0.56.patched/src/widgets/widget-font-selector.c	Fri Sep  8 15:41:38 2000
@@ -58,7 +58,7 @@
 		 return;
 	 }
 
-	 if (!display_font->gdk_font) {
+	 if (!gnome_display_font_get_gdk_font(display_font)) {
 		 gtk_object_unref (GTK_OBJECT (gnome_font));
 		 return;
 	 }
@@ -71,7 +71,7 @@
 
 	 style = gtk_style_copy (fs->font_preview->style);
 	 gdk_font_unref (style->font);
-	 style->font = fs->display_font->gdk_font;
+	 style->font = gnome_display_font_get_gdk_font(fs->display_font);
 	 gdk_font_ref (style->font);
 
 	 gtk_widget_set_style (fs->font_preview, style);