From 084b049b75a381b25af90a54b8818822fdc5cc09 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20Dj=C3=A4rv?= <jan.h.d@swipnet.se>
Date: Wed, 25 Nov 2009 16:19:51 +0000
Subject: [PATCH] xsettings.c: Revert changes from 2009-11-23. Just use Xft
defaults (bug #5025).
---
src/ChangeLog | 5 +++++
src/xsettings.c | 20 --------------------
2 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/src/ChangeLog b/src/ChangeLog
index 865b6a4c635..36032bd01df 100644
--- 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 68c1e0c4eeb..0aba928839f 100644
--- 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;
--
2.39.5