diff options
| author | Krzysztof <kkszysiu@gmail.com> | 2011-03-27 16:34:23 +0200 |
|---|---|---|
| committer | Krzysztof <kkszysiu@gmail.com> | 2011-03-27 16:34:23 +0200 |
| commit | 84eee967ab0dc746dadc47420f808bc92ba98d8c (patch) | |
| tree | 2c0d5d0b8e08e007253682cd7dd165fdd1dac287 | |
| parent | 4e17d3649ccfb2270d1d392e7b5c4f9481a85549 (diff) | |
Revert "Avatars.. once again."
This reverts commit a2ee4b8ec7bdb97ab93b5923283fcb88c5e74d22.
| -rw-r--r-- | sunshine/avatars.py | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/sunshine/avatars.py b/sunshine/avatars.py index 9181990..224ec05 100644 --- a/sunshine/avatars.py +++ b/sunshine/avatars.py @@ -75,6 +75,20 @@ class SunshineAvatars(telepathy.server.ConnectionInterfaceAvatars): #if handle == self.GetSelfHandle(): # #tutaj kiedys trzeba napisac kod odp za naszego avatara # result[handle] = "" + """ + else: + contact = handle.contact + + if contact is not None: + av_token = str(handle.name) + else: + av_token = None + + if av_token is not None: + result[handle] = av_token + elif self._avatar_known: + result[handle] = "" + """ url = 'http://api.gadu-gadu.pl/avatars/%s/0.xml' % (str(handle.name)) d = getPage(url, timeout=10) d.addCallback(self.on_fetch_avatars_file_ok, url, handle) @@ -146,7 +160,7 @@ class SunshineAvatars(telepathy.server.ConnectionInterfaceAvatars): logger.info("Avatar file can't be retrieved from %s, error: %s" % (url, error.getErrorMessage())) def on_fetch_avatars_ok(self, result, handle): - try: + #try: logger.info("Avatar retrieved for %s" % (handle.name)) type = imghdr.what('', result) if type is None: type = 'jpeg' @@ -155,8 +169,8 @@ class SunshineAvatars(telepathy.server.ConnectionInterfaceAvatars): token = self.avatars_urls[handle.name]['token'] self.AvatarRetrieved(handle, token, avatar, 'image/' + type) - except: - logger.debug("Avatar retrieved but something went wrong.") + #except: + # logger.debug("Avatar retrieved but something went wrong.") def on_fetch_avatars_failed(self, error, handle): logger.debug("Avatar not retrieved, error: %s" % (error.getErrorMessage())) |