[Telepathy-commits] [telepathy-gabble/master] Default codec channels to 0, not 1.

[Will Thompson]

Olivier tells me 0 is a wildcard.  The tests were assuming the default
was 1, so had to be changed.
---
 src/jingle-media-rtp.c              |    2 +-
 tests/twisted/jingle/jingletest2.py |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/jingle-media-rtp.c b/src/jingle-media-rtp.c
index 6192867..41b85af 100644
--- a/src/jingle-media-rtp.c
+++ b/src/jingle-media-rtp.c
@@ -306,7 +306,7 @@ parse_payload_type (LmMessageNode *node)
   guint8 id;
   const gchar *name;
   guint clockrate = 0;
-  guint channels = 1;
+  guint channels = 0;
   LmMessageNode *param;
 
   txt = lm_message_node_get_attribute (node, "id");
diff --git a/tests/twisted/jingle/jingletest2.py b/tests/twisted/jingle/jingletest2.py
index 528743f..f5d5bdc 100644
--- a/tests/twisted/jingle/jingletest2.py
+++ b/tests/twisted/jingle/jingletest2.py
@@ -312,12 +312,12 @@ class JingleTest2:
         sync_stream(self.q, self.stream)
 
     def dbusify_codecs(self, codecs):
-        dbussed_codecs = [ (id, name, 0, rate, 1, {} )
+        dbussed_codecs = [ (id, name, 0, rate, 0, {} )
                             for (name, id, rate) in codecs ]
         return dbus.Array(dbussed_codecs, signature='(usuuua{ss})')
 
     def dbusify_codecs_with_params(self, codecs):
-        dbussed_codecs = [ (id, name, 0, rate, 1, params)
+        dbussed_codecs = [ (id, name, 0, rate, 0, params)
                             for (name, id, rate, params) in codecs ]
         return dbus.Array(dbussed_codecs, signature='(usuuua{ss})')
 
-- 
1.5.6.5