Merge changes from emacs-23 branch

[gnu-emacs] / lisp / net / imap-hash.el

diff --git a/lisp/net/imap-hash.el b/lisp/net/imap-hash.el
index 3460389dc1e323fb9292a7c729769e4ae30b9449..a07277cee6888281b88cdb767eef675bde48a650 100644 (file)
--- a/lisp/net/imap-hash.el
+++ b/lisp/net/imap-hash.el
@@ -1,6 +1,6 @@
 ;;; imap-hash.el --- Hashtable-like interface to an IMAP mailbox
 
-;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 
 ;; Author: Teodor Zlatanov <tzz@lifelogs.com>
 ;; Keywords: mail
@@ -43,7 +43,7 @@
 (require 'imap)
 (require 'sendmail)                    ; for mail-header-separator
 (require 'message)
-(autoload 'auth-source-user-or-password "auth-source")
+(autoload 'auth-source-search "auth-source")
 
 ;; retrieve these headers
 (defvar imap-hash-headers
@@ -267,13 +267,14 @@ The function is passed the message headers (see `imap-hash-get-headers')."
                              (imap-hash-password iht))))
         ;; this will not be needed if auth-need is t
         (auth-info (when auth-need
-                     (auth-source-user-or-password
-                      '("login" "password")
-                      server port)))
+                     (nth 0 (auth-source-search :host server :port port))))
         (auth-user (or (imap-hash-user iht)
-                       (nth 0 auth-info)))
+                       (plist-get auth-info :user)))
         (auth-passwd (or (imap-hash-password iht)
-                         (nth 1 auth-info)))
+                         (plist-get auth-info :secret)))
+        (auth-passwd (if (functionp auth-passwd)
+                          (funcall auth-passwd)
+                        auth-passwd))
         (imap-logout-timeout nil))
 
        ;; (debug "opening server: opened+state" (imap-opened) imap-state)