nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: check the correct XClassHint property

Browse source 
kudos to Arkadiusz Bokowy (this commit is a slightly changed version
of a patch sent to the devel-ml): when retrieving the '.res_name' of
a XClassHint we should check '.res_name' and not '.res_class'.

the other changes only reduce the code.
This commit is contained in:
Mathias Gumz 2014-09-14 17:52:29 +02:00
parent 026343b6b1
commit f0a178f515
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Xutil.cc
View file

@ -97,18 +97,15 @@ FbTk::FbString getWMClassName(Window win) {
if (XGetClassHint(FbTk::App::instance()->display(), win, &ch) == 0) {
fbdbg<<"Xutil: Failed to read class hint!"<<endl;
instance_name = "";
} else {
XFree(ch.res_class);
if (ch.res_class != 0) {
if (ch.res_name != 0) {
instance_name = const_cast<char *>(ch.res_name);
XFree(ch.res_name);
ch.res_name = 0;
} else
instance_name = "";
}
}
return instance_name;
@ -122,7 +119,6 @@ FbTk::FbString getWMClassClass(Window win) {
if (XGetClassHint(FbTk::App::instance()->display(), win, &ch) == 0) {
fbdbg<<"Xutil: Failed to read class hint!"<<endl;
class_name = "";
} else {
XFree(ch.res_name);
@ -131,8 +127,7 @@ FbTk::FbString getWMClassClass(Window win) {
class_name = const_cast<char *>(ch.res_class);
XFree(ch.res_class);
ch.res_class = 0;
} else
class_name = "";
}
}
return class_name;