mml-smime: fix gnus-completing-read usage

Signed-off-by: Julien Danjou <julien@danjou.info>

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f873857..93228a1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -12,6 +12,9 @@
 
 2010-10-04  Julien Danjou  <julien@danjou.info>
 
+       * mml-smime.el (mml-smime-openssl-encrypt-query): Fix choices.
+       (mml-smime-openssl-sign-query): Fix gnus-completing-read call.
+
        * gravatar.el (gravatar-retrieved): Kill buffer when gravatar has been
        retrieved.
 

diff --git a/lisp/mml-smime.el b/lisp/mml-smime.el
index 62e742f..188717e 100644 (file)
--- a/lisp/mml-smime.el
+++ b/lisp/mml-smime.el
@@ -162,7 +162,7 @@ Whether the passphrase is cached at all is controlled by
                (and from (smime-get-key-by-email from)))
              (smime-get-key-by-email
               (gnus-completing-read "Sign this part with what signature"
-                                     smime-keys nil nil
+                                     (mapcar 'car smime-keys) nil nil nil
                                      (and (listp (car-safe smime-keys))
                                           (caar smime-keys))))))))
 
@@ -221,7 +221,7 @@ Whether the passphrase is cached at all is controlled by
     (while (not done)
       (ecase (read (gnus-completing-read
                    "Fetch certificate from"
-                   '(("dns") ("ldap") ("file")) t nil nil
+                   '("dns" "ldap" "file") t nil nil
                     "ldap"))
        (dns (setq certs (append certs
                                 (mml-smime-get-dns-cert))))