From ea64e9ddb07fbddb8cb5ec29202617122850d734 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Wed, 17 Dec 2008 05:30:40 +0000
Subject: do not override activity.Activity's toolbox variable

---
diff --git a/TamTamEdit.activity/TamTamEdit.py b/TamTamEdit.activity/TamTamEdit.py
index 8400e82..23aaea8 100644
--- a/TamTamEdit.activity/TamTamEdit.py
+++ b/TamTamEdit.activity/TamTamEdit.py
@@ -42,12 +42,12 @@ class TamTamEdit(activity.Activity):
 
 
         #load the sugar toolbar
-        self.toolbox = activity.ActivityToolbox(self)
-        self.set_toolbox(self.toolbox)
+        toolbox = activity.ActivityToolbox(self)
+        self.set_toolbox(toolbox)
 
-        self.activity_toolbar = self.toolbox.get_activity_toolbar()
+        self.activity_toolbar = toolbox.get_activity_toolbar()
 
-        self.toolbox.show()
+        toolbox.show()
 
         self.trackpad.setContext('edit')
         self.edit = MainWindow(self)
diff --git a/TamTamJam.activity/TamTamJam.py b/TamTamJam.activity/TamTamJam.py
index e0f7381..f85899d 100644
--- a/TamTamJam.activity/TamTamJam.py
+++ b/TamTamJam.activity/TamTamJam.py
@@ -46,12 +46,12 @@ class TamTamJam(activity.Activity):
         self.connect('destroy', self.onDestroy)
 
         #load the sugar toolbar
-        self.toolbox = activity.ActivityToolbox(self)
-        self.set_toolbox(self.toolbox)
+        toolbox = activity.ActivityToolbox(self)
+        self.set_toolbox(toolbox)
 
-        self.activity_toolbar = self.toolbox.get_activity_toolbar()
+        self.activity_toolbar = toolbox.get_activity_toolbar()
 
-        self.toolbox.show()
+        toolbox.show()
 
         self.trackpad.setContext('jam')
         self.jam = JamMain(self)
diff --git a/TamTamMini.activity/TamTamMini.py b/TamTamMini.activity/TamTamMini.py
index 7347f6f..b35ad85 100644
--- a/TamTamMini.activity/TamTamMini.py
+++ b/TamTamMini.activity/TamTamMini.py
@@ -41,14 +41,14 @@ class TamTamMini(activity.Activity):
         self.preloadList = [ self.instrumentPanel ]
 
         #load the sugar toolbar
-        self.toolbox = activity.ActivityToolbox(self)
-        self.set_toolbox(self.toolbox)
+        toolbox = activity.ActivityToolbox(self)
+        self.set_toolbox(toolbox)
 
-        self.activity_toolbar = self.toolbox.get_activity_toolbar()
+        self.activity_toolbar = toolbox.get_activity_toolbar()
         self.activity_toolbar.share.hide()
         self.activity_toolbar.keep.hide()
 
-        self.toolbox.show()
+        toolbox.show()
 
         self.trackpad.setContext('mini')
         self.mini = miniTamTamMain(self)
diff --git a/TamTamSynthLab.activity/TamTamSynthLab.py b/TamTamSynthLab.activity/TamTamSynthLab.py
index 1f27c51..36ea0e0 100644
--- a/TamTamSynthLab.activity/TamTamSynthLab.py
+++ b/TamTamSynthLab.activity/TamTamSynthLab.py
@@ -41,14 +41,14 @@ class TamTamSynthLab(activity.Activity):
         self.connect('destroy', self.onDestroy)
 
         #load the sugar toolbar
-        self.toolbox = activity.ActivityToolbox(self)
-        self.set_toolbox(self.toolbox)
+        toolbox = activity.ActivityToolbox(self)
+        self.set_toolbox(toolbox)
 
-        self.activity_toolbar = self.toolbox.get_activity_toolbar()
+        self.activity_toolbar = toolbox.get_activity_toolbar()
         self.activity_toolbar.share.hide()
         self.activity_toolbar.keep.hide()
 
-        self.toolbox.show()
+        toolbox.show()
 
         self.trackpad.setContext('synthLab')
         self.synthLab = SynthLabMain(self)
--
cgit v0.9.1