Attachment 86128 Details for Bug 69508 – constants.py: sync with Gabble

[patch] constants.py: sync with Gabble

0001-constants.py-sync-with-Gabble.patch (text/plain), 9.11 KB, created by Guillaume Desmottes on 2013-09-19 10:11:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Desmottes

Created: 2013-09-19 10:11:23 UTC

Size: 9.11 KB

patch

obsolete

>From 43f053bba9c46a0f5875d2aac12441c1e5ddc158 Mon Sep 17 00:00:00 2001
>From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
>Date: Thu, 19 Sep 2013 11:56:57 +0200
>Subject: [PATCH 1/4] constants.py: sync with Gabble
>
>https://bugs.freedesktop.org/show_bug.cgi?id=69508
>---
> tests/twisted/constants.py | 136 +++++++++++++++++++++++++++++++++++++--------
> 1 file changed, 113 insertions(+), 23 deletions(-)
>
>diff --git a/tests/twisted/constants.py b/tests/twisted/constants.py
>index 5b42d31..0a93c5e 100644
>--- a/tests/twisted/constants.py
>+++ b/tests/twisted/constants.py
>@@ -26,16 +26,18 @@ CHANNEL_IFACE_PASSWORD = CHANNEL + ".Interface.Password"
> CHANNEL_IFACE_TUBE = CHANNEL + ".Interface.Tube"
> 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.Call.DRAFT"
>+CHANNEL_TYPE_CALL = CHANNEL + ".Type.Call1"
> CHANNEL_TYPE_CONTACT_LIST = CHANNEL + ".Type.ContactList"
> CHANNEL_TYPE_CONTACT_SEARCH = CHANNEL + ".Type.ContactSearch"
> CHANNEL_TYPE_TEXT = CHANNEL + ".Type.Text"
> CHANNEL_TYPE_TUBES = CHANNEL + ".Type.Tubes"
> CHANNEL_TYPE_STREAM_TUBE = CHANNEL + ".Type.StreamTube"
> CHANNEL_TYPE_DBUS_TUBE = CHANNEL + ".Type.DBusTube"
>-CHANNEL_TYPE_STREAMED_MEDIA = CHANNEL + ".Type.StreamedMedia"
> CHANNEL_TYPE_TEXT = CHANNEL + ".Type.Text"
> CHANNEL_TYPE_FILE_TRANSFER = CHANNEL + ".Type.FileTransfer"
> CHANNEL_TYPE_SERVER_AUTHENTICATION = \
>@@ -57,28 +59,26 @@ INITIATOR_HANDLE = CHANNEL + '.InitiatorHandle'
> INITIATOR_ID = CHANNEL + '.InitiatorID'
> INTERFACES = CHANNEL + '.Interfaces'
> 
>-INITIAL_AUDIO = CHANNEL_TYPE_STREAMED_MEDIA + '.InitialAudio'
>-INITIAL_VIDEO = CHANNEL_TYPE_STREAMED_MEDIA + '.InitialVideo'
>-IMMUTABLE_STREAMS = CHANNEL_TYPE_STREAMED_MEDIA + '.ImmutableStreams'
>-
> 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.Call.Content.DRAFT'
>+CALL_CONTENT = 'org.freedesktop.Telepathy.Call1.Content'
> CALL_CONTENT_IFACE_MEDIA = \
>-    'org.freedesktop.Telepathy.Call.Content.Interface.Media.DRAFT'
>+    'org.freedesktop.Telepathy.Call1.Content.Interface.Media'
>+CALL_CONTENT_IFACE_DTMF = \
>+    'org.freedesktop.Telepathy.Call1.Content.Interface.DTMF'
> 
>-CALL_CONTENT_CODECOFFER = \
>-    'org.freedesktop.Telepathy.Call.Content.CodecOffer.DRAFT'
>+CALL_CONTENT_MEDIADESCRIPTION = \
>+    'org.freedesktop.Telepathy.Call1.Content.MediaDescription'
> 
>-CALL_STREAM = 'org.freedesktop.Telepathy.Call.Stream.DRAFT'
>+CALL_STREAM = 'org.freedesktop.Telepathy.Call1.Stream'
> CALL_STREAM_IFACE_MEDIA = \
>-    'org.freedesktop.Telepathy.Call.Stream.Interface.Media.DRAFT'
>+    'org.freedesktop.Telepathy.Call1.Stream.Interface.Media'
> 
>-CALL_STREAM_ENDPOINT = 'org.freedesktop.Telepathy.Call.Stream.Endpoint.DRAFT'
>+CALL_STREAM_ENDPOINT = 'org.freedesktop.Telepathy.Call1.Stream.Endpoint'
> 
> CALL_MEDIA_TYPE_AUDIO = 0
> CALL_MEDIA_TYPE_VIDEO = 1
>@@ -87,15 +87,27 @@ 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_GOOGLE = 3
>+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_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
>@@ -106,6 +118,41 @@ CALL_DISPOSITION_INITIAL = 1
> CALL_SENDING_STATE_NONE = 0
> CALL_SENDING_STATE_PENDING_SEND = 1
> CALL_SENDING_STATE_SENDING = 2
>+CALL_SENDING_STATE_PENDING_STOP_SENDING = 3
>+
>+CALL_STREAM_FLOW_STATE_STOPPED = 0
>+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
>@@ -135,8 +182,11 @@ 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'
> 
> ATTR_CONTACT_CAPABILITIES = CONN_IFACE_CONTACT_CAPS + '/capabilities'
>+ATTR_PRESENCE = CONN_IFACE_SIMPLE_PRESENCE + '/presence'
> 
> STREAM_HANDLER = 'org.freedesktop.Telepathy.Media.StreamHandler'
> 
>@@ -163,6 +213,8 @@ CERT_UNTRUSTED = ERROR + '.Cert.Untrusted'
> SERVICE_BUSY = ERROR + '.ServiceBusy'
> SERVICE_CONFUSED = ERROR + '.ServiceConfused'
> 
>+BANNED = ERROR + '.Channel.Banned'
>+
> UNKNOWN_METHOD = 'org.freedesktop.DBus.Error.UnknownMethod'
> 
> TUBE_PARAMETERS = CHANNEL_IFACE_TUBE + '.Parameters'
>@@ -195,6 +247,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
>@@ -304,11 +363,6 @@ HSR_NONE = 0
> HSR_REQUESTED = 1
> HSR_RESOURCE_NOT_AVAILABLE = 2
> 
>-CALL_STATE_RINGING = 1
>-CALL_STATE_QUEUED = 2
>-CALL_STATE_HELD = 4
>-CALL_STATE_FORWARDED = 8
>-
> CONN_STATUS_CONNECTED = 0
> CONN_STATUS_CONNECTING = 1
> CONN_STATUS_DISCONNECTED = 2
>@@ -386,6 +440,8 @@ 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
> 
>@@ -399,8 +455,25 @@ 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
>+    INVALID_CONTACT = 2
>+    PERMISSION_DENIED = 3
>+    TOO_LONG = 4
>+    NOT_IMPLEMENTED = 5
>+
> PROTOCOL = 'org.freedesktop.Telepathy.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
>@@ -432,6 +505,14 @@ 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
>@@ -442,3 +523,12 @@ 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
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 69508: 86128 | 86129 | 86130 | 86131

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.