From b517c69c46be6eaafbf200c8f513b1395f84e694 Mon Sep 17 00:00:00 2001
From: Daniel Drake <dsd@laptop.org>
Date: Sun, 30 Oct 2011 16:36:25 +0000
Subject: Remove old toolbars support

Reviewed-by: Manuel Quinones <manuq@laptop.org>
Acked-by: Simon Schampijer <simon@laptop.org>
---
(limited to 'webtoolbar.py')

diff --git a/webtoolbar.py b/webtoolbar.py
index a4623be..97bdcd6 100644
--- a/webtoolbar.py
+++ b/webtoolbar.py
@@ -26,14 +26,9 @@ from xpcom.components import interfaces
 from sugar.graphics.toolbutton import ToolButton
 from sugar.graphics.menuitem import MenuItem
 from sugar.graphics import iconentry
-try:
-    from sugar.graphics.toolbarbox import ToolbarBox as ToolbarBase
-    from sugar.activity.widgets import ActivityToolbarButton
-    from sugar.activity.widgets import StopButton
-    NEW_TOOLBARS = True
-except ImportError:
-    from gtk import Toolbar as ToolbarBase
-    NEW_TOOLBARS = False
+from sugar.graphics.toolbarbox import ToolbarBox as ToolbarBase
+from sugar.activity.widgets import ActivityToolbarButton
+from sugar.activity.widgets import StopButton
 
 import filepicker
 import places
@@ -242,12 +237,9 @@ class PrimaryToolbar(ToolbarBase):
 
         self._loading = False
 
-        if NEW_TOOLBARS:
-            toolbar = self.toolbar
-            activity_button = ActivityToolbarButton(self._activity)
-            toolbar.insert(activity_button, 0)
-        else:
-            toolbar = self
+        toolbar = self.toolbar
+        activity_button = ActivityToolbarButton(self._activity)
+        toolbar.insert(activity_button, 0)
 
         self._go_home = ToolButton('go-home')
         self._go_home.set_tooltip(_('Home page'))
@@ -289,9 +281,8 @@ class PrimaryToolbar(ToolbarBase):
         toolbar.insert(self._link_add, -1)
         self._link_add.show()
 
-        if NEW_TOOLBARS:
-            stop_button = StopButton(self._activity)
-            toolbar.insert(stop_button, -1)
+        stop_button = StopButton(self._activity)
+        toolbar.insert(stop_button, -1)
 
         self._progress_listener = None
         self._history = None
--
cgit v0.9.1