diff options
| author | okan <okan> | 2013-01-04 16:23:04 +0000 |
|---|---|---|
| committer | okan <okan> | 2013-01-04 16:23:04 +0000 |
| commit | 698530155d0e76265fa85c24159d58eaaea9ef31 (patch) | |
| tree | 78534e8ed354c052508a4c58c2b62405daa5b353 /parse.y | |
| parent | c139df129c45eab966836e622c71deec821ba370 (diff) | |
| download | cwm-698530155d0e76265fa85c24159d58eaaea9ef31.tar.gz cwm-698530155d0e76265fa85c24159d58eaaea9ef31.tar.xz cwm-698530155d0e76265fa85c24159d58eaaea9ef31.zip | |
get rid of struct color
Diffstat (limited to 'parse.y')
| -rw-r--r-- | parse.y | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/parse.y b/parse.y index 4f00198..fe8ddb2 100644 --- a/parse.y +++ b/parse.y @@ -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]; |