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.

3 files changed, 37 insertions, 16 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index be773219137..1a0f2de1b93 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,11 @@
+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.
+
 2010-09-01  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * gnus-html.el (gnus-html-wash-tags)
diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index 2d6637f253b..aa6d8fe297d 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/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"))
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index 4025b1f63bc..1d6c6a52444 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -1109,7 +1109,8 @@ command whose response triggered the error."
   t)
 
 (deffoo nntp-request-set-mark (group actions &optional server)
-  (unless nntp-marks-is-evil
+  (when (and (not nntp-marks-is-evil)
+             nntp-marks-file-name)
     (nntp-possibly-create-directory group server)
     (nntp-open-marks group server)
     (dolist (action actions)
@@ -1129,7 +1130,8 @@ command whose response triggered the error."
   nil)
 
 (deffoo nntp-request-update-info (group info &optional server)
-  (unless nntp-marks-is-evil
+  (when (and (not nntp-marks-is-evil)
+             nntp-marks-file-name)
     (nntp-possibly-create-directory group server)
     (when (nntp-marks-changed-p group server)
       (nnheader-message 8 "Updating marks for %s..." group)