[tor-commits] r24543: {arm} Correcting page numbering for when either the new and/or old (arm/trunk/src/interface)

[Damian Johnson]

Author: atagar
Date: 2011-04-03 05:23:06 +0000 (Sun, 03 Apr 2011)
New Revision: 24543

Modified:
   arm/trunk/src/interface/controller.py
Log:
Correcting page numbering for when either the new and/or old connection panel aren't being displayed.



Modified: arm/trunk/src/interface/controller.py
===================================================================
--- arm/trunk/src/interface/controller.py	2011-04-03 05:04:10 UTC (rev 24542)
+++ arm/trunk/src/interface/controller.py	2011-04-03 05:23:06 UTC (rev 24543)
@@ -120,7 +120,11 @@
         currentPage = self.page
         pageCount = len(PAGES)
         
-        if self.isBlindMode:
+        if not CONFIG["features.connection.newPanel"]:
+          if currentPage >= 3: currentPage -= 1
+          pageCount -= 1
+        
+        if self.isBlindMode or not CONFIG["features.connection.oldPanel"]:
           if currentPage >= 2: currentPage -= 1
           pageCount -= 1