better historyplacement

[chaz/openbox] / otk / util.cc

diff --git a/otk/util.cc b/otk/util.cc
index a3ec0034ac35e9105d1a8a1a6086303c3e52f9ea..b33a1148116ca54e192b7b8cb9e6a4ccdc89c072 100644 (file)
--- a/otk/util.cc
+++ b/otk/util.cc
@@ -7,6 +7,10 @@
 extern "C" {
 #include <X11/Xatom.h>
 
+#ifdef HAVE_STDIO_H
+#include <stdio.h>
+#endif
+
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
@@ -23,7 +27,7 @@ extern "C" {
 #  include <process.h>
 #endif //   HAVE_PROCESS_H             __EMX__
 
-#include "gettext.h"
+#include "../src/gettext.h"
 #define _(str) gettext(str)
 
 #include <assert.h>
@@ -61,30 +65,6 @@ void bexec(const string& command, const string& displaystring) {
 }
 
 
-string textPropertyToString(Display *display, XTextProperty& text_prop) {
-  string ret;
-
-  if (text_prop.value && text_prop.nitems > 0) {
-    if (text_prop.encoding == XA_STRING) {
-      ret = (char *) text_prop.value;
-    } else {
-      text_prop.nitems = strlen((char *) text_prop.value);
-
-      char **list;
-      int num;
-      if (XmbTextPropertyToTextList(display, &text_prop,
-                                    &list, &num) == Success &&
-          num > 0 && *list) {
-        ret = *list;
-        XFreeStringList(list);
-      }
-    }
-  }
-
-  return ret;
-}
-
-
 string itostring(unsigned long i) {
   if (i == 0)
     return string("0");