Don't show images that are really small.

They're probably tracking images.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b65c2ad..9905d4c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-09-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * gnus-html.el (gnus-html-wash-tags): Don't show images that are really
+       small. They're probably tracking images.
+
        * nntp.el (nntp-request-set-mark): Refuse to do marks if
        nntp-marks-file-name is nil.
 

diff --git a/lisp/gnus-html.el b/lisp/gnus-html.el
index 2d6637f..aa6d8fe 100644 (file)
--- a/lisp/gnus-html.el
+++ b/lisp/gnus-html.el
@@ -94,7 +94,7 @@ fit these criteria."
                                 "-o" "pre_conv=1"
                                 "-t" (format "%s" tab-width)
                                 "-cols" (format "%s" gnus-html-frame-width)
-                                "-o" "display_image=off"
+                                "-o" "display_image=on"
                                 "-T" "text/html"))))
       (gnus-html-wash-tags))))
 
@@ -142,19 +142,30 @@ fit these criteria."
                         (with-current-buffer gnus-summary-buffer
                           gnus-blocked-images)
                       gnus-blocked-images))
-             (let ((file (gnus-html-image-id url)))
-               (if (file-exists-p file)
-                   ;; It's already cached, so just insert it.
-                   (let ((string (buffer-substring start end)))
-                     ;; Delete the ALT text.
-                     (delete-region start end)
-                     (gnus-html-put-image file (point) string))
-                 ;; We don't have it, so schedule it for fetching
-                 ;; asynchronously.
-                 (push (list url
-                             (set-marker (make-marker) start)
-                             (point-marker))
-                       images)))))))
+             (let ((file (gnus-html-image-id url))
+                   width height)
+               (when (string-match "height=\"?\\([0-9]+\\)" parameters)
+                 (setq height (string-to-number (match-string 1 parameters))))
+               (when (string-match "width=\"?\\([0-9]+\\)" parameters)
+                 (setq width (string-to-number (match-string 1 parameters))))
+               ;; Don't fetch images that are really small.  They're
+               ;; probably tracking pictures.
+               (when (and (or (null height)
+                              (> height 4))
+                          (or (null width)
+                              (> width 4)))
+                 (if (file-exists-p file)
+                     ;; It's already cached, so just insert it.
+                     (let ((string (buffer-substring start end)))
+                       ;; Delete the ALT text.
+                       (delete-region start end)
+                       (gnus-html-put-image file (point) string))
+                   ;; We don't have it, so schedule it for fetching
+                   ;; asynchronously.
+                   (push (list url
+                               (set-marker (make-marker) start)
+                               (point-marker))
+                         images))))))))
        ;; Add a link.
        ((or (equal tag "a")
            (equal tag "A"))