diff options
author | okan | 2013-04-08 13:02:31 +0000 |
---|---|---|
committer | okan | 2013-04-08 13:02:31 +0000 |
commit | d1eadb2523343593a8cb47dd42ac971712168710 (patch) | |
tree | 8daa0f4722581ecb30c810f369f1f162d02b1cda | |
parent | 08db9c49019f52bc15fdaccb43fe0d1d75d91a47 (diff) | |
download | cwm-d1eadb2523343593a8cb47dd42ac971712168710.tar.gz |
consistency
-rw-r--r-- | group.c | 3 | ||||
-rw-r--r-- | kbfunc.c | 3 | ||||
-rw-r--r-- | menu.c | 3 | ||||
-rw-r--r-- | mousefunc.c | 4 |
4 files changed, 9 insertions, 4 deletions
@@ -16,7 +16,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: group.c,v 1.71 2013/04/05 17:07:25 okan Exp $ + * $OpenBSD: group.c,v 1.72 2013/04/08 13:02:31 okan Exp $ */ #include <sys/param.h> @@ -351,6 +351,7 @@ group_menu(XButtonEvent *e) int i; sc = screen_fromroot(e->root); + TAILQ_INIT(&menuq); for (i = 0; i < CALMWM_NGROUPS; i++) { @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: kbfunc.c,v 1.76 2013/01/08 15:16:05 okan Exp $ + * $OpenBSD: kbfunc.c,v 1.77 2013/04/08 13:02:31 okan Exp $ */ #include <sys/param.h> @@ -335,6 +335,7 @@ kbfunc_ssh(struct client_ctx *cc, union arg *arg) } TAILQ_INIT(&menuq); + lbuf = NULL; while ((buf = fgetln(fp, &len))) { if (buf[len - 1] == '\n') @@ -16,7 +16,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: menu.c,v 1.53 2013/04/08 00:56:21 okan Exp $ + * $OpenBSD: menu.c,v 1.54 2013/04/08 13:02:31 okan Exp $ */ #include <sys/param.h> @@ -209,6 +209,7 @@ menu_complete_path(struct menu_ctx *mc) mr = xcalloc(1, sizeof(*mr)); TAILQ_INIT(&menuq); + if ((mi = menu_filter(mc->sc, &menuq, mc->searchstr, NULL, CWM_MENU_DUMMY, search_match_path_any, NULL)) != NULL) { mr->abort = mi->abort; diff --git a/mousefunc.c b/mousefunc.c index 745a304..d52a458 100644 --- a/mousefunc.c +++ b/mousefunc.c @@ -16,7 +16,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: mousefunc.c,v 1.44 2013/01/02 21:41:14 okan Exp $ + * $OpenBSD: mousefunc.c,v 1.45 2013/04/08 13:02:31 okan Exp $ */ #include <sys/param.h> @@ -227,6 +227,7 @@ mousefunc_menu_unhide(struct client_ctx *cc, void *arg) old_cc = client_current(); TAILQ_INIT(&menuq); + TAILQ_FOREACH(cc, &Clientq, entry) if (cc->flags & CLIENT_HIDDEN) { wname = (cc->label) ? cc->label : cc->name; @@ -263,6 +264,7 @@ mousefunc_menu_cmd(struct client_ctx *cc, void *arg) struct cmd *cmd; TAILQ_INIT(&menuq); + TAILQ_FOREACH(cmd, &Conf.cmdq, entry) { mi = xcalloc(1, sizeof(*mi)); (void)strlcpy(mi->text, cmd->label, sizeof(mi->text)); |