Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Schampijer <simon@schampijer.de>2007-10-08 16:39:41 (GMT)
committer Simon Schampijer <simon@schampijer.de>2007-10-08 16:39:41 (GMT)
commit6f4c5ccceeaf86dff3d8ad92cc049c0437980a3c (patch)
treecf1de23e7cc6a1d5bfe0d4d3fda408cc7491a714
parentc20784ef3859c2282f234f4a122e6315e97bae4f (diff)
Adopt to actvivity launch changes, start activity on game toolbar
-rw-r--r--NEWS3
-rwxr-xr-xactivity.py6
-rw-r--r--activity/activity.info2
3 files changed, 10 insertions, 1 deletions
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