[gnus git] branch master updated: m0-7-74-g4a8b90d =1= mml2015.el: Limit the size of key images inserted into articles

       via  4a8b90d0d6c0ca1555511d26772e62dea8862f19 (commit)
      from  e7cd5bb8056e88e5292bcc7615e88178fcb5ef88 (commit)


- Log -----------------------------------------------------------------
commit 4a8b90d0d6c0ca1555511d26772e62dea8862f19
Author: David Edmondson <[email protected]>
Date:   Thu Jun 13 10:47:51 2013 +0100

    mml2015.el: Limit the size of key images inserted into articles
    
    * Add `mml2015-maximum-key-image-dimension', which specifies a limit
      on the width or height of any key images that are inserted into the
      article buffer.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a38bbcf..a92df63 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-14  David Edmondson <[email protected]>  (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  <[email protected]>
 
 	* shr.el (shr-tag-table-1): Mark the preliminary table renderings
diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 5d122df..ffe98b6 100644
--- a/lisp/mml2015.el
+++ b/lisp/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)

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog  |    6 ++++++
 lisp/mml2015.el |   14 +++++++++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project