diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-07-12 17:03:23 (GMT) |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-07-12 17:03:23 (GMT) |
commit | c10190d5e82012f4db7619d2ebe421916ca5180f (patch) | |
tree | 5211dbd6febbdb0c5916cb9735abf62a339d450f | |
parent | 7a1e6f2a80516a495f3ce7aadd195e38dbc2adcb (diff) |
Disable support for avatars - the cache seems to give us huge performance problems, and nobody will have a non-default avatar anyway since there's no UI to change them
-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): |