Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c,v
retrieving revision 1.13
diff -u -r1.13 gnu_java_awt_peer_gtk_GdkGraphics2D.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c	8 Oct 2004 21:41:41 -0000	1.13
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c	8 Oct 2004 22:04:56 -0000
@@ -872,13 +872,17 @@
       ft = cairo_ft_font_create_for_ft_face (face);
       g_assert (ft != NULL);
       
-      if (debug) printf ("install_font_peer made new cairo font for '%s'\n", face->family_name);
+      if (debug) printf ("install_font_peer made new cairo font for '%s' at %f\n", 
+			 face->family_name,
+			 (pango_font_description_get_size (pfont->desc) / 
+			  (double)PANGO_SCALE) * (96.0 / 72.0));
     
       cairo_set_font (cr, ft); 
+      cairo_font_destroy (ft);
       cairo_scale_font (cr, 
 			(pango_font_description_get_size (pfont->desc) / 
 			 (double)PANGO_SCALE) * (96.0 / 72.0));
-      
+      ft = cairo_current_font (cr);
       pfont->graphics_resource = ft;
     }
   else
@@ -886,9 +890,6 @@
       if (debug) printf ("install_font_peer reused existing font resource\n");
       ft = (cairo_font_t *) pfont->graphics_resource;
       cairo_set_font (cr, ft);       
-      cairo_scale_font (cr, 
-			(pango_font_description_get_size (pfont->desc) / 
-			 (double)PANGO_SCALE) * (96.0 / 72.0));
     }
 }