[muji/master] Update to match the latest xep updates

[Sjoerd Simons]

---
 multi-jingle-client.py |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/multi-jingle-client.py b/multi-jingle-client.py
index 7548e55..9a3e9a4 100644
--- a/multi-jingle-client.py
+++ b/multi-jingle-client.py
@@ -415,11 +415,10 @@ class Muc:
 
     def maybe_start_calls(self):
         for stanza in self.muji_presences.itervalues():
-            contents = xpath.queryForNodes ('/presence/muji/content', stanza)
+            preparing = xpath.queryForNodes ('/presence/muji/preparing', stanza)
 
-            for c in contents:
-                if c.hasAttribute("preparing"):
-                    return
+            if preparing != None:
+                return
 
         self.start_calls ()
 
@@ -431,12 +430,7 @@ class Muc:
         print "Preparing the conference"
         self.state = Muc.CLAIMING
         muji = domish.Element((ns.MUJI, 'muji'))
-        c = muji.addElement ('content')
-        c['name'] = 'video'
-        c['preparing'] = 'true'
-        c = muji.addElement ('content')
-        c['name'] = 'audio'
-        c['preparing'] = 'true'
+        muji.addElement("preparing")
         self.update_presence(muji)
 
     def presence(self, stanza):
-- 
1.5.6.5