From c4938834a058be4a3d6a87e9d467974e67f14eff Mon Sep 17 00:00:00 2001
From: Rafael Ortiz <rafael@activitycentral.com>
Date: Wed, 09 Mar 2011 16:21:23 +0000
Subject: New version, fixes for new toolbars.

---
diff --git a/Maze.activity/NEWS b/Maze.activity/NEWS
index 79d6c0b..96c16c8 100644
--- a/Maze.activity/NEWS
+++ b/Maze.activity/NEWS
@@ -1,3 +1,7 @@
+9
+
+*Adding new toolbars
+
 6
 
 *Fixed i18n
diff --git a/Maze.activity/activity/activity.info b/Maze.activity/activity/activity.info
index c19b0ed..80fec58 100644
--- a/Maze.activity/activity/activity.info
+++ b/Maze.activity/activity/activity.info
@@ -3,7 +3,7 @@ name = Maze
 bundle_id = vu.lux.olpc.Maze
 class = activity.MazeActivity
 icon = activity-maze
-activity_version = 8
+activity_version = 9
 show_launcher = yes
 host_version = 1
 license = GPLv3+
diff --git a/Maze.activity/olpcgames/activity.py b/Maze.activity/olpcgames/activity.py
index 7f63513..0f09159 100644
--- a/Maze.activity/olpcgames/activity.py
+++ b/Maze.activity/olpcgames/activity.py
@@ -107,36 +107,6 @@ class PyGameActivity(activity.Activity):
         This is a customisation point for those games which want to
         provide custom toolbars when running under Sugar.
         """
-        
-	    try:
-	        from sugar.graphics.toolbarbox import ToolbarBox, ToolbarButton
-	        from sugar.activity.widgets import ActivityToolbarButton
-        
-	        toolbar_box = ToolbarBox()
-	        activity_button = ActivityToolbarButton(self)
-	        toolbar_box.toolbar.insert(activity_button, 0)
-	        activity_button.show()
-	      
-	        separator = gtk.SeparatorToolItem()
-		separator.props.draw = False
-	        separator.set_expand(True)
-	        toolbar_box.toolbar.insert(separator, -1)
-	        separator.show()
-	      	
-	      	stop_button = StopButton(self)
-	      	stop_button.props.accelerator = '<Ctrl><Shift>Q'
-	      	toolbar_box.toolbar.insert(stop_button, -1)
-	      	stop_button.show()
-	      
-	        self.set_toolbar_box(toolbar_box)
-	        toolbar_box.show()
-	        toolbar=toolbar_box.toolbar
-	
-	  except ImportError:
-		 toolbar = activity.ActivityToolbar(self)
-                 toolbar.show()
-		 self.set_toolbox(toolbar)
-		 toolbar.title.unset_flags(gtk.CAN_FOCUS)
 
         try:
             from sugar.graphics.toolbarbox import ToolbarBox, ToolbarButton
--
cgit v0.9.1