[next] telepathy-rakia: DTMF API change

[Guillaume Desmottes]

Module: telepathy-rakia
Branch: next
Commit: 617bdfaef52d28169049dd3b7fa7c3ee32a17f3e
URL:    http://cgit.freedesktop.org/telepathy/telepathy-rakia/commit/?id=617bdfaef52d28169049dd3b7fa7c3ee32a17f3e

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Wed Jan 29 15:56:38 2014 +0100

DTMF API change

constants.py is synced from Gabble next.

---

 rakia/media-manager.c                     |    4 ++--
 tests/twisted/constants.py                |    5 +----
 tests/twisted/voip/requestable-classes.py |    2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/rakia/media-manager.c b/rakia/media-manager.c
index 4257e3c..c5ac45d 100644
--- a/rakia/media-manager.c
+++ b/rakia/media-manager.c
@@ -298,7 +298,7 @@ new_call_channel (RakiaMediaManager *fac,
       initial_video_name = tp_asv_get_string (request_properties,
           TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO_NAME);
       dtmf_initial_tones = tp_asv_get_string (request_properties,
-          TP_PROP_CHANNEL_INTERFACE_DTMF1_INITIAL_TONES);
+          TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_TONES);
     }
 
   g_object_get (priv->conn,
@@ -519,7 +519,7 @@ static const gchar * const named_channel_allowed_properties[] = {
     TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO_NAME,
     TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO_NAME,
     TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_TRANSPORT,
-    TP_PROP_CHANNEL_INTERFACE_DTMF1_INITIAL_TONES,
+    TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_TONES,
     NULL
 };
 
diff --git a/tests/twisted/constants.py b/tests/twisted/constants.py
index d710529..77905b9 100644
--- a/tests/twisted/constants.py
+++ b/tests/twisted/constants.py
@@ -38,7 +38,6 @@ CHANNEL = PREFIX + ".Channel"
 
 CHANNEL_IFACE_CHAT_STATE = CHANNEL + '.Interface.ChatState1'
 CHANNEL_IFACE_DESTROYABLE = CHANNEL + ".Interface.Destroyable1"
-CHANNEL_IFACE_DTMF = CHANNEL + ".Interface.DTMF1"
 CHANNEL_IFACE_GROUP = CHANNEL + ".Interface.Group1"
 CHANNEL_IFACE_HOLD = CHANNEL + ".Interface.Hold1"
 CHANNEL_IFACE_PASSWORD = CHANNEL + ".Interface.Password1"
@@ -85,6 +84,7 @@ CALL_INITIAL_AUDIO_NAME = CHANNEL_TYPE_CALL + '.InitialAudioName'
 CALL_INITIAL_VIDEO = CHANNEL_TYPE_CALL + '.InitialVideo'
 CALL_INITIAL_VIDEO_NAME = CHANNEL_TYPE_CALL + '.InitialVideoName'
 CALL_MUTABLE_CONTENTS = CHANNEL_TYPE_CALL + '.MutableContents'
+CALL_INITIAL_TONES = CHANNEL_TYPE_CALL + '.InitialTones'
 
 CALL_CONTENT = PREFIX + '.Call1.Content'
 CALL_CONTENT_IFACE_MEDIA = CALL_CONTENT + '.Interface.Media'
@@ -576,9 +576,6 @@ CD_PATH = PATH_PREFIX + '/ChannelDispatcher'
 
 MC = PREFIX + '.MissionControl6'
 MC_PATH = PATH_PREFIX + '/MissionControl6'
-DTMF_CURRENTLY_SENDING_TONES = CHANNEL_IFACE_DTMF + '.CurrentlySendingTones'
-DTMF_INITIAL_TONES = CHANNEL_IFACE_DTMF + '.InitialTones'
-DTMF_DEFERRED_TONES = CHANNEL_IFACE_DTMF + '.DeferredTones'
 
 TESTS = PREFIX + ".Tests"
 TESTDOT = PREFIX + ".Test."
diff --git a/tests/twisted/voip/requestable-classes.py b/tests/twisted/voip/requestable-classes.py
index 4642579..ba7b0a0 100644
--- a/tests/twisted/voip/requestable-classes.py
+++ b/tests/twisted/voip/requestable-classes.py
@@ -46,7 +46,7 @@ def rccs(q, bus, conn, stream):
             cs.CALL_INITIAL_VIDEO, cs.CALL_INITIAL_AUDIO,
             cs.CALL_INITIAL_VIDEO_NAME, cs.CALL_INITIAL_AUDIO_NAME,
             cs.CALL_INITIAL_TRANSPORT,
-            cs.DTMF_INITIAL_TONES,
+            cs.CALL_INITIAL_TONES,
             ]
 
         allowed.sort()