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

Code: cosmetic + warning fix

Browse Source
This commit is contained in:
Martin Duquesnoy
2011-07-29 17:19:09 +02:00
parent 69ec9d7db0
commit 08d55605da
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/client.c
View File

@@ -627,11 +627,10 @@ client_set_rules(Client *c)
if((xch.res_class && conf.rule[i].class && !strcmp(xch.res_class, conf.rule[i].class)) if((xch.res_class && conf.rule[i].class && !strcmp(xch.res_class, conf.rule[i].class))
|| (xch.res_name && conf.rule[i].instance && !strcmp(xch.res_name, conf.rule[i].instance))) || (xch.res_name && conf.rule[i].instance && !strcmp(xch.res_name, conf.rule[i].instance)))
{ {
if( ((strlen(wwrole) && conf.rule[i].role && !strcmp(wwrole, conf.rule[i].role)) if(((strlen(wwrole) && conf.rule[i].role && !strcmp(wwrole, conf.rule[i].role))
|| (!strlen(wwrole) || !conf.rule[i].role)) || (!strlen(wwrole) || !conf.rule[i].role))
&& && ((strlen(netwmname) && conf.rule[i].name && !strcmp(netwmname, conf.rule[i].name))
((strlen(netwmname) && conf.rule[i].name && !strcmp(netwmname, conf.rule[i].name)) || (!strlen(netwmname) || !conf.rule[i].name)))
|| (!strlen(netwmname) || !conf.rule[i].name)) )
{ {
if(conf.rule[i].screen != -1) if(conf.rule[i].screen != -1)
c->screen = conf.rule[i].screen; c->screen = conf.rule[i].screen;

2
src/config.c
View File

@@ -678,7 +678,7 @@ conf_rule_section(void)
conf.rule[i].class = fetch_opt_first(rule[i], "", "class").str; conf.rule[i].class = fetch_opt_first(rule[i], "", "class").str;
conf.rule[i].instance = fetch_opt_first(rule[i], "", "instance").str; conf.rule[i].instance = fetch_opt_first(rule[i], "", "instance").str;
conf.rule[i].role = fetch_opt_first(rule[i], "", "role").str; conf.rule[i].role = fetch_opt_first(rule[i], "", "role").str;
conf.rule[i].name = fetch_opt_first(rule[i], "", "name").str; conf.rule[i].name = fetch_opt_first(rule[i], "", "name").str;
conf.rule[i].screen = fetch_opt_first(rule[i], "-1", "screen").num; conf.rule[i].screen = fetch_opt_first(rule[i], "-1", "screen").num;
conf.rule[i].tag = fetch_opt_first(rule[i], "-1", "tag").num; conf.rule[i].tag = fetch_opt_first(rule[i], "-1", "tag").num;
conf.rule[i].free = fetch_opt_first(rule[i], "false", "free").boolean; conf.rule[i].free = fetch_opt_first(rule[i], "false", "free").boolean;

2
src/draw.c
View File

@@ -79,7 +79,7 @@ draw_image(Drawable dr, int x, int y, int w, int h, char *name)
*\param str String *\param str String
*\return n Lenght of i *\return n Lenght of i
*/ */
static int static void
parse_image_block(Drawable dr, char *str) parse_image_block(Drawable dr, char *str)
{ {
ImageAttr im; ImageAttr im;