[Telepathy-commits] [multi-jingle/master] s/mingle/muji/

[Sjoerd Simons]

---
 multi-jingle-client.py |   40 ++++++++++++++++++++--------------------
 1 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/multi-jingle-client.py b/multi-jingle-client.py
index 12306ce..7548e55 100644
--- a/multi-jingle-client.py
+++ b/multi-jingle-client.py
@@ -213,7 +213,7 @@ class Muc:
         self.members = []
         self.conference = jingle.JingleConference()
         self.jingle_sessions = {}
-        self.mingle_presences = {}
+        self.muji_presences = {}
 
         self.my_jid = JID('%s/%s' % (self.jid.userhost(),
             self.client.jid.user))
@@ -269,35 +269,35 @@ class Muc:
 
     def presence_(self, stanza):
         from_jid = JID(stanza['from'])
-        mingle = util.elem_find_child(stanza, ns.MINGLE, 'mingle')
+        muji = util.elem_find_child(stanza, ns.MUJI, 'muji')
 
-        if mingle is None:
+        if muji is None:
             return
 
         if self.state == Muc.WAITING:
-            if not from_jid in self.mingle_presences:
+            if not from_jid in self.muji_presences:
                 return
 
-        self.mingle_presences[from_jid] = stanza
+        self.muji_presences[from_jid] = stanza
 
         if self.state == Muc.WAITING:
             self.maybe_start_calls()
 
-    def update_presence(self, mingle = None):
+    def update_presence(self, muji = None):
         join = domish.Element((None, 'presence'))
         join['to'] = self.my_jid.full()
         self.client.presence_add_caps(join)
 
-        if (mingle != None):
-            join.addChild(mingle)
+        if (muji != None):
+            join.addChild(muji)
 
         self.client.stream.send(join)
 
     def got_codecs(self, results):
         print "Got codecs!!!!"
-        mingle = domish.Element((ns.MINGLE, 'mingle'))
+        muji = domish.Element((ns.MUJI, 'muji'))
         for (result, sessioninfo) in results:
-            c = mingle.addElement ('content')
+            c = muji.addElement ('content')
             desc = c.addElement ((ns.JINGLE_RTP, "description"))
 
             c['name'] = sessioninfo[0]
@@ -322,7 +322,7 @@ class Muc:
                     param['name'] = name
                     param['value'] = value
 
-        self.update_presence(mingle)
+        self.update_presence(muji)
 
         # call the lot using the existing conference
 
@@ -339,7 +339,7 @@ class Muc:
         dlist = defer.DeferredList(deferreds)
         dlist.addCallback(self.got_codecs)
 
-        for jid in self.mingle_presences.iterkeys():
+        for jid in self.muji_presences.iterkeys():
             print "Calling: %s" % jid.full()
             self.ui.add_output (jid.full())
             session = jingle.JingleSession (self.client, self.conference)
@@ -374,7 +374,7 @@ class Muc:
         contact = self.client.get_contact (jid)
 
         deferreds = []
-        contents = xpath.queryForNodes ('/presence/mingle/content', stanza)
+        contents = xpath.queryForNodes ('/presence/muji/content', stanza)
 
         for c in contents:
             description = xpath.queryForNodes ('/content/description', c)[0]
@@ -407,15 +407,15 @@ class Muc:
         self.ui.add_video_preview(session)
 
 
-        for (jid, stanza) in self.mingle_presences.iteritems():
+        for (jid, stanza) in self.muji_presences.iteritems():
             deferreds.append (self.add_participant(jid, stanza))
 
         dlist = defer.DeferredList(deferreds)
         dlist.addCallback(self.participants_done)
 
     def maybe_start_calls(self):
-        for stanza in self.mingle_presences.itervalues():
-            contents = xpath.queryForNodes ('/presence/mingle/content', stanza)
+        for stanza in self.muji_presences.itervalues():
+            contents = xpath.queryForNodes ('/presence/muji/content', stanza)
 
             for c in contents:
                 if c.hasAttribute("preparing"):
@@ -430,14 +430,14 @@ class Muc:
     def joined (self):
         print "Preparing the conference"
         self.state = Muc.CLAIMING
-        mingle = domish.Element((ns.MINGLE, 'mingle'))
-        c = mingle.addElement ('content')
+        muji = domish.Element((ns.MUJI, 'muji'))
+        c = muji.addElement ('content')
         c['name'] = 'video'
         c['preparing'] = 'true'
-        c = mingle.addElement ('content')
+        c = muji.addElement ('content')
         c['name'] = 'audio'
         c['preparing'] = 'true'
-        self.update_presence(mingle)
+        self.update_presence(muji)
 
     def presence(self, stanza):
         from_jid = JID(stanza['from'])
-- 
1.5.6.5