Changes committed gnus/lisp (ChangeLog auth-source.el)

Modified: ChangeLog auth-source.el

Set up autoloads.  Bump to 23.2 because of the
secrets.el dependency.
(auth-sources): Add optional user name.  Add secrets.el configuration
choice (unused right now).


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.2068 gnus/lisp/ChangeLog:7.2069
--- ChangeLog:7.2068	Sat Mar 20 19:52:07 2010
+++ ChangeLog	Sat Mar 20 21:35:24 2010
@@ -1,5 +1,12 @@
 2010-03-20  Teodor Zlatanov  <[email protected]>
 
+	* auth-source.el: Set up autoloads.  Bump to 23.2 because of the
+	secrets.el dependency.
+	(auth-sources): Add optional user name.  Add secrets.el configuration
+	choice (unused right now).
+
+2010-03-20  Teodor Zlatanov  <[email protected]>
+
 	* gnus-sum.el (gnus-summary-make-menu-bar): Let
 	`gnus-registry-install-shortcuts' fill in the functions.
 
Index: auth-source.el
diff -u gnus/lisp/auth-source.el:7.18 gnus/lisp/auth-source.el:7.19
--- auth-source.el:7.18	Wed Jan 13 11:59:43 2010
+++ auth-source.el	Sat Mar 20 21:35:24 2010
@@ -36,6 +36,10 @@
 (eval-when-compile (require 'cl))
 (eval-when-compile (require 'netrc))
 
+(autoload 'secrets-search-items "secrets")
+(autoload 'secrets-get-alias "secrets")
+(autoload 'secrets-get-attribute "secrets")
+
 (defgroup auth-source nil
   "Authentication sources."
   :version "23.1" ;; No Gnus
@@ -49,7 +53,7 @@
   "List of authentication protocols and their names"
 
   :group 'auth-source
-  :version "23.1" ;; No Gnus
+  :version "23.2" ;; No Gnus
   :type '(repeat :tag "Authentication Protocols"
 		 (cons :tag "Protocol Entry"
 		       (symbol :tag "Protocol")
@@ -71,7 +75,7 @@
 (defcustom auth-source-do-cache t
   "Whether auth-source should cache information."
   :group 'auth-source
-  :version "23.1" ;; No Gnus
+  :version "23.2" ;; No Gnus
   :type `boolean)
 
 (defcustom auth-source-debug nil
@@ -85,7 +89,7 @@
 If the value is a function, debug messages are logged by calling
  that function using the same arguments as `message'."
   :group 'auth-source
-  :version "23.1" ;; No Gnus
+  :version "23.2" ;; No Gnus
   :type	`(choice 
 	  :tag "auth-source debugging mode"
 	  (const :tag "Log using `message' to the *Messages* buffer" t)
@@ -96,19 +100,32 @@
   "Whether auth-source should hide passwords in log messages.
 Only relevant if `auth-source-debug' is not nil."
   :group 'auth-source
-  :version "23.1" ;; No Gnus
+  :version "23.2" ;; No Gnus
   :type `boolean)
 
-(defcustom auth-sources '((:source "~/.authinfo.gpg" :host t :protocol t))
+(defcustom auth-sources '((:source "~/.authinfo.gpg" :host t :protocol t nil))
   "List of authentication sources.
 
-Each entry is the authentication type with optional properties."
+Each entry is the authentication type with optional properties.
+
+It's best to customize this with `M-x customize-variable' because the choices
+can get pretty complex."
   :group 'auth-source
-  :version "23.1" ;; No Gnus
+  :version "23.2" ;; No Gnus
   :type `(repeat :tag "Authentication Sources"
 		 (list :tag "Source definition"
 		       (const :format "" :value :source)
-		       (string :tag "Authentication Source")
+		       (choice :tag "Authentication backend choice"
+		               (string :tag "Authentication Source (file)")
+		               (list :tag "secrets.el (Secret Service API/KWallet/GNOME KeyRing)" 
+                                     (const :format "" :value :secrets)
+                                     (choice :tag "Collection to use"
+                                             (string :tag "Collection name")
+                                             (const :tag "Default" 'default)
+                                             (const :tag "Any" t)
+                                             (const :tag "Temporary" "session")
+                                             (string :tag "Specific session name")
+                                             (const :tag "Fallback" nil))))
 		       (const :format "" :value :host)
 		       (choice :tag "Host (machine) choice"
 			       (const :tag "Any" t)
@@ -118,7 +135,15 @@
 		       (choice :tag "Protocol"
 			       (const :tag "Any" t)
 			       (const :tag "Fallback" nil)
-			       ,@auth-source-protocols-customize))))
+			       ,@auth-source-protocols-customize)
+		       (repeat :tag "Extra Parameters"
+			       (choice :tag "Extra parameter"
+				       (list :tag "Preferred username"
+					     (const :format "" :value :preferred-username)
+					     (choice :tag "Personality or username"
+						     (const :tag "Any" t)
+						     (const :tag "Fallback" nil)
+						     (string :tag "Specific user name"))))))))
 
 ;; temp for debugging
 ;; (unintern 'auth-source-protocols)