about summary refs log tree commit diff
path: root/conf.c
diff options
context:
space:
mode:
authorokan <okan>2011-09-03 09:17:16 +0000
committerokan <okan>2011-09-03 09:17:16 +0000
commitb51f8e6a990c3462464b3830e51b54605e2ade6a (patch)
treee9706f6921a223fba475a33378f9e59420381d88 /conf.c
parenta4683b55f8cdac9c0884f44896ed972864b81f78 (diff)
downloadcwm-b51f8e6a990c3462464b3830e51b54605e2ade6a.tar.gz
cwm-b51f8e6a990c3462464b3830e51b54605e2ade6a.tar.xz
cwm-b51f8e6a990c3462464b3830e51b54605e2ade6a.zip
"defaultfont" is unclear (and confusing while reading code) when it also
applies to the user supplied font, so rename.

ok oga@
Diffstat (limited to 'conf.c')
-rw-r--r--conf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/conf.c b/conf.c
index f8b306c..9f19ae2 100644
--- a/conf.c
+++ b/conf.c
@@ -62,7 +62,7 @@ conf_gap(struct conf *c, struct screen_ctx *sc)
 void
 conf_font(struct conf *c, struct screen_ctx *sc)
 {
-	sc->font = font_make(sc, c->DefaultFontName);
+	sc->font = font_make(sc, c->font);
 }
 
 void
@@ -208,7 +208,7 @@ conf_init(struct conf *c)
 	c->color[CWM_COLOR_BG_MENU].name =
 	    xstrdup(CONF_COLOR_MENUBG);
 
-	c->DefaultFontName = xstrdup(DEFAULTFONTNAME);
+	c->font = xstrdup(CONF_FONT);
 }
 
 void
@@ -252,7 +252,7 @@ conf_clear(struct conf *c)
 	for (i = 0; i < CWM_COLOR_MAX; i++)
 		xfree(c->color[i].name);
 
-	xfree(c->DefaultFontName);
+	xfree(c->font);
 }
 
 void