allow style options in the rc file to override those found in the style

[chaz/openbox] / src / Util.cc

diff --git a/src/Util.cc b/src/Util.cc
index 9dadb3e10ea510fcd73961536fdc7f8958d83a3b..1b521aafb6f872259e2eff92e64a7486194e55a3 100644 (file)
--- a/src/Util.cc
+++ b/src/Util.cc
@@ -141,12 +141,6 @@ bool Rect::intersects(const Rect &a) const {
 }
 
 
-bool Rect::contains(int __x, int __y) const {
-  return __x >= _x1 && __x <= _x2 &&
-         __y >= _y1 && __y <= _y2;
-}
-
-
 string expandTilde(const string& s) {
   if (s[0] != '~') return s;
 
@@ -188,8 +182,9 @@ string textPropertyToString(Display *display, XTextProperty& text_prop) {
   string ret;
 
   if (text_prop.value && text_prop.nitems > 0) {
-    ret = (char *) text_prop.value;
-    if (text_prop.encoding != XA_STRING) {
+    if (text_prop.encoding == XA_STRING) {
+      ret = (char *) text_prop.value;
+    } else {
       text_prop.nitems = strlen((char *) text_prop.value);
 
       char **list;