X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece-epg.el;h=63c599722581ed46280f7ae94a139a62983af585;hb=bf2df5d4bf0f70c7f102eb924e352f83d46f3fa4;hp=6f19efc7dc51f8120d39c841f242bb9c25ad2bd4;hpb=7ca27e3d719a97bdec80bbb8d88dba61ea0fe505;p=elisp%2Friece.git

diff --git a/lisp/riece-epg.el b/lisp/riece-epg.el
index 6f19efc..63c5997 100644
--- a/lisp/riece-epg.el
+++ b/lisp/riece-epg.el
@@ -26,11 +26,13 @@
 (require 'riece-message)
 (require 'riece-identity)
 
+(autoload 'widget-convert-button "wid-edit")
 (autoload 'epg-make-context "epg")
 (autoload 'epg-decrypt-string "epg")
 (autoload 'epg-encrypt-string "epg")
 (autoload 'epg-passphrase-callback-function "epg")
 (autoload 'epg-context-set-passphrase-callback "epg")
+(autoload 'epg-cancel "epg")
 
 (eval-when-compile
   (autoload 'riece-command-send-message "riece-commands"))
@@ -63,8 +65,7 @@
 (defun riece-epg-passphrase-callback-function-for-decrypt (context key-id
 								   identity)
   (if (eq key-id 'SYM)
-      (let ((entry (riece-identity-assoc identity riece-epg-passphrase-alist))
-	    passphrase)
+      (let ((entry (riece-identity-assoc identity riece-epg-passphrase-alist)))
 	(if (cdr entry)
 	    (copy-sequence (cdr entry))
 	  (epg-cancel context)))
@@ -85,8 +86,7 @@
   (interactive)
   (let ((context (epg-make-context))
 	(string (buffer-substring (riece-line-beginning-position)
-				  (riece-line-end-position)))
-	entry)
+				  (riece-line-end-position))))
     (epg-context-set-passphrase-callback
      context
      (cons #'riece-epg-passphrase-callback-function
@@ -108,7 +108,7 @@
 	      t)))
     (riece-display-message
      (riece-make-message (riece-current-nickname) riece-current-channel
-			 string nil t))
+			 (concat "[encrypted:" string "]") nil t))
     (let ((next-line-add-newlines t))
       (next-line 1))))
 
@@ -154,8 +154,7 @@
       (when (string-match "\\`\\[encrypted:\\(.*\\)]"
 			  (riece-message-text message))
 	(let ((context (epg-make-context))
-	      (string (match-string 1 (riece-message-text message)))
-	      entry)
+	      (string (match-string 1 (riece-message-text message))))
 	  (epg-context-set-passphrase-callback
 	   context
 	   (cons #'riece-epg-passphrase-callback-function-for-decrypt
@@ -164,7 +163,7 @@
 	      (progn
 		(riece-message-set-text
 		 message
-		 (format "[decrypted:%s]"
+		 (format "[encrypted:%s]"
 			 (riece-epg-decrypt-string-for-identity
 			  context string (riece-message-target message)))))
 	    (error
@@ -172,7 +171,9 @@
 	      0 (length (riece-message-text message))
 	      'riece-epg-encryption-target (riece-message-target message)
 	      (riece-message-text message))
-	     (message "%s" (cdr error)))))))
+	     (if riece-debug
+		 (message "Couldn't decrypt: %s" (cdr error))
+	       (message "Couldn't decrypt")))))))
   message)
 
 (defun riece-epg-add-encrypted-button (start end)
@@ -205,7 +206,7 @@
       (delete-region from to)
       (save-excursion
 	(goto-char from)
-	(insert "[decrypted:" plain "]")))))
+	(insert "[encrypted:" plain "]")))))
 
 (defun riece-epg-requires ()
   (if (memq 'riece-button riece-addons)