use the new config system.. a bit..

diff --git a/scripts/cycle.py b/scripts/cycle.py
index 5a518652c5f7e137aec54b9c95252eb414c58a6e..f77f3d8ad40bb44a397b5db1a122c880fc246597 100644 (file)
--- a/scripts/cycle.py
+++ b/scripts/cycle.py
@@ -1,4 +1,4 @@
-import ob, otk
+import ob, otk, config
 class _Cycle:
     """
     This is a basic cycling class for anything, from xOr's stackedcycle.py, 
@@ -298,7 +298,8 @@ class _CycleWindows(_Cycle):
 
         if not client.normal(): return 0
         if not (client.canFocus() or client.focusNotify()): return 0
-        if focus.AVOID_SKIP_TASKBAR and client.skipTaskbar(): return 0
+        if config.get('focus', 'avoid_skip_taskbar') and client.skipTaskbar():
+                      return 0
 
         if client.iconic():
             if self.INCLUDE_ICONS:
@@ -390,7 +391,8 @@ class _CycleWindowsLinear(_CycleWindows):
 
         if not client.normal(): return 0
         if not (client.canFocus() or client.focusNotify()): return 0
-        if focus.AVOID_SKIP_TASKBAR and client.skipTaskbar(): return 0
+        if config.get('focus', 'avoid_skip_taskbar') and client.skipTaskbar():
+            return 0
 
         if client.iconic(): return 0
         if self.INCLUDE_OMNIPRESENT and desk == 0xffffffff: return 1