From b95a7db4a5310c3ce24aeb06a8984ca168f434e7 Mon Sep 17 00:00:00 2001
From: Eben Eliason <eben@sugar.(none)>
Date: Sat, 18 Oct 2008 21:26:07 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

---
diff --git a/src/jarabe/view/tabbinghandler.py b/src/jarabe/view/tabbinghandler.py
index 87a36a1..b1c85c6 100644
--- a/src/jarabe/view/tabbinghandler.py
+++ b/src/jarabe/view/tabbinghandler.py
@@ -86,7 +86,7 @@ class TabbingHandler(object):
 
         if self._tabbing:
             shell_model = shell.get_model()
-            zoom_level = shell_model.get_zoom_level()
+            zoom_level = shell_model.zoom_level
             zoom_activity = (zoom_level == shell.ShellModel.ZOOM_ACTIVITY)
 
             if not zoom_activity and first_switch:
@@ -109,7 +109,7 @@ class TabbingHandler(object):
 
         if self._tabbing:
             shell_model = shell.get_model()
-            zoom_level = shell_model.get_zoom_level()
+            zoom_level = shell_model.zoom_level
             zoom_activity = (zoom_level == shell.ShellModel.ZOOM_ACTIVITY)
 
             if not zoom_activity and first_switch:
--
cgit v0.9.1