diff options
| author | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2007-05-20 10:38:08 (GMT) |
|---|---|---|
| committer | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2007-05-20 10:38:08 (GMT) |
| commit | 11c89d86c91d91de42a815f7715076494c33fa25 (patch) | |
| tree | 70bcf1c48dc08a9814db0a6e865f487e6f515910 | |
| parent | 04fc7047c2a640f731090839137f26cacc16094c (diff) | |
Put dates to work correctly on the journal, create a new journal entry when resuming a past entry.
| -rw-r--r-- | sugar/activity/activity.py | 4 | ||||
| -rw-r--r-- | sugar/datastore/datastore.py | 3 | ||||
| -rw-r--r-- | sugar/datastore/dbus_helpers.py | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/sugar/activity/activity.py b/sugar/activity/activity.py index 05d02a4..3dba4c7 100644 --- a/sugar/activity/activity.py +++ b/sugar/activity/activity.py @@ -201,12 +201,14 @@ class Activity(Window, gtk.Container): if handle.object_id: self.jobject = datastore.get(handle.object_id) + self.jobject.object_id = '' + del self.jobject['ctime'] + del self.jobject['mtime'] elif create_jobject: logging.debug('Creating a jobject.') self.jobject = datastore.create() self.jobject['title'] = '%s %s' % (get_bundle_name(), 'Activity') self.jobject['activity'] = self.get_service_name() - self.jobject['date'] = str(time.time()) self.jobject['icon'] = self._get_icon() self.jobject['keep'] = '0' self.jobject['buddies'] = '' diff --git a/sugar/datastore/datastore.py b/sugar/datastore/datastore.py index 99fd230..9d65670 100644 --- a/sugar/datastore/datastore.py +++ b/sugar/datastore/datastore.py @@ -39,6 +39,9 @@ class DSObject(gobject.GObject): self.metadata[key] = value self.emit('updated') + def __delitem__(self, key): + del self.metadata[key] + def get_metadata(self): return self._metadata diff --git a/sugar/datastore/dbus_helpers.py b/sugar/datastore/dbus_helpers.py index 33aa9a6..fa05491 100644 --- a/sugar/datastore/dbus_helpers.py +++ b/sugar/datastore/dbus_helpers.py @@ -40,7 +40,7 @@ def create(properties, filename): return object_id def update(uid, properties, filename, reply_handler=None, error_handler=None): - logging.debug('dbus_helpers.update') + logging.debug('dbus_helpers.update: %s, %s' % (uid, filename)) if reply_handler and error_handler: _data_store.update(uid, dbus.Dictionary(properties), filename, reply_handler=reply_handler, |