summary refs log tree commit diff
path: root/conf.c
diff options
context:
space:
mode:
authorokan <okan>2012-11-28 14:14:44 +0000
committerokan <okan>2012-11-28 14:14:44 +0000
commitfad4798e5be4fb560c70c6f0e68aa576c28b85a4 (patch)
tree1d4c734eb259026f49d65a6fed9004b31f412ee2 /conf.c
parent93f64ffc55d29947614f234a5c6deddcbc2d4e81 (diff)
downloadcwm-fad4798e5be4fb560c70c6f0e68aa576c28b85a4.tar.gz
cwm-fad4798e5be4fb560c70c6f0e68aa576c28b85a4.tar.xz
cwm-fad4798e5be4fb560c70c6f0e68aa576c28b85a4.zip
replace hand rolled font_make() with XftFontOpenName() and merge into
font_init().
Diffstat (limited to 'conf.c')
-rw-r--r--conf.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/conf.c b/conf.c
index b4967e4..2fe7363 100644
--- a/conf.c
+++ b/conf.c
@@ -62,8 +62,7 @@ conf_gap(struct conf *c, struct screen_ctx *sc)
 void
 conf_font(struct conf *c, struct screen_ctx *sc)
 {
-	font_init(sc, c->color[CWM_COLOR_FONT].name);
-	sc->font = font_make(sc, c->font);
+	font_init(sc, c->font, c->color[CWM_COLOR_FONT].name);
 }
 
 static struct color color_binds[] = {