(require 'gravatar)
(require 'gnus-art)
+(require 'mail-extr) ;; Because of binding `mail-extr-disable-voodoo'.
(defgroup gnus-gravatar nil
"Gnus Gravatar."
:group 'gnus-visual)
-(defcustom gnus-gravatar-size 32
- "How big should gravatars be displayed."
+(defcustom gnus-gravatar-size nil
+ "How big should gravatars be displayed.
+If nil, default to `gravatar-size'."
:type 'integer
:version "24.1"
:group 'gnus-gravatar)
(defun gnus-gravatar-transform-address (header category &optional force)
(gnus-with-article-headers
- (let ((addresses
- (mail-header-parse-addresses
- ;; mail-header-parse-addresses does not work (reliably) on
- ;; decoded headers.
- (or
- (ignore-errors
- (mail-encode-encoded-word-string
- (or (mail-fetch-field header) "")))
- (mail-fetch-field header))))
- (gravatar-size gnus-gravatar-size)
- name)
+ (let* ((mail-extr-disable-voodoo t)
+ (addresses (mail-extract-address-components
+ (or (mail-fetch-field header) "") t))
+ (gravatar-size gnus-gravatar-size)
+ name)
(dolist (address addresses)
- (when (and (setq name (cdr address))
- (string-match "\\`\\*+ " name)) ;; (X-)Faces exist.
- (setcdr address (setq name (substring name (match-end 0)))))
+ (when (and (setq name (car address))
+ (string-match "\\` +" name))
+ (setcar address (setq name (substring name (match-end 0)))))
(when (or force
(not (and gnus-gravatar-too-ugly
(or (string-match gnus-gravatar-too-ugly
- (car address))
+ (cadr address))
(and name
(string-match gnus-gravatar-too-ugly
name))))))
(ignore-errors
(gravatar-retrieve
- (car address)
+ (cadr address)
'gnus-gravatar-insert
(list header address category))))))))
(when (buffer-live-p (current-buffer))
(gnus-article-goto-header header)
(mail-header-narrow-to-field)
- (let ((real-name (cdr address))
- (mail-address (car address)))
- (when (if real-name ; have a realname, go for it!
- (and (search-forward real-name nil t)
- (search-backward real-name nil t))
- (and (search-forward mail-address nil t)
- (search-backward mail-address nil t)))
- (goto-char (1- (point)))
+ (let ((real-name (car address))
+ (mail-address (cadr address)))
+ (when (if real-name
+ (re-search-forward
+ (concat (gnus-replace-in-string
+ (regexp-quote real-name) "[\t ]+" "[\t\n ]+")
+ "\\|"
+ (regexp-quote mail-address))
+ nil t)
+ (search-forward mail-address nil t))
+ (goto-char (1- (match-beginning 0)))
;; If we're on the " quoting the name, go backward
(when (looking-at "[\"<]")
(goto-char (1- (point))))
;; example we were fetching someaddress, and then we change to
;; another mail with the same someaddress.
(unless (memq 'gnus-gravatar (text-properties-at (point)))
- (let ((inhibit-read-only t)
- (point (point)))
+ (let ((point (point)))
(unless (featurep 'xemacs)
(setq gravatar (append gravatar gnus-gravatar-properties)))
(gnus-put-image gravatar nil category)