From c894c62dce3f433d13811f76baac086ba250c5fc Mon Sep 17 00:00:00 2001
From: Pootle daemon <pootle@pootle.sugarlabs.org>
Date: Sun, 25 Sep 2011 14:26:09 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:stopwatch/stopwatch

---
diff --git a/NEWS b/NEWS
index 5e689b6..a2e74f8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+11
+
+*remove keep button (Gonzalo Odiard)
+*fixing an exec error on activity.info
+*more pootle templates
+
 9
 
 *Disable idle suspend on opening journal entry with running timer by James Cameron
diff --git a/activity.py b/activity.py
index 7a32a6d..88313e2 100644
--- a/activity.py
+++ b/activity.py
@@ -48,7 +48,7 @@ class StopWatchActivity(Activity):
         try:
             from sugar.graphics.toolbarbox import ToolbarBox, ToolbarButton
             from sugar.activity.widgets import ActivityToolbarButton, StopButton, \
-                    ShareButton, KeepButton, TitleEntry, ActivityButton
+                    ShareButton, TitleEntry, ActivityButton
         except ImportError:
             OLD_TOOLBAR = True
 
@@ -70,10 +70,6 @@ class StopWatchActivity(Activity):
             toolbar_box.toolbar.insert(share_button, -1)
             share_button.show()
 
-            keep_button = KeepButton(self)
-            toolbar_box.toolbar.insert(keep_button, -1)
-            keep_button.show()
-
             separator = gtk.SeparatorToolItem()
             separator.props.draw = False
             separator.set_expand(True)
diff --git a/activity/activity.info b/activity/activity.info
index 45f1834..6480745 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,7 +1,7 @@
 [Activity]
 name = StopWatch
 bundle_id = org.laptop.StopWatchActivity
-exec = activity.StopWatchActivity
+exec = sugar-activity activity.StopWatchActivity
 icon = activity-stopwatch
-activity_version = 9
+activity_version = 11
 show_launcher = yes
--
cgit v0.9.1