From 4cf5a98fa42b6d99a178eda07a9e42f91e02c97d Mon Sep 17 00:00:00 2001
From: jasper
Date: Mon, 28 May 2007 18:34:27 +0000
Subject: convert globals from G_foo to Foo, as per TODO.

"looks good" pedro@, ok matthieu@
---
 kbfunc.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'kbfunc.c')

diff --git a/kbfunc.c b/kbfunc.c
index d45b958..1dbfe0b 100644
--- a/kbfunc.c
+++ b/kbfunc.c
@@ -4,7 +4,7 @@
  *  Copyright (c) 2004 Martin Murray <mmurray@monkey.org>
  *  All rights reserved.
  *
- * $Id: kbfunc.c,v 1.2 2007/04/27 18:08:14 bernd Exp $
+ * $Id: kbfunc.c,v 1.3 2007/05/28 18:34:27 jasper Exp $
  */
 
 #include "headers.h"
@@ -31,7 +31,7 @@ kbfunc_client_search(struct client_ctx *scratch, void *arg)
 	
 	TAILQ_INIT(&menuq);
 	
-	TAILQ_FOREACH(cc, &G_clientq, entry) {
+	TAILQ_FOREACH(cc, &Clientq, entry) {
 		struct menu *mi;
 		XCALLOC(mi, struct menu);
 		strlcpy(mi->text, cc->name, sizeof(mi->text));
@@ -66,8 +66,8 @@ kbfunc_menu_search(struct client_ctx *scratch, void *arg)
 
 	TAILQ_INIT(&menuq);
 
-	conf_cmd_refresh(&G_conf);
-	TAILQ_FOREACH(cmd, &G_conf.cmdq, entry) {
+	conf_cmd_refresh(&Conf);
+	TAILQ_FOREACH(cmd, &Conf.cmdq, entry) {
 		XCALLOC(mi, struct menu);
 		strlcpy(mi->text, cmd->label, sizeof(mi->text));
 		mi->ctx = cmd;
@@ -111,15 +111,15 @@ kbfunc_cmdexec(struct client_ctx *cc, void *arg)
 void
 kbfunc_term(struct client_ctx *cc, void *arg)
 {
-	conf_cmd_refresh(&G_conf);
-	u_spawn(G_conf.termpath);
+	conf_cmd_refresh(&Conf);
+	u_spawn(Conf.termpath);
 }
 
 void
 kbfunc_lock(struct client_ctx *cc, void *arg)
 {
-	conf_cmd_refresh(&G_conf);
-	u_spawn(G_conf.lockpath);
+	conf_cmd_refresh(&Conf);
+	u_spawn(Conf.lockpath);
 }
 
 void
@@ -143,7 +143,7 @@ kbfunc_client_delete(struct client_ctx *cc, void *arg)
 void
 kbfunc_client_groupselect(struct client_ctx *cc, void *arg)
 {
-	if (G_groupmode)
+	if (Groupmode)
 		group_done();
 	else
 		group_enter();
@@ -152,7 +152,7 @@ kbfunc_client_groupselect(struct client_ctx *cc, void *arg)
 void
 kbfunc_client_group(struct client_ctx *cc, void *arg)
 {
-	if (G_groupmode)
+	if (Groupmode)
 		group_select(KBTOGROUP((int)arg));
 	else
 		group_hidetoggle(KBTOGROUP((int)arg));
@@ -173,7 +173,7 @@ kbfunc_client_prevgroup(struct client_ctx *cc, void *arg)
 void
 kbfunc_client_nogroup(struct client_ctx *cc, void *arg)
 {
-	if (G_groupmode)
+	if (Groupmode)
 		group_deletecurrent();
 	else
 		group_alltoggle();
-- 
cgit v1.2.3-2-gb3c3