Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2011-08-17 12:29:15 +02:00
commit 2eab8d7f20

View File

@ -425,6 +425,12 @@ void init_ws_for_output(Output *output, Con *content) {
continue; continue;
DLOG("relevant command = %s\n", bind->command); DLOG("relevant command = %s\n", bind->command);
char *target = bind->command + strlen("workspace "); char *target = bind->command + strlen("workspace ");
/* We check if this is the workspace next/prev command. Beware: The
* workspace names "next" and "prev" are OK, so we check before
* stripping the double quotes */
if (strncasecmp(target, "next", strlen("next")) == 0 ||
strncasecmp(target, "prev", strlen("prev")) == 0)
continue;
if (*target == '"') if (*target == '"')
target++; target++;
FREE(ws->name); FREE(ws->name);