From: Dana Jansens <danakj@orodu.net>
Date: Mon, 1 Sep 2003 16:34:00 +0000 (+0000)
Subject: some stuff is exact
X-Git-Tag: openbox-3_0-rc1-RELEASE~430
X-Git-Url: http://git.openbox.org/?p=dana%2Fopenbox.git;a=commitdiff_plain;h=45520c3244dd37982916f896a78a201fcf40457f

some stuff is exact
---

diff --git a/tools/themeupdate/themeupdate.py b/tools/themeupdate/themeupdate.py
index a6d7cd0..171be0b 100755
--- a/tools/themeupdate/themeupdate.py
+++ b/tools/themeupdate/themeupdate.py
@@ -59,12 +59,22 @@ def simple_replace(data):
 def remove(data):
     invalid = []
     invalid.append('toolbar')
-    invalid.append('menu.bullet')
+    for inv in invalid:
+        while 1:
+            i, key, nul = find_key(data, inv)
+            if i >= 0:
+                out(key + ' is no longer supported.\nRemove (Y/n)? ')
+                if read_bool():
+                    out('Removing "' + key + '"\n')
+                    data.pop(i)
+            else:
+                break
     invalid.append('rootCommand')
+    invalid.append('menu.bullet')
     invalid.append('menu.frame.justify')
     for inv in invalid:
         while 1:
-            i, key, nul = find_key(data, inv)
+            i, key, nul = find_key(data, inv, True)
             if i >= 0:
                 out(key + ' is no longer supported.\nRemove (Y/n)? ')
                 if read_bool():