Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src/sugar/activity
diff options
context:
space:
mode:
Diffstat (limited to 'src/sugar/activity')
-rw-r--r--src/sugar/activity/activity.py6
-rw-r--r--src/sugar/activity/activityfactory.py2
-rw-r--r--src/sugar/activity/activityhandle.py2
3 files changed, 4 insertions, 6 deletions
diff --git a/src/sugar/activity/activity.py b/src/sugar/activity/activity.py
index f20d402..1c2e06a 100644
--- a/src/sugar/activity/activity.py
+++ b/src/sugar/activity/activity.py
@@ -470,7 +470,7 @@ class Activity(Window, gtk.Container):
"""
raise NotImplementedError
- def __save_cb(self):
+ def __save_cb(self, object_id=None):
logging.debug('Activity.__save_cb')
self._updating_jobject = False
if self._quit_requested:
@@ -550,7 +550,7 @@ class Activity(Window, gtk.Container):
logging.debug('Cannot save, no journal object.')
return
- logging.debug('Activity.save: %r' % self._jobject.object_id)
+ logging.debug('Activity.save: %r', self._jobject.object_id)
if self._updating_jobject:
logging.info('Activity.save: still processing a previous request.')
@@ -594,7 +594,7 @@ class Activity(Window, gtk.Container):
Activities should not override this method. Instead, like save() do any
copy work that needs to be done in write_file()
"""
- logging.debug('Activity.copy: %r' % self._jobject.object_id)
+ logging.debug('Activity.copy: %r', self._jobject.object_id)
self.save()
self._jobject.object_id = None
diff --git a/src/sugar/activity/activityfactory.py b/src/sugar/activity/activityfactory.py
index 462a0f9..3d790c7 100644
--- a/src/sugar/activity/activityfactory.py
+++ b/src/sugar/activity/activityfactory.py
@@ -319,7 +319,7 @@ class ActivityCreationHandler(gobject.GObject):
def _find_object_reply_handler(self, jobjects, count):
if count > 0:
if count > 1:
- logging.debug("Multiple objects has the same activity_id.")
+ logging.debug("Multiple objects have the same activity_id.")
self._handle.object_id = jobjects[0]['uid']
self._launch_activity()
diff --git a/src/sugar/activity/activityhandle.py b/src/sugar/activity/activityhandle.py
index f255fd5..c4e16a8 100644
--- a/src/sugar/activity/activityhandle.py
+++ b/src/sugar/activity/activityhandle.py
@@ -38,8 +38,6 @@ class ActivityHandle(object):
since new activities does not have an
associated object (yet).
- XXX Not clear how this relates to the activity
- id yet, i.e. not sure we really need both. TBF
uri -- URI associated with the activity. Used when
opening an external file or resource in the
activity, rather than a journal object