tox jabber-tox.el,1.14,1.15

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

Update of /cvsroot/emacs-jabber/tox
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv11263

Modified Files:
	jabber-tox.el 
Log Message:
Alter state-data at _beginning_ of :allocate enter function


Index: jabber-tox.el
===================================================================
RCS file: /cvsroot/emacs-jabber/tox/jabber-tox.el,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- jabber-tox.el	16 Oct 2008 18:12:15 -0000	1.14
+++ jabber-tox.el	16 Oct 2008 18:15:31 -0000	1.15
@@ -71,6 +71,9 @@
 	 (our-codecs
 	  (dbus-call-method :session tox-name tox-session tox-session-interface
 			    "GetLocalCodecs")))
+    (setq state-data (plist-put state-data :tox-session tox-session))
+    (setq state-data (plist-put state-data :our-codecs our-codecs))
+
     (fsm-debug-output "tox-session: %S, our-codecs: %S" tox-session our-codecs)
     ;; Set up the pipeline, so we can search for transport candidates.
     (fsm-debug-output "About to call SetDefaultAudioSink")
@@ -101,12 +104,7 @@
 			       fsm 
 			       (cons :new-native-candidate components)))))
     (fsm-debug-output "Waiting")
-    (list (plist-put 
-	   (plist-put 
-	    state-data
-	    :tox-session tox-session)
-	   :our-codecs our-codecs)
-	  nil)))
+    (list state-data nil)))
 
 (define-enter-state jingle nil
   (fsm state-data)