Skip bad addresses again.

diff --git a/lisp/gnus-picon.el b/lisp/gnus-picon.el
index 759b148..faabc56 100644 (file)
--- a/lisp/gnus-picon.el
+++ b/lisp/gnus-picon.el
@@ -104,9 +104,10 @@ List of pairs (KEY . GLYPH) where KEY is either a filename or an URL.")
 
 (defsubst gnus-picon-split-address (address)
   (setq address (split-string address "@"))
-  (if (cdr address)
-      (cons (car address) (split-string (nth 1 address) "\\."))
-    (split-string (car address) "\\.")))
+  (if (stringp (cadr address))
+      (cons (car address) (split-string (cadr address) "\\."))
+    (if (stringp (car address))
+       (split-string (car address) "\\."))))
 
 (defun gnus-picon-find-face (address directories &optional exact)
   (let* ((databases gnus-picon-databases)
@@ -166,8 +167,8 @@ GLYPH can be either a glyph or a string."
       (dolist (address addresses)
        (setq address (car address)
              first t)
-       (when (stringp address)
-         (setq spec (gnus-picon-split-address address))
+       (when (and (stringp address)
+                  (setq spec (gnus-picon-split-address address)))
          (when (setq file (gnus-picon-find-face
                            address gnus-picon-user-directories))
            (setcar spec (gnus-picon-create-glyph file)))