From 78151f8aec2321ea6c9de1d1b69b6d9d7570f593 Mon Sep 17 00:00:00 2001
From: Sebastian Silva <icarito@sugarlabs.org>
Date: Fri, 04 Mar 2011 08:40:47 +0000
Subject: Merge branch 'master' of git://git.sugarlabs.org/maze/mainline

Conflicts:
	Maze.activity/olpcgames/canvas.pyc
---
diff --git a/Maze.activity/olpcgames/activity.py b/Maze.activity/olpcgames/activity.py
index 45a6a69..c12faf7 100644
--- a/Maze.activity/olpcgames/activity.py
+++ b/Maze.activity/olpcgames/activity.py
@@ -93,10 +93,29 @@ class PyGameActivity(activity.Activity):
         This is a customisation point for those games which want to
         provide custom toolbars when running under Sugar.
         """
-        toolbar = activity.ActivityToolbar(self)
-        toolbar.show()
-        self.set_toolbox(toolbar)
-        def shared_cb(*args, **kwargs):
+	OLD_TOOLBAR = False
+	try:
+		from sugar.graphics.toolbarbox import ToolbarBox, ToolbarButton
+		from sugar.activity.widgets import ActivityToolbarButton
+        except ImportError:
+		OLD_TOOLBAR = True
+        
+	if OLD_TOOLBAR:
+        #	toolbar = activity.ActivityToolbar(self)
+        #	toolbar.show()
+        #	self.set_toolbox(toolbar)
+		self.toolbox = ActivityToolbox(self)
+	        self.set_toolbox(self.toolbox)
+	        self.toolbox.show()
+                self.set_toolbox(self.toolbox)
+        else:
+		toolbar_box = ToolbarBox()
+                self.activity_button = ActivityToolbarButton(self)
+		toolbar_box.toolbar.insert(self.activity_button, 0)
+		self.set_toolbar_box(toolbar_box)
+     
+
+    def shared_cb(*args, **kwargs):
             log.info( 'shared: %s, %s', args, kwargs )
             try:
                 mesh.activity_shared(self)
diff --git a/Maze.activity/olpcgames/canvas.pyc b/Maze.activity/olpcgames/canvas.pyc
deleted file mode 100644
index 75c6c6a..0000000
--- a/Maze.activity/olpcgames/canvas.pyc
+++ /dev/null
Binary files differ
--
cgit v0.9.1