Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17:/tmp/cvs-serv6450
Modified Files:
jabber-core.el
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-376
Creator: Magnus Henoch <ma...@fr...>
Only use STARTTLS if jabber-connection-type is starttls
Index: jabber-core.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-core.el,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- jabber-core.el 22 Apr 2007 10:26:42 -0000 1.51
+++ jabber-core.el 8 Aug 2007 10:58:28 -0000 1.52
@@ -273,7 +273,8 @@
(error "Unexpected stanza %s" stanza))
(cond
- ((jabber-xml-get-children stanza 'starttls)
+ ((and (jabber-xml-get-children stanza 'starttls)
+ (eq jabber-connection-type 'starttls))
(list :starttls state-data))
;; XXX: require encryption for registration?
((plist-get state-data :registerp)
|
