--- a/dwm.c	Wed Jul 08 17:24:39 2009 +0100
+++ b/dwm.c	Wed Jul 08 18:59:20 2009 +0100
@@ -66,7 +66,7 @@
 	int i;
 	unsigned int ui;
 	float f;
-	void *v;
+	const void *v;
 } Arg;
 
 typedef struct {
@@ -136,7 +136,7 @@
 	Client *stack;
 	Monitor *next;
 	Window barwin;
-	Layout *lt[2];
+	const Layout *lt[2];
 };
 
 typedef struct {
@@ -275,7 +275,7 @@
 void
 applyrules(Client *c) {
 	unsigned int i;
-	Rule *r;
+	const Rule *r;
 	XClassHint ch = { 0 };
 
 	/* rule matching */
@@ -1726,8 +1726,8 @@
 		m->sellt = 0;
 		m->tagset[0] = m->tagset[1] = 1;
 		m->mfact = mfact;
-		m->showbar = SHOWBAR;
-		m->topbar = TOPBAR;
+		m->showbar = showbar;
+		m->topbar = topbar;
 		m->lt[0] = &layouts[0];
 		m->lt[1] = &layouts[1 % LENGTH(layouts)];
 		updatebarpos(m);