(sieve-manage-starttls-p): Renamed from imap-starttls-p.

(sieve-manage-starttls-open): Renamed from imap-starttls-open.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d4eeb48..f64186f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-23  Dave Love  <fx@gnu.org>
+
+       * sieve-manage.el (sieve-manage-starttls-p): Renamed from
+       imap-starttls-p.
+       (sieve-manage-starttls-open): Renamed from imap-starttls-open.
+
 2008-12-22  Dave Love  <fx@gnu.org>
 
        * imap.el: Fix author email.  Doc fixes.

diff --git a/lisp/sieve-manage.el b/lisp/sieve-manage.el
index 2e9ec77..886c871 100644 (file)
--- a/lisp/sieve-manage.el
+++ b/lisp/sieve-manage.el
@@ -304,15 +304,14 @@ Returns t if login was successful, nil otherwise."
       (when (memq (process-status process) '(open run))
        process))))
 
-(defun imap-starttls-p (buffer)
-  ;;  (and (imap-capability 'STARTTLS buffer)
+(defun sieve-manage-starttls-p (buffer)
   (condition-case ()
       (progn
        (require 'starttls)
        (call-process "starttls"))
     (error nil)))
 
-(defun imap-starttls-open (name buffer server port)
+(defun sieve-manage-starttls-open (name buffer server port)
   (let* ((port (or port sieve-manage-default-port))
         (coding-system-for-read sieve-manage-coding-system-for-read)
         (coding-system-for-write sieve-manage-coding-system-for-write)