diff options
| author | okan <okan> | 2013-01-06 01:01:26 +0000 |
|---|---|---|
| committer | okan <okan> | 2013-01-06 01:01:26 +0000 |
| commit | 104c7d5de3a92da8b0c3514ef0692ff1e5d0ef82 (patch) | |
| tree | 4e3ce464112ff297402c202eee26cc2fdaa87dfa /parse.y | |
| parent | f77166194f4586cb19abcb7951ca05e356ac74e1 (diff) | |
| parent | c426254da5ff69102284524ddc560cfb00c73204 (diff) | |
| download | cwm-104c7d5de3a92da8b0c3514ef0692ff1e5d0ef82.tar.gz cwm-104c7d5de3a92da8b0c3514ef0692ff1e5d0ef82.tar.xz cwm-104c7d5de3a92da8b0c3514ef0692ff1e5d0ef82.zip | |
cvsimport
Diffstat (limited to 'parse.y')
| -rw-r--r-- | parse.y | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/parse.y b/parse.y index aae8f3c..4188418 100644 --- a/parse.y +++ b/parse.y @@ -173,20 +173,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]); @@ -580,8 +580,8 @@ parse_config(const char *filename, struct conf *xconf) (void)strlcpy(xconf->lockpath, conf->lockpath, sizeof(xconf->lockpath)); - for (i = 0; i < CWM_COLOR_MAX; i++) - xconf->color[i].name = conf->color[i].name; + for (i = 0; i < CWM_COLOR_BORDER_MAX; i++) + xconf->color[i] = conf->color[i]; for (i = 0; i < CWM_COLOR_MENU_MAX; i++) xconf->menucolor[i] = conf->menucolor[i]; |