diff options
| author | Dan Williams <dcbw@localhost.localdomain> | 2006-07-24 16:13:07 (GMT) |
|---|---|---|
| committer | Dan Williams <dcbw@localhost.localdomain> | 2006-07-24 16:13:07 (GMT) |
| commit | 318c49bacfe9f8c6baaa486673fc845145f3ef30 (patch) | |
| tree | ac9489501f7431dcd7cb0ff219ec6b85cd46521b /sugar/chat | |
| parent | a827175a28fe76a0c428b8319cdb5caf54e8212a (diff) | |
Don't traceback when our activity can't be found (because it's not shared)
Diffstat (limited to 'sugar/chat')
| -rw-r--r-- | sugar/chat/ActivityChat.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sugar/chat/ActivityChat.py b/sugar/chat/ActivityChat.py index 8fafcb9..90b1f4b 100644 --- a/sugar/chat/ActivityChat.py +++ b/sugar/chat/ActivityChat.py @@ -14,10 +14,11 @@ class ActivityChat(GroupChat): self._pservice.connect('service-appeared', self._service_appeared_cb) # Find an existing activity chat to latch onto - activity_ps = self._pservice.get_activity(activity.get_id()) - service = activity_ps.get_service_of_type(ActivityChat.SERVICE_TYPE) - if service is not None: - self._service_appeared_cb(self._pservice, None, service) + ps_activity = self._pservice.get_activity(activity.get_id()) + if ps_activity is not None: + service = ps_activity.get_service_of_type(ActivityChat.SERVICE_TYPE) + if service is not None: + self._service_appeared_cb(self._pservice, None, service) def _service_appeared_cb(self, pservice, buddy, service): if service.get_activity_id() != self._activity.get_id(): |