diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-05-24 13:52:20 (GMT) |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-05-24 17:59:06 (GMT) |
commit | 2abcd89c1fb03845c4867818c6f0126832ebff47 (patch) | |
tree | b6a4f1fbe03a68754b3aaaa676df1fc2f277a4f9 /services | |
parent | f7ba2aa1e2d77e6a5fc6819f1402be0a0f9f03d8 (diff) |
services/presence/: Move internal_get_activity to TestPresenceService
Diffstat (limited to 'services')
-rw-r--r-- | services/presence/presenceservice.py | 7 | ||||
-rw-r--r-- | services/presence/pstest.py | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/services/presence/presenceservice.py b/services/presence/presenceservice.py index 94b6f12..f3818eb 100644 --- a/services/presence/presenceservice.py +++ b/services/presence/presenceservice.py @@ -304,7 +304,7 @@ class PresenceService(ExportedGObject): @dbus.service.method(_PRESENCE_INTERFACE, in_signature="s", out_signature="o") def GetActivityById(self, actid): - act = self.internal_get_activity(actid) + act = self._activities.get(actid, None) if not act or not act.props.valid: raise NotFoundError("The activity was not found.") return act.object_path() @@ -419,11 +419,6 @@ class PresenceService(ExportedGObject): if activity: activity.set_properties(props) - def internal_get_activity(self, actid): - if not self._activities.has_key(actid): - return None - return self._activities[actid] - def main(test_num=0, randomize=False): loop = gobject.MainLoop() diff --git a/services/presence/pstest.py b/services/presence/pstest.py index 74cad8c..edec3a8 100644 --- a/services/presence/pstest.py +++ b/services/presence/pstest.py @@ -155,6 +155,9 @@ class TestPresenceService(PresenceService): return TestOwner(self, self._bus_name, self._get_next_object_id(), self.__test_num, self.__randomize) + def internal_get_activity(self, actid): + return self._activities.get(actid, None): + def _extract_public_key(keyfile): try: |