lisp/gnus/mml2015.el (mml2015-maximum-key-image-dimension): New user option to contro...

(mml2015-epg-key-image-to-string): Respect it

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 87256adec0c9b724546d7545e77473253794d01b..02872e8a35fab3f995e6006bf359841745a8524c 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-14  David Edmondson  <dme@dme.org>  (tiny change)
+
+       * mml2015.el (mml2015-maximum-key-image-dimension): New user option to
+       control the maximum size of photo ID image.
+       (mml2015-epg-key-image-to-string): Respect it.
+
 2013-06-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * shr.el (shr-tag-table-1): Mark the preliminary table renderings

diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index 5d122dfbe404c490c042a838b9112ccad9a203a2..ffe98b6deb108bf9a22dd93428875089f0dfc19f 100644 (file)
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -146,6 +146,11 @@ If set, it overrides the setting of `mml2015-sign-with-sender'."
   :group 'mime-security
   :type 'boolean)
 
+(defcustom mml2015-maximum-key-image-dimension 64
+  "The maximum dimension (width or height) of any key images."
+  :group 'mime-security
+  :type 'integer)
+
 ;; Extract plaintext from cleartext signature.  IMO, this kind of task
 ;; should be done by GnuPG rather than Elisp, but older PGP backends
 ;; (such as Mailcrypt, and PGG) discard the output from GnuPG.
@@ -873,13 +878,20 @@ If set, it overrides the setting of `mml2015-sign-with-sender'."
         (insert (substring data 16))
         (create-image (buffer-string) nil t)))))
 
+(autoload 'gnus-rescale-image "gnus-util")
+
 (defun mml2015-epg-key-image-to-string (key-id)
   "Return a string with the image of a key, if any"
   (let* ((result "")
          (key-image (mml2015-epg-key-image key-id)))
     (when key-image
       (setq result "  ")
-      (put-text-property 1 2 'display key-image result))
+      (put-text-property
+       1 2 'display
+       (gnus-rescale-image key-image
+                          (cons mml2015-maximum-key-image-dimension
+                                mml2015-maximum-key-image-dimension))
+       result))
     result))
 
 (defun mml2015-epg-signature-to-string (signature)