diff options
author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-07-12 18:05:40 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-07-12 18:05:40 (GMT) |
commit | b539f146e94557218cb414c03dff36951fae2001 (patch) | |
tree | ee41fb771963a3c82a6d89f36d5f7c63415dc12f /src/presenceservice.py | |
parent | 88643a6cb3e1210ec93fea7772826f5e9a87b257 (diff) | |
parent | c10190d5e82012f4db7619d2ebe421916ca5180f (diff) |
Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/presence-service
Diffstat (limited to 'src/presenceservice.py')
-rw-r--r-- | src/presenceservice.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/presenceservice.py b/src/presenceservice.py index 0dfd7f9..9c57062 100644 --- a/src/presenceservice.py +++ b/src/presenceservice.py @@ -206,7 +206,11 @@ class PresenceService(ExportedGObject): _logger.warning('Connection %s does not support OLPC buddy info', conn.object_path) - if CONN_INTERFACE_AVATARS in conn: + if 1: + # FIXME: Avatars have been disabled for Trial-2 due to performance + # issues in the avatar cache. Revisit this afterwards + pass + elif CONN_INTERFACE_AVATARS in conn: def avatar_retrieved(contact, avatar_token, avatar, mime_type): self._avatar_updated(tp, contact, avatar_token, avatar, mime_type) @@ -311,7 +315,11 @@ class PresenceService(ExportedGObject): for handle in handles: self._queue_contact_online(tp, handle) - if CONN_INTERFACE_AVATARS in conn: + if 1: + # FIXME: Avatars have been disabled for Trial-2 due to performance + # issues in the avatar cache. Revisit this afterwards + pass + elif CONN_INTERFACE_AVATARS in conn: def got_avatar_tokens(tokens): gobject.idle_add(self._run_contacts_online_queue) for contact, token in izip(handles, tokens): |