diff options
Diffstat (limited to 'src/jarabe/journal/listview.py')
| -rw-r--r-- | src/jarabe/journal/listview.py | 39 |
1 files changed, 12 insertions, 27 deletions
diff --git a/src/jarabe/journal/listview.py b/src/jarabe/journal/listview.py index 6556b08..e1ca620 100644 --- a/src/jarabe/journal/listview.py +++ b/src/jarabe/journal/listview.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007, One Laptop Per Child +# Copyright (C) 2007, 2010 One Laptop Per Child # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -23,7 +23,6 @@ import time import hippo import gobject import gtk -import dbus from sugar.graphics import style from sugar.graphics.icon import CanvasIcon, Icon @@ -31,10 +30,6 @@ from sugar.graphics.icon import CanvasIcon, Icon from jarabe.journal.collapsedentry import CollapsedEntry from jarabe.journal import model -DS_DBUS_SERVICE = 'org.laptop.sugar.DataStore' -DS_DBUS_INTERFACE = 'org.laptop.sugar.DataStore' -DS_DBUS_PATH = '/org/laptop/sugar/DataStore' - UPDATE_INTERVAL = 300 EMPTY_JOURNAL = _("Your Journal is empty") @@ -109,19 +104,18 @@ class BaseListView(gtk.HBox): self._refresh_idle_handler = None self._update_dates_timer = None - bus = dbus.SessionBus() - datastore = dbus.Interface( - bus.get_object(DS_DBUS_SERVICE, DS_DBUS_PATH), DS_DBUS_INTERFACE) - self._datastore_created_handler = \ - datastore.connect_to_signal('Created', - self.__datastore_created_cb) - self._datastore_updated_handler = \ - datastore.connect_to_signal('Updated', - self.__datastore_updated_cb) + model.created.connect(self.__model_created_cb) + model.updated.connect(self.__model_updated_cb) + model.deleted.connect(self.__model_deleted_cb) + + def __model_created_cb(self, sender, **kwargs): + self._set_dirty() + + def __model_updated_cb(self, sender, **kwargs): + self._set_dirty() - self._datastore_deleted_handler = \ - datastore.connect_to_signal('Deleted', - self.__datastore_deleted_cb) + def __model_deleted_cb(self, sender, **kwargs): + self._set_dirty() def __destroy_cb(self, widget): self._datastore_created_handler.remove() @@ -463,15 +457,6 @@ class BaseListView(gtk.HBox): if entry.get_visible(): entry.update_date() - def __datastore_created_cb(self, uid): - self._set_dirty() - - def __datastore_updated_cb(self, uid): - self._set_dirty() - - def __datastore_deleted_cb(self, uid): - self._set_dirty() - def _set_dirty(self): if self._fully_obscured: self._dirty = True |