summary refs log tree commit diff
diff options
context:
space:
mode:
authorokan <okan>2011-07-14 11:39:53 +0000
committerokan <okan>2011-07-14 11:39:53 +0000
commitc585dfbf32b69daa483ad129cc2349ce26102dec (patch)
tree9d58c1ba78a0bd0ae4d085e5282d539eada9d2e0
parent3db2d84fa8b36f43a72be28fe2c6700e70849552 (diff)
downloadcwm-c585dfbf32b69daa483ad129cc2349ce26102dec.tar.gz
cwm-c585dfbf32b69daa483ad129cc2349ce26102dec.tar.xz
cwm-c585dfbf32b69daa483ad129cc2349ce26102dec.zip
correct spelling; from Alexander Polakov.
-rw-r--r--calmwm.h2
-rw-r--r--client.c2
-rw-r--r--conf.c2
-rw-r--r--parse.y4
4 files changed, 5 insertions, 5 deletions
diff --git a/calmwm.h b/calmwm.h
index d41d443..be6422c 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -79,7 +79,7 @@ union arg {
 };
 
 enum cwmcolor {
-	CWM_COLOR_BORDOR_ACTIVE,
+	CWM_COLOR_BORDER_ACTIVE,
 	CWM_COLOR_BORDER_INACTIVE,
 	CWM_COLOR_BORDER_GROUP,
 	CWM_COLOR_BORDER_UNGROUP,
diff --git a/client.c b/client.c
index 42fef6b..a55bd42 100644
--- a/client.c
+++ b/client.c
@@ -489,7 +489,7 @@ client_draw_border(struct client_ctx *cc)
 			pixel = sc->color[CWM_COLOR_BORDER_UNGROUP].pixel;
 			break;
 		default:
-			pixel = sc->color[CWM_COLOR_BORDOR_ACTIVE].pixel;
+			pixel = sc->color[CWM_COLOR_BORDER_ACTIVE].pixel;
 			break;
 		}
 	else
diff --git a/conf.c b/conf.c
index 2a34d32..dc4d0c0 100644
--- a/conf.c
+++ b/conf.c
@@ -202,7 +202,7 @@ conf_init(struct conf *c)
 	strlcpy(c->termpath, "xterm", sizeof(c->termpath));
 	strlcpy(c->lockpath, "xlock", sizeof(c->lockpath));
 
-	c->color[CWM_COLOR_BORDOR_ACTIVE].name =
+	c->color[CWM_COLOR_BORDER_ACTIVE].name =
 	    xstrdup(CONF_COLOR_ACTIVEBORDER);
 	c->color[CWM_COLOR_BORDER_INACTIVE].name =
 	    xstrdup(CONF_COLOR_INACTIVEBORDER);
diff --git a/parse.y b/parse.y
index 76ee731..3b042df 100644
--- a/parse.y
+++ b/parse.y
@@ -169,8 +169,8 @@ color		: COLOR colors
 		;
 
 colors		: ACTIVEBORDER STRING {
-			free(conf->color[CWM_COLOR_BORDOR_ACTIVE].name);
-			conf->color[CWM_COLOR_BORDOR_ACTIVE].name = $2;
+			free(conf->color[CWM_COLOR_BORDER_ACTIVE].name);
+			conf->color[CWM_COLOR_BORDER_ACTIVE].name = $2;
 		}
 		| INACTIVEBORDER STRING {
 			free(conf->color[CWM_COLOR_BORDER_INACTIVE].name);