Merge branch 'gtk3' into 'gtk3'

Minor fixes

See merge request gajim/gajim-plugins!48

clients_icons/clients_icons.py

@@ -533,10 +533,11 @@ class ClientsIconsPlugin(GajimPlugin):
         tag = iq_obj.stanza.getTags('c')
         if tag:
             caps = tag[0].getAttr('node')
-            if 'pidgin.im/' in caps:
-                caps = 'libpurple'
-            if 'sleekxmpp.com' in caps:
-                caps = 'httр://sleekxmpp.com/ver/1.1.11'
+            if caps:
+                if 'pidgin.im/' in caps:
+                    caps = 'libpurple'
+                if 'sleekxmpp.com' in caps:
+                    caps = 'httр://sleekxmpp.com/ver/1.1.11'
         iter_ = iq_obj.gc_control.get_contact_iter(iq_obj.nick)
         model = iq_obj.gc_control.model
         if model[iter_][self.muc_renderer_num] is not None:

url_image_preview/http_functions.py

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