emacs-jabber jabber-core.el,1.63,1.64

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17:/tmp/cvs-serv18621

Modified Files:
	jabber-core.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-398
Creator:  Magnus Henoch <ma...@fr...>

Save connection type in state data, and use instead of global variable


Index: jabber-core.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-core.el,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- jabber-core.el	29 Aug 2007 01:45:36 -0000	1.63
+++ jabber-core.el	29 Aug 2007 13:03:41 -0000	1.64
@@ -234,7 +234,8 @@
 			:server server
 			:resource resource
 			:password password
-			:registerp registerp)))))
+			:registerp registerp
+			:connection-type connection-type)))))
 
 (define-enter-state jabber-connection nil
   (fsm state-data)
@@ -372,7 +373,7 @@
 			      :disconnection-reason
 			      (format "Unexpected stanza %s" stanza))))
 	((and (jabber-xml-get-children stanza 'starttls)
-	      (eq jabber-connection-type 'starttls))
+	      (eq (plist-get state-data :connection-type) 'starttls))
 	 (list :starttls state-data))
 	;; XXX: require encryption for registration?
 	((plist-get state-data :registerp)