Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@localhost.localdomain>2006-09-25 17:41:24 (GMT)
committer Marco Pesenti Gritti <marco@localhost.localdomain>2006-09-25 17:41:24 (GMT)
commit5f88062cba7280a7dca2f49c9d8ad18dd00c0c9b (patch)
tree5b6d0984efe12ebee4b4196ce6a1ad7978dc6f9f
parent57992d3fb419561a38cc2e84cf68c4b5790203bb (diff)
parent7ba30ea0d2f82e3f9099f00e7868ceccab51d5d5 (diff)
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
-rw-r--r--services/presence/Buddy.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/services/presence/Buddy.py b/services/presence/Buddy.py
index 2c5d9b6..3cbd1a5 100644
--- a/services/presence/Buddy.py
+++ b/services/presence/Buddy.py
@@ -155,9 +155,9 @@ class Buddy(object):
if (result_status == network.RESULT_FAILED or not icon) and self._icon_tries < 3:
self._icon_tries = self._icon_tries + 1
- logging.debug("Failed to retrieve buddy icon for '%s' on try %d of %d" % (self._nick_name, \
- self._icon_tries, 3))
- gobject.timeout_add(1000, self._get_buddy_icon, service)
+ if self._icon_tries >= 3:
+ logging.debug("Failed to retrieve buddy icon for '%s'." % self._nick_name)
+ gobject.timeout_add(1000, self._get_buddy_icon, service, True)
return False
def _get_buddy_icon(self, service, retry=False):
@@ -172,8 +172,8 @@ class Buddy(object):
logging.debug("%s: icon cache hit for %s." % (self._nick_name, icon_hash))
self._set_icon(icon)
return False
+ logging.debug("%s: icon cache miss, fetching icon from buddy..." % self._nick_name)
- logging.debug("%s: icon cache miss, adding icon to cache." % self._nick_name)
from sugar.p2p import Stream
buddy_stream = Stream.Stream.new_from_service(service, start_reader=False)
writer = buddy_stream.new_writer(service)