[Emacs-diffs] /srv/bzr/emacs/trunk r101833: [Gnus] Introduce gnus-gravatar-too-ugly.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101833
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2010-10-07 12:31:39 +0000
message:
  [Gnus] Introduce gnus-gravatar-too-ugly.
  
  gnus-gravatar.el (gnus-gravatar-too-ugly): New user option.
  gnus-gravatar.el (gnus-gravatar-transform-address): Don't show avatars of 
people of which mail addresses match gnus-gravatar-too-ugly.
  gnus.texi (Gravatars): Document gnus-gravatar-too-ugly.
modified:
  doc/misc/ChangeLog
  doc/misc/gnus.texi
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-gravatar.el

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2010-10-07 02:23:28 +0000
+++ b/doc/misc/ChangeLog        2010-10-07 12:31:39 +0000
@@ -1,3 +1,7 @@
+2010-10-07  Katsumi Yamaoka  <address@hidden>
+
+       * gnus.texi (Gravatars): Document gnus-gravatar-too-ugly.
+
 2010-10-06  Julien Danjou  <address@hidden>
 
        * sieve.texi (Manage Sieve API): Document sieve-manage-authenticate.

=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi        2010-10-06 12:38:45 +0000
+++ b/doc/misc/gnus.texi        2010-10-07 12:31:39 +0000
@@ -827,6 +827,7 @@
 * Smileys::                     Show all those happy faces the way they were
                                   meant to be shown.
 * Picons::                      How to display pictures of what you're reading.
+* Gravatars::                   Display the avatar of people you read.
 * XVarious::                    Other XEmacsy Gnusey variables.
 
 Thwarting Email Spam
@@ -23195,6 +23196,12 @@
 @vindex gnus-gravatar-properties
 List of image properties applied to Gravatar images.
 
address@hidden gnus-gravatar-too-ugly
address@hidden gnus-gravatar-too-ugly
+Regexp that matches mail addresses or names of people of which avatars
+should not be displayed, or @code{nil}.  It default to the value of
address@hidden (@pxref{X-Face}).
+
 @end table
 
 If you want to see them in the From field, set:

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-10-07 11:46:01 +0000
+++ b/lisp/gnus/ChangeLog       2010-10-07 12:31:39 +0000
@@ -1,3 +1,9 @@
+2010-10-07  Katsumi Yamaoka  <address@hidden>
+
+       * 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  <address@hidden>
 
        * shr.el (shr-table-widths): Expand TD elements to fill available

=== modified file 'lisp/gnus/gnus-gravatar.el'
--- a/lisp/gnus/gnus-gravatar.el        2010-10-07 06:47:37 +0000
+++ b/lisp/gnus/gnus-gravatar.el        2010-10-07 12:31:39 +0000
@@ -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.