diff options
| author | okan | 2013-01-04 16:23:04 +0000 |
|---|---|---|
| committer | okan | 2013-01-04 16:23:04 +0000 |
| commit | 4b1ea8b20680932c9423c6bcedf86564a41ba024 (patch) | |
| tree | 3ed4a840a52a347ab361d4f8f42f12c2eca5d57c /parse.y | |
| parent | 1f61f7e4a9bf381aa66667f07087d1161436eae8 (diff) | |
| download | cwm-4b1ea8b20680932c9423c6bcedf86564a41ba024.tar.gz | |
get rid of struct color
Diffstat (limited to 'parse.y')
| -rw-r--r-- | parse.y | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.37 2012/12/19 15:21:34 okan Exp $ */ +/* $OpenBSD: parse.y,v 1.38 2013/01/04 16:23:04 okan Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -171,20 +171,20 @@ color : COLOR colors ; colors : ACTIVEBORDER STRING { - free(conf->color[CWM_COLOR_BORDER_ACTIVE].name); - conf->color[CWM_COLOR_BORDER_ACTIVE].name = $2; + free(conf->color[CWM_COLOR_BORDER_ACTIVE]); + conf->color[CWM_COLOR_BORDER_ACTIVE] = $2; } | INACTIVEBORDER STRING { - free(conf->color[CWM_COLOR_BORDER_INACTIVE].name); - conf->color[CWM_COLOR_BORDER_INACTIVE].name = $2; + free(conf->color[CWM_COLOR_BORDER_INACTIVE]); + conf->color[CWM_COLOR_BORDER_INACTIVE] = $2; } | GROUPBORDER STRING { - free(conf->color[CWM_COLOR_BORDER_GROUP].name); - conf->color[CWM_COLOR_BORDER_GROUP].name = $2; + free(conf->color[CWM_COLOR_BORDER_GROUP]); + conf->color[CWM_COLOR_BORDER_GROUP] = $2; } | UNGROUPBORDER STRING { - free(conf->color[CWM_COLOR_BORDER_UNGROUP].name); - conf->color[CWM_COLOR_BORDER_UNGROUP].name = $2; + free(conf->color[CWM_COLOR_BORDER_UNGROUP]); + conf->color[CWM_COLOR_BORDER_UNGROUP] = $2; } | MENUBG STRING { free(conf->menucolor[CWM_COLOR_MENU_BG]); @@ -579,7 +579,7 @@ parse_config(const char *filename, struct conf *xconf) sizeof(xconf->lockpath)); for (i = 0; i < CWM_COLOR_MAX; i++) - xconf->color[i].name = conf->color[i].name; + xconf->color[i] = conf->color[i]; for (i = 0; i < CWM_COLOR_MENU_MAX; i++) xconf->menucolor[i] = conf->menucolor[i]; |