2 files changed, 23 insertions, 4 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index bb3d1ccacb6..2e07fa8798e 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-gravatar.el (gnus-gravatar-too-ugly): New user option.
+        (gnus-gravatar-transform-address): Don't show avatars of people of
+        which mail addresses match gnus-gravatar-too-ugly.
+
 2010-10-07  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * shr.el (shr-table-widths): Expand TD elements to fill available
diff --git a/lisp/gnus/gnus-gravatar.el b/lisp/gnus/gnus-gravatar.el
index ecd9f753f5e..e974e9a8a89 100644
--- a/lisp/gnus/gnus-gravatar.el
+++ b/lisp/gnus/gnus-gravatar.el
@@ -42,6 +42,13 @@
   :version "24.1"
   :group 'gnus-gravatar)
 
+(defcustom gnus-gravatar-too-ugly (if (boundp 'gnus-article-x-face-too-ugly)
+                                      gnus-article-x-face-too-ugly)
+  "Regexp matching posters whose avatar shouldn't be shown automatically."
+  :type '(choice regexp (const nil))
+  :version "24.1"
+  :group 'gnus-gravatar)
+
 (defun gnus-gravatar-transform-address (header category)
   (gnus-with-article-headers
     (let ((addresses
@@ -55,10 +62,16 @@
              (mail-fetch-field header)))))
       (let ((gravatar-size gnus-gravatar-size))
         (dolist (address addresses)
-          (gravatar-retrieve
-           (car address)
-           'gnus-gravatar-insert
-           (list header address category)))))))
+          (unless (and gnus-gravatar-too-ugly
+                       (or (string-match gnus-gravatar-too-ugly
+                                         (car address))
+                           (and (cdr address)
+                                (string-match gnus-gravatar-too-ugly
+                                              (cdr address)))))
+            (gravatar-retrieve
+             (car address)
+             'gnus-gravatar-insert
+             (list header address category))))))))
 
 (defun gnus-gravatar-insert (gravatar header address category)
   "Insert GRAVATAR for ADDRESS in HEADER in current article buffer.