[Pkg-telepathy-commits] [telepathy-mission-control-6] 24/280: sync

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository telepathy-mission-control-6.

commit 032a1ed39a9ad3ee35b3d42c1b21825d9b873973
Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Tue Oct 1 17:23:05 2013 +0200

    sync
---
 tests/twisted/constants.py | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/tests/twisted/constants.py b/tests/twisted/constants.py
index e72c592..38cf204 100644
--- a/tests/twisted/constants.py
+++ b/tests/twisted/constants.py
@@ -33,8 +33,6 @@ CM = PREFIX + ".ConnectionManager"
 HT_NONE = 0
 HT_CONTACT = 1
 HT_ROOM = 2
-HT_LIST = 3
-HT_GROUP = 4
 
 CHANNEL = PREFIX + ".Channel"
 
@@ -53,6 +51,7 @@ CHANNEL_IFACE_SUBJECT = CHANNEL + '.Interface.Subject1'
 CHANNEL_IFACE_FILE_TRANSFER_METADATA = CHANNEL + '.Interface.FileTransfer.Metadata1'
 
 CHANNEL_TYPE_CALL = CHANNEL + ".Type.Call1"
+CHANNEL_TYPE_CONTACT_LIST = CHANNEL + ".Type.ContactList1"
 CHANNEL_TYPE_CONTACT_SEARCH = CHANNEL + ".Type.ContactSearch1"
 CHANNEL_TYPE_TEXT = CHANNEL + ".Type.Text"
 CHANNEL_TYPE_STREAM_TUBE = CHANNEL + ".Type.StreamTube1"
@@ -73,6 +72,15 @@ INITIATOR_HANDLE = CHANNEL + '.InitiatorHandle'
 INITIATOR_ID = CHANNEL + '.InitiatorID'
 INTERFACES = CHANNEL + '.Interfaces'
 
+CALL_CONTENTS = CHANNEL_TYPE_CALL + '.Contents'
+CALL_CALL_STATE_DETAILS = CHANNEL_TYPE_CALL + '.CallStateDetails'
+CALL_CALL_STATE = CHANNEL_TYPE_CALL + '.CallState'
+CALL_CALL_FLAGS = CHANNEL_TYPE_CALL + '.CallFlags'
+CALL_CALL_STATE_REASON = CHANNEL_TYPE_CALL + '.CallStateReason'
+CALL_HARDWARE_STREAMING = CHANNEL_TYPE_CALL + '.HardwareStreaming'
+CALL_CALL_MEMBERS = CHANNEL_TYPE_CALL + '.CallMembers'
+CALL_MEMBER_IDENTIFIERS = CHANNEL_TYPE_CALL + '.MemberIdentifiers'
+CALL_INITIAL_TRANSPORT = CHANNEL_TYPE_CALL + '.InitialTransport'
 CALL_INITIAL_AUDIO = CHANNEL_TYPE_CALL + '.InitialAudio'
 CALL_INITIAL_AUDIO_NAME = CHANNEL_TYPE_CALL + '.InitialAudioName'
 CALL_INITIAL_VIDEO = CHANNEL_TYPE_CALL + '.InitialVideo'
@@ -83,7 +91,7 @@ CALL_CONTENT = PREFIX + '.Call1.Content'
 CALL_CONTENT_IFACE_MEDIA = CALL_CONTENT + '.Interface.Media'
 CALL_CONTENT_IFACE_DTMF = CALL_CONTENT + '.Interface.DTMF1'
 
-CALL_CONTENT_MEDIADESCRIPTION = CALL_CONTENT + '.MediaDescription'
+CALL_CONTENT_MEDIA_DESCRIPTION = CALL_CONTENT + '.MediaDescription'
 
 CALL_STREAM = PREFIX + '.Call1.Stream'
 CALL_STREAM_IFACE_MEDIA = CALL_STREAM + '.Interface.Media'
@@ -458,6 +466,12 @@ MT_NOTICE = 2
 MT_AUTO_REPLY = 3
 MT_DELIVERY_REPORT = 4
 
+class MessageFlag(object):
+    TRUNCATED = 1
+    NON_TEXT_CONTENT = 2
+    SCROLLBACK = 4
+    RESCUED = 8
+
 class SendError(object):
     UNKNOWN = 0
     OFFLINE = 1
@@ -556,6 +570,9 @@ 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'
 
 TESTDOT = PREFIX + ".Test."
 TESTSLASH = PATH_PREFIX + "/Test/"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-mission-control-6.git