[Emacs-diffs] /srv/bzr/emacs/trunk r101821: sieve-manage.el: Add authenticate function.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101821
author: Julien Danjou <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Wed 2010-10-06 14:02:39 +0000
message:
  sieve-manage.el: Add authenticate function.
  sieve-manage.el (sieve-manage-open): Use sieve-manage-default-port.
modified:
  doc/misc/ChangeLog
  doc/misc/sieve.texi
  lisp/gnus/ChangeLog
  lisp/gnus/sieve-manage.el
  lisp/gnus/sieve.el

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2010-10-06 12:38:45 +0000
+++ b/doc/misc/ChangeLog        2010-10-06 14:02:39 +0000
@@ -1,5 +1,7 @@
 2010-10-06  Julien Danjou  <address@hidden>
 
+       * sieve.texi (Manage Sieve API): Document sieve-manage-authenticate.
+
        * message.texi (PGP Compatibility): Remove reference to gpg-2comp,
        broken link.
 

=== modified file 'doc/misc/sieve.texi'
--- a/doc/misc/sieve.texi       2010-10-06 13:13:11 +0000
+++ b/doc/misc/sieve.texi       2010-10-06 14:02:39 +0000
@@ -292,6 +292,10 @@
 @findex sieve-manage-close
 Close a server connection.
 
address@hidden sieve-manage-authenticate
address@hidden sieve-manage-authenticate
+Authenticate to the server.
+
 @item sieve-manage-capability
 @findex sieve-manage-capability
 Return a list of capabilities the server supports.

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-10-06 13:21:07 +0000
+++ b/lisp/gnus/ChangeLog       2010-10-06 14:02:39 +0000
@@ -1,3 +1,13 @@
+2010-10-06  Julien Danjou  <address@hidden>
+
+       * sieve-manage.el: Update example in `Commentary'.
+
+       * sieve.el (sieve-open-server): Use sieve-manage-authenticate.
+
+       * sieve-manage.el (sieve-manage-open): Use sieve-manage-default-port,
+       not 2000.
+       (sieve-manage-authenticate): Re-add function.
+
 2010-10-06  Lars Magne Ingebrigtsen  <address@hidden>
 
        * shr.el (shr-insert): Get 'space transition right.

=== modified file 'lisp/gnus/sieve-manage.el'
--- a/lisp/gnus/sieve-manage.el 2010-10-06 13:13:11 +0000
+++ b/lisp/gnus/sieve-manage.el 2010-10-06 14:02:39 +0000
@@ -50,9 +50,11 @@
 ;;
 ;; and that's it.  Example of a managesieve session in *scratch*:
 ;;
+;; (with-current-buffer (sieve-manage-open "mail.example.com")
+;;   (sieve-manage-authenticate)
+;;   (sieve-manage-listscripts))
 ;;
-;; (sieve-manage-listscripts my-buf)
-;; ("vacation" "testscript" ("splitmail") "badscript")
+;; => ((active . "main") "vacation")
 ;;
 ;; References:
 ;;
@@ -387,7 +389,7 @@
 If nil, chooses the best stream the server is capable of.
 Optional argument BUFFER is buffer (buffer, or string naming buffer)
 to work in."
-  (setq buffer (or buffer (format " *sieve* %s:%d" server (or port 2000))))
+  (setq buffer (or buffer (format " *sieve* %s:%d" server (or port 
sieve-manage-default-port))))
   (with-current-buffer (get-buffer-create buffer)
     (mapc 'make-local-variable sieve-manage-local-variables)
     (sieve-manage-disable-multibyte)
@@ -444,6 +446,17 @@
       (sieve-manage-erase)
       buffer)))
 
+(defun sieve-manage-authenticate (&optional buffer)
+  "Authenticate on server in BUFFER.
+Return `sieve-manage-state' value."
+  (with-current-buffer (or buffer (current-buffer))
+    (if (eq sieve-manage-state 'nonauth)
+        (when (funcall (nth 2 (assq sieve-manage-auth
+                                    sieve-manage-authenticator-alist))
+                       (current-buffer))
+          (setq sieve-manage-state 'auth))
+      sieve-manage-state)))
+
 (defun sieve-manage-opened (&optional buffer)
   "Return non-nil if connection to managesieve server in BUFFER is open.
 If BUFFER is nil then the current buffer is used."

=== modified file 'lisp/gnus/sieve.el'
--- a/lisp/gnus/sieve.el        2010-10-06 13:13:11 +0000
+++ b/lisp/gnus/sieve.el        2010-10-06 14:02:39 +0000
@@ -320,17 +320,12 @@
       (insert "\n"))))
 
 (defun sieve-open-server (server &optional port)
+  "Open SERVER (on PORT) and authenticate."
   (with-current-buffer
       ;; open server
       (set (make-local-variable 'sieve-manage-buffer)
            (sieve-manage-open server))
-    ;; authenticate
-    (if (eq sieve-manage-state 'nonauth)
-      (if (funcall (nth 2 (assq sieve-manage-auth
-                                sieve-manage-authenticator-alist))
-                   (current-buffer))
-          (setq sieve-manage-state 'auth))
-      (eq sieve-manage-state 'auth))))
+    (sieve-manage-authenticate)))
 
 (defun sieve-refresh-scriptlist ()
   (interactive)