decrypted -> encrypted.

[riece] / lisp / riece-epg.el

diff --git a/lisp/riece-epg.el b/lisp/riece-epg.el
index 0ac63a9..6c1c77f 100644 (file)
--- a/lisp/riece-epg.el
+++ b/lisp/riece-epg.el
@@ -26,6 +26,7 @@
 (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")
@@ -63,8 +64,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 +85,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 +107,7 @@
              t)))
     (riece-display-message
      (riece-make-message (riece-current-nickname) riece-current-channel
-                        (concat "[decrypted:" string "]") nil t))
+                        (concat "[encrypted:" string "]") nil t))
     (let ((next-line-add-newlines t))
       (next-line 1))))
 
@@ -154,8 +153,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 +162,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 +170,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 +205,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)