Merge branch 'gtk3' into 'gtk3'

Minor fixes

See merge request gajim/gajim-plugins!48
This commit is contained in:
Philipp Hörist
2017-11-06 15:42:25 +01:00
2 changed files with 6 additions and 5 deletions

View File

@@ -533,6 +533,7 @@ class ClientsIconsPlugin(GajimPlugin):
tag = iq_obj.stanza.getTags('c') tag = iq_obj.stanza.getTags('c')
if tag: if tag:
caps = tag[0].getAttr('node') caps = tag[0].getAttr('node')
if caps:
if 'pidgin.im/' in caps: if 'pidgin.im/' in caps:
caps = 'libpurple' caps = 'libpurple'
if 'sleekxmpp.com' in caps: if 'sleekxmpp.com' in caps:

View File

@@ -67,7 +67,7 @@ def _get_http_head_direct(url):
clen = f.headers['Content-Length'] clen = f.headers['Content-Length']
try: try:
clen = int(clen) clen = int(clen)
except ValueError: except (TypeError, ValueError):
pass pass
return (ctype, clen) return (ctype, clen)