From 963e9b44c5ac00c1e84b9b8659e343902cc704fb Mon Sep 17 00:00:00 2001
From: Pootle daemon <pootle@pootle.sugarlabs.org>
Date: Thu, 21 Jul 2011 18:57:14 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:turtleart/mainline

---
(limited to 'TurtleArtActivity.py')

diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py
index 69bb506..7076179 100644
--- a/TurtleArtActivity.py
+++ b/TurtleArtActivity.py
@@ -587,15 +587,9 @@ class TurtleArtActivity(activity.Activity):
         view_toolbar.show()
         help_toolbar.show()
         self._toolbox.show()
-        # Setup palette toolbar only *after* initializing the plugins
-
-        if self.has_toolbarbox:
-            # Hack as a workaround for #2050
-            edit_toolbar_button.set_expanded(True)
-            edit_toolbar_button.set_expanded(False)
 
-            self._palette_toolbar_button.set_expanded(True)
-        else:
+        # Setup palette toolbar only *after* initializing the plugins
+        if not self.has_toolbarbox:
             self._toolbox.set_current_toolbar(1)
 
     def _setup_palette_toolbar(self):
--
cgit v0.9.1