xsettings.c: Revert changes from 2009-11-23. Just use Xft defaults (bug #5025).

diff --git a/src/ChangeLog b/src/ChangeLog
index 865b6a4c6351eecc263abb444c9c4394b1884d72..36032bd01df44ec253f60fcd0461dbbc94c7949e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-25  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * xsettings.c: Revert changes from 2009-11-23. Just use Xft
+       defaults (bug #5025).
+
 2009-11-24  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * insdel.c (adjust_markers_for_delete): Move it in the

diff --git a/src/xsettings.c b/src/xsettings.c
index 68c1e0c4eeb3536bba81a7aa4ec54aea3eb47254..0aba928839f50d6e5a8f6ad4dd528c658f0f3821 100644 (file)
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -367,24 +367,6 @@ read_xft_settings (dpyinfo, settings)
   return rc == Success;
 }
 
-static void
-set_default_xft_settings (dpyinfo)
-     struct x_display_info *dpyinfo;
-{
-  FcPattern *pat;
-  pat = FcPatternCreate ();
-  XftDefaultSubstitute (dpyinfo->display,
-                        XScreenNumberOfScreen (dpyinfo->screen),
-                        pat);
-
-  FcPatternDel (pat, FC_ANTIALIAS);
-  FcPatternAddBool (pat, FC_ANTIALIAS, FcTrue);
-  FcPatternDel (pat, FC_HINTING);
-  FcPatternAddBool (pat, FC_HINTING, FcTrue);
-  FcPatternDel (pat, FC_HINT_STYLE);
-  FcPatternAddInteger (pat, FC_HINT_STYLE,FC_HINT_MEDIUM);
-  XftDefaultSet (dpyinfo->display, pat);
-}
 
 static void
 apply_xft_settings (dpyinfo, send_event_p)
@@ -565,8 +547,6 @@ init_xfd_settings (dpyinfo)
   get_prop_window (dpyinfo);
   if (dpyinfo->xsettings_window != None)
     apply_xft_settings (dpyinfo, False);
-  else
-    set_default_xft_settings (dpyinfo);
 
   UNBLOCK_INPUT;