Index: app/text/gimpfontlist.c
===================================================================
--- app/text/gimpfontlist.c	(revision 22910)
+++ app/text/gimpfontlist.c	(working copy)
@@ -38,17 +38,6 @@
 #include "gimp-intl.h"
 
 
-/* Use fontconfig directly for speed. We can use the pango stuff when/if
- * fontconfig/pango get more efficient.
- */
-#define USE_FONTCONFIG_DIRECTLY
-
-#ifdef USE_FONTCONFIG_DIRECTLY
-/* PangoFT2 is assumed, so we should have this in our cflags */
-#include <fontconfig/fontconfig.h>
-#endif
-
-
 typedef char * (* GimpFontDescToStringFunc) (const PangoFontDescription *desc);
 
 
@@ -172,91 +161,6 @@ gimp_font_list_add_font (GimpFontList   
   g_object_unref (font);
 }
 
-#ifdef USE_FONTCONFIG_DIRECTLY
-/* We're really chummy here with the implementation. Oh well. */
-
-/* This is copied straight from make_alias_description in pango, plus
- * the gimp_font_list_add_font bits.
- */
-static void
-gimp_font_list_make_alias (GimpFontList *list,
-                           PangoContext *context,
-                           const gchar  *family,
-                           gboolean      bold,
-                           gboolean      italic)
-{
-  PangoFontDescription *desc = pango_font_description_new ();
-
-  pango_font_description_set_family (desc, family);
-  pango_font_description_set_style (desc,
-                                    italic ?
-                                    PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL);
-  pango_font_description_set_variant (desc, PANGO_VARIANT_NORMAL);
-  pango_font_description_set_weight (desc,
-                                     bold ?
-                                     PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL);
-  pango_font_description_set_stretch (desc, PANGO_STRETCH_NORMAL);
-
-  gimp_font_list_add_font (list, context, desc);
-
-  pango_font_description_free (desc);
-}
-
-static void
-gimp_font_list_load_aliases (GimpFontList *list,
-                             PangoContext *context)
-{
-  const gchar *families[] = { "Sans", "Serif", "Monospace" };
-  gint         i;
-
-  for (i = 0; i < 3; i++)
-    {
-      gimp_font_list_make_alias (list, context, families[i], FALSE, FALSE);
-      gimp_font_list_make_alias (list, context, families[i], TRUE,  FALSE);
-      gimp_font_list_make_alias (list, context, families[i], FALSE, TRUE);
-      gimp_font_list_make_alias (list, context, families[i], TRUE,  TRUE);
-    }
-}
-
-static void
-gimp_font_list_load_names (GimpFontList *list,
-                           PangoFontMap *fontmap,
-                           PangoContext *context)
-{
-  FcObjectSet *os;
-  FcPattern   *pat;
-  FcFontSet   *fontset;
-  gint         i;
-
-  os = FcObjectSetBuild (FC_FAMILY, FC_STYLE,
-                         FC_SLANT, FC_WEIGHT, FC_WIDTH,
-                         NULL);
-
-  pat = FcPatternCreate ();
-
-  fontset = FcFontList (NULL, pat, os);
-
-  FcPatternDestroy (pat);
-  FcObjectSetDestroy (os);
-
-  for (i = 0; i < fontset->nfont; i++)
-    {
-      PangoFontDescription *desc;
-
-      desc = pango_fc_font_description_from_pattern (fontset->fonts[i], FALSE);
-      gimp_font_list_add_font (list, context, desc);
-      pango_font_description_free (desc);
-    }
-
-  /*  only create aliases if there is at least one font available  */
-  if (fontset->nfont > 0)
-    gimp_font_list_load_aliases (list, context);
-
-  FcFontSetDestroy (fontset);
-}
-
-#else  /* ! USE_FONTCONFIG_DIRECTLY */
-
 static void
 gimp_font_list_load_names (GimpFontList *list,
                            PangoFontMap *fontmap,
@@ -286,5 +190,3 @@ gimp_font_list_load_names (GimpFontList 
 
   g_free (families);
 }
-
-#endif /* USE_FONTCONFIG_DIRECTLY */
