1 files changed, 3 insertions, 98 deletions

diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 0f9aa9cdb..b05e6f431 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -143,88 +143,6 @@ gtk_settings_get_type (void)
   return settings_type;
 }
 
-#if 0
-static void
-	
-gtk_default_substitute (FcPattern *pattern,
-			gpointer   data)
-{
-  GtkSettings *settings = data;
-  gint antialias;
-  gint hinting;
-  char *rgba;
-  char *hintstyle;
-  gint dpi;
-  FcValue v;
-  
-  g_object_get (settings,
-		"gtk-xft-antialias", &antialias,
-		"gtk-xft-hinting", &hinting,
-		"gtk-xft-hintstyle", &hintstyle,
-		"gtk-xft-rgba", &rgba,
-		"gtk-xft-dpi", &dpi,
-		NULL);
-  
-  if (antialias >= 0 &&
-      FcPatternGet (pattern, FC_ANTIALIAS, 0, &v) == FcResultNoMatch)
-    FcPatternAddBool (pattern, FC_ANTIALIAS, antialias != 0);
-  
-  if (hinting >= 0 &&
-      FcPatternGet (pattern, FC_HINTING, 0, &v) == FcResultNoMatch)
-    FcPatternAddBool (pattern, FC_HINTING, hinting != 0);
- 
-#ifdef FC_HINT_STYLE 
-  if (hintstyle && FcPatternGet (pattern, FC_HINT_STYLE, 0, &v) == FcResultNoMatch)
-    {
-      int val = FC_HINT_FULL;	/* Quiet GCC */
-      gboolean found = TRUE;
-
-      if (strcmp (hintstyle, "hintnone") == 0)
-	val = FC_HINT_NONE;
-      else if (strcmp (hintstyle, "hintslight") == 0)
-	val = FC_HINT_SLIGHT;
-      else if (strcmp (hintstyle, "hintmedium") == 0)
-	val = FC_HINT_MEDIUM;
-      else if (strcmp (hintstyle, "hintfull") == 0)
-	val = FC_HINT_FULL;
-      else
-	found = FALSE;
-
-      if (found)
-	FcPatternAddInteger (pattern, FC_HINT_STYLE, val);
-    }
-#endif /* FC_HINT_STYLE */
-
-  if (rgba && FcPatternGet (pattern, FC_RGBA, 0, &v) == FcResultNoMatch)
-    {
-      int val = FC_RGBA_NONE;	/* Quiet GCC */
-      gboolean found = TRUE;
-
-      if (strcmp (rgba, "none") == 0)
-	val = FC_RGBA_NONE;
-      else if (strcmp (rgba, "rgb") == 0)
-	val = FC_RGBA_RGB;
-      else if (strcmp (rgba, "bgr") == 0)
-	val = FC_RGBA_BGR;
-      else if (strcmp (rgba, "vrgb") == 0)
-	val = FC_RGBA_VRGB;
-      else if (strcmp (rgba, "vbgr") == 0)
-	val = FC_RGBA_VBGR;
-      else
-	found = FALSE;
-
-      if (found)
-	FcPatternAddInteger (pattern, FC_RGBA, val);
-    }
-
-  if (dpi >= 0 && FcPatternGet (pattern, FC_DPI, 0, &v) == FcResultNoMatch)
-    FcPatternAddDouble (pattern, FC_DPI, dpi / 1024.);
-
-  g_free (hintstyle);
-  g_free (rgba);
-}
-#endif /* GDK_WINDOWING_X11 */
-
 static void
 gtk_settings_init (GtkSettings *settings)
 {
@@ -411,7 +329,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
   result = settings_install_property_parser (class,
 					     g_param_spec_string ("gtk-xft-hintstyle",
  								  P_("Xft Hint Style"),
- 								  P_("What degree of hinting to use; none, slight, medium, or full"),
+ 								  P_("What degree of hinting to use; hintnone, hintslight, hintmedium, or hintfull"),
  								  NULL,
  								  GTK_PARAM_READWRITE),
                                               NULL);
@@ -509,15 +427,6 @@ gtk_settings_get_for_screen (GdkScreen *screen)
       settings->screen = screen;
       g_object_set_data (G_OBJECT (screen), "gtk-settings", settings);
 
-#if 0
-      /* Set the default substitution function for the Pango fontmap.
-       */
-      pango_xft_set_default_substitute (GDK_SCREEN_XDISPLAY (screen),
-					GDK_SCREEN_XNUMBER (screen),
-					gtk_default_substitute,
-					settings, NULL);
-#endif /* GDK_WINDOWING_X11 */
-      
       gtk_rc_reparse_all_for_settings (settings, TRUE);
       settings_update_double_click (settings);
     }
@@ -646,22 +555,18 @@ gtk_settings_notify (GObject    *object,
     case PROP_DOUBLE_CLICK_DISTANCE:
       settings_update_double_click (settings);
       break;
-#if 0
+#ifdef GDK_WINDOWING_X11
+    case PROP_XFT_DPI:
     case PROP_XFT_ANTIALIAS:
     case PROP_XFT_HINTING:
     case PROP_XFT_HINTSTYLE:
     case PROP_XFT_RGBA:
-    case PROP_XFT_DPI:
-      pango_xft_substitute_changed (GDK_SCREEN_XDISPLAY (settings->screen),
- 				    GDK_SCREEN_XNUMBER (settings->screen));
       /* This is a hack because with gtk_rc_reset_styles() doesn't get
        * widgets with gtk_widget_style_set(), and also causes more
        * recomputation than necessary.
        */
       gtk_rc_reset_styles (GTK_SETTINGS (object));
       break;
-#endif
-#ifdef GDK_WINDOWING_X11
     case PROP_CURSOR_THEME_NAME:
     case PROP_CURSOR_THEME_SIZE:
       settings_update_cursor_theme (settings);