From d9975e05e840a450623ca41602c3636810d8b1ff Mon Sep 17 00:00:00 2001
From: okan
Date: Sat, 3 Sep 2011 09:17:16 +0000
Subject: "defaultfont" is unclear (and confusing while reading code) when it
 also applies to the user supplied font, so rename.

ok oga@
---
 conf.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'conf.c')

diff --git a/conf.c b/conf.c
index f5b98ac..656133e 100644
--- a/conf.c
+++ b/conf.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: conf.c,v 1.91 2011/08/29 09:10:49 okan Exp $
+ * $OpenBSD: conf.c,v 1.92 2011/09/03 09:17:16 okan Exp $
  */
 
 #include <sys/param.h>
@@ -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
-- 
cgit v1.2.3-2-gb3c3