Attachment 86899 Details for Bug 69995 – sync constants.py from Gabble master

[patch] sync constants.py from Gabble master

0002-sync-constants.py-from-Gabble-master.patch (text/plain), 21.16 KB, created by Guillaume Desmottes on 2013-10-01 11:53:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Desmottes

Created: 2013-10-01 11:53:15 UTC

Size: 21.16 KB

patch

obsolete

>From cba526374cfd1a57d2b13ed49457a04dd5037315 Mon Sep 17 00:00:00 2001
>From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
>Date: Tue, 1 Oct 2013 12:20:24 +0200
>Subject: [PATCH 2/6] sync constants.py from Gabble master
>
>https://bugs.freedesktop.org/show_bug.cgi?id=69995
>---
> tests/twisted/constants.py                | 336 +++++++++++++++++++++++-------
> tests/twisted/voip/calltest.py            |   8 +-
> tests/twisted/voip/requestable-classes.py |   8 +-
> 3 files changed, 267 insertions(+), 85 deletions(-)
>
>diff --git a/tests/twisted/constants.py b/tests/twisted/constants.py
>index 1edb092..74803a9 100644
>--- a/tests/twisted/constants.py
>+++ b/tests/twisted/constants.py
>@@ -1,10 +1,34 @@
>+# Copyright (C) 2009 Nokia Corporation
>+# Copyright (C) 2009-2013 Collabora Ltd.
>+#
>+# This library is free software; you can redistribute it and/or
>+# modify it under the terms of the GNU Lesser General Public
>+# License as published by the Free Software Foundation; either
>+# version 2.1 of the License, or (at your option) any later version.
>+#
>+# This library is distributed in the hope that it will be useful, but
>+# WITHOUT ANY WARRANTY; without even the implied warranty of
>+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
>+# Lesser General Public License for more details.
>+#
>+# You should have received a copy of the GNU Lesser General Public
>+# License along with this library; if not, write to the Free Software
>+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
>+# 02110-1301 USA
>+
> """
> Some handy constants for other tests to share and enjoy.
> """
> 
>-from dbus import PROPERTIES_IFACE
>+from dbus import PROPERTIES_IFACE, INTROSPECTABLE_IFACE
>+
>+PREFIX = "org.freedesktop.Telepathy"
>+PATH_PREFIX = '/' + PREFIX.replace('.', '/')
>+
>+tp_name_prefix = PREFIX
>+tp_path_prefix = PATH_PREFIX
> 
>-CM = "org.freedesktop.Telepathy.ConnectionManager"
>+CM = PREFIX + ".ConnectionManager"
> 
> HT_NONE = 0
> HT_CONTACT = 1
>@@ -12,7 +36,7 @@ HT_ROOM = 2
> HT_LIST = 3
> HT_GROUP = 4
> 
>-CHANNEL = "org.freedesktop.Telepathy.Channel"
>+CHANNEL = PREFIX + ".Channel"
> 
> CHANNEL_IFACE_CALL_STATE = CHANNEL + ".Interface.CallState"
> CHANNEL_IFACE_CHAT_STATE = CHANNEL + '.Interface.ChatState'
>@@ -24,8 +48,12 @@ CHANNEL_IFACE_MEDIA_SIGNALLING = CHANNEL + ".Interface.MediaSignalling"
> CHANNEL_IFACE_MESSAGES = CHANNEL + ".Interface.Messages"
> CHANNEL_IFACE_PASSWORD = CHANNEL + ".Interface.Password"
> CHANNEL_IFACE_TUBE = CHANNEL + ".Interface.Tube"
>-CHANNEL_IFACE_SASL_AUTH = CHANNEL + ".Interface.SaslAuthentication.DRAFT"
>+CHANNEL_IFACE_SASL_AUTH = CHANNEL + ".Interface.SASLAuthentication"
> CHANNEL_IFACE_CONFERENCE = CHANNEL + '.Interface.Conference'
>+CHANNEL_IFACE_ROOM = CHANNEL + '.Interface.Room2'
>+CHANNEL_IFACE_ROOM_CONFIG = CHANNEL + '.Interface.RoomConfig1'
>+CHANNEL_IFACE_SUBJECT = CHANNEL + '.Interface.Subject2'
>+CHANNEL_IFACE_FILE_TRANSFER_METADATA = CHANNEL + '.Interface.FileTransfer.Metadata'
> 
> CHANNEL_TYPE_CALL = CHANNEL + ".Type.Call1"
> CHANNEL_TYPE_CONTACT_LIST = CHANNEL + ".Type.ContactList"
>@@ -36,12 +64,13 @@ CHANNEL_TYPE_STREAM_TUBE = CHANNEL + ".Type.StreamTube"
> CHANNEL_TYPE_DBUS_TUBE = CHANNEL + ".Type.DBusTube"
> CHANNEL_TYPE_TEXT = CHANNEL + ".Type.Text"
> CHANNEL_TYPE_FILE_TRANSFER = CHANNEL + ".Type.FileTransfer"
>+CHANNEL_TYPE_ROOM_LIST = CHANNEL + ".Type.RoomList"
> CHANNEL_TYPE_SERVER_AUTHENTICATION = \
>-    CHANNEL + ".Type.ServerAuthentication.DRAFT"
>+    CHANNEL + ".Type.ServerAuthentication"
> CHANNEL_TYPE_SERVER_TLS_CONNECTION = \
>     CHANNEL + ".Type.ServerTLSConnection"
> 
>-TP_AWKWARD_PROPERTIES = "org.freedesktop.Telepathy.Properties"
>+TP_AWKWARD_PROPERTIES = PREFIX + ".Properties"
> PROPERTY_FLAG_READ = 1
> PROPERTY_FLAG_WRITE = 2
> PROPERTY_FLAGS_RW = PROPERTY_FLAG_READ | PROPERTY_FLAG_WRITE
>@@ -55,52 +84,60 @@ INITIATOR_HANDLE = CHANNEL + '.InitiatorHandle'
> INITIATOR_ID = CHANNEL + '.InitiatorID'
> INTERFACES = CHANNEL + '.Interfaces'
> 
>-INITIAL_AUDIO = CHANNEL_TYPE_CALL + '.InitialAudio'
>-INITIAL_VIDEO = CHANNEL_TYPE_CALL + '.InitialVideo'
>-INITIAL_AUDIO_NAME = CHANNEL_TYPE_CALL + '.InitialAudioName'
>-INITIAL_VIDEO_NAME = CHANNEL_TYPE_CALL + '.InitialVideoName'
>-INITIAL_TRANSPORT = CHANNEL_TYPE_CALL + '.InitialTransport'
>-MUTABLE_CONTENTS = CHANNEL_TYPE_CALL + '.MutableContents'
>-
>-DTMF_INITIAL_TONES = CHANNEL_IFACE_DTMF + '.InitialTones'
>+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'
>+CALL_INITIAL_VIDEO_NAME = CHANNEL_TYPE_CALL + '.InitialVideoName'
>+CALL_MUTABLE_CONTENTS = CHANNEL_TYPE_CALL + '.MutableContents'
> 
>-CALL_CONTENT = 'org.freedesktop.Telepathy.Call1.Content'
>-CALL_CONTENT_IFACE_MEDIA = \
>-    'org.freedesktop.Telepathy.Call1.Content.Interface.Media'
>+CALL_CONTENT = PREFIX + '.Call1.Content'
>+CALL_CONTENT_IFACE_MEDIA = CALL_CONTENT + '.Interface.Media'
>+CALL_CONTENT_IFACE_DTMF = CALL_CONTENT + '.Interface.DTMF'
> 
>-CALL_CONTENT_MEDIA_DESCRIPTION = \
>-    'org.freedesktop.Telepathy.Call1.Content.MediaDescription'
>+CALL_CONTENT_MEDIA_DESCRIPTION = CALL_CONTENT + '.MediaDescription'
> 
>-CALL_STREAM = 'org.freedesktop.Telepathy.Call1.Stream'
>-CALL_STREAM_IFACE_MEDIA = \
>-    'org.freedesktop.Telepathy.Call1.Stream.Interface.Media'
>+CALL_STREAM = PREFIX + '.Call1.Stream'
>+CALL_STREAM_IFACE_MEDIA = CALL_STREAM + '.Interface.Media'
> 
>-CALL_STREAM_ENDPOINT = 'org.freedesktop.Telepathy.Call1.Stream.Endpoint'
>-
>-
>-CALL_STREAM_ENDPOINT_STATE_CONNECTING = 0
>-CALL_STREAM_ENDPOINT_STATE_PROVISIONALLY_CONNECTED = 1
>-CALL_STREAM_ENDPOINT_STATE_FULLY_CONNECTED = 2
>-CALL_STREAM_ENDPOINT_STATE_EXHAUSTED_CANDIDATES = 3
>-CALL_STREAM_ENDPOINT_STATE_FAILED = 4
>+CALL_STREAM_ENDPOINT = CALL_STREAM + '.Endpoint'
> 
> CALL_MEDIA_TYPE_AUDIO = 0
> CALL_MEDIA_TYPE_VIDEO = 1
> 
>-
>-MEDIA_STREAM_BASE_PROTO_UDP = 0
>-MEDIA_STREAM_BASE_PROTO_TCP = 1
>+CALL_CONTENT_PACKETIZATION_RTP = 0
>+CALL_CONTENT_PACKETIZATION_RAW = 1
>+CALL_CONTENT_PACKETIZATION_MSN_WEBCAM = 2
> 
> CALL_STREAM_TRANSPORT_UNKNOWN = 0
> CALL_STREAM_TRANSPORT_RAW_UDP = 1
> CALL_STREAM_TRANSPORT_ICE = 2
>-
>+CALL_STREAM_TRANSPORT_GTALK_P2P = 3
>+CALL_STREAM_TRANSPORT_WLM_2009 = 4
>+CALL_STREAM_TRANSPORT_SHM = 5
>+CALL_STREAM_TRANSPORT_MULTICAST = 6
> 
> CALL_STATE_UNKNOWN = 0
> CALL_STATE_PENDING_INITIATOR = 1
>-CALL_STATE_PENDING_RECEIVER = 2
>-CALL_STATE_ACCEPTED = 3
>-CALL_STATE_ENDED = 4
>+CALL_STATE_INITIALISING = 2
>+CALL_STATE_INITIALISED = 3
>+CALL_STATE_ACCEPTED = 4
>+CALL_STATE_ACTIVE = 5
>+CALL_STATE_ENDED = 6
>+
>+CALL_FLAG_LOCALLY_HELD = 1
>+CALL_FLAG_LOCALLY_RINGING = 2
>+CALL_FLAG_LOCALLY_QUEUED = 4
>+CALL_FLAG_FORWARDED = 8
>+CALL_FLAG_CLEARING = 16
> 
> CALL_MEMBER_FLAG_RINGING = 1
> CALL_MEMBER_FLAG_HELD = 2
>@@ -118,6 +155,35 @@ CALL_STREAM_FLOW_STATE_PENDING_START = 1
> CALL_STREAM_FLOW_STATE_PENDING_STOP = 2
> CALL_STREAM_FLOW_STATE_STARTED = 3
> 
>+CALL_STREAM_ENDPOINT_STATE_CONNECTING = 0
>+CALL_STREAM_ENDPOINT_STATE_PROVISIONALLY_CONNECTED = 1
>+CALL_STREAM_ENDPOINT_STATE_FULLY_CONNECTED = 2
>+CALL_STREAM_ENDPOINT_STATE_EXHAUSTED_CANDIDATES = 3
>+CALL_STREAM_ENDPOINT_STATE_FAILED = 4
>+
>+CALL_STREAM_CANDIDATE_TYPE_HOST = 1
>+CALL_STREAM_CANDIDATE_TYPE_SERVER_REFLEXIVE = 2
>+CALL_STREAM_CANDIDATE_TYPE_RELAY = 4
>+
>+CALL_STATE_CHANGE_REASON_UNKNOWN = 0
>+CALL_STATE_CHANGE_REASON_PROGRESS_MADE = 1
>+CALL_STATE_CHANGE_REASON_USER_REQUESTED = 2
>+CALL_STATE_CHANGE_REASON_FORWARDED = 3
>+CALL_STATE_CHANGE_REASON_REJECTED = 4
>+CALL_STATE_CHANGE_REASON_NO_ANSWER = 5
>+CALL_STATE_CHANGE_REASON_INVALID_CONTACT = 6
>+CALL_STATE_CHANGE_REASON_PERMISSION_DENIED = 7
>+CALL_STATE_CHANGE_REASON_BUSY = 8
>+CALL_STATE_CHANGE_REASON_INTERNAL_ERROR = 9
>+CALL_STATE_CHANGE_REASON_SERVICE_ERROR = 10
>+CALL_STATE_CHANGE_REASON_NETWORK_ERROR = 11
>+CALL_STATE_CHANGE_REASON_MEDIA_ERROR = 12
>+CALL_STATE_CHANGE_REASON_CONNECTIVITY_ERROR = 13
>+
>+CALL_STREAM_COMPONENT_UNKNOWN = 0
>+CALL_STREAM_COMPONENT_DATA = 1
>+CALL_STREAM_COMPONENT_CONTROL = 2
>+
> SUBSCRIPTION_STATE_UNKNOWN = 0
> SUBSCRIPTION_STATE_NO = 1
> SUBSCRIPTION_STATE_REMOVED_REMOTELY = 2
>@@ -129,27 +195,37 @@ CONTACT_LIST_STATE_WAITING = 1
> CONTACT_LIST_STATE_FAILURE = 2
> CONTACT_LIST_STATE_SUCCESS = 3
> 
>-CONN = "org.freedesktop.Telepathy.Connection"
>+CONN = PREFIX + ".Connection"
> CONN_IFACE_AVATARS = CONN + '.Interface.Avatars'
> CONN_IFACE_ALIASING = CONN + '.Interface.Aliasing'
> CONN_IFACE_CAPS = CONN + '.Interface.Capabilities'
> CONN_IFACE_CONTACTS = CONN + '.Interface.Contacts'
>-CONN_IFACE_CONTACT_CAPS = CONN + '.Interface.ContactCapabilities.DRAFT'
>+CONN_IFACE_CONTACT_CAPS = CONN + '.Interface.ContactCapabilities'
> CONN_IFACE_CONTACT_INFO = CONN + ".Interface.ContactInfo"
> CONN_IFACE_PRESENCE = CONN + '.Interface.Presence'
> CONN_IFACE_SIMPLE_PRESENCE = CONN + '.Interface.SimplePresence'
> CONN_IFACE_REQUESTS = CONN + '.Interface.Requests'
> CONN_IFACE_LOCATION = CONN + '.Interface.Location'
> CONN_IFACE_GABBLE_DECLOAK = CONN + '.Interface.Gabble.Decloak'
>-CONN_IFACE_MAIL_NOTIFICATION = CONN + '.Interface.MailNotification.DRAFT'
>+CONN_IFACE_MAIL_NOTIFICATION = CONN + '.Interface.MailNotification'
> CONN_IFACE_CONTACT_LIST = CONN + '.Interface.ContactList'
> CONN_IFACE_CONTACT_GROUPS = CONN + '.Interface.ContactGroups'
>+CONN_IFACE_CLIENT_TYPES = CONN + '.Interface.ClientTypes'
>+CONN_IFACE_POWER_SAVING = CONN + '.Interface.PowerSaving'
>+CONN_IFACE_CONTACT_BLOCKING = CONN + '.Interface.ContactBlocking'
>+CONN_IFACE_ADDRESSING = CONN + '.Interface.Addressing1'
>+CONN_IFACE_SERVICE_POINT = CONN + '.Interface.ServicePoint'
> 
>+ATTR_CONTACT_ID = CONN + '/contact-id'
> ATTR_CONTACT_CAPABILITIES = CONN_IFACE_CONTACT_CAPS + '/capabilities'
>+ATTR_PRESENCE = CONN_IFACE_SIMPLE_PRESENCE + '/presence'
>+ATTR_SUBSCRIBE = CONN_IFACE_CONTACT_LIST + '/subscribe'
>+ATTR_PUBLISH = CONN_IFACE_CONTACT_LIST + '/publish'
>+ATTR_GROUPS = CONN_IFACE_CONTACT_GROUPS + '/groups'
> 
>-STREAM_HANDLER = 'org.freedesktop.Telepathy.Media.StreamHandler'
>+STREAM_HANDLER = PREFIX + '.Media.StreamHandler'
> 
>-ERROR = 'org.freedesktop.Telepathy.Error'
>+ERROR = PREFIX + '.Error'
> INVALID_ARGUMENT = ERROR + '.InvalidArgument'
> NOT_IMPLEMENTED = ERROR + '.NotImplemented'
> NOT_AVAILABLE = ERROR + '.NotAvailable'
>@@ -160,6 +236,7 @@ CONNECTION_REFUSED = ERROR + '.ConnectionRefused'
> CONNECTION_FAILED = ERROR + '.ConnectionFailed'
> CONNECTION_LOST = ERROR + '.ConnectionLost'
> CANCELLED = ERROR + '.Cancelled'
>+NOT_YOURS = ERROR + '.NotYours'
> DISCONNECTED = ERROR + '.Disconnected'
> REGISTRATION_EXISTS = ERROR + '.RegistrationExists'
> AUTHENTICATION_FAILED = ERROR + '.AuthenticationFailed'
>@@ -169,8 +246,14 @@ NETWORK_ERROR = ERROR + '.NetworkError'
> NOT_YET = ERROR + '.NotYet'
> INVALID_HANDLE = ERROR + '.InvalidHandle'
> CERT_UNTRUSTED = ERROR + '.Cert.Untrusted'
>+SERVICE_BUSY = ERROR + '.ServiceBusy'
>+SERVICE_CONFUSED = ERROR + '.ServiceConfused'
>+SOFTWARE_UPGRADE_REQUIRED = ERROR + '.SoftwareUpgradeRequired'
>+
>+BANNED = ERROR + '.Channel.Banned'
> 
>-UNKNOWN_METHOD = 'org.freedesktop.DBus.Error.UnknownMethod'
>+DBUS_ERROR_UNKNOWN_METHOD = 'org.freedesktop.DBus.Error.UnknownMethod'
>+DBUS_ERROR_NO_REPLY = 'org.freedesktop.DBus.Error.NoReply'
> 
> TUBE_PARAMETERS = CHANNEL_IFACE_TUBE + '.Parameters'
> TUBE_STATE = CHANNEL_IFACE_TUBE + '.State'
>@@ -202,6 +285,13 @@ TUBE_CHANNEL_STATE_NOT_OFFERED = 3
> MEDIA_STREAM_TYPE_AUDIO = 0
> MEDIA_STREAM_TYPE_VIDEO = 1
> 
>+MEDIA_STREAM_BASE_PROTO_UDP = 0
>+MEDIA_STREAM_BASE_PROTO_TCP = 1
>+
>+MEDIA_STREAM_TRANSPORT_TYPE_LOCAL = 0
>+MEDIA_STREAM_TRANSPORT_TYPE_DERIVED = 1
>+MEDIA_STREAM_TRANSPORT_TYPE_RELAY = 2
>+
> SOCKET_ADDRESS_TYPE_UNIX = 0
> SOCKET_ADDRESS_TYPE_ABSTRACT_UNIX = 1
> SOCKET_ADDRESS_TYPE_IPV4 = 2
>@@ -271,6 +361,9 @@ FT_AVAILABLE_SOCKET_TYPES = CHANNEL_TYPE_FILE_TRANSFER + '.AvailableSocketTypes'
> FT_TRANSFERRED_BYTES = CHANNEL_TYPE_FILE_TRANSFER + '.TransferredBytes'
> FT_INITIAL_OFFSET = CHANNEL_TYPE_FILE_TRANSFER + '.InitialOffset'
> FT_FILE_COLLECTION = CHANNEL_TYPE_FILE_TRANSFER + '.FUTURE.FileCollection'
>+FT_URI = CHANNEL_TYPE_FILE_TRANSFER + '.URI'
>+FT_SERVICE_NAME = CHANNEL_IFACE_FILE_TRANSFER_METADATA + '.ServiceName'
>+FT_METADATA = CHANNEL_IFACE_FILE_TRANSFER_METADATA + '.Metadata'
> 
> GF_CAN_ADD = 1
> GF_CAN_REMOVE = 2
>@@ -308,24 +401,6 @@ HSR_NONE = 0
> HSR_REQUESTED = 1
> HSR_RESOURCE_NOT_AVAILABLE = 2
> 
>-CALL_STATE_UNKNOWN = 0,
>-CALL_STATE_PENDING_INITIATOR = 1
>-CALL_STATE_INITIALISING = 2
>-CALL_STATE_INITIALISED = 3
>-CALL_STATE_ACCEPTED = 4
>-CALL_STATE_ACTIVE = 5
>-CALL_STATE_ENDED = 6
>-
>-
>-CALL_MEMBER_FLAG_RINGING = 1
>-CALL_MEMBER_FLAG_HELD = 2
>-
>-CALL_FLAG_LOCALLY_HELD = 1
>-CALL_FLAG_LOCALLY_RINGING = 2
>-CALL_FLAG_LOCALLY_QUEUED = 4
>-CALL_FLAG_FORWARDED = 8
>-CALL_FLAG_CLEARING = 16
>-
> CONN_STATUS_CONNECTED = 0
> CONN_STATUS_CONNECTING = 1
> CONN_STATUS_DISCONNECTED = 2
>@@ -362,8 +437,9 @@ MEDIA_CAP_GTALKP2P = 8
> MEDIA_CAP_ICEUDP = 16
> MEDIA_CAP_IMMUTABLE_STREAMS = 32
> 
>-CLIENT = 'org.freedesktop.Telepathy.Client'
>+CLIENT = PREFIX + '.Client'
> 
>+PRESENCE_UNSET = 0
> PRESENCE_OFFLINE = 1
> PRESENCE_AVAILABLE = 2
> PRESENCE_AWAY = 3
>@@ -375,11 +451,8 @@ PRESENCE_ERROR = 8
> 
> CONTACT_INFO_FLAG_CAN_SET = 1
> CONTACT_INFO_FLAG_PUSH = 2
>-CONTACT_INFO_FIELD_FLAG_PARAMETERS_MANDATORY = 1
>-
>-# Channel_Type_ServerAuthentication
>-AUTH_TYPE_SASL = 0
>-AUTH_TYPE_CAPTCHA = 1
>+CONTACT_INFO_FIELD_FLAG_PARAMETERS_EXACT = 1
>+CONTACT_INFO_FIELD_FLAG_OVERWRITTEN_BY_NICKNAME = 2
> 
> # Channel_Interface_SaslAuthentication
> SASL_STATUS_NOT_STARTED = 0
>@@ -394,12 +467,20 @@ SASL_ABORT_REASON_INVALID_CHALLENGE = 0
> SASL_ABORT_REASON_USER_ABORT = 1
> 
> AUTH_METHOD = CHANNEL_TYPE_SERVER_AUTHENTICATION + ".AuthenticationMethod"
>-AUTH_INFO = CHANNEL_TYPE_SERVER_AUTHENTICATION + ".AuthenticationInformation"
> SASL_AVAILABLE_MECHANISMS = CHANNEL_IFACE_SASL_AUTH + ".AvailableMechanisms"
>+SASL_STATUS = CHANNEL_IFACE_SASL_AUTH + ".SASLStatus"
>+SASL_ERROR = CHANNEL_IFACE_SASL_AUTH + ".SASLError"
>+SASL_ERROR_DETAILS = CHANNEL_IFACE_SASL_AUTH + ".SASLErrorDetails"
>+SASL_CONTEXT = CHANNEL_IFACE_SASL_AUTH + ".SASLContext"
>+SASL_AUTHORIZATION_IDENTITY = CHANNEL_IFACE_SASL_AUTH + ".AuthorizationIdentity"
>+SASL_DEFAULT_REALM = CHANNEL_IFACE_SASL_AUTH + ".DefaultRealm"
>+SASL_DEFAULT_USERNAME = CHANNEL_IFACE_SASL_AUTH + ".DefaultUsername"
> 
> # Channel_Type_ServerTLSConnection
> TLS_CERT_PATH = CHANNEL_TYPE_SERVER_TLS_CONNECTION + ".ServerCertificate"
> TLS_HOSTNAME = CHANNEL_TYPE_SERVER_TLS_CONNECTION + ".Hostname"
>+TLS_REFERENCE_IDENTITIES = \
>+    CHANNEL_TYPE_SERVER_TLS_CONNECTION + ".ReferenceIdentities"
> 
> # Connection.Interface.Location
> 
>@@ -413,14 +494,32 @@ MT_NOTICE = 2
> MT_AUTO_REPLY = 3
> MT_DELIVERY_REPORT = 4
> 
>-PROTOCOL = 'org.freedesktop.Telepathy.Protocol'
>+class MessageFlag(object):
>+    TRUNCATED = 1
>+    NON_TEXT_CONTENT = 2
>+    SCROLLBACK = 4
>+    RESCUED = 8
>+
>+class SendError(object):
>+    UNKNOWN = 0
>+    OFFLINE = 1
>+    INVALID_CONTACT = 2
>+    PERMISSION_DENIED = 3
>+    TOO_LONG = 4
>+    NOT_IMPLEMENTED = 5
>+
>+PROTOCOL = PREFIX + '.Protocol'
>+PROTOCOL_IFACE_PRESENCES = PROTOCOL + '.Interface.Presence'
>+PROTOCOL_IFACE_ADDRESSING = PROTOCOL + '.Interface.Addressing'
>+PROTOCOL_IFACE_AVATARS = PROTOCOL + '.Interface.Avatars'
>+
> PARAM_REQUIRED = 1
> PARAM_REGISTER = 2
> PARAM_HAS_DEFAULT = 4
> PARAM_SECRET = 8
> PARAM_DBUS_PROPERTY = 16
> 
>-AUTHENTICATION = 'org.freedesktop.Telepathy.Authentication'
>+AUTHENTICATION = PREFIX + '.Authentication'
> AUTH_TLS_CERT = AUTHENTICATION + ".TLSCertificate"
> 
> TLS_CERT_STATE_PENDING = 0
>@@ -430,12 +529,95 @@ TLS_CERT_STATE_REJECTED = 2
> TLS_REJECT_REASON_UNKNOWN = 0
> TLS_REJECT_REASON_UNTRUSTED = 1
> 
>+# Channel.Interface.Messages
>+
>+MESSAGE_PART_SUPPORT_FLAGS = CHANNEL_IFACE_MESSAGES + '.MessagePartSupportFlags'
>+DELIVERY_REPORTING_SUPPORT = CHANNEL_IFACE_MESSAGES + '.DeliveryReportingSupport'
>+SUPPORTED_CONTENT_TYPES = CHANNEL_IFACE_MESSAGES + '.SupportedContentTypes'
>+
>+MSG_SENDING_FLAGS_REPORT_DELIVERY = 1
>+MSG_SENDING_FLAGS_REPORT_READ = 2
>+MSG_SENDING_FLAGS_REPORT_DELETED = 4
>+
>+DELIVERY_REPORTING_SUPPORT_FLAGS_RECEIVE_FAILURES = 1
>+DELIVERY_REPORTING_SUPPORT_FLAGS_RECEIVE_SUCCESSES = 2
>+DELIVERY_REPORTING_SUPPORT_FLAGS_RECEIVE_READ = 4
>+DELIVERY_REPORTING_SUPPORT_FLAGS_RECEIVE_DELETED = 8
>+
>+DELIVERY_STATUS_UNKNOWN = 0
>+DELIVERY_STATUS_DELIVERED = 1
>+DELIVERY_STATUS_TEMPORARILY_FAILED = 2
>+DELIVERY_STATUS_PERMANENTLY_FAILED = 3
>+DELIVERY_STATUS_ACCEPTED = 4
>+DELIVERY_STATUS_READ = 5
>+DELIVERY_STATUS_DELETED = 6
>+
>+MEDIA_STREAM_ERROR_UNKNOWN = 0
>+MEDIA_STREAM_ERROR_EOS = 1
>+MEDIA_STREAM_ERROR_CODEC_NEGOTIATION_FAILED = 2
>+MEDIA_STREAM_ERROR_CONNECTION_FAILED = 3
>+MEDIA_STREAM_ERROR_NETWORK_ERROR = 4
>+MEDIA_STREAM_ERROR_NO_CODECS = 5
>+MEDIA_STREAM_ERROR_INVALID_CM_BEHAVIOR = 6
>+MEDIA_STREAM_ERROR_MEDIA_ERROR = 7
>+
>+PASSWORD_FLAG_PROVIDE = 8
>+
>+# Channel.Interface.Room
>+ROOM_NAME = CHANNEL_IFACE_ROOM + '.RoomName'
>+ROOM_SERVER = CHANNEL_IFACE_ROOM + '.Server'
>+
>+# Channel.Interface.Subject
>+SUBJECT = CHANNEL_IFACE_ROOM + '.Subject'
>+SUBJECT_PRESENT = 1
>+SUBJECT_CAN_SET = 2
>+
>+DEBUG_IFACE = PREFIX + '.Debug'
>+DEBUG_PATH = PATH_PREFIX + '/debug'
>+
>+SERVICE_POINT_TYPE_NONE = 0
>+SERVICE_POINT_TYPE_EMERGENCY = 1
>+SERVICE_POINT_TYPE_COUNSELING = 2
>+
>+CLIENT = PREFIX + '.Client'
>+CLIENT_PATH = PATH_PREFIX + '/Client'
>+OBSERVER = PREFIX + '.Client.Observer'
>+APPROVER = PREFIX + '.Client.Approver'
>+HANDLER = PREFIX + '.Client.Handler'
>+CLIENT_IFACE_REQUESTS = CLIENT + '.Interface.Requests'
>+
>+ACCOUNT = PREFIX + '.Account'
>+ACCOUNT_IFACE_AVATAR = ACCOUNT + '.Interface.Avatar'
>+ACCOUNT_IFACE_ADDRESSING = ACCOUNT + '.Interface.Addressing'
>+ACCOUNT_IFACE_HIDDEN = ACCOUNT + '.Interface.Hidden.DRAFT1'
>+ACCOUNT_IFACE_NOKIA_CONDITIONS = 'com.nokia.Account.Interface.Conditions'
>+ACCOUNT_PATH_PREFIX = PATH_PREFIX + '/Account/'
>+
>+AM = PREFIX + '.AccountManager'
>+AM_IFACE_HIDDEN = AM + '.Interface.Hidden.DRAFT1'
>+AM_PATH = PATH_PREFIX + '/AccountManager'
>+
>+CR = PREFIX + '.ChannelRequest'
>+CDO = PREFIX + '.ChannelDispatchOperation'
>+
>+CD = PREFIX + '.ChannelDispatcher'
>+CD_IFACE_OP_LIST = PREFIX + '.ChannelDispatcher.Interface.OperationList'
>+CD_PATH = PATH_PREFIX + '/ChannelDispatcher'
>+CD_REDISPATCH = CD + '.Interface.Redispatch.DRAFT'
>+
>+MC = PREFIX + '.MissionControl5'
>+MC_PATH = PATH_PREFIX + '/MissionControl5'
>+
>+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/"
> 
>-CALL_CONTENT_PACKETIZATION_RTP = 0
>-CALL_CONTENT_PACKETIZATION_RAW = 1
>-CALL_CONTENT_PACKETIZATION_MSN_WEBCAM = 2
>+TEST_DBUS_ACCOUNT_SERVICE = TESTDOT + "DBusAccountService"
>+TEST_DBUS_ACCOUNT_SERVICE_PATH = TESTSLASH + "DBusAccountService"
>+TEST_DBUS_ACCOUNT_SERVICE_IFACE = TEST_DBUS_ACCOUNT_SERVICE
> 
>-CALL_SCR_UNKNOWN = 0
>-CALL_SCR_PROGRESS_MADE = 1
>-CALL_SCR_USER_REQUESTED = 2
>-CALL_SCR_MEDIA_ERROR = 12
>+TEST_DBUS_ACCOUNT_PLUGIN_PATH = TESTSLASH + "DBusAccountPlugin"
>+TEST_DBUS_ACCOUNT_PLUGIN_IFACE = TESTDOT + "DBusAccountPlugin"
>diff --git a/tests/twisted/voip/calltest.py b/tests/twisted/voip/calltest.py
>index f038d72..aad5cd1 100644
>--- a/tests/twisted/voip/calltest.py
>+++ b/tests/twisted/voip/calltest.py
>@@ -244,10 +244,10 @@ class CallTest:
>                     cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_CALL,
>                     cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT,
>                     cs.TARGET_HANDLE: self.remote_handle,
>-                    cs.INITIAL_AUDIO: self.initial_audio_content_name is not None,
>-                    cs.INITIAL_AUDIO_NAME: self.initial_audio_content_name or "",
>-                    cs.INITIAL_VIDEO: self.initial_video_content_name is not None,
>-                    cs.INITIAL_VIDEO_NAME: self.initial_video_content_name or "",
>+                    cs.CALL_INITIAL_AUDIO: self.initial_audio_content_name is not None,
>+                    cs.CALL_INITIAL_AUDIO_NAME: self.initial_audio_content_name or "",
>+                    cs.CALL_INITIAL_VIDEO: self.initial_video_content_name is not None,
>+                    cs.CALL_INITIAL_VIDEO_NAME: self.initial_video_content_name or "",
>                     })[0]
> 
>         nc = self.q.expect('dbus-signal', signal='NewChannels')
>diff --git a/tests/twisted/voip/requestable-classes.py b/tests/twisted/voip/requestable-classes.py
>index fde4ee6..2c9ea96 100644
>--- a/tests/twisted/voip/requestable-classes.py
>+++ b/tests/twisted/voip/requestable-classes.py
>@@ -40,13 +40,13 @@ def rccs(q, bus, conn, stream):
>         fixed, allowed = media_class
> 
>         assertEquals(cs.HT_CONTACT, fixed[cs.TARGET_HANDLE_TYPE])
>-        assert fixed.has_key(cs.INITIAL_AUDIO) or fixed.has_key(cs.INITIAL_VIDEO)
>+        assert fixed.has_key(cs.CALL_INITIAL_AUDIO) or fixed.has_key(cs.CALL_INITIAL_VIDEO)
> 
>         expected_allowed = [
>             cs.TARGET_ID, cs.TARGET_HANDLE,
>-            cs.INITIAL_VIDEO, cs.INITIAL_AUDIO,
>-            cs.INITIAL_VIDEO_NAME, cs.INITIAL_AUDIO_NAME,
>-            cs.INITIAL_TRANSPORT,
>+            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,
>             ]
> 
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 69995: 86898 | 86899 | 86900 | 86901 | 86902 | 86903

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.