remove a fixme; remove old and replace with that we really mean by old, so we do not get confused with date
This commit is contained in:
parent
ef6685a047
commit
17034b654a
|
@ -2060,7 +2060,7 @@ class Connection:
|
||||||
cached_sha = vcard['PHOTO']['SHA']
|
cached_sha = vcard['PHOTO']['SHA']
|
||||||
if self.vcard_shas.has_key(jid) and self.vcard_shas[jid] != \
|
if self.vcard_shas.has_key(jid) and self.vcard_shas[jid] != \
|
||||||
cached_sha:
|
cached_sha:
|
||||||
# we had an old cached vcard
|
# user change his vcard so don't use the cached one
|
||||||
return {}
|
return {}
|
||||||
vcard['jid'] = jid
|
vcard['jid'] = jid
|
||||||
vcard['resource'] = gajim.get_resource_from_jid(fjid)
|
vcard['resource'] = gajim.get_resource_from_jid(fjid)
|
||||||
|
|
|
@ -673,7 +673,6 @@ class Interface:
|
||||||
jid + '/' + resource):
|
jid + '/' + resource):
|
||||||
win = self.instances[account]['chats'][jid + '/' + resource]
|
win = self.instances[account]['chats'][jid + '/' + resource]
|
||||||
if win:
|
if win:
|
||||||
# FIXME: this will be removed when we have the thread working
|
|
||||||
win.show_avatar(jid, resource)
|
win.show_avatar(jid, resource)
|
||||||
# Show avatar in roster
|
# Show avatar in roster
|
||||||
self.roster.draw_avatar(jid, account)
|
self.roster.draw_avatar(jid, account)
|
||||||
|
|
|
@ -425,7 +425,8 @@ def get_avatar_pixbuf_from_cache(jid):
|
||||||
'''checks if jid has cached avatar and if that avatar is valid image
|
'''checks if jid has cached avatar and if that avatar is valid image
|
||||||
(can be shown)
|
(can be shown)
|
||||||
returns None if there is no image in vcard
|
returns None if there is no image in vcard
|
||||||
returns 'ask' if vcard is old (we have new sha) or if we don't have the vcard'''
|
returns 'ask' if cached vcard should not be used (user changed his vcard,
|
||||||
|
so we have new sha) or if we don't have the vcard'''
|
||||||
if jid not in os.listdir(gajim.VCARDPATH):
|
if jid not in os.listdir(gajim.VCARDPATH):
|
||||||
return 'ask'
|
return 'ask'
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue