X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fcycle.py;h=5a518652c5f7e137aec54b9c95252eb414c58a6e;hb=cf9773325130da00f12a1c3475b2bc6d7d2bd466;hp=f29bf23ebb1832a7b1e1a59139d6297aaabff7d5;hpb=3c82ae888de284af39fa415f291e5e08028ca5b7;p=chaz%2Fopenbox

diff --git a/scripts/cycle.py b/scripts/cycle.py
index f29bf23e..5a518652 100644
--- a/scripts/cycle.py
+++ b/scripts/cycle.py
@@ -327,7 +327,7 @@ class _CycleWindows(_Cycle):
         if self.INCLUDE_ALL_DESKTOPS:
             d = client.desktop()
             if d == 0xffffffff: d = self.screen.desktop()
-            t = self.screen.desktopName(d) + " - " + t
+            t = self.screen.desktopNames()[d] + " - " + t
 
         return t
     
@@ -420,7 +420,7 @@ class _CycleWindowsLinear(_CycleWindows):
         if self.INCLUDE_ALL_DESKTOPS:
             d = client.desktop()
             if d == 0xffffffff: d = self.screen.desktop()
-            t = self.screen.desktopName(d) + " - " + t
+            t = self.screen.desktopNames()[d] + " - " + t
 
         return t
     
@@ -447,9 +447,10 @@ class _CycleDesktops(_Cycle):
         _Cycle.__init__(self)
 
     def populateItems(self):
-        for i in range(self.screen.numDesktops()):
-            self.items.append(
-                _CycleDesktops.Desktop(self.screen.desktopName(i), i))
+        names = self.screen.desktopNames()
+        num = self.screen.numDesktops()
+        for n, i in zip(names[:num], range(num)):
+            self.items.append(_CycleDesktops.Desktop(n, i))
 
     def menuLabel(self, desktop):
         return desktop.name