"defaultfont" is unclear (and confusing while reading code) when it also

applies to the user supplied font, so rename.

ok oga@
This commit is contained in:
okan
2011-09-03 09:17:16 +00:00
parent a4683b55f8
commit b51f8e6a99
3 changed files with 8 additions and 8 deletions

View File

@@ -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);