Use the proper 'Ice' Call capability

Also, use token constants when possible.

6 files changed, 14 insertions, 9 deletions

diff --git a/src/media-factory.c b/src/media-factory.c
index 85e4a1c46..2d46258b6 100644
--- a/src/media-factory.c
+++ b/src/media-factory.c
@@ -1211,7 +1211,7 @@ gabble_media_factory_represent_client (GabbleCapsChannelManager *manager,
     GPtrArray *data_forms)
 {
   static GQuark q_gtalk_p2p = 0, q_ice_udp = 0, q_h264 = 0;
-  static GQuark qc_gtalk_p2p = 0, qc_ice_udp = 0, qc_h264 = 0;
+  static GQuark qc_gtalk_p2p = 0, qc_ice_udp = 0, qc_h264 = 0, qc_ice = 0;
   gboolean gtalk_p2p = FALSE, h264 = FALSE, audio = FALSE, video = FALSE,
            ice_udp = FALSE;
   guint i;
@@ -1220,11 +1220,15 @@ gabble_media_factory_represent_client (GabbleCapsChannelManager *manager,
   if (G_UNLIKELY (q_gtalk_p2p == 0))
     {
       q_gtalk_p2p = g_quark_from_static_string (
-          TP_IFACE_CHANNEL_INTERFACE_MEDIA_SIGNALLING "/gtalk-p2p");
+          TP_TOKEN_CHANNEL_INTERFACE_MEDIA_SIGNALLING_GTALK_P2P);
       qc_gtalk_p2p = g_quark_from_static_string (
-          TP_IFACE_CHANNEL_TYPE_CALL "/gtalk-p2p");
+          TP_TOKEN_CHANNEL_TYPE_CALL_GTALK_P2P);
       q_ice_udp = g_quark_from_static_string (
-          TP_IFACE_CHANNEL_INTERFACE_MEDIA_SIGNALLING "/ice-udp");
+          TP_TOKEN_CHANNEL_INTERFACE_MEDIA_SIGNALLING_ICE_UDP);
+      qc_ice = g_quark_from_static_string (
+          TP_TOKEN_CHANNEL_TYPE_CALL_ICE);
+      /* 'ice-udp' isn't the proper cap name, 'ice' is. We keep supporting
+       * 'ice-udp' for now to not break existing clients. */
       qc_ice_udp = g_quark_from_static_string (
           TP_IFACE_CHANNEL_TYPE_CALL "/ice-udp");
       q_h264 = g_quark_from_static_string (
@@ -1246,6 +1250,7 @@ gabble_media_factory_represent_client (GabbleCapsChannelManager *manager,
           } q2cap[] = {
               { q_gtalk_p2p, &gtalk_p2p }, { qc_gtalk_p2p, &gtalk_p2p },
               { q_ice_udp, &ice_udp }, { qc_ice_udp, &ice_udp },
+              { qc_ice, &ice_udp },
               { q_h264, &h264 }, { qc_h264, &h264 },
               { 0, NULL },
           };
diff --git a/tests/twisted/caps/advertise-contact-caps.py b/tests/twisted/caps/advertise-contact-caps.py
index ab40277fd..138cb2627 100644
--- a/tests/twisted/caps/advertise-contact-caps.py
+++ b/tests/twisted/caps/advertise-contact-caps.py
@@ -238,7 +238,7 @@ def run_mixed_test (q, bus, conn, stream):
             cs.CALL_INITIAL_VIDEO: True},
         ], [
             cs.CHANNEL_TYPE_CALL + '/gtalk-p2p',
-            cs.CHANNEL_TYPE_CALL + '/ice-udp',
+            cs.CHANNEL_TYPE_CALL + '/ice',
             cs.CHANNEL_TYPE_CALL + '/video/h264',
             ]),
         ])
diff --git a/tests/twisted/jingle/call-codecoffer.py b/tests/twisted/jingle/call-codecoffer.py
index 0ccf94122..91821721e 100644
--- a/tests/twisted/jingle/call-codecoffer.py
+++ b/tests/twisted/jingle/call-codecoffer.py
@@ -92,7 +92,7 @@ def prepare_test(jp, q, bus, conn, stream):
                 cs.CALL_INITIAL_VIDEO: True},
             ], [
                 cs.CHANNEL_TYPE_CALL + '/gtalk-p2p',
-                cs.CHANNEL_TYPE_CALL + '/ice-udp',
+                cs.CHANNEL_TYPE_CALL + '/ice',
                 cs.CHANNEL_TYPE_CALL + '/video/h264',
             ]),
         ])
diff --git a/tests/twisted/jingle/call_helper.py b/tests/twisted/jingle/call_helper.py
index 402f1c931..024ddaad1 100644
--- a/tests/twisted/jingle/call_helper.py
+++ b/tests/twisted/jingle/call_helper.py
@@ -259,7 +259,7 @@ class CallTest(object):
                 cs.CALL_INITIAL_VIDEO: initial_video},
             ], [
                 cs.CHANNEL_TYPE_CALL + '/gtalk-p2p',
-                cs.CHANNEL_TYPE_CALL + '/ice-udp',
+                cs.CHANNEL_TYPE_CALL + '/ice',
                 cs.CHANNEL_TYPE_CALL + '/video/h264',
             ]),
         ])
diff --git a/tests/twisted/jingle/google-relay.py b/tests/twisted/jingle/google-relay.py
index 18940fa16..24b2cf493 100644
--- a/tests/twisted/jingle/google-relay.py
+++ b/tests/twisted/jingle/google-relay.py
@@ -104,7 +104,7 @@ def test(q, bus, conn, stream, incoming=True, too_slow=None, use_call=False):
                     cs.CALL_INITIAL_VIDEO: True},
                 ], [
                     cs.CHANNEL_TYPE_CALL + '/gtalk-p2p',
-                    cs.CHANNEL_TYPE_CALL + '/ice-udp',
+                    cs.CHANNEL_TYPE_CALL + '/ice',
                     cs.CHANNEL_TYPE_CALL + '/video/h264',
                 ]),
             ])
diff --git a/tests/twisted/jingle/stun-server.py b/tests/twisted/jingle/stun-server.py
index 0676993d4..1ecb1c738 100644
--- a/tests/twisted/jingle/stun-server.py
+++ b/tests/twisted/jingle/stun-server.py
@@ -207,7 +207,7 @@ def test_call(jp, q, bus, conn, stream,
                 cs.CALL_INITIAL_VIDEO: True},
             ], [
                 cs.CHANNEL_TYPE_CALL + '/gtalk-p2p',
-                cs.CHANNEL_TYPE_CALL + '/ice-udp',
+                cs.CHANNEL_TYPE_CALL + '/ice',
                 cs.CHANNEL_TYPE_CALL + '/video/h264',
             ]),
         ])