From fd7668947091b11c9d9d5775edf5f414e4be6173 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Sat, 15 Feb 2003 12:47:05 +0000
Subject: dont provide a default icon in the python stuff, itll come from the
 style

---
 src/client.cc | 41 +++++++++++++++++------------------------
 src/config.cc | 17 -----------------
 src/config.hh |  5 -----
 3 files changed, 17 insertions(+), 46 deletions(-)

(limited to 'src')

diff --git a/src/client.cc b/src/client.cc
index 3dc6237f..61827734 100644
--- a/src/client.cc
+++ b/src/client.cc
@@ -708,7 +708,6 @@ void Client::updateIcons()
   unsigned long num = (unsigned) -1;
   unsigned long *data;
   unsigned long w, h, i = 0;
-  bool freeit = false;
 
   for (int j = 0; j < _nicons; ++j)
     delete [] _icons[j].data;
@@ -716,38 +715,32 @@ void Client::updateIcons()
     delete [] _icons;
   _nicons = 0;
 
-  if (!otk::Property::get(_window, otk::Property::atoms.net_wm_icon,
+  if (otk::Property::get(_window, otk::Property::atoms.net_wm_icon,
                           otk::Property::atoms.cardinal, &num, &data)) {
-    // use default icon(s)
-    num = openbox->screen(_screen)->config().icon_length;
-    data = openbox->screen(_screen)->config().default_icon;
-  } else
-    freeit = true;
-  
-  // figure out how man valid icons are in here
-  while (num - i > 2) {
-    w = data[i++];
-    h = data[i++];
-    i += w * h;
-    if (i > num) break;
-    ++_nicons;
-  }
-
-  _icons = new Icon[_nicons];
+    // figure out how man valid icons are in here
+    while (num - i > 2) {
+      w = data[i++];
+      h = data[i++];
+      i += w * h;
+      if (i > num) break;
+      ++_nicons;
+    }
 
-  // store the icons
-  i = 0;
-  for (int j = 0; j < _nicons; ++j) {
-    w = _icons[j].w = data[i++];
+    _icons = new Icon[_nicons];
+    
+    // store the icons
+    i = 0;
+    for (int j = 0; j < _nicons; ++j) {
+      w = _icons[j].w = data[i++];
       h = _icons[j].h = data[i++];
       _icons[j].data = new unsigned long[w * h];
       ::memcpy(_icons[j].data, &data[i], w * h * sizeof(unsigned long));
       i += w * h;
       assert(i <= num);
-  }
+    }
 
-  if (freeit)
     delete [] data;
+  }
 
   if (_nicons <= 0) {
     _nicons = 1;
diff --git a/src/config.cc b/src/config.cc
index e5ec74d4..8d569693 100644
--- a/src/config.cc
+++ b/src/config.cc
@@ -69,27 +69,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());
-  } else {
-    default_icon = 0;
-  }
-      
-  icon_length = s.bytes();
 }
 
 Config::~Config()
 {
-  if (default_icon) delete [] default_icon;
 }
 
 }
diff --git a/src/config.hh b/src/config.hh
index cfa0adc5..f0205509 100644
--- a/src/config.hh
+++ b/src/config.hh
@@ -21,11 +21,6 @@ struct Config {
   long drag_threshold;
   long num_desktops;
 
-  unsigned long *default_icon;
-  long icon_w;
-  long icon_h;
-  long icon_length;
-  
   Config();
   ~Config();
 };
-- 
cgit v1.2.3