From 20bf81d221e56080997d8cf60ee8d24b21ed127a Mon Sep 17 00:00:00 2001
From: Gonzalo Odiard <godiard@gmail.com>
Date: Thu, 24 Jan 2013 21:08:16 +0000
Subject: Fix TamTamJam Toolbars

Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
---
(limited to 'TamTamJam.py')

diff --git a/TamTamJam.py b/TamTamJam.py
index ab34bdc..7d53df6 100644
--- a/TamTamJam.py
+++ b/TamTamJam.py
@@ -70,36 +70,30 @@ class TamTamJam(activity.Activity):
         self.connect('notify::active', self.onActive)
         self.connect('destroy', self.onDestroy)
 
-        #load the sugar toolbar
-        if Config.HAVE_TOOLBOX:
-            self.toolbox = ToolbarBox()
-            self.toolbox.toolbar.insert(widgets.ActivityToolbarButton(self), -1)
-            self.toolbox.toolbar.insert(Gtk.SeparatorToolItem(), -1)
-        else:
-            self.toolbox = activity.ActivityToolbox(self)
-            self.set_toolbox(self.toolbox)
-
-        self.toolbox.show()
+        toolbox = ToolbarBox()
+        toolbox.toolbar.insert(widgets.ActivityToolbarButton(self), -1)
+        toolbox.toolbar.insert(Gtk.SeparatorToolItem(), -1)
 
         self.trackpad.setContext('jam')
+
+        self.set_toolbar_box(toolbox)
+
         self.jam = JamMain(self)
         self.connect('key-press-event', self.jam.onKeyPress)
         self.connect('key-release-event', self.jam.onKeyRelease)
         #self.modeList[mode].regenerate()
-
-        self.set_canvas(self.jam)
-
         self.jam.onActivate(arg=None)
 
-        if Config.HAVE_TOOLBOX:
-            separator = Gtk.SeparatorToolItem()
-            separator.props.draw = False
-            separator.set_expand(True)
-            self.toolbox.toolbar.insert(separator, -1)
-            self.toolbox.toolbar.insert(widgets.StopButton(self), -1)
-            self.toolbox.toolbar.show_all()
+        separator = Gtk.SeparatorToolItem()
+        separator.props.draw = False
+        separator.set_expand(True)
+        toolbox.toolbar.insert(separator, -1)
+        toolbox.toolbar.insert(widgets.StopButton(self), -1)
+
+        toolbox.toolbar.show_all()
+        self.set_canvas(self.jam)
 
-        self.show()
+        self.show_all()
 
     def onPreloadTimeout(self):
         if Config.DEBUG > 4: 
--
cgit v0.9.1