godzil/wmfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'github/master' into bacardi55

Browse Source
This commit is contained in:
bacardi55@gmail.com
2011-01-02 19:51:36 +01:00
parent bf16b4a2e7 b85b6bd687
commit 74bbf0bd04
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/client.c
View File

@@ -1233,7 +1233,8 @@ client_unmanage(Client *c)
infobar_draw(c->screen); infobar_draw(c->screen);
} }
XFree(c->title);
/*XFree(c->title);*/
client_focus_next(c); client_focus_next(c);

2
src/parse.c
View File

@@ -436,7 +436,7 @@ get_option(struct keyword **head)
while (kw && kw->type != LIST_END) { while (kw && kw->type != LIST_END) {
switch (kw->type) { switch (kw->type) {
case WORD: case WORD:
if (j > (PARSE_MAX_LIST - 1)) { if (j >= (PARSE_MAX_LIST - 1)) {
syntax(kw, "too much values in list"); syntax(kw, "too much values in list");
return free_opt(o); return free_opt(o);
} }

2
src/parse.h
View File

@@ -21,7 +21,7 @@
#include <sys/queue.h> #include <sys/queue.h>
#define INCLUDE_CMD "@include" #define INCLUDE_CMD "@include"
#define PARSE_MAX_LIST 10 #define PARSE_MAX_LIST 32
#if defined(Bool) #if defined(Bool)
#define bool_t Bool #define bool_t Bool

7
src/tag.c
View File

@@ -61,11 +61,14 @@ tag_set(int tag)
} }
else else
{ {
if(!tag || tag == seltag[selscreen] if(!tag || (tag == seltag[selscreen] && tag == prevseltag[selscreen])
|| tag > conf.ntag[selscreen]) || tag > conf.ntag[selscreen])
return; return;
seltag[selscreen] = tag; if(tag == seltag[selscreen] && tag != prevseltag[selscreen])
tag = seltag[selscreen] = prevseltag[selscreen];
else
seltag[selscreen] = tag;
} }
ewmh_update_current_tag_prop(); ewmh_update_current_tag_prop();