emacs-jabber jabber-core.el,1.70,1.71

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

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

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

Don't use jabber-resource in resource binding


Index: jabber-core.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-core.el,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- jabber-core.el	14 Sep 2007 22:08:28 -0000	1.70
+++ jabber-core.el	19 Sep 2007 06:59:23 -0000	1.71
@@ -566,11 +566,13 @@
 				 xml-data))))
 	       ;; So let's bind a resource.  We can either pick a resource ourselves,
 	       ;; or have the server pick one for us.
-	       (jabber-send-iq fsm nil "set"
-			       `(bind ((xmlns . "urn:ietf:params:xml:ns:xmpp-bind"))
-				      (resource () ,jabber-resource))
-			       #'handle-bind t
-			       #'handle-bind nil)
+	       (let ((resource (plist-get state-data :resource)))
+		 (jabber-send-iq fsm nil "set"
+				 `(bind ((xmlns . "urn:ietf:params:xml:ns:xmpp-bind"))
+					,@(when resource
+					    `((resource () ,resource))))
+				 #'handle-bind t
+				 #'handle-bind nil))
 	       (list :bind state-data))
 	   (message "Server doesn't permit resource binding and session establishing")
 	   (list nil state-data)))