summary refs log tree commit diff
path: root/parse.y
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 /parse.y
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 'parse.y')
-rw-r--r--parse.y6
1 files changed, 3 insertions, 3 deletions
diff --git a/parse.y b/parse.y
index 1b55f08..1b291ca 100644
--- a/parse.y
+++ b/parse.y
@@ -105,8 +105,8 @@ yesno		: YES				{ $$ = 1; }
 		;
 
 main		: FONTNAME STRING		{
-			free(conf->DefaultFontName);
-			conf->DefaultFontName = $2;
+			free(conf->font);
+			conf->font = $2;
 		}
 		| STICKY yesno {
 			if ($2 == 0)
@@ -561,7 +561,7 @@ parse_config(const char *filename, struct conf *xconf)
 		for (i = 0; i < CWM_COLOR_MAX; i++)
 			xconf->color[i].name = conf->color[i].name;
 
-		xconf->DefaultFontName = conf->DefaultFontName;
+		xconf->font = conf->font;
 	}
 
 	free(conf);