From 6f4c5ccceeaf86dff3d8ad92cc049c0437980a3c Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Mon, 08 Oct 2007 16:39:41 +0000
Subject: Adopt to actvivity launch changes, start activity on game toolbar

---
diff --git a/NEWS b/NEWS
index 3305397..64738ed 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+* Adopt to actvivity launch changes (erikos)
+* Start on game toolbar (erikos)
+* Do not set title #3061 (erikos)
 * Fix for memorize accepts clicks when it should not #3727 (erikos) 
 
 18
diff --git a/activity.py b/activity.py
index 2e785cb..68c2e04 100755
--- a/activity.py
+++ b/activity.py
@@ -48,6 +48,9 @@ SERVICE = "org.laptop.Memorize"
 IFACE = SERVICE
 PATH = "/org/laptop/Memorize"
 
+_TOOLBAR_GAME = 1
+_TOOLBAR_CREATE = 2
+
 _logger = logging.getLogger('memorize-activity')
 
 class MemorizeActivity(Activity):
@@ -108,6 +111,9 @@ class MemorizeActivity(Activity):
         self.connect('focus_out_event', self._focus_out)
         self.connect('destroy', self._cleanup_cb)
 
+        # start on the game toolbar, might change this to the create toolbar later
+        self.toolbox.set_current_toolbar(_TOOLBAR_GAME)
+        
         # Get the Presence Service
         self.pservice = presenceservice.get_instance()
         try:
diff --git a/activity/activity.info b/activity/activity.info
index 7f354ed..8f0a9c0 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,7 +1,7 @@
 [Activity]
 name = Memorize
 service_name = org.laptop.Memorize
-class = activity.MemorizeActivity
+exec = sugar-activity activity.MemorizeActivity
 icon = activity-memorize
 activity_version = 18
 show_launcher = yes
--
cgit v0.9.1