dont wrap pointerassassin

[chaz/openbox] / src / config.cc

diff --git a/src/config.cc b/src/config.cc
index 79250e3db784f61838b5837cf332b173c94dee91..d464ebbc5234a72cf3c59419dbee4f7c728d198b 100644 (file)
--- a/src/config.cc
+++ b/src/config.cc
@@ -28,7 +28,6 @@ bool python_get_string(const char *name, otk::ustring *value)
   PyObject *val = PyDict_GetItemString(obdict, const_cast<char*>(name));
   if (!(val && PyString_Check(val))) return false;
 
-  printf("PYLENGTH %d\n", PyString_Size(val));
   std::string temp(PyString_AsString(val), PyString_Size(val));
   *value = temp;
   return true;
@@ -56,8 +55,7 @@ Config::Config()
   PyObject *obmodule = PyImport_AddModule("config");
   obdict = PyModule_GetDict(obmodule);
 
-  std::vector<otk::ustring> names;
-  python_get_stringlist("DESKTOP_NAMES", &names);
+  python_get_stringlist("DESKTOP_NAMES", &desktop_names);
 
   python_get_string("THEME", &theme);
 
@@ -70,29 +68,10 @@ Config::Config()
     drag_threshold = 3;
   if (!python_get_long("NUMBER_OF_DESKTOPS", (long*)&num_desktops))
     num_desktops = 1;
-
-  otk::ustring s;
-  long w, h;
-  if (python_get_string("DEFAULT_ICON", &s) && s.bytes() > 2 &&
-      python_get_long("DEFAULT_ICON_WIDTH", &w) &&
-      python_get_long("DEFAULT_ICON_HEIGHT", &h) &&
-      (unsigned)(w * h) == s.bytes() / sizeof(unsigned long)) {
-    default_icon = new unsigned long[s.bytes() / sizeof(unsigned long) + 2];
-    default_icon[0] = w;
-    default_icon[1] = h;
-    memcpy(default_icon + 2, s.data(), s.bytes());
-    printf("%d %d\n", default_icon[0], default_icon[1]);
-  } else {
-    default_icon = 0;
-  }
-      
-  icon_length = s.bytes();
-  printf("LENGTH %d\n", icon_length);
 }
 
 Config::~Config()
 {
-  if (default_icon) delete [] default_icon;
 }
 
 }