If we have gnutls loaded, then try to use that for the tls stream.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1605235..75db5dc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-09  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * nnimap.el (nnimap-open-connection): If we have gnutls loaded, then
+       try to use that for the tls stream.
+

 2010-10-09  Julien Danjou  <julien@danjou.info>
 
        * nnir.el (nnir-read-parm): Fix call to gnus-completing-read.
 2010-10-09  Julien Danjou  <julien@danjou.info>
 
        * nnir.el (nnir-read-parm): Fix call to gnus-completing-read.

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index f8eb665..33e37ed 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -317,8 +317,7 @@ textual parts.")
                   'starttls))
                '("imap"))
               ((memq nnimap-stream '(ssl tls))
                   'starttls))
                '("imap"))
               ((memq nnimap-stream '(ssl tls))

-               (funcall (if (and nil
-                                 (fboundp 'open-gnutls-stream))
+               (funcall (if (fboundp 'open-gnutls-stream)

                             'open-gnutls-stream
                           'open-tls-stream)
                         "*nnimap*" (current-buffer) nnimap-address
                             'open-gnutls-stream
                           'open-tls-stream)
                         "*nnimap*" (current-buffer) nnimap-address