X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FUtil.cc;h=1b521aafb6f872259e2eff92e64a7486194e55a3;hb=137a0c4e596409a1d35f0f6ea1bd6e4fcd5a3831;hp=0300e52bb0ee279e66f3f0611bb3749ff49bc5c0;hpb=8794d357e67abddf9fda9db77b235e294d0ec590;p=chaz%2Fopenbox

diff --git a/src/Util.cc b/src/Util.cc
index 0300e52b..1b521aaf 100644
--- a/src/Util.cc
+++ b/src/Util.cc
@@ -52,6 +52,8 @@ extern "C" {
 
 #include <X11/Xatom.h>
 
+#include <assert.h>
+
 #include <algorithm>
 
 #include "Util.hh"
@@ -180,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;
@@ -220,3 +223,24 @@ timeval normalizeTimeval(const timeval &tm) {
 
   return ret;
 }
+
+
+string itostring(unsigned long i) {
+  if (i == 0)
+    return string("0");
+  
+  string tmp;
+  for (; i > 0; i /= 10)
+    tmp.insert(tmp.begin(), "0123456789"[i%10]);
+  return tmp;
+}
+
+
+string itostring(long i) {
+  if (i < 0) {
+    std::string tmp = itostring( (unsigned long) -i);
+    tmp.insert(tmp.begin(), '-');
+    return tmp;
+  } else
+    return itostring( (unsigned long) i);
+}