--- old/src/share/classes/com/sun/java/swing/plaf/gtk/PangoFonts.java	Wed Aug  5 18:13:24 2009
+++ new/src/share/classes/com/sun/java/swing/plaf/gtk/PangoFonts.java	Wed Aug  5 18:13:23 2009
@@ -29,8 +29,10 @@
 import java.awt.geom.AffineTransform;
 import javax.swing.plaf.FontUIResource;
 import java.util.StringTokenizer;
-import sun.font.FontManager;
 
+import sun.font.FontConfigManager;
+import sun.font.FontUtilities;
+
 /**
  * @author Shannon Hickey
  * @author Leif Samuelsson
@@ -193,13 +195,13 @@
         }
 
         String fcFamilyLC = family.toLowerCase();
-        if (FontManager.mapFcName(fcFamilyLC) != null) {
+        if (FontConfigManager.mapFcName(fcFamilyLC) != null) {
             /* family is a Fc/Pango logical font which we need to expand. */
-           return FontManager.getFontConfigFUIR(fcFamilyLC, style, size);
+           return FontUtilities.getFontConfigFUIR(fcFamilyLC, style, size);
         } else {
             /* It's a physical font which we will create with a fallback */
             Font font = new FontUIResource(family, style, size);
-            return FontManager.getCompositeFontUIResource(font);
+            return FontUtilities.getCompositeFontUIResource(font);
         }
     }