diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-06-12 00:20:55 (GMT) |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-06-12 00:20:55 (GMT) |
| commit | ad3ec6d0be088eb3545078548d8b2bb8f1c0070f (patch) | |
| tree | 976f238737b8915ab73993fab8071ce2b20c08bd | |
| parent | aaaa946098d351806c776eed7c3069ecd421b83a (diff) | |
buddy: make sure we have _activities_by_connection entry before setting activities. Don't set alias twice - if there's a problem, we want to fix it instead of working around it
| -rw-r--r-- | src/buddy.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/buddy.py b/src/buddy.py index 82e6b2a..84f5bea 100644 --- a/src/buddy.py +++ b/src/buddy.py @@ -736,11 +736,12 @@ class GenericOwner(Buddy): def add_telepathy_handle(self, tp_client, handle, uid): Buddy.add_telepathy_handle(self, tp_client, handle, uid) + self._activities_by_connection.setdefault(tp_client, {}) self._set_self_olpc_properties(tp_client) self._set_self_alias(tp_client) # Hack; send twice to make sure the server gets it - gobject.timeout_add(1000, lambda: self._set_self_alias(tp_client)) + #gobject.timeout_add(1000, lambda: self._set_self_alias(tp_client)) self._set_self_activities(tp_client) self._set_self_current_activity(tp_client) |