From: Magnus H. <leg...@us...> - 2008-10-06 22:57:26
|
Update of /cvsroot/emacs-jabber/tox In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5140 Modified Files: jabber-tox.el Log Message: Go to :wait-for-initiate instead of :initiate if we are the target Index: jabber-tox.el =================================================================== RCS file: /cvsroot/emacs-jabber/tox/jabber-tox.el,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- jabber-tox.el 6 Oct 2008 22:55:23 -0000 1.3 +++ jabber-tox.el 6 Oct 2008 22:57:19 -0000 1.4 @@ -126,7 +126,12 @@ (case (car-safe event) (:new-native-candidate (setq state-data (plist-put state-data :native-candidates (list (cdr event)))) - (list :initiate state-data)) + (list (ecase (plist-get state-data :role) + (:initiator + :initiate) + (:target + :wait-for-initiate)) + state-data)) (:native-candidates-prepared ;; this code is currently unnecessary, as we never get the @@ -134,7 +139,12 @@ (let ((components (cdr event))) (fsm-debug-output "The native candidates are %S" components) (setq state-data (plist-put state-data :native-candidates components)) - (list :initiate state-data))) + (list (ecase (plist-get state-data :role) + (:initiator + :initiate) + (:target + :wait-for-initiate)) + state-data))) (:iq-set :defer))) |