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 | |
| parent | 88643a6cb3e1210ec93fea7772826f5e9a87b257 (diff) | |
| parent | c10190d5e82012f4db7619d2ebe421916ca5180f (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/presence-service
| -rw-r--r-- | src/buddy.py | 9 | ||||
| -rw-r--r-- | src/presenceservice.py | 12 |
2 files changed, 19 insertions, 2 deletions
diff --git a/src/buddy.py b/src/buddy.py index 9e8887e..9db801b 100644 --- a/src/buddy.py +++ b/src/buddy.py @@ -563,6 +563,11 @@ class Buddy(ExportedGObject): def update_avatar(self, tp, new_avatar_token, icon=None, mime_type=None): """Handle update of the avatar""" + + # FIXME: Avatars have been disabled for Trial-2 due to performance + # issues in the avatar cache. Revisit this afterwards + return + conn = tp.get_connection() handle, identifier = self._handles[tp] @@ -785,6 +790,10 @@ class GenericOwner(Buddy): self._set_self_avatar(tp) def _set_self_avatar(self, tp): + # FIXME: Avatars have been disabled for Trial-2 due to performance + # issues in the avatar cache. Revisit this afterwards + return + conn = tp.get_connection() icon_data = self._icon 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): |