summary refs log tree commit diff
path: root/group.c
diff options
context:
space:
mode:
authorokan <okan>2013-07-10 14:15:58 +0000
committerokan <okan>2013-07-10 14:15:58 +0000
commit93bfc4a5c14db580a426571b8be6011998189ad2 (patch)
treea14fb69b67091ef2e2b753dc53f60854b0b58e74 /group.c
parentba9baaf671a4054524f62a5b90b21f603c369a5b (diff)
parentbd7b8163bb0be2bd4904a179771a8f79163e8161 (diff)
downloadcwm-93bfc4a5c14db580a426571b8be6011998189ad2.tar.gz
cwm-93bfc4a5c14db580a426571b8be6011998189ad2.tar.xz
cwm-93bfc4a5c14db580a426571b8be6011998189ad2.zip
cvsimport
Diffstat (limited to 'group.c')
-rw-r--r--group.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/group.c b/group.c
index 30bc5d5..4264813 100644
--- a/group.c
+++ b/group.c
@@ -309,16 +309,13 @@ group_cycle(struct screen_ctx *sc, int flags)
 }
 
 void
-group_menu(XButtonEvent *e)
+group_menu(struct screen_ctx *sc)
 {
-	struct screen_ctx	*sc;
 	struct group_ctx	*gc;
 	struct menu		*mi;
 	struct menu_q		 menuq;
 	int			 i;
 
-	sc = screen_fromroot(e->root);
-
 	TAILQ_INIT(&menuq);
 
 	for (i = 0; i < CALMWM_NGROUPS; i++) {
@@ -430,8 +427,8 @@ group_update_names(struct screen_ctx *sc)
 		}
 	}
 
-	strings = xmalloc((nstrings < CALMWM_NGROUPS ? CALMWM_NGROUPS :
-	    nstrings) * sizeof(*strings));
+	strings = xcalloc((nstrings < CALMWM_NGROUPS ? CALMWM_NGROUPS :
+	    nstrings), sizeof(*strings));
 
 	p = (char *)prop_ret;
 	while (n < nstrings) {