use the new atoms global

[chaz/openbox] / scripts / stackedcycle.py

diff --git a/scripts/stackedcycle.py b/scripts/stackedcycle.py
index 9c60c1b9c66a25a9c7ccc5f3c0f5d13ee40a9e91..bfeaf31d918333ad601282b606c035f3881c26c8 100644 (file)
--- a/scripts/stackedcycle.py
+++ b/scripts/stackedcycle.py
@@ -96,11 +96,9 @@ class _cycledata:
         # get the list of clients, keeping iconic windows at the bottom
         self.clients = []
         iconic_clients = []
-        for i in focus._clients:
-            c = ob.openbox.findClient(i)
-            if c:
-                if c.iconic(): iconic_clients.append(c)
-                else: self.clients.append(c)
+        for c in focus._clients:
+            if c.iconic(): iconic_clients.append(c)
+            else: self.clients.append(c)
         self.clients.extend(iconic_clients)
 
         font = self.style.labelFont()
@@ -167,7 +165,7 @@ class _cycledata:
         if not (client.iconic() or client.desktop() == 0xffffffff or \
                 client.desktop() == self.screen.desktop()):
             root = self.screeninfo.rootWindow()
-            ob.send_client_msg(root, otk.Property_atoms().net_current_desktop,
+            ob.send_client_msg(root, otk.atoms.net_current_desktop,
                                root, client.desktop())
         
         # send a net_active_window message for the target
@@ -175,7 +173,7 @@ class _cycledata:
             if final: r = focuscycle.RAISE_WINDOW
             else: r = 0
             ob.send_client_msg(self.screeninfo.rootWindow(),
-                               otk.Property_atoms().openbox_active_window,
+                               otk.atoms.openbox_active_window,
                                client.window(), final, r)
 
     def cycle(self, data, forward):