[Telepathy-commits] [mingle/master] Mingle only does new style jingle, so don't advertise older caps and use the clockrate instead of rate attribute

[Sjoerd Simons]

---
 mingle-client.py |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/mingle-client.py b/mingle-client.py
index 32851cf..c811126 100644
--- a/mingle-client.py
+++ b/mingle-client.py
@@ -167,9 +167,6 @@ class Muc:
         client.features.update([
          ns.JINGLE,
          ns.JINGLE_RTP,
-         ns.OLD_JINGLE,
-         ns.OLD_JINGLE_DESC_AUDIO,
-         ns.OLD_JINGLE_DESC_VIDEO,
         ] + transports)
 
         client.send_presence()
@@ -254,7 +251,7 @@ class Muc:
 
                 pt['id'] = str(codec.id)
                 pt['name'] = codec.encoding_name
-                pt['rate'] = str(codec.clock_rate)
+                pt['clockrate'] = str(codec.clock_rate)
                 if codec.channels > 0:
                     pt['channels'] = str(codec.channels)
 
@@ -297,7 +294,7 @@ class Muc:
             codec = farsight.Codec(int(p["id"]),
                                     p["name"],
                                     session.type,
-                                    int(p["rate"]))
+                                    int(p["clockrate"]))
             params = xpath.queryForNodes("/payload-type/parameter", p)
             if params !=None:
                 optional_params = []
-- 
1.5.6.5