X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=emacs%2Fnotmuch-crypto.el;h=44fccae08d3d8d90848a830c57a8f7930ca6e99d;hp=f03266ffc4e54932a82ad16963e4ca65d86e28cc;hb=9207f90f525cde1e3f5c4695eb5b59c53b4a01ca;hpb=09793b61324514b9691af36e19e6f124d54559e4

diff --git a/emacs/notmuch-crypto.el b/emacs/notmuch-crypto.el
index f03266ff..44fccae0 100644
--- a/emacs/notmuch-crypto.el
+++ b/emacs/notmuch-crypto.el
@@ -31,8 +31,9 @@ on the success or failure of the verification process and on the
 validity of user ID of the signer.
 
 The effect of setting this variable can be seen temporarily by
-viewing a signed or encrypted message with M-RET in notmuch
-search."
+providing a prefix when viewing a signed or encrypted message, or
+by providing a prefix when reloading the message in notmuch-show
+mode."
   :group 'notmuch
   :type 'boolean)
 
@@ -70,20 +71,26 @@ search."
   (let* ((status (plist-get sigstatus :status))
 	 (help-msg nil)
 	 (label "Signature not processed")
-	 (face 'notmuch-crypto-signature-unknown))
+	 (face 'notmuch-crypto-signature-unknown)
+	 (button-action '(lambda (button) (message (button-get button 'help-echo)))))
     (cond
      ((string= status "good")
-      ; if userid present, userid has full or greater validity
-      (if (plist-member sigstatus :userid)
-	  (let ((userid (plist-get sigstatus :userid)))
-	    (setq label (concat "Good signature by: " userid))
-	    (setq face 'notmuch-crypto-signature-good))
-	(let ((fingerprint (concat "0x" (plist-get sigstatus :fingerprint))))
-	  (setq label (concat "Good signature by key: " fingerprint))
-	  (setq face 'notmuch-crypto-signature-good-key))))
+      (let ((fingerprint (concat "0x" (plist-get sigstatus :fingerprint))))
+	;; if userid present, userid has full or greater validity
+	(if (plist-member sigstatus :userid)
+	    (let ((userid (plist-get sigstatus :userid)))
+	      (setq label (concat "Good signature by: " userid))
+	      (setq face 'notmuch-crypto-signature-good))
+	  (progn
+	    (setq label (concat "Good signature by key: " fingerprint))
+	    (setq face 'notmuch-crypto-signature-good-key)))
+	(setq button-action 'notmuch-crypto-sigstatus-good-callback)
+	(setq help-msg (concat "Click to list key ID 0x" fingerprint "."))))
      ((string= status "error")
       (let ((keyid (concat "0x" (plist-get sigstatus :keyid))))
-	(setq label (concat "Unknown key ID " keyid " or unsupported algorithm"))))
+	(setq label (concat "Unknown key ID " keyid " or unsupported algorithm"))
+	(setq button-action 'notmuch-crypto-sigstatus-error-callback)
+	(setq help-msg (concat "Click to retreive key ID " keyid " from keyserver and redisplay."))))
      ((string= status "bad")
       (let ((keyid (concat "0x" (plist-get sigstatus :keyid))))
 	(setq label (concat "Bad signature (claimed key ID " keyid ")"))
@@ -97,10 +104,36 @@ search."
      'help-echo help-msg
      'face face
      'mouse-face face
+     'action button-action
      :notmuch-sigstatus sigstatus
      :notmuch-from from)
     (insert "\n")))
 
+(declare-function notmuch-show-refresh-view "notmuch-show" (&optional crypto-switch))
+
+(defun notmuch-crypto-sigstatus-good-callback (button)
+  (let* ((sigstatus (button-get button :notmuch-sigstatus))
+	 (fingerprint (concat "0x" (plist-get sigstatus :fingerprint)))
+	 (buffer (get-buffer-create "*notmuch-crypto-gpg-out*"))
+	 (window (display-buffer buffer t nil)))
+    (with-selected-window window
+      (with-current-buffer buffer
+	(call-process "gpg" nil t t "--list-keys" fingerprint))
+      (recenter -1))))
+
+(defun notmuch-crypto-sigstatus-error-callback (button)
+  (let* ((sigstatus (button-get button :notmuch-sigstatus))
+	 (keyid (concat "0x" (plist-get sigstatus :keyid)))
+	 (buffer (get-buffer-create "*notmuch-crypto-gpg-out*"))
+	 (window (display-buffer buffer t nil)))
+    (with-selected-window window
+      (with-current-buffer buffer
+	(call-process "gpg" nil t t "--recv-keys" keyid)
+	(insert "\n")
+	(call-process "gpg" nil t t "--list-keys" keyid))
+      (recenter -1))
+    (notmuch-show-refresh-view)))
+
 (defun notmuch-crypto-insert-encstatus-button (encstatus)
   (let* ((status (plist-get encstatus :status))
 	 (help-msg nil)