X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-picon.el;h=188f07168fee71d70b5cd2b6919df703688bc3b3;hb=f7214ffc48a0e4ff482a4aaa1844f1806cf30d4d;hp=a878b32d8986b4b2427b877d3165a9e2ce79aa70;hpb=d416214c2ab5597a227aefed55c7bed040e44e79;p=gnus

diff --git a/lisp/gnus-picon.el b/lisp/gnus-picon.el
index a878b32d8..188f07168 100644
--- a/lisp/gnus-picon.el
+++ b/lisp/gnus-picon.el
@@ -44,32 +44,21 @@
 
 ;;; User variables:
 
-(defgroup picon nil
-  "Show pictures of people, domains, and newsgroups."
-  :group 'gnus-visual)
-
-(defcustom gnus-picon-databases '("/usr/lib/picon" "/usr/local/faces")
-  "*Defines the location of the faces database.
-For information on obtaining this database of pretty pictures, please
-see http://www.cs.indiana.edu/picons/ftp/index.html"
-  :type 'directory
-  :group 'picon)
-
 (defcustom gnus-picon-news-directories '("news")
   "*List of directories to search for newsgroups faces."
   :type '(repeat string)
-  :group 'picon)
+  :group 'gnus-picon)
 
 (defcustom gnus-picon-user-directories '("users" "usenix" "local" "misc")
   "*List of directories to search for user faces."
   :type '(repeat string)
-  :group 'picon)
+  :group 'gnus-picon)
 
 (defcustom gnus-picon-domain-directories '("domains")
   "*List of directories to search for domain faces.
 Some people may want to add \"unknown\" to this list."
   :type '(repeat string)
-  :group 'picon)
+  :group 'gnus-picon)
 
 (defcustom gnus-picon-file-types
   (let ((types (list "xbm")))
@@ -80,15 +69,15 @@ Some people may want to add \"unknown\" to this list."
     types)
   "*List of suffixes on picon file names to try."
   :type '(repeat string)
-  :group 'picon)
+  :group 'gnus-picon)
 
 (defface gnus-picon-xbm-face '((t (:foreground "black" :background "white")))
   "Face to show xbm picon in."
-  :group 'picon)
+  :group 'gnus-picon)
 
 (defface gnus-picon-face '((t (:foreground "black" :background "white")))
   "Face to show picon in."
-  :group 'picon)
+  :group 'gnus-picon)
 
 ;;; Internal variables:
 
@@ -96,6 +85,7 @@ Some people may want to add \"unknown\" to this list."
 (defvar gnus-picon-glyph-alist nil
   "Picon glyphs cache.
 List of pairs (KEY . GLYPH) where KEY is either a filename or an URL.")
+(defvar gnus-picon-cache nil)
 
 ;;; Functions:
 
@@ -118,10 +108,10 @@ List of pairs (KEY . GLYPH) where KEY is either a filename or an URL.")
 		base (expand-file-name directory database))
 	  (while address
 	    (when (setq result (gnus-picon-find-image
-				(concat base "/" (mapconcat 'identity
+				(concat base "/" (mapconcat 'downcase
 							    (reverse address)
 							    "/")
-					"/" user "/")))
+					"/" (downcase user) "/")))
 	      (throw 'found result))
 	    (if exact
 		(setq address nil)
@@ -162,36 +152,39 @@ GLYPH can be either a glyph or a string."
   (gnus-with-article-headers
     (let ((addresses
 	   (mail-header-parse-addresses (mail-fetch-field header)))
-	  spec file point)
+	  spec file point cache)
       (dolist (address addresses)
 	(setq address (car address))
 	(when (and (stringp address)
 		   (setq spec (gnus-picon-split-address address)))
-	  (when (setq file (or (gnus-picon-find-face
-				address gnus-picon-user-directories)
-			       (gnus-picon-find-face
+	  (if (setq cache (cdr (assoc address gnus-picon-cache)))
+	      (setq spec cache)
+	    (when (setq file (or (gnus-picon-find-face
+				  address gnus-picon-user-directories)
+				 (gnus-picon-find-face
+				  (concat "unknown@"
+					  (mapconcat
+					   'identity (cdr spec) "."))
+				  gnus-picon-user-directories)))
+	      (setcar spec (cons (gnus-picon-create-glyph file)
+				 (car spec))))
+
+	    (dotimes (i (1- (length spec)))
+	      (when (setq file (gnus-picon-find-face
 				(concat "unknown@"
 					(mapconcat
-					 'identity (cdr spec) "."))
-				gnus-picon-user-directories)))
-	    (setcar spec (cons (gnus-picon-create-glyph file)
-			       (car spec))))
-	      
-	  (dotimes (i (1- (length spec)))
-	    (when (setq file (gnus-picon-find-face
-			      (concat "unknown@"
-				      (mapconcat
-				       'identity (nthcdr (1+ i) spec) "."))
-			      gnus-picon-domain-directories t))
-	      (setcar (nthcdr (1+ i) spec)
-		      (cons (gnus-picon-create-glyph file)
-			    (nth (1+ i) spec)))))
-	  
+					 'identity (nthcdr (1+ i) spec) "."))
+				gnus-picon-domain-directories t))
+		(setcar (nthcdr (1+ i) spec)
+			(cons (gnus-picon-create-glyph file)
+			      (nth (1+ i) spec)))))
+	    (setq spec (nreverse spec))
+	    (push (cons address spec) gnus-picon-cache))
+
 	  (gnus-article-goto-header header)
 	  (mail-header-narrow-to-field)
 	  (when (search-forward address nil t)
 	    (delete-region (match-beginning 0) (match-end 0))
-	    (setq spec (nreverse spec))
 	    (setq point (point))
 	    (while spec
 	      (goto-char point)
@@ -209,16 +202,18 @@ GLYPH can be either a glyph or a string."
     (let ((groups (message-tokenize-header (mail-fetch-field header)))
 	  spec file point)
       (dolist (group groups)
-	(setq spec (nreverse (split-string group "[.]")))
-	(dotimes (i (length spec))
-	  (when (setq file (gnus-picon-find-face
-			    (concat "unknown@"
-				    (mapconcat
-				     'identity (nthcdr i spec) "."))
-			    gnus-picon-news-directories t))
-	    (setcar (nthcdr i spec)
-		    (cons (gnus-picon-create-glyph file)
-			  (nth i spec)))))
+	(unless (setq spec (cdr (assoc group gnus-picon-cache)))
+	  (setq spec (nreverse (split-string group "[.]")))
+	  (dotimes (i (length spec))
+	    (when (setq file (gnus-picon-find-face
+			      (concat "unknown@"
+				      (mapconcat
+				       'identity (nthcdr i spec) "."))
+			      gnus-picon-news-directories t))
+	      (setcar (nthcdr i spec)
+		      (cons (gnus-picon-create-glyph file)
+			    (nth i spec)))))
+	    (push (cons group spec) gnus-picon-cache))
 	(when (search-forward group nil t)
 	  (delete-region (match-beginning 0) (match-end 0))
 	  (save-restriction