Merge branch 'master' into chaz

[chaz/openbox] / tools / themeupdate / themeupdate.py

diff --git a/tools/themeupdate/themeupdate.py b/tools/themeupdate/themeupdate.py
index 8454c1af6f3ce28bc0b984100922c2a6396dd569..c2ad6a75ebe4197ad1f053a0ffcfe74c34a1d8cc 100755 (executable)
--- a/tools/themeupdate/themeupdate.py
+++ b/tools/themeupdate/themeupdate.py
@@ -1,5 +1,23 @@
 #! /usr/bin/python
 
+# themeupdate.py for the Openbox window manager
+# This utility is for updating old themes from Blackbox, Fluxbox, and Openbox2
+# to Openbox3
+#
+# Copyright (c) 2003-2007        Dana Jansens
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# See the COPYING file for a copy of the GNU General Public License.
+
 import sys
 
 data = []
@@ -256,7 +274,7 @@ def x_fonts(data):
             return
     else: return
     while 1:
-        i, key = key_find(data, '.font')
+        i, key, nul = find_key(data, '.font')
         if i < 0:
             break
         out('Removing "' + key + '"\n')
@@ -338,7 +356,7 @@ def pixelsize(data):
                 valid = False
 
 def warn_missing(data):
-    need = ('window.button.hover.focus',  'window.button.hover.unfocus',
+    need = ('window.active.button.hover',  'window.inactive.button.hover',
             'menu.overlap')
     for n in need:
         i, nul, nul = find_key(data, n)