diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2012-01-27 18:18:07 -0500 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2012-01-31 11:56:26 -0500 |
| commit | 1f3ad32a833e22a29a16356a3fd87d9dea8f23dc (patch) | |
| tree | 1e970406b79bf6ae8281bf068448c11ffed91962 | |
| parent | 8baa04889e25bc0d5f7fbd9fa0f0d67ce1dd4b4e (diff) | |
spec: update to newest 'next' spec
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
122 files changed, 1728 insertions, 1832 deletions
diff --git a/examples/cm/contactlist/example_contact_list.manager b/examples/cm/contactlist/example_contact_list.manager index 379d822b4..e5216af59 100644 --- a/examples/cm/contactlist/example_contact_list.manager +++ b/examples/cm/contactlist/example_contact_list.manager @@ -3,7 +3,7 @@ Interfaces= [Protocol example] Interfaces= -ConnectionInterfaces=org.freedesktop.Telepathy.Connection.Interface.Requests;org.freedesktop.Telepathy.Connection.Interface.Contacts;org.freedesktop.Telepathy.Connection.Interface.Presence;org.freedesktop.Telepathy.Connection.Interface.SimplePresence; +ConnectionInterfaces=im.telepathy1.Connection.Interface.Requests;im.telepathy1.Connection.Interface.Contacts;im.telepathy1.Connection.Interface.Presence; param-account=s required register param-simulation-delay=u default-simulation-delay=1000 @@ -13,11 +13,11 @@ EnglishName=Example with a contact list Icon=face-smile [contactlist] -org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.ContactList -org.freedesktop.Telepathy.Channel.TargetHandleType u=3 -allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy.Channel.TargetID; +im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.ContactList +im.telepathy1.Channel.TargetHandleType u=3 +allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID; [contactgroup] -org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.ContactList -org.freedesktop.Telepathy.Channel.TargetHandleType u=4 -allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy.Channel.TargetID; +im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.ContactList +im.telepathy1.Channel.TargetHandleType u=4 +allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID; diff --git a/examples/future/call-cm/call-channel.c b/examples/future/call-cm/call-channel.c index 5c0093007..37e5a08f3 100644 --- a/examples/future/call-cm/call-channel.c +++ b/examples/future/call-cm/call-channel.c @@ -232,7 +232,7 @@ example_call_channel_init (ExampleCallChannel *self) } static ExampleCallContent *example_call_channel_add_content ( - ExampleCallChannel *self, TpMediaStreamType media_type, + ExampleCallChannel *self, FutureMediaStreamType media_type, gboolean locally_requested, gboolean initial, const gchar *requested_name, GError **error); @@ -272,7 +272,7 @@ constructed (GObject *object) /* This is an incoming call, so the self-handle is locally * pending, to indicate that we need to answer. */ example_call_channel_set_state (self, - FUTURE_CALL_STATE_RINGING, 0, self->priv->handle, + FUTURE_CALL_STATE_INITIALISED, 0, self->priv->handle, FUTURE_CALL_STATE_CHANGE_REASON_USER_REQUESTED, "", NULL); } @@ -283,14 +283,14 @@ constructed (GObject *object) { g_message ("Channel initially has an audio stream"); example_call_channel_add_content (self, - TP_MEDIA_STREAM_TYPE_AUDIO, TRUE, TRUE, NULL, NULL); + FUTURE_MEDIA_STREAM_TYPE_AUDIO, TRUE, TRUE, NULL, NULL); } if (self->priv->initial_video) { g_message ("Channel initially has a video stream"); example_call_channel_add_content (self, - TP_MEDIA_STREAM_TYPE_VIDEO, TRUE, TRUE, NULL, NULL); + FUTURE_MEDIA_STREAM_TYPE_VIDEO, TRUE, TRUE, NULL, NULL); } } else @@ -302,14 +302,14 @@ constructed (GObject *object) { g_message ("Channel initially has an audio stream"); example_call_channel_add_content (self, - TP_MEDIA_STREAM_TYPE_AUDIO, FALSE, TRUE, NULL, NULL); + FUTURE_MEDIA_STREAM_TYPE_AUDIO, FALSE, TRUE, NULL, NULL); } if (self->priv->initial_video) { g_message ("Channel initially has a video stream"); example_call_channel_add_content (self, - TP_MEDIA_STREAM_TYPE_VIDEO, FALSE, TRUE, NULL, NULL); + FUTURE_MEDIA_STREAM_TYPE_VIDEO, FALSE, TRUE, NULL, NULL); } } } @@ -974,7 +974,6 @@ streams_removed_cb (ExampleCallContent *content, g_hash_table_remove (self->priv->contents, name); - future_svc_call_content_emit_removed (content); future_svc_channel_type_call_emit_content_removed (self, path, self->priv->call_state_reason); g_free (path); @@ -1025,7 +1024,7 @@ simulate_contact_answered_cb (gpointer p) /* otherwise, we're waiting for a response from the contact, which now * arrives */ - g_assert_cmpuint (self->priv->call_state, ==, FUTURE_CALL_STATE_RINGING); + g_assert_cmpuint (self->priv->call_state, ==, FUTURE_CALL_STATE_INITIALISED); g_message ("SIGNALLING: receive: contact answered our call"); @@ -1076,7 +1075,7 @@ simulate_contact_busy_cb (gpointer p) /* otherwise, we're waiting for a response from the contact, which now * arrives */ - g_assert_cmpuint (self->priv->call_state, ==, FUTURE_CALL_STATE_RINGING); + g_assert_cmpuint (self->priv->call_state, ==, FUTURE_CALL_STATE_INITIALISED); g_message ("SIGNALLING: receive: call terminated: <user-is-busy/>"); @@ -1090,7 +1089,7 @@ simulate_contact_busy_cb (gpointer p) static ExampleCallContent * example_call_channel_add_content (ExampleCallChannel *self, - TpMediaStreamType media_type, + FutureMediaStreamType media_type, gboolean locally_requested, gboolean initial, const gchar *requested_name, @@ -1107,7 +1106,7 @@ example_call_channel_add_content (ExampleCallChannel *self, FUTURE_CALL_CONTENT_DISPOSITION_NONE; guint i; - type_str = (media_type == TP_MEDIA_STREAM_TYPE_AUDIO ? "audio" : "video"); + type_str = (media_type == FUTURE_MEDIA_STREAM_TYPE_AUDIO ? "audio" : "video"); creator = self->priv->handle; /* an arbitrary limit much less than 2**32 means we don't use ridiculous @@ -1239,7 +1238,7 @@ example_call_channel_initiate_outgoing (ExampleCallChannel *self) { g_message ("SIGNALLING: send: new streamed media call"); example_call_channel_set_state (self, - FUTURE_CALL_STATE_RINGING, 0, + FUTURE_CALL_STATE_INITIALISED, 0, tp_base_connection_get_self_handle (self->priv->conn), FUTURE_CALL_STATE_CHANGE_REASON_USER_REQUESTED, "", NULL); @@ -1265,7 +1264,7 @@ call_set_ringing (FutureSvcChannelTypeCall *iface, goto finally; } - if (self->priv->call_state != FUTURE_CALL_STATE_RINGING) + if (self->priv->call_state != FUTURE_CALL_STATE_INITIALISED) { g_set_error (&error, TP_ERRORS, TP_ERROR_NOT_AVAILABLE, "Ringing() makes no sense now that we're not pending receiver"); @@ -1274,7 +1273,7 @@ call_set_ringing (FutureSvcChannelTypeCall *iface, g_message ("SIGNALLING: send: ring, ring!"); - example_call_channel_set_state (self, FUTURE_CALL_STATE_RINGING, + example_call_channel_set_state (self, FUTURE_CALL_STATE_INITIALISED, self->priv->call_flags | FUTURE_CALL_FLAG_LOCALLY_RINGING, tp_base_connection_get_self_handle (self->priv->conn), FUTURE_CALL_STATE_CHANGE_REASON_USER_REQUESTED, "", NULL); @@ -1299,7 +1298,7 @@ accept_incoming_call (ExampleCallChannel *self) GHashTableIter iter; gpointer v; - g_assert_cmpint (self->priv->call_state, ==, FUTURE_CALL_STATE_RINGING); + g_assert_cmpint (self->priv->call_state, ==, FUTURE_CALL_STATE_INITIALISED); g_message ("SIGNALLING: send: Accepting incoming call from %s", tp_handle_inspect (contact_repo, self->priv->handle)); @@ -1362,7 +1361,7 @@ call_accept (FutureSvcChannelTypeCall *iface G_GNUC_UNUSED, } else { - if (self->priv->call_state == FUTURE_CALL_STATE_RINGING) + if (self->priv->call_state == FUTURE_CALL_STATE_INITIALISED) { accept_incoming_call (self); future_svc_channel_type_call_return_from_accept (context); @@ -1423,8 +1422,8 @@ call_add_content (FutureSvcChannelTypeCall *iface, switch (content_type) { - case TP_MEDIA_STREAM_TYPE_AUDIO: - case TP_MEDIA_STREAM_TYPE_VIDEO: + case FUTURE_MEDIA_STREAM_TYPE_AUDIO: + case FUTURE_MEDIA_STREAM_TYPE_VIDEO: break; default: diff --git a/examples/future/call-cm/call-content.c b/examples/future/call-cm/call-content.c index 5bd6db6ee..dcc10080d 100644 --- a/examples/future/call-cm/call-content.c +++ b/examples/future/call-cm/call-content.c @@ -52,7 +52,7 @@ struct _ExampleCallContentPrivate gchar *object_path; TpBaseConnection *conn; gchar *name; - TpMediaStreamType type; + FutureMediaStreamType type; TpHandle creator; FutureCallContentDisposition disposition; ExampleCallStream *stream; @@ -280,9 +280,9 @@ example_call_content_class_init (ExampleCallContentClass *klass) G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); g_object_class_install_property (object_class, PROP_CONNECTION, param_spec); - param_spec = g_param_spec_uint ("type", "TpMediaStreamType", + param_spec = g_param_spec_uint ("type", "FutureMediaStreamType", "Media stream type", - 0, NUM_TP_MEDIA_STREAM_TYPES - 1, 0, + 0, NUM_FUTURE_MEDIA_STREAM_TYPES - 1, 0, G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); g_object_class_install_property (object_class, PROP_TYPE, param_spec); diff --git a/examples/future/call-cm/example_call.manager b/examples/future/call-cm/example_call.manager index b83bd93d5..afe4895f2 100644 --- a/examples/future/call-cm/example_call.manager +++ b/examples/future/call-cm/example_call.manager @@ -3,7 +3,7 @@ Interfaces= [Protocol example] Interfaces= -ConnectionInterfaces=org.freedesktop.Telepathy.Connection.Interface.Requests;org.freedesktop.Telepathy.Connection.Interface.Contacts;org.freedesktop.Telepathy.Connection.Interface.Presence;org.freedesktop.Telepathy.Connection.Interface.SimplePresence; +ConnectionInterfaces=im.telepathy1.Connection.Interface.Requests;im.telepathy1.Connection.Interface.Contacts;im.telepathy1.Connection.Interface.Presence; param-account=s required register param-simulation-delay=u default-simulation-delay=1000 @@ -13,13 +13,13 @@ EnglishName=Example with Call channels Icon=face-smile [audio] -org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Call.DRAFT -org.freedesktop.Telepathy.Channel.TargetHandleType u=1 -org.freedesktop.Telepathy.Channel.Type.Call.DRAFT.InitialAudio b=1 -allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy.Channel.TargetID;org.freedesktop.Telepathy.Channel.Type.Call.DRAFT.InitialVideo; +im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.Call.DRAFT +im.telepathy1.Channel.TargetHandleType u=1 +im.telepathy1.Channel.Type.Call.DRAFT.InitialAudio b=1 +allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID;im.telepathy1.Channel.Type.Call.DRAFT.InitialVideo; [video] -org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Call.DRAFT -org.freedesktop.Telepathy.Channel.TargetHandleType u=1 -org.freedesktop.Telepathy.Channel.Type.Call.DRAFT.InitialVideo b=1 -allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy.Channel.TargetID;org.freedesktop.Telepathy.Channel.Type.Call.DRAFT.InitialAudio; +im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.Call.DRAFT +im.telepathy1.Channel.TargetHandleType u=1 +im.telepathy1.Channel.Type.Call.DRAFT.InitialVideo b=1 +allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID;im.telepathy1.Channel.Type.Call.DRAFT.InitialAudio; diff --git a/extensions/call-content.xml b/extensions/call-content.xml index b9b02af40..9351b85b1 100644 --- a/extensions/call-content.xml +++ b/extensions/call-content.xml @@ -6,5 +6,6 @@ <xi:include href="../spec/Call_Content.xml"/> <xi:include href="../spec/Call_Content_Interface_Media.xml"/> +<xi:include href="../spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions.xml"/> </tp:spec> diff --git a/spec/Account.xml b/spec/Account.xml index 675ea8125..81192b63f 100644 --- a/spec/Account.xml +++ b/spec/Account.xml @@ -19,14 +19,14 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </p> </tp:license> - <interface name="org.freedesktop.Telepathy.Account"> + <interface name="im.telepathy1.Account"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>An Account object encapsulates the necessary details to make a Telepathy connection.</p> <p>Accounts are uniquely identified by object path. The object path of an Account MUST take the form - <code>/org/freedesktop/Telepathy/Account/<em>cm</em>/<em>proto</em>/<em>acct</em></code>, where:</p> + <code>/im/telepathy/Account/<em>cm</em>/<em>proto</em>/<em>acct</em></code>, where:</p> <ul> <li><em>cm</em> is the same <tp:type>Connection_Manager_Name</tp:type> @@ -34,10 +34,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. object path</li> <li><em>proto</em> is the <tp:type>Protocol</tp:type> name as seen in <tp:dbus-ref - namespace="org.freedesktop.Telepathy">ConnectionManager.ListProtocols</tp:dbus-ref>, + namespace="im.telepathy1">ConnectionManager.Protocols</tp:dbus-ref>, but with "-" replaced with "_" (i.e. the same as in the object-path of a <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Connection</tp:dbus-ref>)</li> + namespace="im.telepathy1">Connection</tp:dbus-ref>)</li> <li><em>acct</em> is an arbitrary string of ASCII letters, digits and underscores, starting with a letter or underscore, which uniquely identifies this account</li> @@ -117,7 +117,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <method name="Remove" tp:name-for-bindings="Remove"> <tp:docstring>Delete the account.</tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.PermissionDenied"/> + <tp:error name="im.telepathy1.Error.PermissionDenied"/> </tp:possible-errors> </method> @@ -127,7 +127,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:rationale> This is redundant with <tp:dbus-ref - namespace="org.freedesktop.Telepathy.AccountManager">AccountRemoved</tp:dbus-ref>, + namespace="im.telepathy1.AccountManager">AccountRemoved</tp:dbus-ref>, but it's still worth having, to avoid having to bind to AccountManager.AccountRemoved to tell you whether your Account is valid — ideally, an account-editing UI @@ -235,7 +235,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. The nickname to set on this account for display to other contacts, as set by the user. When the account becomes connected, the account manager SHOULD set this as the user's alias using <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection.Interface.Aliasing">SetAliases</tp:dbus-ref> + namespace="im.telepathy1.Connection.Interface.Aliasing1">SetAliases</tp:dbus-ref> if appropriate. <tp:rationale> @@ -288,10 +288,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <p>This property MAY be set, if appropriate, when calling <tp:dbus-ref - namespace="org.freedesktop.Telepathy.AccountManager" + namespace="im.telepathy1.AccountManager" >CreateAccount</tp:dbus-ref>. Updating this property will fail on externally-stored accounts whose <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Account.Interface.Storage" + namespace="im.telepathy1.Account.Interface.Storage1" >StorageRestrictions</tp:dbus-ref> include <code>Cannot_Set_Service</code>.</p> </tp:docstring> @@ -302,7 +302,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A map from connection manager parameter names (as in the <tp:dbus-ref - namespace="org.freedesktop.Telepathy">ConnectionManager</tp:dbus-ref> + namespace="im.telepathy1">ConnectionManager</tp:dbus-ref> interface) to their values. This property includes only those parameters that are stored for this account, and SHOULD only include those parameters that the user has explicitly set. @@ -376,7 +376,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. the empty list, signifying that no reconnection is required for the new parameters to take effect. For example, if the only parameter updated is <tt>...Cellular.<tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection.Interface.Cellular">MessageValidityPeriod</tp:dbus-ref></tt>, + namespace="im.telepathy1.Connection.Interface.Cellular1">MessageValidityPeriod</tp:dbus-ref></tt>, the new value can be applied immediately to the connection.</p> <p>Otherwise, a list of the names of parameters with changes that @@ -385,7 +385,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:member-ref>Reconnect</tp:member-ref> in response to receiving a non-empty list. For example, if the caller updates both <tt>...Anonymity.<tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection.Interface.Anonymity">AnonymityMandatory</tp:dbus-ref></tt> + namespace="im.telepathy1.Connection.Interface.Anonymity1">AnonymityMandatory</tp:dbus-ref></tt> and <tt>require-encryption</tt>, the former can be applied to the current connection, but the latter needs a reconnect to take effect, so this method should return @@ -394,8 +394,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.PermissionDenied"/> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"/> + <tp:error name="im.telepathy1.Error.PermissionDenied"/> + <tp:error name="im.telepathy1.Error.InvalidArgument"/> </tp:possible-errors> </method> @@ -446,7 +446,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. type="o" access="read"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Either the object path of the <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Connection</tp:dbus-ref> to + namespace="im.telepathy1">Connection</tp:dbus-ref> to this account, or the special value <code>'/'</code> if there is no connection.</p> @@ -503,9 +503,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <p>If the last connection to this account failed with an error, the D-Bus error name of that error; otherwise, the empty string. The account manager is expected to set this by observing the - <tp:dbus-ref namespace="org.freedesktop.Telepathy" + <tp:dbus-ref namespace="im.telepathy1" >Connection.ConnectionError</tp:dbus-ref> and - <tp:dbus-ref namespace="org.freedesktop.Telepathy" + <tp:dbus-ref namespace="im.telepathy1" >Connection.StatusChanged</tp:dbus-ref> signals.</p> @@ -534,7 +534,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. a mapping representing any additional information about the last disconnection; otherwise, the empty map. The keys and values are the same as for the second argument of - <tp:dbus-ref namespace="org.freedesktop.Telepathy" + <tp:dbus-ref namespace="im.telepathy1" >Connection.ConnectionError</tp:dbus-ref>.</p> <p>Whenever the Connection connects successfully, this property should @@ -555,7 +555,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:type>Connection_Presence_Type</tp:type> SHOULD be Connection_Presence_Type_Offline. If the connection is online but does not support the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection.Interface">SimplePresence</tp:dbus-ref> + namespace="im.telepathy1.Connection.Interface">Presence1</tp:dbus-ref> interface, the type SHOULD be Connection_Presence_Type_Unset. The account manager is expected to set this by observing signals from the Connection. @@ -664,11 +664,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The normalized user ID of the local user on this account (i.e. the string returned when the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection">InspectHandles</tp:dbus-ref> - method is called on the - result of <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection">GetSelfHandle</tp:dbus-ref> - for an active connection).</p> + namespace="im.telepathy1.Connection">InspectHandles</tp:dbus-ref> + method is called on the value of the <tp:dbus-ref + namespace="im.telepathy1.Connection">SelfHandle</tp:dbus-ref> + property for an active connection).</p> <p>It is unspecified whether this user ID is globally unique.</p> diff --git a/spec/Account_Interface_Addressing.xml b/spec/Account_Interface_Addressing.xml index 4b2846b68..28c366c77 100644 --- a/spec/Account_Interface_Addressing.xml +++ b/spec/Account_Interface_Addressing.xml @@ -16,8 +16,8 @@ Lesser General Public License for more details.</p> License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Account.Interface.Addressing"> - <tp:requires interface="org.freedesktop.Telepathy.Account"/> + <interface name="im.telepathy1.Account.Interface.Addressing1"> + <tp:requires interface="im.telepathy1.Account"/> <tp:added version="0.21.5">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Some accounts can be used for multiple protocols; for instance, SIP diff --git a/spec/Account_Interface_Avatar.xml b/spec/Account_Interface_Avatar.xml index a6c516727..6ffe0a085 100644 --- a/spec/Account_Interface_Avatar.xml +++ b/spec/Account_Interface_Avatar.xml @@ -19,8 +19,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </p> </tp:license> - <interface name="org.freedesktop.Telepathy.Account.Interface.Avatar"> - <tp:requires interface="org.freedesktop.Telepathy.Account"/> + <interface name="im.telepathy1.Account.Interface.Avatar1"> + <tp:requires interface="im.telepathy1.Account"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>This interface extends the core Account interface to provide a diff --git a/spec/Account_Interface_External_Password_Storage.xml b/spec/Account_Interface_External_Password_Storage.xml index 5bd1bfce0..1224687df 100644 --- a/spec/Account_Interface_External_Password_Storage.xml +++ b/spec/Account_Interface_External_Password_Storage.xml @@ -20,21 +20,21 @@ 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Account.Interface.ExternalPasswordStorage.DRAFT" + <interface name="im.telepathy1.Account.Interface.ExternalPasswordStorage1" tp:causes-havoc="experimental"> <tp:added version="0.21.10">(draft 1)</tp:added> - <tp:requires interface="org.freedesktop.Telepathy.Account"/> + <tp:requires interface="im.telepathy1.Account"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>An interface for Accounts whose passwords are stored externally and SHOULD NOT be stored by either the - <tp:dbus-ref namespace="ofdT">AccountManager</tp:dbus-ref> nor any - <tp:dbus-ref namespace="ofdT.Channel.Type">ServerAuthentication</tp:dbus-ref> + <tp:dbus-ref namespace="imt1">AccountManager</tp:dbus-ref> nor any + <tp:dbus-ref namespace="imt1.Channel.Type">ServerAuthentication1</tp:dbus-ref> handler.</p> <p>This interface SHOULD only appear on accounts for which the related Connection Manager implements - <tp:dbus-ref namespace="ofdT">ConnectionManager.Interface.AccountStorage.DRAFT</tp:dbus-ref>.</p> + <tp:dbus-ref namespace="imt1">ConnectionManager.Interface.AccountStorage1</tp:dbus-ref>.</p> </tp:docstring> <method name="ForgetPassword" tp:name-for-bindings="Forget_Password"> diff --git a/spec/Account_Interface_Hidden.xml b/spec/Account_Interface_Hidden.xml index cb0019178..3f98c1bae 100644 --- a/spec/Account_Interface_Hidden.xml +++ b/spec/Account_Interface_Hidden.xml @@ -20,7 +20,7 @@ 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Account.Interface.Hidden.DRAFT1" + <interface name="im.telepathy1.Account.Interface.Hidden1" tp:causes-havoc="outrageous"> <tp:added version="0.21.10">(draft 1)</tp:added> @@ -30,7 +30,7 @@ Accounts whose <tp:member-ref>Hidden</tp:member-ref> property is <code>True</code> are intended for non-interactive use (by non-user-visible services), and appear on the <tp:dbus-ref - namespace='ofdT'>AccountManager.Interface.Hidden.DRAFT1</tp:dbus-ref> + namespace='imt1'>AccountManager.Interface.Hidden1</tp:dbus-ref> interface; in all other respects, they behave like any other account.</p> @@ -54,9 +54,9 @@ <p>If <code>True</code>, this account is intended for non-interactive use, and thus should not be presented to the user. It will not appear in properties and signals on the main <tp:dbus-ref - namespace='ofdT'>AccountManager</tp:dbus-ref> interface; instead, it + namespace='imt1'>AccountManager</tp:dbus-ref> interface; instead, it will show up on <tp:dbus-ref - namespace='ofdT'>AccountManager.Interface.Hidden.DRAFT1</tp:dbus-ref>.</p> + namespace='imt1'>AccountManager.Interface.Hidden1</tp:dbus-ref>.</p> </tp:docstring> </property> diff --git a/spec/Account_Interface_Storage.xml b/spec/Account_Interface_Storage.xml index 4e3ba5dca..f486fbd1a 100644 --- a/spec/Account_Interface_Storage.xml +++ b/spec/Account_Interface_Storage.xml @@ -18,8 +18,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </p> </tp:license> - <interface name="org.freedesktop.Telepathy.Account.Interface.Storage"> - <tp:requires interface="org.freedesktop.Telepathy.Account"/> + <interface name="im.telepathy1.Account.Interface.Storage1"> + <tp:requires interface="im.telepathy1.Account"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p> @@ -130,9 +130,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:flag suffix="Cannot_Set_Parameters" value="1"> <tp:docstring> The account's <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Account" + namespace="im.telepathy1.Account" >Parameters</tp:dbus-ref> property can't be changed by calling - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Account" + <tp:dbus-ref namespace="im.telepathy1.Account" >UpdateParameters</tp:dbus-ref>. </tp:docstring> </tp:flag> @@ -140,7 +140,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:flag suffix="Cannot_Set_Enabled" value="2"> <tp:docstring> The account can't be enabled/disabled by setting the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Account" + namespace="im.telepathy1.Account" >Enabled</tp:dbus-ref> property. </tp:docstring> </tp:flag> @@ -148,9 +148,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:flag suffix="Cannot_Set_Presence" value="4"> <tp:docstring> The account's presence can't be changed by setting the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Account" + namespace="im.telepathy1.Account" >RequestedPresence</tp:dbus-ref> and <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Account" + namespace="im.telepathy1.Account" >AutomaticPresence</tp:dbus-ref> properties. </tp:docstring> </tp:flag> @@ -158,7 +158,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:flag suffix="Cannot_Set_Service" value="8"> <tp:docstring> The account's <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Account">Service</tp:dbus-ref> + namespace="im.telepathy1.Account">Service</tp:dbus-ref> property cannot be changed. </tp:docstring> </tp:flag> diff --git a/spec/Account_Manager.xml b/spec/Account_Manager.xml index 52cd42a1e..22f20ff3f 100644 --- a/spec/Account_Manager.xml +++ b/spec/Account_Manager.xml @@ -19,15 +19,15 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </p> </tp:license> - <interface name="org.freedesktop.Telepathy.AccountManager"> + <interface name="im.telepathy1.AccountManager"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The account manager is a central service used to store account details.</p> <p>The current account manager is defined to be the process that owns - the well-known bus name <tt>org.freedesktop.Telepathy.AccountManager</tt> on + the well-known bus name <tt>im.telepathy1.AccountManager</tt> on the session bus. This process must export an - <tt>/org/freedesktop/Telepathy/AccountManager</tt> object with the + <tt>/im/telepathy/AccountManager</tt> object with the AccountManager interface.</p> </tp:docstring> <tp:added version="0.17.2"/> @@ -54,7 +54,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. tp:name-for-bindings="Valid_Accounts"> <tp:docstring> A list of the valid (complete, usable) <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Account</tp:dbus-ref>s. Change + namespace="im.telepathy1">Account</tp:dbus-ref>s. Change notification is via <tp:member-ref>AccountValidityChanged</tp:member-ref>. @@ -71,7 +71,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. tp:name-for-bindings="Invalid_Accounts"> <tp:docstring> A list of incomplete or otherwise unusable <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Account</tp:dbus-ref>s. Change + namespace="im.telepathy1">Account</tp:dbus-ref>s. Change notification is via <tp:member-ref>AccountValidityChanged</tp:member-ref>. </tp:docstring> @@ -111,7 +111,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <arg name="Account" type="o"> <tp:docstring> An <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Account</tp:dbus-ref>. + namespace="im.telepathy1">Account</tp:dbus-ref>. </tp:docstring> </arg> @@ -135,43 +135,43 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:rationale> <p>Examples of good properties to support here include <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Account">Icon</tp:dbus-ref>, + namespace="im.telepathy1.Account">Icon</tp:dbus-ref>, <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Account">Enabled</tp:dbus-ref>, + namespace="im.telepathy1.Account">Enabled</tp:dbus-ref>, <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Account">Nickname</tp:dbus-ref>, + namespace="im.telepathy1.Account">Nickname</tp:dbus-ref>, <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Account">AutomaticPresence</tp:dbus-ref>, + namespace="im.telepathy1.Account">AutomaticPresence</tp:dbus-ref>, <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Account">ConnectAutomatically</tp:dbus-ref>, + namespace="im.telepathy1.Account">ConnectAutomatically</tp:dbus-ref>, <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Account">RequestedPresence</tp:dbus-ref> + namespace="im.telepathy1.Account">RequestedPresence</tp:dbus-ref> and <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Account.Interface.Avatar">Avatar</tp:dbus-ref>. + namespace="im.telepathy1.Account.Interface.Avatar1">Avatar</tp:dbus-ref>. </p> <p>Examples of properties that would make no sense here include <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Account">Valid</tp:dbus-ref>, + namespace="im.telepathy1.Account">Valid</tp:dbus-ref>, <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Account">Connection</tp:dbus-ref>, + namespace="im.telepathy1.Account">Connection</tp:dbus-ref>, <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Account">ConnectionStatus</tp:dbus-ref>, + namespace="im.telepathy1.Account">ConnectionStatus</tp:dbus-ref>, <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Account">ConnectionStatusReason</tp:dbus-ref>, + namespace="im.telepathy1.Account">ConnectionStatusReason</tp:dbus-ref>, <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Account">CurrentPresence</tp:dbus-ref> + namespace="im.telepathy1.Account">CurrentPresence</tp:dbus-ref> and <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Account">NormalizedName</tp:dbus-ref>. + namespace="im.telepathy1.Account">NormalizedName</tp:dbus-ref>. </p> </tp:rationale> <p>This property MUST NOT include include the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Account">DisplayName</tp:dbus-ref> + namespace="im.telepathy1.Account">DisplayName</tp:dbus-ref> and <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Account">Parameters</tp:dbus-ref> + namespace="im.telepathy1.Account">Parameters</tp:dbus-ref> properties, which are set using separate arguments.</p> <p>This property MAY include the names of properties that, after @@ -181,7 +181,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:rationale> <p>For example, an account manager might support migration tools that use this to preserve the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Account">HasBeenOnline</tp:dbus-ref> + namespace="im.telepathy1.Account">HasBeenOnline</tp:dbus-ref> property, even though that property is usually read-only.</p> </tp:rationale> </tp:docstring> @@ -190,7 +190,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <method name="CreateAccount" tp:name-for-bindings="Create_Account"> <tp:docstring> Request the creation of a new <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Account</tp:dbus-ref>. The + namespace="im.telepathy1">Account</tp:dbus-ref>. The account manager SHOULD NOT allow invalid accounts to be created. </tp:docstring> <tp:changed version="0.17.24">added the Properties argument</tp:changed> @@ -209,7 +209,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <arg name="Display_Name" direction="in" type="s"> <tp:docstring>The initial value of the new account's <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Account">DisplayName</tp:dbus-ref> + namespace="im.telepathy1.Account">DisplayName</tp:dbus-ref> property. The account manager SHOULD modify this to make it unique if an Account already exists with the same display name, for instance by appending a number or the 'account' parameter. Account manager @@ -235,7 +235,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <arg name="Parameters" direction="in" type="a{sv}"> <tp:docstring>Initial parameter values, as would be passed to <tp:dbus-ref - namespace="org.freedesktop.Telepathy.ConnectionManager">RequestConnection</tp:dbus-ref>.</tp:docstring> + namespace="im.telepathy1.ConnectionManager">RequestConnection</tp:dbus-ref>.</tp:docstring> </arg> <arg name="Properties" direction="in" type="a{sv}" @@ -247,9 +247,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <p>Only the properties mentioned in <tp:member-ref>SupportedAccountProperties</tp:member-ref> are acceptable here. In particular, the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Account">DisplayName</tp:dbus-ref> + namespace="im.telepathy1.Account">DisplayName</tp:dbus-ref> and <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Account">Parameters</tp:dbus-ref> + namespace="im.telepathy1.Account">Parameters</tp:dbus-ref> properties are never allowed here, since they are set using the other arguments to this method.</p> @@ -260,17 +260,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <arg name="Account" direction="out" type="o"> <tp:docstring>The new <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Account</tp:dbus-ref>.</tp:docstring> + namespace="im.telepathy1">Account</tp:dbus-ref>.</tp:docstring> </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The <var>Connection_Manager</var> is not installed or does not implement the given <var>Protocol</var>.</p> </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> + <tp:error name="im.telepathy1.Error.InvalidArgument"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The <var>Parameters</var> provided were unacceptable: they might omit a diff --git a/spec/Account_Manager_Interface_Hidden.xml b/spec/Account_Manager_Interface_Hidden.xml index 284eb6428..7617540dc 100644 --- a/spec/Account_Manager_Interface_Hidden.xml +++ b/spec/Account_Manager_Interface_Hidden.xml @@ -20,12 +20,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </p> </tp:license> <interface - name="org.freedesktop.Telepathy.AccountManager.Interface.Hidden.DRAFT1" + name="im.telepathy1.AccountManager.Interface.Hidden1" tp:causes-havoc='kind of sketchy'> - <tp:requires interface='org.freedesktop.Telepathy.AccountManager'/> + <tp:requires interface='im.telepathy1.AccountManager'/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>This interface lists accounts whose <tp:dbus-ref - namespace='ofdT.Account.Interface.Hidden.DRAFT1'>Hidden</tp:dbus-ref> + namespace='imt1.Account.Interface.Hidden1'>Hidden</tp:dbus-ref> property is <code>True</code>.</p> </tp:docstring> <tp:added version="0.21.10">first draft</tp:added> @@ -34,10 +34,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. tp:name-for-bindings="Valid_Hidden_Accounts"> <tp:docstring> A list of valid (complete, usable) <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Account</tp:dbus-ref>s intended + namespace="im.telepathy1">Account</tp:dbus-ref>s intended exclusively for noninteractive applications. These accounts are not included in <tp:dbus-ref - namespace='ofdT'>AccountManager.ValidAccounts</tp:dbus-ref>. Change + namespace='imt1'>AccountManager.ValidAccounts</tp:dbus-ref>. Change notification is via <tp:member-ref>HiddenAccountValidityChanged</tp:member-ref>. </tp:docstring> @@ -47,7 +47,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. tp:name-for-bindings="Invalid_Hidden_Accounts"> <tp:docstring> A list of incomplete or otherwise unusable <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Account</tp:dbus-ref>s intended + namespace="im.telepathy1">Account</tp:dbus-ref>s intended exclusively for noninteractive applications. Change notification is via <tp:member-ref>HiddenAccountValidityChanged</tp:member-ref>. </tp:docstring> @@ -84,7 +84,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <arg name="Account" type="o"> <tp:docstring> An <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Account</tp:dbus-ref>. + namespace="im.telepathy1">Account</tp:dbus-ref>. </tp:docstring> </arg> diff --git a/spec/Authentication_TLS_Certificate.xml b/spec/Authentication_TLS_Certificate.xml index db1d76fd7..79098f93f 100644 --- a/spec/Authentication_TLS_Certificate.xml +++ b/spec/Authentication_TLS_Certificate.xml @@ -17,7 +17,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:license> - <interface name="org.freedesktop.Telepathy.Authentication.TLSCertificate"> + <interface name="im.telepathy1.Authentication.TLSCertificate"> <tp:added version="0.19.13">(as stable API)</tp:added> <tp:docstring> @@ -114,7 +114,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:enum type="u" name="TLS_Certificate_State"> <tp:docstring> The possible states for a <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Authentication">TLSCertificate</tp:dbus-ref> + namespace="im.telepathy1.Authentication">TLSCertificate</tp:dbus-ref> object. </tp:docstring> @@ -291,7 +291,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> + <tp:error name="im.telepathy1.Error.InvalidArgument"> <tp:docstring> Raised when the method is called on an object whose <tp:member-ref>State</tp:member-ref> is not <code>Pending</code>, or when the provided rejection list is empty. diff --git a/spec/Call_Content.xml b/spec/Call_Content.xml index ef08acc3b..58ff7c989 100644 --- a/spec/Call_Content.xml +++ b/spec/Call_Content.xml @@ -20,16 +20,16 @@ 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Call1.Content" + <interface name="im.telepathy1.Call1.Content" tp:causes-havoc="experimental"> <tp:added version="0.19.0">(draft 1)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>This object represents one Content inside a <tp:dbus-ref - namespace="ofdT.Channel.Type">Call1</tp:dbus-ref>. For + namespace="imt1.Channel.Type">Call1</tp:dbus-ref>. For example, in an audio/video call there would be one audio content and one video content. Each content has one or more <tp:dbus-ref - namespace="ofdT.Call1">Stream</tp:dbus-ref> objects which + namespace="imt1.Call1">Stream</tp:dbus-ref> objects which represent the actual transport to one or more remote contacts.</p> <tp:rationale> There are two cases where multiple streams may happen: @@ -44,7 +44,7 @@ </tp:rationale> <p>For protocols that support muting all streams of a given content separately, this object MAY also implement the <tp:dbus-ref - namespace="ofdT.Call1.Interface">Mute</tp:dbus-ref> interface</p> + namespace="imt1.Call1.Interface">Mute</tp:dbus-ref> interface</p> </tp:docstring> <method name="Remove" tp:name-for-bindings="Remove"> @@ -52,14 +52,14 @@ arguments</tp:changed> <tp:docstring> Remove the content from the call. This will cause - <tp:member-ref>Removed</tp:member-ref>((self_handle, + <tp:dbus-ref namespace="imt1.Channel.Type">Call1.ContentRemoved</tp:dbus-ref>((self_handle, <tp:value-ref type="Call_State_Change_Reason">User_Requested</tp:value-ref>, "", "")) to be emitted. </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError" /> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.NetworkError" /> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring> Raised when a Call doesn't support removing contents (e.g. a Google Talk video call). @@ -68,23 +68,14 @@ </tp:possible-errors> </method> - <signal name="Removed" tp:name-for-bindings="Removed"> - <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - <p>Emitted when the content is removed from the call. This - is the same as the <tp:dbus-ref - namespace="ofdT.Channel.Type">Call1.ContentRemoved</tp:dbus-ref> - signal.</p> - </tp:docstring> - </signal> - <property name="Interfaces" tp:name-for-bindings="Interfaces" type="as" tp:type="DBus_Interface[]" access="read" tp:immutable="yes"> <tp:added version="0.19.11"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Extra interfaces provided by this content, such as <tp:dbus-ref - namespace="ofdT.Call1">Content.Interface.Media</tp:dbus-ref>, - <tp:dbus-ref namespace="ofdT.Channel">Interface.Hold</tp:dbus-ref> or - <tp:dbus-ref namespace="ofdT.Call1">Interface.Mute</tp:dbus-ref>. + namespace="imt1.Call1">Content.Interface.Media</tp:dbus-ref>, + <tp:dbus-ref namespace="imt1.Channel">Interface.Hold1</tp:dbus-ref> or + <tp:dbus-ref namespace="imt1.Call1">Interface.Mute</tp:dbus-ref>. This SHOULD NOT include the Content interface itself, and cannot change once the content has been created.</p> </tp:docstring> @@ -117,7 +108,7 @@ The disposition of this content, which defines whether to automatically start sending data on the streams when <tp:dbus-ref - namespace="ofdT.Channel.Type.Call1">Accept</tp:dbus-ref> is + namespace="imt1.Channel.Type.Call1">Accept</tp:dbus-ref> is called on the channel. </tp:docstring> @@ -131,14 +122,14 @@ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The content was initially part of the call. When <tp:dbus-ref - namespace="ofdT.Channel.Type.Call1">Accept</tp:dbus-ref> + namespace="imt1.Channel.Type.Call1">Accept</tp:dbus-ref> is called on the channel, all streams of this content with <tp:dbus-ref - namespace="ofdT.Call1.Stream">LocalSendingState</tp:dbus-ref> + namespace="imt1.Call1.Stream">LocalSendingState</tp:dbus-ref> set to <tp:value-ref type="Sending_State">Pending_Send</tp:value-ref> will be moved to <tp:value-ref type="Sending_State">Sending</tp:value-ref> as if <tp:dbus-ref - namespace="ofdT.Call1.Stream">SetSending</tp:dbus-ref> + namespace="imt1.Call1.Stream">SetSending</tp:dbus-ref> (True) had been called.</p> </tp:docstring> </tp:enumvalue> @@ -161,7 +152,7 @@ <arg name="Streams" type="ao"> <tp:docstring> The <tp:dbus-ref - namespace="ofdT.Call1">Stream</tp:dbus-ref>s which were + namespace="imt1.Call1">Stream</tp:dbus-ref>s which were added. </tp:docstring> </arg> @@ -176,7 +167,7 @@ <arg name="Streams" type="ao"> <tp:docstring> The <tp:dbus-ref - namespace="ofdT.Call1">Stream</tp:dbus-ref>s which were + namespace="imt1.Call1">Stream</tp:dbus-ref>s which were removed. </tp:docstring> </arg> @@ -190,7 +181,7 @@ <property name="Streams" tp:name-for-bindings="Streams" type="ao" access="read"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - <p>The list of <tp:dbus-ref namespace="ofdT.Call1" + <p>The list of <tp:dbus-ref namespace="imt1.Call1" >Stream</tp:dbus-ref> objects that exist in this content.</p> diff --git a/spec/Call_Content_Interface_Audio_Control.xml b/spec/Call_Content_Interface_Audio_Control.xml new file mode 100644 index 000000000..e2c6dce01 --- /dev/null +++ b/spec/Call_Content_Interface_Audio_Control.xml @@ -0,0 +1,111 @@ +<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> +<node name="/Call_Content_Interface_Audio_Control" + xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"> + <tp:copyright>Copyright © 2009-2011 Collabora Ltd.</tp:copyright> + <tp:license xmlns="http://www.w3.org/1999/xhtml"> + <p>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.</p> + + <p>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.</p> + + <p>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 Street, Fifth Floor, Boston, MA + 02110-1301, USA.</p> + </tp:license> + + <interface name="im.telepathy1.Call1.Content.Interface.AudioControl1" + tp:causes-havoc="experimental"> + <tp:added version="0.25.1">(draft 1)</tp:added> + <tp:requires interface="im.telepathy1.Call1.Content.Interface.Media"/> + <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/> + + <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> + <p>This interface allows the connection manager to be kept informed of, + and control, the input and output volumes of an audio stream. + While generally not needed, if the connection manager needs to + handle stream volumes directly (typically when using + <tp:value-ref>Call_Content_Packetization_Type_Raw</tp:value-ref>), + this interface may be necessary.</p> + + <p>If this interface is present, the handler should call + <tp:member-ref>ReportInputVolume</tp:member-ref> + and <tp:member-ref>ReportOutputVolume</tp:member-ref> whenever the + input and output volume change, both when the user manually modifies + the volume and when the volumes are adjusted in response to + <tp:member-ref>RequestedInputVolume</tp:member-ref> and + <tp:member-ref>RequestedOutputVolume</tp:member-ref> changing.</p> + + <p>The maximum volume as used in this interface represent the unamplified + hardware volume (0 dB). No software amplification should be used to + boost the signal to a higher level when this Interface is in use</p> + </tp:docstring> + + <property name="RequestedInputVolume" tp:type="Audio_Control_Volume" + type="i" access="read" tp:name-for-bindings="Requested_Input_Volume"> + <tp:docstring> + The input volume as requested by the Connection Manager. + Initially and on any changes the client should change its input volume + to match the requested volume. + </tp:docstring> + </property> + + <method name="ReportInputVolume" tp:name-for-bindings="Report_Input_Volume"> + <arg direction="in" name="Volume" tp:type="Audio_Control_Volume" type="i"> + <tp:docstring> + Report the input volume level as set by the client. + </tp:docstring> + </arg> + <tp:docstring> + <p>Report to the CM that the Content input volume has been + changed by the client.</p> + + <p>It is the client's responsibility to change the input volume used for + the content. However, the client MUST call this whenever it changes + input volume for the content.</p> + </tp:docstring> + </method> + + <property name="RequestedOutputVolume" tp:type="Audio_Control_Volume" + type="i" access="read" tp:name-for-bindings="Requested_Output_Volume"> + <tp:docstring> + The input volume as requested by the Connection Manager. + Initially and on any changes the client should change its input volume + to match the requested volume. + </tp:docstring> + </property> + + <method name="ReportOutputVolume" + tp:name-for-bindings="Report_Output_Volume"> + <arg direction="in" name="Volume" tp:type="Audio_Control_Volume" type="i"> + <tp:docstring> + Report the output volume level as set by the client. + </tp:docstring> + </arg> + <tp:docstring> + <p>Report to the CM that the content output volume has been + changed by the client.</p> + + <p>It is the client's responsibility to change the output volume used + for the content. However, the client MUST call this whenever it + changes output volume for the content.</p> + </tp:docstring> + </method> + + <tp:simple-type name="Audio_Control_Volume" type="i"> + <tp:docstring> + <p>A volume value either reported to or requested by the Connection + Manager. This value should either be -1 for an unknown value or in the + range of 0-255, with 0 being the minimal volume and 255 being the + highest unamplified volume the input or output is capable of (known + as 0 dB) + </p> + </tp:docstring> + </tp:simple-type> + </interface> +</node> diff --git a/spec/Call_Content_Interface_Media.xml b/spec/Call_Content_Interface_Media.xml index ca5ed36bf..a336a5f3c 100644 --- a/spec/Call_Content_Interface_Media.xml +++ b/spec/Call_Content_Interface_Media.xml @@ -21,16 +21,16 @@ </tp:license> <interface - name="org.freedesktop.Telepathy.Call1.Content.Interface.Media" + name="im.telepathy1.Call1.Content.Interface.Media" tp:causes-havoc="experimental"> <tp:added version="0.23.4">(draft 2)</tp:added> - <tp:requires interface="org.freedesktop.Telepathy.Call1.Content"/> + <tp:requires interface="im.telepathy1.Call1.Content"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Interface to use by a software implementation of media streaming. The reason behind splitting the members of this interface out from the main <tp:dbus-ref - namespace="ofdT.Call1">Content</tp:dbus-ref> interface is + namespace="imt1.Call1">Content</tp:dbus-ref> interface is that the software is not necessarily what controls the media. An example of this is in GSM phones, where the CM just tells the phone to dial a number and it does the audio routing @@ -40,41 +40,41 @@ <h4>Codec Negotiation</h4> <p>When a new <tp:dbus-ref - namespace="ofdT.Channel.Type">Call1</tp:dbus-ref> channel + namespace="imt1.Channel.Type">Call1</tp:dbus-ref> channel appears (whether it was requested or not) a <tp:dbus-ref - namespace="ofdT.Call1.Content">MediaDescription</tp:dbus-ref> + namespace="imt1.Call1.Content">MediaDescription</tp:dbus-ref> object will either be waiting in the <tp:member-ref>MediaDescriptionOffer</tp:member-ref> property, or will appear at some point via the <tp:member-ref>NewMediaDescriptionOffer</tp:member-ref> signal.</p> <p>If nothing is known about the remote side's Media capabilities - (e.g. outgoing SIP/XMPP call), this <tp:dbus-ref namespace="ofdT.Call1.Content" + (e.g. outgoing SIP/XMPP call), this <tp:dbus-ref namespace="imt1.Call1.Content" >MediaDescription</tp:dbus-ref> will pop up with {<tp:dbus-ref - namespace="ofdT.Call1.Content.MediaDescription" + namespace="imt1.Call1.Content.MediaDescription" >HasRemoteInformation</tp:dbus-ref> = false, <tp:dbus-ref - namespace="ofdT.Call1.Content.MediaDescription" + namespace="imt1.Call1.Content.MediaDescription" >FurtherNegotiationRequired</tp:dbus-ref> = true}, and the local user's streaming implementation SHOULD call - <tp:dbus-ref namespace="ofdT.Call1.Content.MediaDescription" + <tp:dbus-ref namespace="imt1.Call1.Content.MediaDescription" >Accept</tp:dbus-ref>, with a description of all supported codecs and other features. The CM will then send this information to the remote side (and <tp:member-ref>LocalMediaDescriptionChanged</tp:member-ref> will fire with details of the description passed into <tp:dbus-ref - namespace="ofdT.Call1.Content.MediaDescription" + namespace="imt1.Call1.Content.MediaDescription" >Accept</tp:dbus-ref> for debugging purposes). </p> <p>When the remote codecs and other content information are available (e.g. Remote user replies to initial offer, or sends a new offer of - their own, a new <tp:dbus-ref namespace="ofdT.Call1.Content" + their own, a new <tp:dbus-ref namespace="imt1.Call1.Content" >MediaDescription</tp:dbus-ref> will appear, with {<tp:dbus-ref - namespace="ofdT.Call1.Content.MediaDescription" + namespace="imt1.Call1.Content.MediaDescription" >HasRemoteInformation</tp:dbus-ref> = true, <tp:dbus-ref - namespace="ofdT.Call1.Content.MediaDescription" + namespace="imt1.Call1.Content.MediaDescription" >FurtherNegotiationRequired</tp:dbus-ref> = false}, and the <tp:dbus-ref - namespace="ofdT.Call1.Content.MediaDescription" + namespace="imt1.Call1.Content.MediaDescription" >Codecs</tp:dbus-ref> property on the description offer set to the codecs which are supported by the remote contact. The local user's streaming @@ -84,9 +84,9 @@ <tp:member-ref>LocalMediaDescriptionChanged</tp:member-ref> and <tp:member-ref>RemoteMediaDescriptionsChanged</tp:member-ref> will fire to signal their respective changes, to aid with debugging. - Note that if <tp:dbus-ref namespace="ofdT.Call1.Content.MediaDescription" + Note that if <tp:dbus-ref namespace="imt1.Call1.Content.MediaDescription" >Accept</tp:dbus-ref> is called, with <tp:dbus-ref - namespace="ofdT.Call1.Content.MediaDescription" + namespace="imt1.Call1.Content.MediaDescription" >FurtherNegotiationRequired</tp:dbus-ref> set to false, the CM should be able to rely on the fact that the description passed into Accept is compatible with the one in the @@ -106,7 +106,7 @@ </p> <p> If parameters requiring negotiation are changed, then the <tp:dbus-ref - namespace="ofdT.Call1.Content.MediaDescription" + namespace="imt1.Call1.Content.MediaDescription" >FurtherNegotiationRequired</tp:dbus-ref> property should be set to TRUE, and the new media description should only be used once they come in a new MediaDescriptionOffer @@ -114,7 +114,7 @@ <p>If the other side decides to update his or her codec list during a call, a new <tp:dbus-ref - namespace="ofdT.Call1.Content">MediaDescription</tp:dbus-ref> + namespace="imt1.Call1.Content">MediaDescription</tp:dbus-ref> object will appear through <tp:member-ref>NewMediaDescriptionOffer</tp:member-ref> which should be acted on as documented above.</p> @@ -122,12 +122,12 @@ <h4>Protocols without negotiation</h4> <p>For protocols where the codecs are not negotiable, the initial content's <tp:dbus-ref - namespace="ofdT.Call1.Content">MediaDescription</tp:dbus-ref> + namespace="imt1.Call1.Content">MediaDescription</tp:dbus-ref> object will appear with <tp:dbus-ref - namespace="ofdT.Call1.Content.MediaDescription" + namespace="imt1.Call1.Content.MediaDescription" >HasRemoteInformation</tp:dbus-ref>, set to true and the known supported codec values in <tp:dbus-ref - namespace="ofdT.Call1.Content.MediaDescription" + namespace="imt1.Call1.Content.MediaDescription" >Codecs</tp:dbus-ref>. </p> </tp:docstring> @@ -160,7 +160,7 @@ <tp:member name="Updated" type="b"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> This should be set to true in calls to <tp:dbus-ref - namespace="ofdT.Call1.Content.MediaDescription" + namespace="imt1.Call1.Content.MediaDescription" >Accept</tp:dbus-ref> and <tp:member-ref>UpdateLocalMediaDescription</tp:member-ref> if this codec has changed in a way that needs to be signalled over the @@ -201,9 +201,9 @@ <tp:member name="Remote_Contact" type="u" tp:type="Handle"> <tp:docstring> The remote contact this description refers to or 0. This matches the - <tp:dbus-ref namespace="ofdT.Call1.Content.MediaDescription" + <tp:dbus-ref namespace="imt1.Call1.Content.MediaDescription" >RemoteContact</tp:dbus-ref> property on - <tp:dbus-ref namespace="ofdT.Call1.Content" + <tp:dbus-ref namespace="imt1.Call1.Content" >MediaDescription</tp:dbus-ref> </tp:docstring> </tp:member> @@ -221,15 +221,10 @@ </tp:docstring> <tp:member name="Media_Description" type="o"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - The object path to the <tp:dbus-ref namespace="ofdT.Call1.Content" + The object path to the <tp:dbus-ref namespace="imt1.Call1.Content" >MediaDescription</tp:dbus-ref> </tp:docstring> </tp:member> - <tp:member name="Remote_Contact" type="u" tp:type="Contact_Handle"> - <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - The contact handle that this description applies to. - </tp:docstring> - </tp:member> <tp:member name="Properties" type="a{sv}" tp:type="Media_Description_Properties"> <tp:docstring> @@ -256,15 +251,6 @@ Otherwise, only parameters which strictly describe the media being sent can be changed. </tp:docstring> - <arg name="Remote_Contact" type="u" tp:type="Handle" direction="in"> - <tp:docstring> - The remote contact that this description should be negotiated with - (or 0 to mean "negotiate this with everyone"). Note that encoding - the same video multiple times is often needlessly expensive, so - differences in MediaDescriptions negotiated with different parties - in the call should be limited to payloading parameters if possible. - </tp:docstring> - </arg> <arg name="MediaDescription" direction="in" type="a{sv}" tp:type="Media_Description_Properties"> <tp:docstring> @@ -272,12 +258,12 @@ </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring> The protocol does not support changing the codecs mid-call. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> + <tp:error name="im.telepathy1.Error.InvalidArgument"> <tp:docstring> The description given is invalid in some way. </tp:docstring> @@ -294,8 +280,8 @@ contact.</p> <p>Keys of this map will appear in at most one <tp:dbus-ref - namespace="ofdT.Call1.Stream">RemoteMembers</tp:dbus-ref>. - See <tp:dbus-ref namespace="ofdT.Call1.Content.MediaDescription" + namespace="imt1.Call1.Stream">RemoteMembers</tp:dbus-ref>. + See <tp:dbus-ref namespace="imt1.Call1.Content.MediaDescription" >RemoteContact</tp:dbus-ref> for more details on how to map between MediaDescriptions and Streams.</p> </tp:docstring> @@ -313,12 +299,12 @@ <signal name="NewMediaDescriptionOffer" tp:name-for-bindings="New_Media_Description_Offer"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - <p>Emitted when a new <tp:dbus-ref namespace="ofdT.Call1.Content" + <p>Emitted when a new <tp:dbus-ref namespace="imt1.Call1.Content" >MediaDescription</tp:dbus-ref> appears. The streaming >implementation MUST respond by calling the - <tp:dbus-ref namespace="ofdT.Call1.Content.MediaDescription" + <tp:dbus-ref namespace="imt1.Call1.Content.MediaDescription" >Accept</tp:dbus-ref> or <tp:dbus-ref - namespace="ofdT.Call1.Content.MediaDescription" + namespace="imt1.Call1.Content.MediaDescription" >Reject</tp:dbus-ref> method on the description object appeared.</p> <p>Emission of this signal indicates that the @@ -327,10 +313,10 @@ <code>(Description, Contact, MediaDescriptionProperties)</code>.</p> <p>When the MediaDescriptionOffer has been dealt with then - <tp:dbus-ref namespace="ofdT.Call1.Content.Interface.Media" + <tp:dbus-ref namespace="imt1.Call1.Content.Interface.Media" >MediaDescriptionOfferDone</tp:dbus-ref> must be emitted before <tp:dbus-ref - namespace="ofdT.Call1.Content.Interface.Media" + namespace="imt1.Call1.Content.Interface.Media" >NewMediaDescriptionOffer</tp:dbus-ref> is emitted again. </p> @@ -363,7 +349,7 @@ <signal name="MediaDescriptionOfferDone" tp:name-for-bindings="Media_Description_Offer_Done"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - <p>Emitted when a <tp:dbus-ref namespace="ofdT.Call1.Content" + <p>Emitted when a <tp:dbus-ref namespace="imt1.Call1.Content" >MediaDescription</tp:dbus-ref> has been handled. </p> <p>Emission of this signal indicates that the <tp:member-ref>MediaDescriptionOffer</tp:member-ref> property has @@ -378,18 +364,11 @@ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Change notification for - <tp:dbus-ref namespace="ofdT.Call1.Content.Interface.Media" + <tp:dbus-ref namespace="imt1.Call1.Content.Interface.Media" >LocalMediaDescriptions</tp:dbus-ref> </p> </tp:docstring> - <arg name="Remote_Contact" type="u" tp:type="Handle"> - <tp:docstring> - The remote contact that this description was negotiated with - (or 0 to mean "negotiated with everyone"). - </tp:docstring> - </arg> - <arg name="Updated_Media_Description" type="a{sv}" tp:type="Media_Description_Properties"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -403,7 +382,7 @@ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Change notification for - <tp:dbus-ref namespace="ofdT.Call1.Content.Interface.Media" + <tp:dbus-ref namespace="imt1.Call1.Content.Interface.Media" >RemoteMediaDescriptions</tp:dbus-ref> </p> </tp:docstring> @@ -421,10 +400,10 @@ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Removal notification for - <tp:dbus-ref namespace="ofdT.Call1.Content.Interface.Media" + <tp:dbus-ref namespace="imt1.Call1.Content.Interface.Media" >RemoteMediaDescriptions</tp:dbus-ref> and - <tp:dbus-ref namespace="ofdT.Call1.Content.Interface.Media" + <tp:dbus-ref namespace="imt1.Call1.Content.Interface.Media" >LocalMediaDescriptions</tp:dbus-ref> </p> </tp:docstring> @@ -440,12 +419,12 @@ <property name="MediaDescriptionOffer" tp:name-for-bindings="Media_Description_Offer" - type="(oua{sv})" tp:type="Media_Description_Offer" access="read"> + type="(oa{sv})" tp:type="Media_Description_Offer" access="read"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The object path to the current - <tp:dbus-ref namespace="ofdT.Call1.Content" + <tp:dbus-ref namespace="imt1.Call1.Content" >MediaDescription</tp:dbus-ref> object, its - <tp:dbus-ref namespace="ofdT.Call1.Content.MediaDescription" + <tp:dbus-ref namespace="imt1.Call1.Content.MediaDescription" >RemoteContact</tp:dbus-ref> and a mapping of the MediaDescriptions properties. If the object path is "/" then there isn't an outstanding @@ -453,7 +432,7 @@ <tp:rationale> Having all <tp:dbus-ref - namespace="ofdT.Call1.Content">MediaDescription</tp:dbus-ref> + namespace="imt1.Call1.Content">MediaDescription</tp:dbus-ref> properties here saves a D-Bus round-trip - it shouldn't be necessary to get these properties from the Content MediaDescription object, in practice. @@ -506,7 +485,7 @@ tp:name-for-bindings="DTMF_Change_Requested"> <tp:docstring> Used by the CM to relay instructions from <tp:dbus-ref - namespace="ofdT">Channel.Interface.DTMF</tp:dbus-ref> to the streaming + namespace="imt1">Channel.Interface.DTMF1</tp:dbus-ref> to the streaming implementation. If any contact in this call supports the telephone-event codec in their MediaDescription, this event should be sent as outlined in RFC 4733. Otherwise, it should be sent as an diff --git a/spec/Call_Content_Interface_Video_Control.xml b/spec/Call_Content_Interface_Video_Control.xml index 086d47581..80644b4af 100644 --- a/spec/Call_Content_Interface_Video_Control.xml +++ b/spec/Call_Content_Interface_Video_Control.xml @@ -19,10 +19,10 @@ 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Call1.Content.Interface.VideoControl" + <interface name="im.telepathy1.Call1.Content.Interface.VideoControl1" tp:causes-havoc="experimental"> <tp:added version="0.21.10">(draft 1)</tp:added> - <tp:requires interface="org.freedesktop.Telepathy.Call1.Content.Interface.Media"/> + <tp:requires interface="im.telepathy1.Call1.Content.Interface.Media"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>An interface that allows the connection manager to control the video diff --git a/spec/Call_Content_Media_Description.xml b/spec/Call_Content_Media_Description.xml index 7c494a410..a22329b5b 100644 --- a/spec/Call_Content_Media_Description.xml +++ b/spec/Call_Content_Media_Description.xml @@ -20,7 +20,7 @@ 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Call1.Content.MediaDescription" + <interface name="im.telepathy1.Call1.Content.MediaDescription" tp:causes-havoc="experimental"> <tp:added version="0.23.4">(draft 1)</tp:added> @@ -29,7 +29,7 @@ streaming implementation should reply with its local Description. This is intended as a temporary transactional object for use with <tp:dbus-ref - namespace="ofdT.Call1">Content.Interface.Media</tp:dbus-ref>. + namespace="imt1.Call1">Content.Interface.Media</tp:dbus-ref>. There will always be 0 or 1 MediaDescription object per Content. In most cases, this object will stay alive until you call either <tp:member-ref>Accept</tp:member-ref> or @@ -45,7 +45,7 @@ <tp:docstring> The local description to send to the remote contacts and to use in the <tp:dbus-ref - namespace="ofdT.Call1">Content</tp:dbus-ref>. + namespace="imt1.Call1">Content</tp:dbus-ref>. </tp:docstring> </arg> <tp:docstring> @@ -56,7 +56,7 @@ FurtherNegotiationRequired set to False). </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> + <tp:error name="im.telepathy1.Error.InvalidArgument"> <tp:docstring> The description given is invalid in some way. </tp:docstring> @@ -69,7 +69,7 @@ Reject the proposed update to the remote description. </tp:docstring> <arg name="Reason" type="(uuss)" tp:type="Call_State_Reason" - direction="out"> + direction="in"> <tp:docstring> A structured reason for the rejection. </tp:docstring> @@ -135,7 +135,7 @@ The contact handle that this description applies to. This property can be used as an opaque identifier, and searched for in - <tp:dbus-ref namespace="ofdT.Call1.Stream" + <tp:dbus-ref namespace="imt1.Call1.Stream" >RemoteMembers</tp:dbus-ref> for each Stream in this Content, to determine which Stream this MediaDescription applies to. If multiple MediaDescriptions apply to the same Stream, the @@ -179,7 +179,7 @@ list containing a single SSRC (which does not collide with these, or any previously seen SSRCs). If a new MediaDescription offer appears with an SSRC the same as one in <tp:dbus-ref - namespace="ofdT.Call1.Content.Interface.Media" + namespace="imt1.Call1.Content.Interface.Media" >LocalMediaDescriptions</tp:dbus-ref>, then the streaming implementation should pick a new SSRC to resolve the collision.</p> @@ -205,15 +205,15 @@ <p> A mapping containing all properties that define the information from a <tp:dbus-ref - namespace="ofdT.Call1.Content" + namespace="imt1.Call1.Content" >MediaDescription</tp:dbus-ref> and its interfaces. </p> <p> - If <tp:dbus-ref namespace="ofdT.Call1.Content.MediaDescription" + If <tp:dbus-ref namespace="imt1.Call1.Content.MediaDescription" >HasRemoteInformation</tp:dbus-ref> is True, then this mapping will always contains at least - <tp:dbus-ref namespace="ofdT.Call1.Content.MediaDescription" + <tp:dbus-ref namespace="imt1.Call1.Content.MediaDescription" >Codecs</tp:dbus-ref> </p> </tp:docstring> diff --git a/spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports.xml b/spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports.xml index f973306cb..29696b804 100644 --- a/spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports.xml +++ b/spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports.xml @@ -18,11 +18,11 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:license> - <interface name="org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPExtendedReports" + <interface name="im.telepathy1.Call1.Content.MediaDescription.Interface.RTCPExtendedReports1" tp:causes-havoc="experimental"> <tp:added version="0.23.4">(draft version, not API-stable)</tp:added> <tp:requires - interface="org.freedesktop.Telepathy.Call1.Content.MediaDescription"/> + interface="im.telepathy1.Call1.Content.MediaDescription"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>This codec offer interface provides a method of signalling for diff --git a/spec/Call_Content_Media_Description_Interface_RTCP_Feedback.xml b/spec/Call_Content_Media_Description_Interface_RTCP_Feedback.xml index f586fe4c2..263b5eef3 100644 --- a/spec/Call_Content_Media_Description_Interface_RTCP_Feedback.xml +++ b/spec/Call_Content_Media_Description_Interface_RTCP_Feedback.xml @@ -18,10 +18,10 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:license> - <interface name="org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPFeedback" + <interface name="im.telepathy1.Call1.Content.MediaDescription.Interface.RTCPFeedback1" tp:causes-havoc="experimental"> <tp:added version="0.23.4">(draft version, not API-stable)</tp:added> - <tp:requires interface="org.freedesktop.Telepathy.Call1.Content.MediaDescription"/> + <tp:requires interface="im.telepathy1.Call1.Content.MediaDescription"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>This codec offer interface provides a method of signalling @@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <p>The codec identifiers used in the description of the Feedback Messages sent in the <tp:dbus-ref - namespace="ofdT.Call1.Content.MediaDescription">Accept</tp:dbus-ref>'s + namespace="imt1.Call1.Content.MediaDescription">Accept</tp:dbus-ref>'s should match those used for the RemoteCodecs in the same Accept call. </p> @@ -41,6 +41,72 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> + <tp:struct name="RTCP_Feedback_Message_Properties"> + <tp:added version="0.22.1"/> + <tp:changed version="0.23.4">This struct is also used by Call, but + in call, the CM should know about RTP profiles, and never use MAXUINT + as a default value, because it complicates things unnecessarily. + </tp:changed> + <tp:member type="u" name="RTCPMinimumInterval"> + <tp:docstring> + The minimum interval between two regular RTCP packets in + milliseconds for this content. If no special value is + required, 5000 (5 seconds) should be used in RTP/AVP, and a + lower value in RTP/AVPF (by default, 0). + </tp:docstring> + </tp:member> + <tp:member type="a(sss)" tp:type="RTCP_Feedback_Message[]" + name="Messages"> + <tp:docstring> + The RTCP feedback messages for this codec. + </tp:docstring> + </tp:member> + </tp:struct> + + <tp:struct name="RTCP_Feedback_Message" + array-name="RTCP_Feedback_Message_List"> + <tp:added version="0.22.1"/> + <tp:docstring> + A struct defining an RTCP feedback message. + </tp:docstring> + <tp:member type="s" name="Type"> + <tp:docstring> + Feedback type, for example "ack", "nack", or "ccm". + </tp:docstring> + </tp:member> + <tp:member type="s" name="Subtype"> + <tp:docstring> + Feedback subtype, according to the Type, can be an empty string (""), + if there is no subtype. + For example, generic nack is Type="nack" Subtype="". + </tp:docstring> + </tp:member> + <tp:member type="s" name="Parameters"> + <tp:docstring> + Feedback parameters as a string. Format is defined in the relevant RFC + </tp:docstring> + </tp:member> + </tp:struct> + + <tp:mapping name="RTCP_Feedback_Message_Map"> + <tp:added version="0.22.1"/> + <tp:docstring> + A map of codec and its feedback properties. + </tp:docstring> + <tp:member type="u" name="Codec_Identifier"> + <tp:docstring> + Numeric identifier for the codec. This will be used as the + PT in the SDP or content description. + </tp:docstring> + </tp:member> + <tp:member type="(ua(sss))" tp:type="RTCP_Feedback_Message_Properties" + name="Properties"> + <tp:docstring> + The RTCP feedback properties for this codec. + </tp:docstring> + </tp:member> + </tp:mapping> + <property name="FeedbackMessages" type="a{u(ua(sss))}" tp:type="RTCP_Feedback_Message_Map" access="read" tp:name-for-bindings="Feedback_Messages"> diff --git a/spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions.xml b/spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions.xml index a35615add..babafecf9 100644 --- a/spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions.xml +++ b/spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions.xml @@ -18,10 +18,10 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:license> - <interface name="org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTPHeaderExtensions" + <interface name="im.telepathy1.Call1.Content.MediaDescription.Interface.RTPHeaderExtensions1" tp:causes-havoc="experimental"> <tp:added version="0.23.4">(draft version, not API-stable)</tp:added> - <tp:requires interface="org.freedesktop.Telepathy.Call1.Content.MediaDescription"/> + <tp:requires interface="im.telepathy1.Call1.Content.MediaDescription"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>This media description interface provides a method of signalling @@ -34,6 +34,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> + <tp:enum name="Media_Stream_Direction" type="u"> + <tp:enumvalue suffix="None" value="0"> + <tp:docstring>Media are not being sent or received</tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="Send" value="1"> + <tp:docstring>Media are being sent, but not received</tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="Receive" value="2"> + <tp:docstring>Media are being received, but not sent</tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="Bidirectional" value="3"> + <tp:docstring>Media are being sent and received</tp:docstring> + </tp:enumvalue> + </tp:enum> + <tp:struct name="RTP_Header_Extension" array-name="RTP_Header_Extensions_List"> <tp:docstring> diff --git a/spec/Call_Interface_Mute.xml b/spec/Call_Interface_Mute.xml index 1202383f7..4d3f0bfdf 100644 --- a/spec/Call_Interface_Mute.xml +++ b/spec/Call_Interface_Mute.xml @@ -18,12 +18,12 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:license> - <interface name="org.freedesktop.Telepathy.Call1.Interface.Mute" tp:causes-havoc="experimental"> + <interface name="im.telepathy1.Call1.Interface.Mute" tp:causes-havoc="experimental"> <tp:added version="0.19.6">(draft version, not API-stable)</tp:added> <tp:xor-requires> - <tp:requires interface="org.freedesktop.Telepathy.Channel.Type.Call1"/> - <tp:requires interface="org.freedesktop.Telepathy.Call1.Content"/> - <tp:requires interface="org.freedesktop.Telepathy.Call1.Stream"/> + <tp:requires interface="im.telepathy1.Channel.Type.Call1"/> + <tp:requires interface="im.telepathy1.Call1.Content"/> + <tp:requires interface="im.telepathy1.Call1.Stream"/> </tp:xor-requires> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -114,12 +114,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. access="read" tp:name-for-bindings="Local_Mute_State"> <tp:docstring> The current mute state of this part of the call. New - <tp:dbus-ref namespace="ofdT.Call1">Content</tp:dbus-ref>s should + <tp:dbus-ref namespace="imt1.Call1">Content</tp:dbus-ref>s should inherit the value of this property from the parent - <tp:dbus-ref namespace="ofdT.Channel.Type">Call1</tp:dbus-ref>. - Similarly, <tp:dbus-ref namespace="ofdT.Call1">Stream</tp:dbus-ref>s + <tp:dbus-ref namespace="imt1.Channel.Type">Call1</tp:dbus-ref>. + Similarly, <tp:dbus-ref namespace="imt1.Call1">Stream</tp:dbus-ref>s should inherit it from the parent <tp:dbus-ref - namespace="ofdT.Call1">Content</tp:dbus-ref>. + namespace="imt1.Call1">Content</tp:dbus-ref>. </tp:docstring> </property> diff --git a/spec/Call_Stream.xml b/spec/Call_Stream.xml index b8b347d48..13d5549d0 100644 --- a/spec/Call_Stream.xml +++ b/spec/Call_Stream.xml @@ -20,19 +20,19 @@ 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Call1.Stream" + <interface name="im.telepathy1.Call1.Stream" tp:causes-havoc="experimental"> <tp:added version="0.19.0">(draft 1)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>One stream inside a <tp:dbus-ref - namespace="ofdT.Call1">Content</tp:dbus-ref>. A stream is + namespace="imt1.Call1">Content</tp:dbus-ref>. A stream is a single flow of packets to and from a single remote endpoint. If your call connects to multiple people, you could have multiple streams.</p> <p>For protocols that support muting streams separately, this object MAY also implement the <tp:dbus-ref - namespace="ofdT.Call1.Interface">Mute</tp:dbus-ref> interface</p> + namespace="imt1.Call1.Interface">Mute</tp:dbus-ref> interface</p> </tp:docstring> <method name="SetSending" tp:name-for-bindings="Set_Sending"> @@ -56,8 +56,8 @@ </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented" /> - <tp:error name="org.freedesktop.Telepathy.Error.NotYet"> + <tp:error name="im.telepathy1.Error.NotImplemented" /> + <tp:error name="im.telepathy1.Error.NotYet"> <tp:docstring>If the call has not been accepted yet, calling SetSending(True) is an error. See <tp:member-ref>LocalSendingState</tp:member-ref> for details. @@ -90,14 +90,14 @@ </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidHandle"/> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> + <tp:error name="im.telepathy1.Error.InvalidHandle"/> + <tp:error name="im.telepathy1.Error.InvalidArgument"> <tp:docstring> The request contact is valid but is not involved in this stream. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring> The protocol does not allow the local user to request the other side starts sending on this stream. @@ -212,7 +212,7 @@ <tp:added version="0.19.11"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Extra interfaces provided by this stream, such as <tp:dbus-ref - namespace="ofdT.Call1">Stream.Interface.Media</tp:dbus-ref>. + namespace="imt1.Call1">Stream.Interface.Media</tp:dbus-ref>. This SHOULD NOT include the Stream interface itself, and cannot change once the stream has been created.</p> </tp:docstring> @@ -226,7 +226,7 @@ <p>Media sent to this stream will be sent to all members listed here. All members listed here will also appear in <tp:dbus-ref - namespace="ofdT.Channel.Type.Call1">CallMembers</tp:dbus-ref>, + namespace="imt1.Channel.Type.Call1">CallMembers</tp:dbus-ref>, and each CallMembers member will be listed in at most one Stream per Content. Therefore, to hide things from a member of the call, UIs only need to mute one Stream per Content.</p> @@ -238,10 +238,10 @@ >LocalSendingState</tp:member-ref>.</p> <p>This mapping is also used by the streaming implementation to map - from <tp:dbus-ref namespace="ofdT.Call1.Content" + from <tp:dbus-ref namespace="imt1.Call1.Content" >MediaDescription</tp:dbus-ref>s to Streams. In this use-case, all of the senders in this stream will be represented in - <tp:dbus-ref namespace="ofdT.Call1.Content.Interface.Media" + <tp:dbus-ref namespace="imt1.Call1.Content.Interface.Media" >RemoteMediaDescriptions</tp:dbus-ref>. This use-case should not affect anything that does not handle media streaming.</p> </tp:docstring> @@ -280,13 +280,13 @@ this property indicates that the other side requested the local user start sending media (which can be done by calling either <tp:member-ref>SetSending</tp:member-ref> or <tp:dbus-ref - namespace="ofdT.Channel.Type.Call1">Accept</tp:dbus-ref>).</p> + namespace="imt1.Channel.Type.Call1">Accept</tp:dbus-ref>).</p> <p>When <tp:dbus-ref - namespace="ofdT.Channel.Type.Call1">Accept</tp:dbus-ref> is + namespace="imt1.Channel.Type.Call1">Accept</tp:dbus-ref> is called, all streams with a local sending state of <tp:value-ref type="Sending_State">Pending_Send</tp:value-ref> and the associated - <tp:dbus-ref namespace="ofdT.Call1.Content" + <tp:dbus-ref namespace="imt1.Call1.Content" >Disposition</tp:dbus-ref> set to <tp:value-ref type="Call_Content_Disposition">Initial</tp:value-ref> are automatically set to sending.</p> diff --git a/spec/Call_Stream_Endpoint.xml b/spec/Call_Stream_Endpoint.xml index 2aa7e52f3..c52b7da3e 100644 --- a/spec/Call_Stream_Endpoint.xml +++ b/spec/Call_Stream_Endpoint.xml @@ -20,7 +20,7 @@ 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Call1.Stream.Endpoint" + <interface name="im.telepathy1.Call1.Stream.Endpoint" tp:causes-havoc="experimental"> <tp:added version="0.19.0">(draft 1)</tp:added> @@ -149,7 +149,7 @@ <p>Also note that some or all of the local candidates in this list may represent a peer-reflexive candidate that do not appear in - <tp:dbus-ref namespace="ofdT.Call1.Stream.Interface.Media" + <tp:dbus-ref namespace="imt1.Call1.Stream.Interface.Media" >LocalCandidates</tp:dbus-ref>.</p> <p>See <a href='http://tools.ietf.org/html/rfc5245#appendix-B.6'>RFC @@ -188,7 +188,7 @@ </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"/> + <tp:error name="im.telepathy1.Error.InvalidArgument"/> </tp:possible-errors> </method> @@ -284,8 +284,8 @@ </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"/> + <tp:error name="im.telepathy1.Error.InvalidArgument"/> + <tp:error name="im.telepathy1.Error.NotAvailable"/> </tp:possible-errors> </method> @@ -309,7 +309,7 @@ </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"/> + <tp:error name="im.telepathy1.Error.InvalidArgument"/> </tp:possible-errors> </method> @@ -333,14 +333,19 @@ </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"/> + <tp:error name="im.telepathy1.Error.InvalidArgument"/> </tp:possible-errors> </method> <property name="Transport" tp:name-for-bindings="Transport" type="u" tp:type="Stream_Transport_Type" access="read"> <tp:docstring> - The transport type for the stream endpoint. + The transport type for the stream endpoint. This can be + different from the transport of the Stream in the case where + of falling back from <tp:value-ref + type="Stream_Transport_Type">ICE</tp:value-ref> to + <tp:value-ref + type="Stream_Transport_Type">Raw_UDP</tp:value-ref>. </tp:docstring> </property> diff --git a/spec/Call_Stream_Interface_Media.xml b/spec/Call_Stream_Interface_Media.xml index 450d5ea42..5ca170088 100644 --- a/spec/Call_Stream_Interface_Media.xml +++ b/spec/Call_Stream_Interface_Media.xml @@ -20,10 +20,10 @@ 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Call1.Stream.Interface.Media" + <interface name="im.telepathy1.Call1.Stream.Interface.Media" tp:causes-havoc="experimental"> <tp:added version="0.19.0">(draft 1)</tp:added> - <tp:requires interface="org.freedesktop.Telepathy.Call1.Stream"/> + <tp:requires interface="im.telepathy1.Call1.Stream"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>This interface deals with how to connect a stream to an @@ -33,7 +33,7 @@ endpoints at the same time. This is called forking in the SIP jargon. Informations related to the connections are on the <tp:dbus-ref - namespace="ofdT.Call1.Stream">Endpoint</tp:dbus-ref> + namespace="imt1.Call1.Stream">Endpoint</tp:dbus-ref> objects. Once the call is established, there MUST be a single endpoint left.</p> @@ -80,17 +80,16 @@ data, and everything is going swimmingly. </tp:docstring> </tp:enumvalue> - <tp:enumvalue suffix="Pending_Pause" value="4"> + <tp:enumvalue suffix="Pending_Mute" value="4"> <tp:docstring> - The streaming implementation has been told to pause sending or - displaying data, but it has not yet indicated that it has done so. + The streaming implementation has been told to mute sending, + but it has not yet indicated that it has done so. </tp:docstring> </tp:enumvalue> - <tp:enumvalue suffix="Paused" value="5"> + <tp:enumvalue suffix="Muted" value="5"> <tp:docstring> - The streaming implementation has successfully paused either sending or - displaying data, and the local user's privacy or peace-and-quiet is - protected. + The streaming implementation has successfully muted sending, + and the local user's privacy is protected. </tp:docstring> </tp:enumvalue> </tp:enum> @@ -140,7 +139,7 @@ </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> + <tp:error name="im.telepathy1.Error.InvalidArgument"> <tp:docstring> The state change made no sense, and was ignored by the CM. The most likely cause for this is a race-condition between the CM @@ -201,7 +200,7 @@ </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> + <tp:error name="im.telepathy1.Error.InvalidArgument"> <tp:docstring> The state change made no sense, and was ignored by the CM. The most likely cause for this is a race-condition between the CM @@ -215,7 +214,7 @@ <method name="ReportReceivingFailure" tp:name-for-bindings="Report_Receiving_Failure"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - Can be called at any point to indicate a failure in the outgoing + Can be called at any point to indicate a failure in the incoming portion of the stream. </tp:docstring> <arg name="Reason" type="u" tp:type="Call_State_Change_Reason" @@ -291,6 +290,14 @@ </tp:enumvalue> </tp:enum> + <tp:enum name="Media_Stream_Base_Proto" type="u"> + <tp:enumvalue suffix="UDP" value="0"> + <tp:docstring>UDP (User Datagram Protocol)</tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="TCP" value="1"> + <tp:docstring>TCP (Transmission Control Protocol)</tp:docstring> + </tp:enumvalue> + </tp:enum> <tp:mapping name="Candidate_Info"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -437,7 +444,7 @@ <tp:docstring> Raw UDP, with or without STUN. All streaming clients are assumed to support this transport, so there is no handler capability token for - it in the <tp:dbus-ref namespace="ofdT.Channel.Type" + it in the <tp:dbus-ref namespace="imt1.Channel.Type" >Call1</tp:dbus-ref> interface. [This corresponds to "none" or "stun" in the old Media.StreamHandler interface.] @@ -724,7 +731,7 @@ <property name="Endpoints" tp:name-for-bindings="Endpoints" type="ao" access="read"> <tp:docstring> - <p>The list of <tp:dbus-ref namespace="ofdT.Call1.Stream" + <p>The list of <tp:dbus-ref namespace="imt1.Call1.Stream" >Endpoint</tp:dbus-ref> objects that exist for this stream.</p> diff --git a/spec/Channel_Dispatch_Operation.xml b/spec/Channel_Dispatch_Operation.xml index 6ec69a67b..2b4756a97 100644 --- a/spec/Channel_Dispatch_Operation.xml +++ b/spec/Channel_Dispatch_Operation.xml @@ -21,29 +21,26 @@ MA 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.ChannelDispatchOperation"> + <interface name="im.telepathy1.ChannelDispatchOperation"> <tp:added version="0.17.26">(as a stable interface)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A channel dispatch operation is an object in the ChannelDispatcher representing a batch of unrequested channels being announced to client - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Client">Approver</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1.Client">Approver</tp:dbus-ref> processes.</p> <p>These objects can result from new incoming channels or channels which are automatically created for some reason, but cannot result from outgoing requests for channels.</p> - <p>More specifically, whenever the - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.NewChannels</tp:dbus-ref> - signal contains channels whose - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">Requested</tp:dbus-ref> - property is false, or whenever the - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.NewChannel</tp:dbus-ref> - signal contains a channel with suppress_handler false, - one or more ChannelDispatchOperation objects are created for those - channels.</p> + <p>More specifically, whenever the <tp:dbus-ref + namespace="im.telepathy1">Connection.Interface.Requests.NewChannels</tp:dbus-ref> + signal contains channels whose <tp:dbus-ref + namespace="im.telepathy1.Channel">Requested</tp:dbus-ref> + property is false, one or more ChannelDispatchOperation + objects are created for those channels.</p> <p>(If some channels in a NewChannels signal are in different bundles, this is an error. The channel dispatcher SHOULD recover by treating @@ -52,9 +49,9 @@ <p>First, the channel dispatcher SHOULD construct a list of all the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Client">Handler</tp:dbus-ref>s + namespace="im.telepathy1.Client">Handler</tp:dbus-ref>s that could handle all the channels (based on their <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Client.Handler">HandlerChannelFilter</tp:dbus-ref> + namespace="im.telepathy1.Client.Handler">HandlerChannelFilter</tp:dbus-ref> property), ordered by priority in some implementation-dependent way. If there are handlers which could handle all the channels, one channel dispatch operation @@ -66,30 +63,20 @@ SHOULD terminate that channel instead of creating a channel dispatcher for it. It is RECOMMENDED that the channel dispatcher closes the channels using <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Channel.Interface.Destroyable.Destroy</tp:dbus-ref> + namespace="im.telepathy1">Channel.Interface.Destroyable1.Destroy</tp:dbus-ref> if supported, or <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Channel.Close</tp:dbus-ref> - otherwise. As a special case, the channel dispatcher SHOULD NOT close - <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Type">ContactList</tp:dbus-ref> - channels, and if Close fails, the channel dispatcher SHOULD ignore - that channel.</p> - - <tp:rationale> - <p>ContactList channels are strange. We hope to replace them with - something better, such as an interface on the Connection, in a - future version of this specification.</p> - </tp:rationale> + namespace="im.telepathy1">Channel.Close</tp:dbus-ref> + otherwise.</p> <p>When listing channel handlers, priority SHOULD be given to channel handlers that are already handling channels from the same bundle.</p> <p>If a handler with <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Client.Handler">BypassApproval</tp:dbus-ref> + namespace="im.telepathy1.Client.Handler">BypassApproval</tp:dbus-ref> <code>= True</code> could handle all of the channels in the dispatch operation, then the channel dispatcher SHOULD call <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Client.Handler">HandleChannels</tp:dbus-ref> + namespace="im.telepathy1.Client.Handler">HandleChannels</tp:dbus-ref> on that handler, and (assuming the call succeeds) emit <tp:member-ref>Finished</tp:member-ref> and stop processing those channels without involving any approvers.</p> @@ -97,12 +84,12 @@ <tp:rationale> <p>Some channel types can be picked up "quietly" by an existing channel handler. If a <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Type">Text</tp:dbus-ref> + namespace="im.telepathy1.Channel.Type">Text</tp:dbus-ref> channel is added to an existing bundle containing a <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Type">StreamedMedia</tp:dbus-ref> + namespace="im.telepathy1.Channel.Type">Call1</tp:dbus-ref> channel, there shouldn't be any approvers, flashing icons or notification bubbles, if the - the UI for the StreamedMedia channel can just add a text box + the UI for the Call channel can just add a text box and display the message.</p> </tp:rationale> @@ -111,7 +98,7 @@ approver to claim the channels or request that they are handled. See <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Client.Approver">AddDispatchOperation</tp:dbus-ref> + namespace="im.telepathy1.Client.Approver">AddDispatchOperation</tp:dbus-ref> for more details on this.</p> <p>Finally, if the approver requested it, the channel dispatcher SHOULD @@ -130,7 +117,7 @@ type="o" access="read"> <tp:docstring> The <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Connection</tp:dbus-ref> + namespace="im.telepathy1">Connection</tp:dbus-ref> with which the <tp:member-ref>Channels</tp:member-ref> are associated. The well-known bus name to use can be derived from this object path by removing the leading '/' and replacing all @@ -142,7 +129,7 @@ type="o" access="read"> <tp:docstring> The <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Account</tp:dbus-ref> + namespace="im.telepathy1">Account</tp:dbus-ref> with which the <tp:member-ref>Connection</tp:member-ref> and <tp:member-ref>Channels</tp:member-ref> are associated. This property cannot change. @@ -153,7 +140,7 @@ type="a(oa{sv})" access="read" tp:type="Channel_Details[]"> <tp:docstring> The <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Channel</tp:dbus-ref>s + namespace="im.telepathy1">Channel</tp:dbus-ref>s to be dispatched, and their properties. Change notification is via the <tp:member-ref>ChannelLost</tp:member-ref> signal (channels cannot be added to this property, only removed). @@ -170,7 +157,7 @@ <p>This signal MUST NOT be emitted until all Approvers that were invoked have returned (successfully or with an error) from their <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Client.Approver">AddDispatchOperation</tp:dbus-ref> + namespace="im.telepathy1.Client.Approver">AddDispatchOperation</tp:dbus-ref> method.</p> <tp:rationale> @@ -189,7 +176,7 @@ <arg name="Channel" type="o"> <tp:docstring> The <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Channel</tp:dbus-ref> + namespace="im.telepathy1">Channel</tp:dbus-ref> that closed. </tp:docstring> </arg> @@ -198,7 +185,7 @@ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The name of a D-Bus error indicating why the channel closed. If no better reason can be found, - <code>org.freedesktop.Telepathy.Error.NotAvailable</code> MAY + <code>im.telepathy1.Error.NotAvailable</code> MAY be used as a fallback; this means that this error SHOULD NOT be given any more specific meaning.</p> </tp:docstring> @@ -215,9 +202,9 @@ type="as" access="read" tp:type="DBus_Well_Known_Name[]"> <tp:docstring> <p>The well known bus names (starting with - <code>org.freedesktop.Telepathy.Client.</code>) of the possible + <code>im.telepathy1.Client.</code>) of the possible <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Client">Handler</tp:dbus-ref>s + namespace="im.telepathy1.Client">Handler</tp:dbus-ref>s for these channels. The channel dispatcher MUST place the most preferred handlers first, according to some reasonable heuristic. As a result, approvers SHOULD use the first handler by default.</p> @@ -257,7 +244,7 @@ <p>(FIXME: list some possible errors)</p> <p>If the channel handler raises an error from <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Client.Handler">HandleChannels</tp:dbus-ref>, + namespace="im.telepathy1.Client.Handler">HandleChannels</tp:dbus-ref>, this method MAY respond by raising that same error, even if it is not specifically documented here.</p> @@ -266,27 +253,27 @@ <arg direction="in" type="s" tp:type="DBus_Bus_Name" name="Handler"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The well-known bus name (starting with - <code>org.freedesktop.Telepathy.Client.</code>) of the channel + <code>im.telepathy1.Client.</code>) of the channel handler that should handle the channel, or the empty string if the client has no preferred channel handler.</p> </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> + <tp:error name="im.telepathy1.Error.InvalidArgument"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> The selected handler is non-empty, but is not a syntactically correct <tp:type>DBus_Bus_Name</tp:type> or does not start with - "<code>org.freedesktop.Telepathy.Client.</code>". + "<code>im.telepathy1.Client.</code>". </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring> The selected handler is temporarily unable to handle these channels. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring> The selected handler is syntactically correct, but will never be able to handle these channels (for instance because the channels @@ -294,7 +281,7 @@ raised NotImplemented). </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotYours"> + <tp:error name="im.telepathy1.Error.NotYours"> <tp:docstring> At the time that HandleWith was called, this dispatch operation was processing an earlier call to HandleWith. The earlier call has @@ -315,18 +302,18 @@ internally. If this method is called successfully, the process calling this method becomes the handler for the channel, but <em>does not</em> have the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Client.Handler">HandleChannels</tp:dbus-ref> + namespace="im.telepathy1.Client.Handler">HandleChannels</tp:dbus-ref> method called on it.</p> <p>Clients that call Claim on channels but do not immediately close them SHOULD implement the Handler interface and its <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Client.Handler">HandledChannels</tp:dbus-ref> + namespace="im.telepathy1.Client.Handler">HandledChannels</tp:dbus-ref> property.</p> <p>Approvers wishing to reject channels MUST call this method to claim ownership of them, and MUST NOT call - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">Close</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1.Channel">Close</tp:dbus-ref> on the channels unless/until this method returns successfully.</p> <tp:rationale> @@ -336,13 +323,15 @@ to acknowledge any messages that have already been displayed to the user first - ideally, the approver would display and then acknowledge the messages - or to call <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Channel.Interface.Destroyable.Destroy</tp:dbus-ref> + namespace="im.telepathy1">Channel.Interface.Destroyable1.Destroy</tp:dbus-ref> if the destructive behaviour of that method is desired.</p> - <p>Similarly, an Approver for StreamedMedia channels can close the - channel with a reason (e.g. "busy") if desired. The channel - dispatcher, which is designed to have no specific knowledge - of particular channel types, can't do that.</p> + <p>Similarly, an Approver for <tp:dbus-ref + namespace="imt1.Channel.Type">Call1</tp:dbus-ref> channels + can close the channel with a reason (e.g. "busy") if + desired. The channel dispatcher, which is designed to have + no specific knowledge of particular channel types, can't + do that.</p> </tp:rationale> <p>If successful, this method will cause the ChannelDispatchOperation @@ -359,7 +348,7 @@ </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NotYours"> + <tp:error name="im.telepathy1.Error.NotYours"> <tp:docstring> At the time that Claim was called, this dispatch operation was processing a call to HandleWith which has now succeeded, so @@ -380,14 +369,14 @@ <p>A variant of <tp:member-ref>HandleWith</tp:member-ref> allowing the approver to pass an user action time. This timestamp will be passed to the Handler when <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Client.Handler">HandleChannels</tp:dbus-ref> + namespace="im.telepathy1.Client.Handler">HandleChannels</tp:dbus-ref> is called.</p> </tp:docstring> <arg direction="in" type="s" tp:type="DBus_Bus_Name" name="Handler"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The well-known bus name (starting with - <code>org.freedesktop.Telepathy.Client.</code>) of the channel + <code>im.telepathy1.Client.</code>) of the channel handler that should handle the channel, or the empty string if the client has no preferred channel handler.</p> </tp:docstring> @@ -400,20 +389,20 @@ </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> + <tp:error name="im.telepathy1.Error.InvalidArgument"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> The selected handler is non-empty, but is not a syntactically correct <tp:type>DBus_Bus_Name</tp:type> or does not start with - "<code>org.freedesktop.Telepathy.Client.</code>". + "<code>im.telepathy1.Client.</code>". </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring> The selected handler is temporarily unable to handle these channels. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring> The selected handler is syntactically correct, but will never be able to handle these channels (for instance because the channels @@ -421,7 +410,7 @@ raised NotImplemented). </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotYours"> + <tp:error name="im.telepathy1.Error.NotYours"> <tp:docstring> At the time that HandleWith was called, this dispatch operation was processing an earlier call to HandleWith. The earlier call has @@ -461,7 +450,7 @@ <p>This signal MUST NOT be emitted until all Approvers that were invoked have returned (successfully or with an error) from their <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Client.Approver">AddDispatchOperation</tp:dbus-ref> + namespace="im.telepathy1.Client.Approver">AddDispatchOperation</tp:dbus-ref> method.</p> <tp:rationale> diff --git a/spec/Channel_Dispatcher_Interface_Operation_List.xml b/spec/Channel_Dispatcher_Interface_Operation_List.xml index be06f5caa..46a22a3ed 100644 --- a/spec/Channel_Dispatcher_Interface_Operation_List.xml +++ b/spec/Channel_Dispatcher_Interface_Operation_List.xml @@ -21,10 +21,10 @@ USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.ChannelDispatcher.Interface.OperationList"> + <interface name="im.telepathy1.ChannelDispatcher.Interface.OperationList1"> <tp:added version="0.17.26">(as a stable interface)</tp:added> - <tp:requires interface="org.freedesktop.Telepathy.ChannelDispatcher"/> + <tp:requires interface="im.telepathy1.ChannelDispatcher"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>This interface allows users of the ChannelDispatcher to enumerate @@ -51,7 +51,7 @@ <tp:docstring> The object path of the <tp:dbus-ref - namespace="org.freedesktop.Telepathy">ChannelDispatchOperation</tp:dbus-ref>. + namespace="im.telepathy1">ChannelDispatchOperation</tp:dbus-ref>. </tp:docstring> </tp:member> @@ -71,10 +71,10 @@ <p>Each dictionary MUST contain at least the following keys:</p> <ul> - <li><tp:dbus-ref>org.freedesktop.Telepathy.ChannelDispatchOperation.Interfaces</tp:dbus-ref></li> - <li><tp:dbus-ref>org.freedesktop.Telepathy.ChannelDispatchOperation.Connection</tp:dbus-ref></li> - <li><tp:dbus-ref>org.freedesktop.Telepathy.ChannelDispatchOperation.Account</tp:dbus-ref></li> - <li><tp:dbus-ref>org.freedesktop.Telepathy.ChannelDispatchOperation.PossibleHandlers</tp:dbus-ref></li> + <li><tp:dbus-ref>im.telepathy1.ChannelDispatchOperation.Interfaces</tp:dbus-ref></li> + <li><tp:dbus-ref>im.telepathy1.ChannelDispatchOperation.Connection</tp:dbus-ref></li> + <li><tp:dbus-ref>im.telepathy1.ChannelDispatchOperation.Account</tp:dbus-ref></li> + <li><tp:dbus-ref>im.telepathy1.ChannelDispatchOperation.PossibleHandlers</tp:dbus-ref></li> </ul> </tp:docstring> </tp:member> @@ -118,7 +118,7 @@ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> Emitted when a dispatch operation finishes (i.e. exactly once per emission of <tp:dbus-ref - namespace="org.freedesktop.Telepathy">ChannelDispatchOperation.Finished</tp:dbus-ref>). + namespace="im.telepathy1">ChannelDispatchOperation.Finished</tp:dbus-ref>). <tp:rationale> Strictly speaking this is redundant with diff --git a/spec/Channel_Interface_Addressing.xml b/spec/Channel_Interface_Addressing.xml index 494fd7bf0..9fa27b03b 100644 --- a/spec/Channel_Interface_Addressing.xml +++ b/spec/Channel_Interface_Addressing.xml @@ -16,7 +16,7 @@ Lesser General Public License for more details.</p> License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Channel.Interface.Addressing.DRAFT" + <interface name="im.telepathy1.Channel.Interface.Addressing1" tp:causes-havoc="experimental"> <tp:added version="0.19.12">(as draft)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -54,7 +54,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:rationale> <p>While this seems redundant, since the scheme is included in <tp:member-ref>TargetURI</tp:member-ref>, it exists for constructing - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface.Requests">RequestableChannelClasses</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1.Connection.Interface.Requests">RequestableChannelClasses</tp:dbus-ref> that support a limited set of URI schemes.</p> </tp:rationale> @@ -72,10 +72,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>If this is present in a channel request, <tp:member-ref>TargetVCardField</tp:member-ref> MUST be present, and - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">TargetHandle</tp:dbus-ref>, - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">TargetID</tp:dbus-ref>, + <tp:dbus-ref namespace="im.telepathy1.Channel">TargetHandle</tp:dbus-ref>, + <tp:dbus-ref namespace="im.telepathy1.Channel">TargetID</tp:dbus-ref>, and <tp:member-ref>TargetURI</tp:member-ref> MUST NOT be present. - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">TargetHandleType</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1.Channel">TargetHandleType</tp:dbus-ref> must either not be present or set to Handle_Type_Contact. The request MUST fail with error InvalidHandle, without side-effects, if the requested vCard address cannot be found.</p> @@ -92,11 +92,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>If this is present in a channel request, <tp:member-ref>TargetVCardField</tp:member-ref> MUST be present, and - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">TargetHandle</tp:dbus-ref>, - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">TargetID</tp:dbus-ref>, + <tp:dbus-ref namespace="im.telepathy1.Channel">TargetHandle</tp:dbus-ref>, + <tp:dbus-ref namespace="im.telepathy1.Channel">TargetID</tp:dbus-ref>, and <tp:member-ref>TargetVCardAddress</tp:member-ref> MUST NOT be present. - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">TargetHandleType</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1.Channel">TargetHandleType</tp:dbus-ref> must either not be present or set to Handle_Type_Contact. The request MUST fail with error InvalidHandle, without side-effects, if the requested vCard address cannot be found.</p> diff --git a/spec/Channel_Interface_Anonymity.xml b/spec/Channel_Interface_Anonymity.xml index ef3a3b85d..54c621638 100644 --- a/spec/Channel_Interface_Anonymity.xml +++ b/spec/Channel_Interface_Anonymity.xml @@ -21,13 +21,13 @@ 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Channel.Interface.Anonymity"> + <interface name="im.telepathy1.Channel.Interface.Anonymity1"> <tp:added version="0.19.7">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Interface for requesting the anonymity modes of a channel - (as defined in <tp:dbus-ref namespace="org.freedesktop.Telepathy" - >Connection.Interface.Anonymity</tp:dbus-ref>).</p> + (as defined in <tp:dbus-ref namespace="im.telepathy1" + >Connection.Interface.Anonymity1</tp:dbus-ref>).</p> </tp:docstring> <property name="AnonymityModes" type="u" tp:type="Anonymity_Mode_Flags" diff --git a/spec/Channel_Interface_Chat_State.xml b/spec/Channel_Interface_Chat_State.xml index 27515d2e8..727432037 100644 --- a/spec/Channel_Interface_Chat_State.xml +++ b/spec/Channel_Interface_Chat_State.xml @@ -16,8 +16,8 @@ Lesser General Public License for more details.</p> License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Channel.Interface.ChatState"> - <tp:requires interface="org.freedesktop.Telepathy.Channel.Type.Text"/> + <interface name="im.telepathy1.Channel.Interface.ChatState1"> + <tp:requires interface="im.telepathy1.Channel.Type.Text"/> <tp:mapping name="Chat_State_Map"> <tp:added version="0.19.7"/> @@ -39,26 +39,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>Contacts in this channel, but who are not listed in this map, may be assumed to be in the Inactive state.</p> - - <p>In implementations that do not have this property, its value may be - assumed to be empty until a - <tp:member-ref>ChatStateChanged</tp:member-ref> signal indicates - otherwise.</p> - - <tp:rationale> - <p>This property was not present in older versions of telepathy-spec, - because chat states in XMPP are not state-recoverable (if you - miss the change notification signal, there's no way to know the - state). However, this property still allows clients to recover - state changes that were seen by the CM before the client started - to deal with the channel.</p> - - <p>In CMs that follow older spec versions, assuming Inactive will - mean that initial chat states will always be assumed to be - Inactive, which is the best we can do. XEP 0085 specifies - Inactive as the "neutral" state to be assumed unless told - otherwise.</p> - </tp:rationale> </tp:docstring> </property> @@ -73,9 +53,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ has changed. </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"/> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.NotAvailable"/> + <tp:error name="im.telepathy1.Error.InvalidArgument"/> </tp:possible-errors> </method> <signal name="ChatStateChanged" tp:name-for-bindings="Chat_State_Changed"> diff --git a/spec/Channel_Interface_Conference.xml b/spec/Channel_Interface_Conference.xml index abda59eef..a5923b2b6 100644 --- a/spec/Channel_Interface_Conference.xml +++ b/spec/Channel_Interface_Conference.xml @@ -20,11 +20,11 @@ 02110-1301, USA.</p> </tp:license> <interface - name="org.freedesktop.Telepathy.Channel.Interface.Conference"> + name="im.telepathy1.Channel.Interface.Conference1"> <tp:added version="0.19.13">(as stable API)</tp:added> - <tp:requires interface="org.freedesktop.Telepathy.Channel"/> + <tp:requires interface="im.telepathy1.Channel"/> <tp:requires - interface="org.freedesktop.Telepathy.Channel.Interface.Group"/> + interface="im.telepathy1.Channel.Interface.Group1"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>An interface for multi-user conference channels that can "continue @@ -44,13 +44,13 @@ <p>Existing channels are upgraded by requesting a new channel of the same <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel">ChannelType</tp:dbus-ref>, + namespace="im.telepathy1.Channel">ChannelType</tp:dbus-ref>, listing the channels to be merged into the new conference in the <tp:member-ref>InitialChannels</tp:member-ref> property of the request. If <tp:member-ref>InitialInviteeHandles</tp:member-ref> and <tp:member-ref>InitialInviteeIDs</tp:member-ref> are <var>Allowed_Properties</var> in <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection.Interface.Requests">RequestableChannelClasses</tp:dbus-ref>, + namespace="im.telepathy1.Connection.Interface.Requests">RequestableChannelClasses</tp:dbus-ref>, ad-hoc conferences to a set of contacts may be created by requesting a channel, specifying <tp:member-ref>InitialInviteeHandles</tp:member-ref> and/or @@ -60,15 +60,15 @@ upgrade a channel to a conference and invite others to join it.</p> <p>Channels with this interface MAY also implement <tp:dbus-ref - namespace='ofdT.Channel.Interface'>MergeableConference.DRAFT</tp:dbus-ref> + namespace='imt1.Channel.Interface'>MergeableConference1</tp:dbus-ref> to support merging more 1-1 channels into an ongoing conference. Similarly, 1-1 channels MAY implement <tp:dbus-ref - namespace='ofdT.Channel.Interface'>Splittable.DRAFT</tp:dbus-ref> to + namespace='imt1.Channel.Interface'>Splittable1</tp:dbus-ref> to support being broken out of a Conference channel.</p> <p>The <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Interface" - >Group</tp:dbus-ref> interface on Conference channels MAY use + namespace="im.telepathy1.Channel.Interface" + >Group1</tp:dbus-ref> interface on Conference channels MAY use channel-specific handles for participants; clients SHOULD support both Conferences that have channel-specific handles, and those that do not.</p> @@ -114,8 +114,8 @@ into a single conference call by calling:</p> <blockquote> - <code><tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>({ - ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">ChannelType</tp:dbus-ref>: ...Call, + <code><tp:dbus-ref namespace="im.telepathy1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>({ + ...<tp:dbus-ref namespace="im.telepathy1.Channel">ChannelType</tp:dbus-ref>: ...Call, ...<tp:member-ref>InitialChannels</tp:member-ref>: [C1, C2] })</code> </blockquote> @@ -123,7 +123,7 @@ <p>which returns a new channel <var>Cn</var> implementing the conference interface. (As a quirk of GSM, both 1-1 will cease to function normally until they are <tp:dbus-ref - namespace="ofdT.Channel.Interface.Splittable.DRAFT">Split</tp:dbus-ref> + namespace="imt1.Channel.Interface.Splittable1">Split</tp:dbus-ref> from the conference, or the conference ends.)</p> <p>An XMPP 1-1 conversation <var>C3</var> (with @@ -153,10 +153,10 @@ the room), call:</p> <blockquote> - <code><tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface.Requests">EnsureChannel</tp:dbus-ref>({ + <code><tp:dbus-ref namespace="im.telepathy1.Connection.Interface.Requests">EnsureChannel</tp:dbus-ref>({ ...ChannelType: ...Text, - ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">TargetHandleType</tp:dbus-ref>: ...Room, - ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">TargetID</tp:dbus-ref>: 'telepathy@conf.example.com', + ...<tp:dbus-ref namespace="im.telepathy1.Channel">TargetHandleType</tp:dbus-ref>: ...Room, + ...<tp:dbus-ref namespace="im.telepathy1.Channel">TargetID</tp:dbus-ref>: 'telepathy@conf.example.com', ...<tp:member-ref>InitialChannels</tp:member-ref>: [C3] })</code> </blockquote> @@ -189,7 +189,7 @@ (maybe it transformed the existing tab into the group chat window, and so there'd be no UI element still around to show new messages), then it should just <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel">Close</tp:dbus-ref> the + namespace="im.telepathy1.Channel">Close</tp:dbus-ref> the old 1-1 channel; it'll respawn if necessary.</p> </tp:rationale> @@ -204,7 +204,7 @@ TargetHandle of C1 into Cn), then immediately inviting the TargetHandle of C2, the TargetHandle of C3, etc. into Cn as well.</p> - <h4>Sample <tp:dbus-ref namespace='ofdT.Connection.Interface.Requests' + <h4>Sample <tp:dbus-ref namespace='imt1.Connection.Interface.Requests' >RequestableChannelClasses</tp:dbus-ref></h4> <p>A GSM connection might advertise the following channel class for @@ -213,11 +213,11 @@ <blockquote> <code> ( Fixed = {<br/> - ...<tp:dbus-ref namespace='ofdT.Channel'>ChannelType</tp:dbus-ref>: - ...<tp:dbus-ref namespace='ofdT.Channel.Type'>StreamedMedia</tp:dbus-ref><br/> + ...<tp:dbus-ref namespace='imt1.Channel'>ChannelType</tp:dbus-ref>: + ...<tp:dbus-ref namespace='imt1.Channel.Type'>Call1</tp:dbus-ref><br/> },<br/> Allowed = [ <tp:member-ref>InitialChannels</tp:member-ref>, - <tp:dbus-ref namespace='ofdT.Channel.Type.StreamedMedia' + <tp:dbus-ref namespace='imt1.Channel.Type.Call1' >InitialAudio</tp:dbus-ref> ]<br/> ) @@ -235,8 +235,8 @@ <blockquote> <code> ( Fixed = {<br/> - ...<tp:dbus-ref namespace='ofdT.Channel'>ChannelType</tp:dbus-ref>: - ...<tp:dbus-ref namespace='ofdT.Channel.Type'>Text</tp:dbus-ref><br/> + ...<tp:dbus-ref namespace='imt1.Channel'>ChannelType</tp:dbus-ref>: + ...<tp:dbus-ref namespace='imt1.Channel.Type'>Text</tp:dbus-ref><br/> },<br/> Allowed = [ <tp:member-ref>InitialChannels</tp:member-ref>, <tp:member-ref>InitialInviteeHandles</tp:member-ref>, @@ -245,13 +245,13 @@ ]<br/> ),<br/> ( Fixed = {<br/> - ...<tp:dbus-ref namespace='ofdT.Channel'>ChannelType</tp:dbus-ref>: - ...<tp:dbus-ref namespace='ofdT.Channel.Type'>Text</tp:dbus-ref>,<br/> - ...<tp:dbus-ref namespace='ofdT.Channel'>TargetHandleType</tp:dbus-ref>: + ...<tp:dbus-ref namespace='imt1.Channel'>ChannelType</tp:dbus-ref>: + ...<tp:dbus-ref namespace='imt1.Channel.Type'>Text</tp:dbus-ref>,<br/> + ...<tp:dbus-ref namespace='imt1.Channel'>TargetHandleType</tp:dbus-ref>: Room<br/> },<br/> - Allowed = [ <tp:dbus-ref namespace='ofdT.Channel'>TargetHandle</tp:dbus-ref>, - <tp:dbus-ref namespace='ofdT.Channel'>TargetID</tp:dbus-ref>,<br/> + Allowed = [ <tp:dbus-ref namespace='imt1.Channel'>TargetHandle</tp:dbus-ref>, + <tp:dbus-ref namespace='imt1.Channel'>TargetID</tp:dbus-ref>,<br/> <tp:member-ref>InitialChannels</tp:member-ref>, <tp:member-ref>InitialInviteeHandles</tp:member-ref>, <tp:member-ref>InitialInviteeIDs</tp:member-ref>, @@ -272,11 +272,11 @@ access="read" type="ao"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The individual <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Channel</tp:dbus-ref>s that + namespace="im.telepathy1">Channel</tp:dbus-ref>s that are continued by this conference, which have the same <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel" + namespace="im.telepathy1.Channel" >ChannelType</tp:dbus-ref> as this one, but with <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel" + namespace="im.telepathy1.Channel" >TargetHandleType</tp:dbus-ref> = CONTACT.</p> <p>This property MUST NOT be requestable; instead, the @@ -288,7 +288,7 @@ <tp:member-ref>InitialInviteeHandles</tp:member-ref> and <tp:member-ref>InitialInviteeIDs</tp:member-ref>, rather than requesting <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Interface">Group.Members</tp:dbus-ref> + namespace="im.telepathy1.Channel.Interface">Group1.Members</tp:dbus-ref> and some hypothetical ID version of that property.</p> </tp:rationale> @@ -311,12 +311,12 @@ <arg name="Channel_Specific_Handle" type="u" tp:type="Contact_Handle"> <tp:docstring>A new channel-specific handle for the <tp:dbus-ref - namespace="ofdT.Channel">TargetHandle</tp:dbus-ref> of + namespace="imt1.Channel">TargetHandle</tp:dbus-ref> of <var>Channel</var>, as will appear in <tp:member-ref>OriginalChannels</tp:member-ref>, or <tt>0</tt> if a global handle is used for <var>Channel</var>'s TargetHandle on the <tp:dbus-ref - namespace="ofdT.Channel.Interface">Group</tp:dbus-ref> interface + namespace="imt1.Channel.Interface">Group1</tp:dbus-ref> interface of this channel.</tp:docstring> </arg> @@ -331,11 +331,11 @@ <p>Emitted when a channel is removed from the value of <tp:member-ref>Channels</tp:member-ref>, either because it closed or because it was split using the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Interface" - >Splittable.DRAFT.Split</tp:dbus-ref> method.</p> + namespace="im.telepathy1.Channel.Interface" + >Splittable1.Split</tp:dbus-ref> method.</p> <p>If a channel is removed because it was closed, <tp:dbus-ref - namespace='ofdT.Channel'>Closed</tp:dbus-ref> should be emitted + namespace='imt1.Channel'>Closed</tp:dbus-ref> should be emitted before this signal.</p> </tp:docstring> @@ -348,8 +348,8 @@ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> Additional information about the removal, which may include the same well-known keys as the Details argument of - <tp:dbus-ref namespace="ofdT.Channel.Interface.Group" - >MembersChangedDetailed</tp:dbus-ref>, with the same semantics. + <tp:dbus-ref namespace="imt1.Channel.Interface.Group1" + >MembersChanged</tp:dbus-ref>, with the same semantics. </tp:docstring> </arg> </signal> @@ -366,7 +366,7 @@ <tp:member-ref>InitialInviteeHandles</tp:member-ref> and <tp:member-ref>InitialInviteeIDs</tp:member-ref> are <var>Allowed_Properties</var> in <tp:dbus-ref - namespace='ofdT.Connection.Interface.Requests' + namespace='imt1.Connection.Interface.Requests' >RequestableChannelClasses</tp:dbus-ref>, then requests with zero or one channel paths SHOULD also succeed; otherwise, clients SHOULD NOT make requests with zero or one paths for this property.</p> @@ -385,8 +385,8 @@ the protocol, the Channels MAY be placed in a "frozen" state by placing them in this property's value or by calling <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Interface" - >MergeableConference.DRAFT.Merge</tp:dbus-ref> on them.</p> + namespace="im.telepathy1.Channel.Interface" + >MergeableConference1.Merge</tp:dbus-ref> on them.</p> <tp:rationale> <p>In Jingle, nothing special will happen to merged calls. UIs MAY @@ -396,8 +396,8 @@ <p>In GSM, the calls that are merged go into a state similar to Hold, but they cannot be unheld, only split from the conference - call using <tp:dbus-ref namespace="org.freedesktop.Telepathy" - >Channel.Interface.Splittable.DRAFT.Split</tp:dbus-ref>.</p> + call using <tp:dbus-ref namespace="im.telepathy1" + >Channel.Interface.Splittable1.Split</tp:dbus-ref>.</p> </tp:rationale> <p>Depending on the protocol, it might be signalled to remote users @@ -428,7 +428,7 @@ (as opposed to merging several channels into one new conference channel), this property SHOULD be requestable, and appear in the allowed properties in <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection.Interface.Requests" + namespace="im.telepathy1.Connection.Interface.Requests" >RequestableChannelClasses</tp:dbus-ref>. Otherwise, this property SHOULD NOT be requestable, and its value SHOULD always be the empty list.</p> @@ -442,8 +442,8 @@ <p>If included in a request, the given contacts are automatically invited into the new channel, as if they had been added with - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Interface" - >Group.AddMembers</tp:dbus-ref>(InitialInviteeHandles, + <tp:dbus-ref namespace="im.telepathy1.Channel.Interface" + >Group1.AddMembers</tp:dbus-ref>(InitialInviteeHandles, <tp:member-ref>InvitationMessage</tp:member-ref>) immediately after the channel was created.</p> @@ -454,8 +454,8 @@ </tp:rationale> <p>If the local user was not the initiator of this channel, the - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Interface" - >Group.SelfHandle</tp:dbus-ref> SHOULD appear in the value of this + <tp:dbus-ref namespace="im.telepathy1.Channel.Interface" + >Group1.SelfHandle</tp:dbus-ref> SHOULD appear in the value of this property, together with any other contacts invited at the same time (if that information is known).</p> @@ -521,7 +521,7 @@ <p>This property SHOULD be requestable, and appear in the allowed properties in <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection.Interface.Requests" + namespace="im.telepathy1.Connection.Interface.Requests" >RequestableChannelClasses</tp:dbus-ref>, in protocols where invitations can have an accompanying text message.</p> @@ -546,9 +546,9 @@ a corporate switchboard. This is represented using channel-specific handles; whether or not a channel uses channel-specific handles is reported in <tp:dbus-ref - namespace='ofdT.Channel.Interface'>Group.GroupFlags</tp:dbus-ref>. + namespace='imt1.Channel.Interface'>Group1.GroupFlags</tp:dbus-ref>. The <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Interface">Group.HandleOwners</tp:dbus-ref> + namespace="im.telepathy1.Channel.Interface">Group1.HandleOwners</tp:dbus-ref> property specifies the mapping from opaque channel-specific handles to actual numbers; this property specifies the original 1-1 channel corresponding to each channel-specific handle in the conference.</p> @@ -577,13 +577,13 @@ <blockquote> <code>{<br/> ...<tp:dbus-ref - namespace="ofdT.Channel.Interface">Group.GroupFlags</tp:dbus-ref>: + namespace="imt1.Channel.Interface">Group1.GroupFlags</tp:dbus-ref>: Channel_Specific_Handles | (other flags),<br/> ...<tp:dbus-ref - namespace="ofdT.Channel.Interface">Group.Members</tp:dbus-ref>: + namespace="imt1.Channel.Interface">Group1.Members</tp:dbus-ref>: [self_handle, s, j],<br/> ...<tp:dbus-ref - namespace="ofdT.Channel.Interface">Group.HandleOwners</tp:dbus-ref>: + namespace="imt1.Channel.Interface">Group1.HandleOwners</tp:dbus-ref>: { s: h, j: h },<br/> ...<tp:member-ref>InitialChannels</tp:member-ref>: ['/call/to/simon', '/call/to/jonny'],<br/> diff --git a/spec/Channel_Interface_Credentials_Storage.xml b/spec/Channel_Interface_Credentials_Storage.xml index e44b13e32..10ce2ce54 100644 --- a/spec/Channel_Interface_Credentials_Storage.xml +++ b/spec/Channel_Interface_Credentials_Storage.xml @@ -17,10 +17,10 @@ Lesser General Public License for more details.</p> License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Channel.Interface.CredentialsStorage.DRAFT" + <interface name="im.telepathy1.Channel.Interface.CredentialsStorage1" tp:causes-havoc="experimental"> <tp:added version="0.21.10">(draft 1)</tp:added> - <tp:requires interface="org.freedesktop.Telepathy.Channel.Interface.SASLAuthentication"/> + <tp:requires interface="im.telepathy1.Channel.Interface.SASLAuthentication1"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A channel interface for SASL authentication channels that can save the credentials in the connection manager.</p> @@ -31,10 +31,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>In practice, this interface should only be implemented by connection managers that implement the <tp:dbus-ref - namespace="ofdT">ConnectionManager.Interface.AccountStorage.DRAFT</tp:dbus-ref> + namespace="imt1">ConnectionManager.Interface.AccountStorage1</tp:dbus-ref> interface. To clear a password that has been saved in this manner, a client should call <tp:dbus-ref - namespace="ofdT.ConnectionManager.Interface">AccountStorage.DRAFT.ForgetCredentials</tp:dbus-ref> + namespace="imt1.ConnectionManager.Interface">AccountStorage1.ForgetCredentials</tp:dbus-ref> on the Account.</p> </tp:docstring> @@ -51,7 +51,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>If credentials have been stored in this way, the client SHOULD NOT attempt to store the credentials locally in a keyring.</p> <p>This method MUST be called before <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Interface.SASLAuthentication">AcceptSASL</tp:dbus-ref> + namespace="im.telepathy1.Channel.Interface.SASLAuthentication1">AcceptSASL</tp:dbus-ref> is called or it will have no effect.</p> </tp:docstring> </method> diff --git a/spec/Channel_Interface_DTMF.xml b/spec/Channel_Interface_DTMF.xml index bb579a113..d8b9a1511 100644 --- a/spec/Channel_Interface_DTMF.xml +++ b/spec/Channel_Interface_DTMF.xml @@ -18,33 +18,32 @@ Lesser General Public License for more details.</p> License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Channel.Interface.DTMF"> - <tp:xor-requires> - <tp:requires interface="org.freedesktop.Telepathy.Channel.Type.StreamedMedia"/> - <tp:requires interface="org.freedesktop.Telepathy.Channel.Type.Call1"/> - </tp:xor-requires> - <tp:changed version="0.19.6">The <tp:type>Stream_ID</tp:type>s in this + <interface name="im.telepathy1.Channel.Interface.DTMF1"> + <tp:requires interface="im.telepathy1.Channel.Type.Call1"/> + <tp:changed version="0.19.6">The Stream_IDs in this interface should now be ignored by CMs. This is primarily to allow this interface to be used with <tp:dbus-ref - namespace='ofdT.Channel.Type'>Call1</tp:dbus-ref> + namespace='imt1.Channel.Type'>Call1</tp:dbus-ref> channels.</tp:changed> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - An interface that gives a Channel the ability to send DTMF events over - audio streams which have been established using the StreamedMedia channel - type. The event codes used are in common with those defined in <a - href="http://www.rfc-editor.org/rfc/rfc4733.txt">RFC4733</a>, and are - listed in the <tp:type>DTMF_Event</tp:type> enumeration. + An interface that gives a Channel the ability to send DTMF + events over audio streams which have been established using the + <tp:dbus-ref namespace="imt1.Channel.Type">Call1</tp:dbus-ref> + channel type. The event codes used are in common with those + defined in <a + href="http://www.rfc-editor.org/rfc/rfc4733.txt">RFC4733</a>, + and are listed in the <tp:type>DTMF_Event</tp:type> enumeration. </tp:docstring> <method name="StartTone" tp:name-for-bindings="Start_Tone"> <tp:changed version="0.19.6">The <var>Stream_ID</var> parameter became vestigial.</tp:changed> - <arg direction="in" name="Stream_ID" type="u" tp:type="Stream_ID"> - <tp:docstring>A stream ID as defined in the StreamedMedia channel - type. This argument is included for backwards compatibility and MUST - be ignored by the implementations - the tone SHOULD be sent to all - eligible streams in the channel.</tp:docstring> + <arg direction="in" name="Stream_ID" type="u"> + <tp:docstring>This argument is included for backwards + compatibility and MUST be ignored by the implementations - the + tone SHOULD be sent to all eligible streams in the + channel.</tp:docstring> </arg> <arg direction="in" name="Event" type="y" tp:type="DTMF_Event"> <tp:docstring>A numeric event code from the DTMF_Event enum.</tp:docstring> @@ -67,19 +66,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ be called if no DTMF tones are already being played.</p> </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError" /> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> + <tp:error name="im.telepathy1.Error.NetworkError" /> + <tp:error name="im.telepathy1.Error.InvalidArgument"> <tp:docstring> The given stream ID was invalid. Deprecated, since stream IDs are ignored. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring> There are no eligible audio streams. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.ServiceBusy"> + <tp:error name="im.telepathy1.Error.ServiceBusy"> <tp:docstring> DTMF tones are already being played. </tp:docstring> @@ -90,11 +89,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <method name="StopTone" tp:name-for-bindings="Stop_Tone"> <tp:changed version="0.19.6">The <var>Stream_ID</var> parameter became vestigial.</tp:changed> - <arg direction="in" name="Stream_ID" type="u" tp:type="Stream_ID"> - <tp:docstring>A stream ID as defined in the StreamedMedia channel - type. This argument is included for backwards compatibility and MUST - be ignored by the implementations - the sending SHOULD be stoped in - all eligible streams in the channel.</tp:docstring> + <arg direction="in" name="Stream_ID" type="u"> + <tp:docstring>This argument is included for backwards + compatibility and MUST be ignored by the implementations - the + sending SHOULD be stoped in all eligible streams in the + channel.</tp:docstring> </arg> <tp:docstring> @@ -111,14 +110,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:rationale> </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError" /> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> + <tp:error name="im.telepathy1.Error.NetworkError" /> + <tp:error name="im.telepathy1.Error.InvalidArgument"> <tp:docstring> The given stream ID was invalid. Deprecated, since stream IDs are ignored. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring> Continuous tones are not supported by this stream. Deprecated, since stream IDs are ignored. @@ -176,18 +175,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ be called if no DTMF tones are already being played.</p> </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError" /> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> + <tp:error name="im.telepathy1.Error.NetworkError" /> + <tp:error name="im.telepathy1.Error.InvalidArgument"> <tp:docstring> The supplied Tones string was invalid. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring> There are no eligible audio streams. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.ServiceBusy"> + <tp:error name="im.telepathy1.Error.ServiceBusy"> <tp:docstring> DTMF tones are already being played. </tp:docstring> diff --git a/spec/Channel_Interface_Destroyable.xml b/spec/Channel_Interface_Destroyable.xml index ce5592327..2cc6dc895 100644 --- a/spec/Channel_Interface_Destroyable.xml +++ b/spec/Channel_Interface_Destroyable.xml @@ -22,17 +22,17 @@ </tp:license> <interface - name="org.freedesktop.Telepathy.Channel.Interface.Destroyable"> - <tp:requires interface="org.freedesktop.Telepathy.Channel"/> + name="im.telepathy1.Channel.Interface.Destroyable1"> + <tp:requires interface="im.telepathy1.Channel"/> <tp:added version="0.17.14">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>This interface exists to support channels where <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Channel.Close</tp:dbus-ref> + namespace="im.telepathy1">Channel.Close</tp:dbus-ref> is insufficiently destructive. At the moment this means <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Channel.Type.Text</tp:dbus-ref>, + namespace="im.telepathy1">Channel.Type.Text</tp:dbus-ref>, but the existence of this interface means that unsupported channels can be terminated in a non-channel-type-specific way.</p> </tp:docstring> @@ -55,12 +55,12 @@ <p>Most clients SHOULD call <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Channel.Close</tp:dbus-ref> + namespace="im.telepathy1">Channel.Close</tp:dbus-ref> instead. However, if a client explicitly intends to destroy the channel with possible loss of data, it SHOULD call this method if this interface is supported (according to the <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Channel.Interfaces</tp:dbus-ref> + namespace="im.telepathy1">Channel.Interfaces</tp:dbus-ref> property), falling back to Close if not.</p> <p>In particular, channel dispatchers SHOULD use this method if diff --git a/spec/Channel_Interface_File_Transfer_Metadata.xml b/spec/Channel_Interface_File_Transfer_Metadata.xml index 4d2d728d9..ffe1c98ec 100644 --- a/spec/Channel_Interface_File_Transfer_Metadata.xml +++ b/spec/Channel_Interface_File_Transfer_Metadata.xml @@ -21,8 +21,8 @@ </tp:license> <interface - name="org.freedesktop.Telepathy.Channel.Interface.FileTransfer.Metadata"> - <tp:requires interface="org.freedesktop.Telepathy.Channel.Type.FileTransfer"/> + name="im.telepathy1.Channel.Interface.FileTransfer.Metadata1"> + <tp:requires interface="im.telepathy1.Channel.Type.FileTransfer1"/> <tp:added version="0.25.0"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -48,9 +48,9 @@ <p>A string representing the service name that will be used over the file transfer channel. This property is equivalent to the <tp:dbus-ref - namespace="ofdT">Channel.Type.DBusTube.ServiceName</tp:dbus-ref> + namespace="imt1">Channel.Type.DBusTube1.ServiceName</tp:dbus-ref> and <tp:dbus-ref - namespace="ofdT">Channel.Type.StreamTube.Service</tp:dbus-ref> + namespace="imt1">Channel.Type.StreamTube1.Service</tp:dbus-ref> properties. If no service name is given then this property will be the empty string.</p> </tp:docstring> diff --git a/spec/Channel_Interface_HTML.xml b/spec/Channel_Interface_HTML.xml index ad86867ca..fca6e12fd 100644 --- a/spec/Channel_Interface_HTML.xml +++ b/spec/Channel_Interface_HTML.xml @@ -19,17 +19,16 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> <interface - name="org.freedesktop.Telepathy.Channel.Interface.HTML.DRAFT" + name="im.telepathy1.Channel.Interface.HTML1" tp:causes-havoc="unfinished"> - <tp:requires interface="org.freedesktop.Telepathy.Channel.Type.Text"/> - <tp:requires - interface="org.freedesktop.Telepathy.Channel.Interface.Messages"/> + <tp:requires interface="im.telepathy1.Channel.Type.Text"/> <tp:added version="0.17.5">(draft version, not API-stable)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - <p>This interface extends the Messages interface to support - capability discovery, so clients can decide what subset of HTML - is supported.</p> + <p>This interface extends the <tp:dbus-ref + namespace="imt1.Channel.Type">Text</tp:dbus-ref> interface to + support capability discovery, so clients can decide what + subset of HTML is supported.</p> <p>(However, the capability discovery mechanism has not been written yet, so this interface MUST NOT be used. It exists only to diff --git a/spec/Channel_Interface_Hold.xml b/spec/Channel_Interface_Hold.xml index 69d295d97..96d1f659b 100644 --- a/spec/Channel_Interface_Hold.xml +++ b/spec/Channel_Interface_Hold.xml @@ -19,12 +19,9 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:license> - <interface name="org.freedesktop.Telepathy.Channel.Interface.Hold"> - <tp:xor-requires> - <tp:requires interface="org.freedesktop.Telepathy.Channel.Type.StreamedMedia"/> - <tp:requires interface="org.freedesktop.Telepathy.Channel.Type.Call1"/> - <tp:requires interface="org.freedesktop.Telepathy.Call1.Content"/> - </tp:xor-requires> + <interface name="im.telepathy1.Channel.Interface.Hold1"> + <tp:requires interface="im.telepathy1.Channel.Type.Call1"/> + <tp:requires interface="im.telepathy1.Call1.Content"/> <tp:changed version="0.17.4">first API-stable version</tp:changed> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -32,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. This only makes sense for channels where you are streaming media to or from the members. (To see whether the other participant has put you on hold, see <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Interface" + namespace="im.telepathy1.Channel.Type.Call1" >CallState</tp:dbus-ref>.)</p> <p>If you place a channel on hold, this indicates that you do not wish @@ -215,9 +212,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring> The requested hold state cannot be achieved; for example, if only a limited number of channels can be in the "not on hold" diff --git a/spec/Channel_Interface_Mergeable_Conference.xml b/spec/Channel_Interface_Mergeable_Conference.xml index cd606c1b7..5ff5d69d9 100644 --- a/spec/Channel_Interface_Mergeable_Conference.xml +++ b/spec/Channel_Interface_Mergeable_Conference.xml @@ -20,10 +20,10 @@ 02110-1301, USA.</p> </tp:license> <interface - name="org.freedesktop.Telepathy.Channel.Interface.MergeableConference.DRAFT" + name="im.telepathy1.Channel.Interface.MergeableConference1" tp:causes-havoc="experimental"> <tp:added version="0.19.0">(draft 1)</tp:added> - <tp:requires interface="org.freedesktop.Telepathy.Channel.Interface.Conference"/> + <tp:requires interface="im.telepathy1.Channel.Interface.Conference1"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>An interface for multi-user conference channels that can have @@ -49,12 +49,12 @@ channel.</p> <p>The given channel SHOULD be added to <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Interface" - >Conference.Channels</tp:dbus-ref> if and only if the + namespace="im.telepathy1.Channel.Interface" + >Conference1.Channels</tp:dbus-ref> if and only if the underlying protocol signals the merge in some way. It MUST NOT be added to <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Interface" - >Conference.InitialChannels</tp:dbus-ref> (to preserve + namespace="im.telepathy1.Channel.Interface" + >Conference1.InitialChannels</tp:dbus-ref> (to preserve immutability).</p> <tp:rationale> @@ -73,28 +73,28 @@ <arg direction="in" name="Channel" type="o"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A channel with the same <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel" + namespace="im.telepathy1.Channel" >ChannelType</tp:dbus-ref> as this one, but with <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel" + namespace="im.telepathy1.Channel" >TargetHandleType</tp:dbus-ref> = CONTACT.</p> </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> + <tp:error name="im.telepathy1.Error.InvalidArgument"> <tp:docstring> The given channel isn't suitable for merging into this one: for instance, it might have the wrong channel type or handle type. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring> It will never be possible to merge channels into this particular conference. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> The given channel is theoretically suitable for merging into this one, but that's not currently possible for some reason (for diff --git a/spec/Channel_Interface_Password.xml b/spec/Channel_Interface_Password.xml index 8f08627e2..aec04b80e 100644 --- a/spec/Channel_Interface_Password.xml +++ b/spec/Channel_Interface_Password.xml @@ -20,8 +20,8 @@ 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 Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:license> - <interface name="org.freedesktop.Telepathy.Channel.Interface.Password"> - <tp:requires interface="org.freedesktop.Telepathy.Channel"/> + <interface name="im.telepathy1.Channel.Interface.Password1"> + <tp:requires interface="im.telepathy1.Channel"/> <tp:flags name="Channel_Password_Flags" value-prefix="Channel_Password_Flag" type="u"> <tp:flag suffix="Provide" value="8"> <tp:docstring> @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:flag suffix="Hint" value="4"> <tp:added version="0.25.0"/> <tp:docstring> - The <tp:dbus-ref namespace="ofdT.Channel.Interface">RoomConfig1.PasswordHint</tp:dbus-ref> + The <tp:dbus-ref namespace="imt1.Channel.Interface">RoomConfig1.PasswordHint</tp:dbus-ref> contains a hint for the password. </tp:docstring> </tp:flag> @@ -51,8 +51,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. which operations are currently valid. </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> </tp:possible-errors> </method> <signal name="PasswordFlagsChanged" @@ -90,9 +90,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. proceed if the 'provide' password flag is set. </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"/> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.InvalidArgument"/> </tp:possible-errors> </method> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -106,7 +106,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <p>Once the user has joined the channel, the current password-protectedness of the room can be checked (and possibly modified) using the <tp:dbus-ref - namespace='ofdT.Channel.Interface'>RoomConfig1</tp:dbus-ref> + namespace='imt1.Channel.Interface'>RoomConfig1</tp:dbus-ref> interface, if implemented.</p> </tp:docstring> </interface> diff --git a/spec/Channel_Interface_Picture.xml b/spec/Channel_Interface_Picture.xml index fb2fcf3d2..ba8f1d63b 100644 --- a/spec/Channel_Interface_Picture.xml +++ b/spec/Channel_Interface_Picture.xml @@ -20,9 +20,9 @@ 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Channel.Interface.Picture1" + <interface name="im.telepathy1.Channel.Interface.Picture1" tp:causes-havoc="draft"> - <tp:requires interface="org.freedesktop.Telepathy.Channel"/> + <tp:requires interface="im.telepathy1.Channel"/> <tp:added version="0.25.0"/> <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/> @@ -31,13 +31,13 @@ <p>An interface channels can implement to support a picture. Most of the time this will be implemented by channels implementing the <tp:dbus-ref - namespace="ofdT.Channel.Interface">Room2</tp:dbus-ref> + namespace="imt1.Channel.Interface">Room1</tp:dbus-ref> interface. Note that this interface is not restricted to Text channels, and can also be used on Call channels.</p> <tp:rationale> This is a separate interface from - <tp:dbus-ref namespace="ofdT.Channel.Interface">RoomConfig1</tp:dbus-ref> + <tp:dbus-ref namespace="imt1.Channel.Interface">RoomConfig1</tp:dbus-ref> because (a) it's possible some protocol might support pictures for 1:1 chats; and (b) it avoids downloading an unwanted picture in a GetAll request. @@ -62,14 +62,14 @@ further changes by other users or the server.</p> </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"/> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> + <tp:error name="im.telepathy1.Error.NotImplemented"/> + <tp:error name="im.telepathy1.Error.InvalidArgument"> <tp:docstring> Picture is somehow invalid: e.g. unsupported MIME type, too big, etc. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.PermissionDenied"/> + <tp:error name="im.telepathy1.Error.PermissionDenied"/> </tp:possible-errors> </method> diff --git a/spec/Channel_Interface_Room.xml b/spec/Channel_Interface_Room.xml index 92423b67c..8b9d23993 100644 --- a/spec/Channel_Interface_Room.xml +++ b/spec/Channel_Interface_Room.xml @@ -21,8 +21,8 @@ 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Channel.Interface.Room2"> - <tp:requires interface="org.freedesktop.Telepathy.Channel"/> + <interface name="im.telepathy1.Channel.Interface.Room1"> + <tp:requires interface="im.telepathy1.Channel"/> <tp:added version="0.24.0">(version 2)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -45,9 +45,9 @@ <p>This interface intends to support and differentiate these mechanisms more clearly than the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel">TargetHandleType</tp:dbus-ref> + namespace="im.telepathy1.Channel">TargetHandleType</tp:dbus-ref> and <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel">TargetID</tp:dbus-ref> + namespace="im.telepathy1.Channel">TargetID</tp:dbus-ref> properties can alone. It initially contains a pair of properties used to represent the human-readable parts of a <tp:type>Room_Handle</tp:type>'s identifier, if any. The above examples @@ -57,10 +57,10 @@ <li>The IRC channel <tt>#telepathy</tt> on Freenode is represented by a channel with properties <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel">TargetHandleType</tp:dbus-ref> + namespace="im.telepathy1.Channel">TargetHandleType</tp:dbus-ref> = <code>Room</code>, <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel">TargetID</tp:dbus-ref> + namespace="im.telepathy1.Channel">TargetID</tp:dbus-ref> = <code>"#telepathy"</code>, <tp:member-ref>RoomName</tp:member-ref> = <code>"#telepathy"</code>, <tp:member-ref>Server</tp:member-ref> = <code>""</code>, indicating @@ -78,10 +78,10 @@ <li>A Skype group chat with opaque identifier <tt>0xdeadbeef</tt> has <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel">TargetHandleType</tp:dbus-ref> + namespace="im.telepathy1.Channel">TargetHandleType</tp:dbus-ref> = <code>Room</code>, <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel">TargetID</tp:dbus-ref> + namespace="im.telepathy1.Channel">TargetID</tp:dbus-ref> = <code>"0xdeadbeef"</code>, <tp:member-ref>RoomName</tp:member-ref> = <code>""</code>, <tp:member-ref>Server</tp:member-ref> = <code>""</code>, indicating @@ -90,7 +90,7 @@ <li>An MSN group chat has <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel">TargetHandleType</tp:dbus-ref> + namespace="im.telepathy1.Channel">TargetHandleType</tp:dbus-ref> = <code>None</code>, <tp:member-ref>RoomName</tp:member-ref> = <code>""</code>, <tp:member-ref>Server</tp:member-ref> = <code>""</code>, indicating @@ -101,10 +101,10 @@ <li>A standard Jabber multi-user chat <tt>jdev@conference.jabber.org</tt> has <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel">TargetHandleType</tp:dbus-ref> + namespace="im.telepathy1.Channel">TargetHandleType</tp:dbus-ref> = <code>Room</code>, <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel">TargetID</tp:dbus-ref> + namespace="im.telepathy1.Channel">TargetID</tp:dbus-ref> = <code>"jdev@conference.jabber.org"</code>, <tp:member-ref>RoomName</tp:member-ref> = <code>"jdev"</code>, <tp:member-ref>Server</tp:member-ref> = <code>"conference.jabber.org"</code>. @@ -112,10 +112,10 @@ <li>A Google Talk private MUC <tt>private-chat-11111x1x-11xx-111x-1111-111x1xx11x11@groupchat.google.com</tt> has <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel">TargetHandleType</tp:dbus-ref> + namespace="im.telepathy1.Channel">TargetHandleType</tp:dbus-ref> = <code>Room</code>, <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel">TargetID</tp:dbus-ref> + namespace="im.telepathy1.Channel">TargetID</tp:dbus-ref> = <code>"private-chat-11111x1x-11xx-111x-1111-111x1xx11x11@groupchat.google.com"</code>, <tp:member-ref>RoomName</tp:member-ref> = <code>""</code>, <tp:member-ref>Server</tp:member-ref> = @@ -127,10 +127,10 @@ <li>Similarly, a XEP-0045 §10.1.4 uniquely-named room <tt>lrcgsnthzvwm@conference.jabber.org</tt> has <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel">TargetHandleType</tp:dbus-ref> + namespace="im.telepathy1.Channel">TargetHandleType</tp:dbus-ref> = <code>Room</code>, <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel">TargetID</tp:dbus-ref> + namespace="im.telepathy1.Channel">TargetID</tp:dbus-ref> = <code>"lrcgsnthzvwm@conference.jabber.org"</code>, <tp:member-ref>RoomName</tp:member-ref> = <code>""</code>, <tp:member-ref>Server</tp:member-ref> = @@ -148,21 +148,21 @@ <blockquote> <pre> -( Fixed = { ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel" - >ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Type" +( Fixed = { ...<tp:dbus-ref namespace="im.telepathy1.Channel" + >ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="im.telepathy1.Channel.Type" >Text</tp:dbus-ref>, - ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel" + ...<tp:dbus-ref namespace="im.telepathy1.Channel" >TargetHandleType</tp:dbus-ref>: Room, }, - Allowed = [ ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel" + Allowed = [ ...<tp:dbus-ref namespace="im.telepathy1.Channel" >TargetID</tp:dbus-ref>, - ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel" + ...<tp:dbus-ref namespace="im.telepathy1.Channel" >TargetHandle</tp:dbus-ref>, ] )</pre></blockquote> - <p>Channel requests must specify either <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel" - >TargetID</tp:dbus-ref> or <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel" + <p>Channel requests must specify either <tp:dbus-ref namespace="im.telepathy1.Channel" + >TargetID</tp:dbus-ref> or <tp:dbus-ref namespace="im.telepathy1.Channel" >TargetHandle</tp:dbus-ref>.</p> <p>If, like IRC, the room identifiers are also human-readable, the @@ -170,22 +170,22 @@ <blockquote> <pre> -( Fixed = { ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel" - >ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Type" +( Fixed = { ...<tp:dbus-ref namespace="im.telepathy1.Channel" + >ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="im.telepathy1.Channel.Type" >Text</tp:dbus-ref>, - ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel" + ...<tp:dbus-ref namespace="im.telepathy1.Channel" >TargetHandleType</tp:dbus-ref>: Room, }, - Allowed = [ ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel" + Allowed = [ ...<tp:dbus-ref namespace="im.telepathy1.Channel" >TargetID</tp:dbus-ref>, - ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel" + ...<tp:dbus-ref namespace="im.telepathy1.Channel" >TargetHandle</tp:dbus-ref>, ...<tp:member-ref>RoomName</tp:member-ref> ] ), -( Fixed = { ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel" - >ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Type" +( Fixed = { ...<tp:dbus-ref namespace="im.telepathy1.Channel" + >ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="im.telepathy1.Channel.Type" >Text</tp:dbus-ref> }, Allowed = [ ...<tp:member-ref>RoomName</tp:member-ref>, @@ -193,20 +193,20 @@ )</pre></blockquote> <p>Requests may specify the RoomName in place of - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">TargetID</tp:dbus-ref> or - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">TargetHandle</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1.Channel">TargetID</tp:dbus-ref> or + <tp:dbus-ref namespace="im.telepathy1.Channel">TargetHandle</tp:dbus-ref> . Note how <tp:member-ref>RoomName</tp:member-ref> appears in <var>Allowed_Properties</var> of a different RCC because - when <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel" + when <tp:dbus-ref namespace="im.telepathy1.Channel" >TargetHandleType</tp:dbus-ref> is omitted (or is None), both - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel" + <tp:dbus-ref namespace="im.telepathy1.Channel" >TargetHandle</tp:dbus-ref> and - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel" + <tp:dbus-ref namespace="im.telepathy1.Channel" >TargetID</tp:dbus-ref> must also be omitted. <tp:member-ref>RoomName</tp:member-ref> is allowed in conjuction with - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">TargetID</tp:dbus-ref> or - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">TargetHandle</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1.Channel">TargetID</tp:dbus-ref> or + <tp:dbus-ref namespace="im.telepathy1.Channel">TargetHandle</tp:dbus-ref> in some situations, as explained below in the <em>Requesting room channels</em> section. </p> @@ -217,22 +217,22 @@ <tp:member-ref>Server</tp:member-ref> if not explicitly specified in a channel request. The CM's default server MAY be configurable by a connection parameter specified on a - <tp:dbus-ref namespace="org.freedesktop.Telepathy.ConnectionManager" + <tp:dbus-ref namespace="im.telepathy1.ConnectionManager" >RequestConnection</tp:dbus-ref> call, similarly to how the fallback conference server is specified on jabber connections in gabble.</p> <p>If the protocol supports unnamed rooms, <tp:member-ref>RoomName</tp:member-ref> should be fixed to the empty string, and - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">TargetHandleType</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1.Channel">TargetHandleType</tp:dbus-ref> should be None:</p> <blockquote> <pre> -( Fixed = { ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel" - >ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Type" +( Fixed = { ...<tp:dbus-ref namespace="im.telepathy1.Channel" + >ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="im.telepathy1.Channel.Type" >Text</tp:dbus-ref>, - ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel" + ...<tp:dbus-ref namespace="im.telepathy1.Channel" >TargetHandleType</tp:dbus-ref>: None, ...<tp:member-ref>RoomName</tp:member-ref>: "", }, @@ -248,18 +248,18 @@ <blockquote> <pre> -{ ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Type">Text</tp:dbus-ref>, - ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">TargetHandleType</tp:dbus-ref>: Room, - ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">TargetID</tp:dbus-ref>: "qwerasdfzxcv@conference.jabber.org", +{ ...<tp:dbus-ref namespace="im.telepathy1.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="im.telepathy1.Channel.Type">Text</tp:dbus-ref>, + ...<tp:dbus-ref namespace="im.telepathy1.Channel">TargetHandleType</tp:dbus-ref>: Room, + ...<tp:dbus-ref namespace="im.telepathy1.Channel">TargetID</tp:dbus-ref>: "qwerasdfzxcv@conference.jabber.org", ...<tp:member-ref>RoomName</tp:member-ref>: "" }</pre></blockquote> <p>If <tp:member-ref>RoomName</tp:member-ref> features in <var>Allowed_Properties</var> then the only value allowed in conjunction - with <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">TargetID</tp:dbus-ref> - or <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">TargetHandle</tp:dbus-ref> + with <tp:dbus-ref namespace="im.telepathy1.Channel">TargetID</tp:dbus-ref> + or <tp:dbus-ref namespace="im.telepathy1.Channel">TargetHandle</tp:dbus-ref> is the empty string. Requests with conflicting - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">TargetID</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1.Channel">TargetID</tp:dbus-ref> and <tp:member-ref>RoomName</tp:member-ref> properties will fail with InvalidArgument.</p> @@ -269,7 +269,7 @@ <blockquote> <pre> -{ ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Type">Text</tp:dbus-ref>, +{ ...<tp:dbus-ref namespace="im.telepathy1.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="im.telepathy1.Channel.Type">Text</tp:dbus-ref>, ...<tp:member-ref>RoomName</tp:member-ref>: "" ...<tp:member-ref>Server</tp:member-ref>: "conference.jabber.org" }</pre> @@ -280,9 +280,9 @@ <blockquote> <pre> -{ ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Type">Text</tp:dbus-ref>, - ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">TargetHandleType</tp:dbus-ref>: Room, - ...<tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">TargetID</tp:dbus-ref>: "kajsdhkajshdfjkshdfjkhs@conference.jabber.org", +{ ...<tp:dbus-ref namespace="im.telepathy1.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="im.telepathy1.Channel.Type">Text</tp:dbus-ref>, + ...<tp:dbus-ref namespace="im.telepathy1.Channel">TargetHandleType</tp:dbus-ref>: Room, + ...<tp:dbus-ref namespace="im.telepathy1.Channel">TargetID</tp:dbus-ref>: "kajsdhkajshdfjkshdfjkhs@conference.jabber.org", ...<tp:member-ref>RoomName</tp:member-ref>: "" ...<tp:member-ref>Server</tp:member-ref>: "conference.jabber.org" }</pre> @@ -306,7 +306,7 @@ persistent. This D-Bus property is <strong>not</strong> this XMPP room name, but the bit before the @ in the room jid; see <tp:dbus-ref - namespace='ofdT.Channel.Interface'>RoomConfig1.Title</tp:dbus-ref> + namespace='imt1.Channel.Interface'>RoomConfig1.Title</tp:dbus-ref> for that concept.</p> <p>This property cannot change during the lifetime of the channel. It diff --git a/spec/Channel_Interface_Room_Config.xml b/spec/Channel_Interface_Room_Config.xml index 18bb06f0c..8079ef5c2 100644 --- a/spec/Channel_Interface_Room_Config.xml +++ b/spec/Channel_Interface_Room_Config.xml @@ -20,11 +20,11 @@ 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Channel.Interface.RoomConfig1"> + <interface name="im.telepathy1.Channel.Interface.RoomConfig1"> <tp:added version="0.24.0">version 1. This replaces the old-school Telepathy properties on <tp:dbus-ref - namespace='ofdT.Channel.Type'>Text</tp:dbus-ref>.</tp:added> - <tp:requires interface='org.freedesktop.Telepathy.Channel.Interface.Room2'/> + namespace='imt1.Channel.Type'>Text</tp:dbus-ref>.</tp:added> + <tp:requires interface='im.telepathy1.Channel.Interface.Room1'/> <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/> @@ -36,7 +36,7 @@ <p>The “topic” (on IRC) or “subject” (on XMPP) is not part of this interface; it can be found on the <tp:dbus-ref - namespace='ofdT.Channel.Interface'>Subject2</tp:dbus-ref> + namespace='imt1.Channel.Interface'>Subject1</tp:dbus-ref> interface.</p> </tp:docstring> @@ -64,7 +64,7 @@ <property name="Title" tp:name-for-bindings="Title" type="s" access="read"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> A human-visible name for the channel, if it differs from <tp:dbus-ref - namespace='ofdT.Channel.Interface'>Room2.RoomName</tp:dbus-ref>; the + namespace='imt1.Channel.Interface'>Room1.RoomName</tp:dbus-ref>; the empty string, otherwise. <tp:rationale> @@ -75,10 +75,10 @@ <ul> <li><tp:dbus-ref - namespace='ofdT.Channel.Interface'>Room2.RoomName</tp:dbus-ref> + namespace='imt1.Channel.Interface'>Room1.RoomName</tp:dbus-ref> = <code>"jdev"</code>;</li> <li><tp:dbus-ref - namespace='ofdT.Channel.Interface'>Room2.Server</tp:dbus-ref> + namespace='imt1.Channel.Interface'>Room1.Server</tp:dbus-ref> = <code>"conference.jabber.org"</code>;</li> <li><tp:member-ref>Title</tp:member-ref> = <code>"General Jabber development discussion"</code>.</li> @@ -111,7 +111,7 @@ <code>True</code> if contacts joining this channel must provide a password to be granted entry. Note that this property does not indicate that a password is required <em>right now</em>; see the - <tp:dbus-ref namespace='ofdT.Channel.Interface'>Password</tp:dbus-ref> + <tp:dbus-ref namespace='imt1.Channel.Interface'>Password1</tp:dbus-ref> interface for the API used to provide a password while joining a room. </tp:docstring> </property> @@ -233,26 +233,26 @@ method.</p> </tp:docstring> - <tp:error name="org.freedesktop.Telepathy.Error.PermissionDenied"> + <tp:error name="im.telepathy1.Error.PermissionDenied"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> The user is not allowed to reconfigure this room. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> + <tp:error name="im.telepathy1.Error.InvalidArgument"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> One or more of the specified properties is unknown, or ill-typed. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> One or more of the specified properties cannot be modified on this protocol. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> The room's current configuration has not yet been retrieved, so we cannot update it just yet. The application might like to try again diff --git a/spec/Channel_Interface_SASL_Authentication.xml b/spec/Channel_Interface_SASL_Authentication.xml index 7985a6bd5..420678902 100644 --- a/spec/Channel_Interface_SASL_Authentication.xml +++ b/spec/Channel_Interface_SASL_Authentication.xml @@ -17,20 +17,20 @@ Lesser General Public License for more details.</p> License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Channel.Interface.SASLAuthentication"> + <interface name="im.telepathy1.Channel.Interface.SASLAuthentication1"> <tp:added version="0.21.5">(as stable API)</tp:added> - <tp:requires interface="org.freedesktop.Telepathy.Channel"/> + <tp:requires interface="im.telepathy1.Channel"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A channel interface for SASL authentication, as defined by <a href="http://tools.ietf.org/html/rfc4422">RFC 4422</a>. When this interface appears on a <tp:dbus-ref - namespace="ofdT.Channel.Type">ServerAuthentication</tp:dbus-ref> + namespace="imt1.Channel.Type">ServerAuthentication1</tp:dbus-ref> channel, it represents authentication with the server. In future, it could also be used to authenticate with secondary services, or even to authenticate end-to-end connections with contacts. As a result, - this interface does not REQUIRE <tp:dbus-ref namespace="ofdT.Channel.Type" - >ServerAuthentication</tp:dbus-ref> to allow for a potential future + this interface does not REQUIRE <tp:dbus-ref namespace="imt1.Channel.Type" + >ServerAuthentication1</tp:dbus-ref> to allow for a potential future Channel.Type.PeerAuthentication interface.</p> <p>In any protocol that requires a password, the connection manager can @@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ interactively. This can be used to connect to protocols that may require a password, without requiring that the password is saved in the <tp:dbus-ref - namespace="ofdT">Account.Parameters</tp:dbus-ref>.</p> + namespace="imt1">Account.Parameters</tp:dbus-ref>.</p> <p>In some protocols, such as XMPP, authentication with the server is also carried out using SASL. In these protocols, a channel with this @@ -55,9 +55,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:rationale> <p>For channels managed by a - <tp:dbus-ref namespace="ofdT">ChannelDispatcher</tp:dbus-ref>, + <tp:dbus-ref namespace="imt1">ChannelDispatcher</tp:dbus-ref>, only the channel's <tp:dbus-ref - namespace="ofdT.Client">Handler</tp:dbus-ref> may call the + namespace="imt1.Client">Handler</tp:dbus-ref> may call the methods on this interface. Other clients MAY observe the authentication process by watching its signals and properties.</p> @@ -189,11 +189,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:error-ref>ServiceConfused</tp:error-ref>.</p> <p>If this interface appears on a <tp:dbus-ref - namespace="ofdT.Channel.Type">ServerAuthentication</tp:dbus-ref> + namespace="imt1.Channel.Type">ServerAuthentication1</tp:dbus-ref> channel, and connection to the server fails with an authentication failure, this error code SHOULD be copied into the <tp:dbus-ref - namespace="ofdT">Connection.ConnectionError</tp:dbus-ref> + namespace="imt1">Connection.ConnectionError</tp:dbus-ref> signal.</p> </tp:docstring> </property> @@ -207,14 +207,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ disconnection; otherwise, the empty map. The keys and values are the same as for the second argument of <tp:dbus-ref - namespace="ofdT">Connection.ConnectionError</tp:dbus-ref>.</p> + namespace="imt1">Connection.ConnectionError</tp:dbus-ref>.</p> <p>If this interface appears on a <tp:dbus-ref - namespace="ofdT.Channel.Type">ServerAuthentication</tp:dbus-ref> + namespace="imt1.Channel.Type">ServerAuthentication1</tp:dbus-ref> channel, and connection to the server fails with an authentication failure, these details SHOULD be copied into the <tp:dbus-ref - namespace="ofdT">Connection.ConnectionError</tp:dbus-ref> + namespace="imt1">Connection.ConnectionError</tp:dbus-ref> signal.</p> </tp:docstring> </property> @@ -225,7 +225,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The identity for which authorization is being attempted, typically the 'account' from the <tp:dbus-ref - namespace="ofdT.ConnectionManager">RequestConnection</tp:dbus-ref> + namespace="imt1.ConnectionManager">RequestConnection</tp:dbus-ref> parameters, normalized and formatted according to the conventions used for SASL in this protocol.</p> @@ -311,7 +311,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>For example, in the simple case, if the user connects with <tp:dbus-ref - namespace="ofdT.ConnectionManager">RequestConnection</tp:dbus-ref>({ + namespace="imt1.ConnectionManager">RequestConnection</tp:dbus-ref>({ account: "<tt>user@example.com</tt>" }) and use PLAIN with password "password", he or she should authenticate like so: "<tt>\0user\0password</tt>" and the channel will look like @@ -324,7 +324,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>In the complex case, if the same user is using his or her sysadmin powers to log in as the "announcements" role address, he or she would connect with <tp:dbus-ref - namespace="ofdT.ConnectionManager">RequestConnection</tp:dbus-ref>({ + namespace="imt1.ConnectionManager">RequestConnection</tp:dbus-ref>({ account: "<tt>announcements@example.com</tt>" }) and the SASL channel would look like this:</p> @@ -407,7 +407,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring> The channel is not in a state where starting authentication makes sense (i.e. SASL_Status_Not_Started, or (if @@ -418,8 +418,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ SASL_Status_Client_Failed before starting another attempt. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring> The server or connection manager doesn't implement the given SASL mechanism. Choose a SASL mechanism from @@ -481,7 +481,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring> The channel is not in a state where starting authentication makes sense (i.e. SASL_Status_Not_Started, or (if @@ -492,8 +492,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ SASL_Status_Client_Failed before starting another attempt. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring> The server or connection manager doesn't implement the given SASL mechanism (choose one from @@ -519,13 +519,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring> Either the state is not In_Progress, or no challenge has been received yet, or you have already responded to the last challenge. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> </tp:possible-errors> </method> @@ -546,21 +546,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>In mechanisms where the server authenticates itself to the client, calling this method indicates that the client considers this to have been successful. In the case of <tp:dbus-ref - namespace="ofdT.Channel.Type">ServerAuthentication</tp:dbus-ref> + namespace="imt1.Channel.Type">ServerAuthentication1</tp:dbus-ref> channels, this means that the connection manager MAY continue to connect, and MAY advance the <tp:dbus-ref - namespace="ofdT">Connection.Status</tp:dbus-ref> to Connected.</p> + namespace="imt1">Connection.Status</tp:dbus-ref> to Connected.</p> </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring> Either the state is neither In_Progress nor Server_Succeeded, or no challenge has been received yet, or you have already responded to the last challenge. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> </tp:possible-errors> </method> @@ -587,7 +587,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ reason code.</p> </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring> The current state is either Succeeded or Client_Accepted. </tp:docstring> @@ -694,7 +694,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:member-ref>AcceptSASL</tp:member-ref>). Connection to the server will proceed as soon as this state is reached. The Handler SHOULD call <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel">Close</tp:dbus-ref> + namespace="im.telepathy1.Channel">Close</tp:dbus-ref> to close the channel. </tp:docstring> </tp:enumvalue> @@ -706,7 +706,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:member-ref>StartMechanism</tp:member-ref> or <tp:member-ref>StartMechanismWithData</tp:member-ref> again. Otherwise, it should give up completely, by calling <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel">Close</tp:dbus-ref> + namespace="im.telepathy1.Channel">Close</tp:dbus-ref> on the channel. </tp:docstring> </tp:enumvalue> diff --git a/spec/Channel_Interface_SMS.xml b/spec/Channel_Interface_SMS.xml index 497e94519..eb0225ed3 100644 --- a/spec/Channel_Interface_SMS.xml +++ b/spec/Channel_Interface_SMS.xml @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:license> <interface - name="org.freedesktop.Telepathy.Channel.Interface.SMS"> - <tp:requires interface="org.freedesktop.Telepathy.Channel.Type.Text"/> + name="im.telepathy1.Channel.Interface.SMS1"> + <tp:requires interface="im.telepathy1.Channel.Type.Text"/> <tp:added version='0.19.12'>Imported from rtcom-telepathy-glib, with the unused properties removed and the documentation tidied up.</tp:added> @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. messages will be delivered via SMS.</p> <p>This interface MAY appear in the - <tp:dbus-ref namespace="ofdT.Channel">Interfaces</tp:dbus-ref> property + <tp:dbus-ref namespace="imt1.Channel">Interfaces</tp:dbus-ref> property of channels where <tp:member-ref>SMSChannel</tp:member-ref> would be immutable and false. It SHOULD appear on channels where <tp:member-ref>SMSChannel</tp:member-ref> is immutable and true, and @@ -47,16 +47,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <p>A handler for class 0 SMSes should advertise the following filter:</p> <blockquote><code> -{ ...<tp:dbus-ref namespace='ofdT.Channel'>ChannelType</tp:dbus-ref>: - ...<tp:dbus-ref namespace='ofdT.Channel.Type'>Text</tp:dbus-ref>,<br/> - ...<tp:dbus-ref namespace='ofdT.Channel'>TargetHandleType</tp:dbus-ref>: +{ ...<tp:dbus-ref namespace='imt1.Channel'>ChannelType</tp:dbus-ref>: + ...<tp:dbus-ref namespace='imt1.Channel.Type'>Text</tp:dbus-ref>,<br/> + ...<tp:dbus-ref namespace='imt1.Channel'>TargetHandleType</tp:dbus-ref>: <tp:value-ref type="Handle_Type">Contact</tp:value-ref>,<br/> - ...<tp:dbus-ref namespace='ofdT.Channel.Interface'>SMS.Flash</tp:dbus-ref>: + ...<tp:dbus-ref namespace='imt1.Channel.Interface'>SMS1.Flash</tp:dbus-ref>: True,<br/> }</code></blockquote> <p>It should also set its <tp:dbus-ref - namespace='ofdT.Client.Handler'>BypassApproval</tp:dbus-ref> property + namespace='imt1.Client.Handler'>BypassApproval</tp:dbus-ref> property to <code>True</code>, so that it is invoked immediately for new channels.</p> @@ -71,22 +71,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <blockquote><code> [<br/> - ({ ...<tp:dbus-ref namespace='ofdT.Channel'>ChannelType</tp:dbus-ref>: - ...<tp:dbus-ref namespace='ofdT.Channel.Type'>Text</tp:dbus-ref>,<br/> - ...<tp:dbus-ref namespace='ofdT.Channel'>TargetHandleType</tp:dbus-ref>: + ({ ...<tp:dbus-ref namespace='imt1.Channel'>ChannelType</tp:dbus-ref>: + ...<tp:dbus-ref namespace='imt1.Channel.Type'>Text</tp:dbus-ref>,<br/> + ...<tp:dbus-ref namespace='imt1.Channel'>TargetHandleType</tp:dbus-ref>: <tp:value-ref type="Handle_Type">Contact</tp:value-ref>,<br/> },<br/> - [ ...<tp:dbus-ref namespace='ofdT.Channel'>TargetHandle</tp:dbus-ref>, - ...<tp:dbus-ref namespace='ofdT.Channel'>TargetID</tp:dbus-ref> ]),<br/> + [ ...<tp:dbus-ref namespace='imt1.Channel'>TargetHandle</tp:dbus-ref>, + ...<tp:dbus-ref namespace='imt1.Channel'>TargetID</tp:dbus-ref> ]),<br/> <br/> - ({ ...<tp:dbus-ref namespace='ofdT.Channel'>ChannelType</tp:dbus-ref>: - ...<tp:dbus-ref namespace='ofdT.Channel.Type'>Text</tp:dbus-ref>,<br/> - ...<tp:dbus-ref namespace='ofdT.Channel'>TargetHandleType</tp:dbus-ref>: + ({ ...<tp:dbus-ref namespace='imt1.Channel'>ChannelType</tp:dbus-ref>: + ...<tp:dbus-ref namespace='imt1.Channel.Type'>Text</tp:dbus-ref>,<br/> + ...<tp:dbus-ref namespace='imt1.Channel'>TargetHandleType</tp:dbus-ref>: <tp:value-ref type="Handle_Type">Contact</tp:value-ref>,<br/> ...<tp:member-ref>SMSChannel</tp:member-ref>: True,<br/> },<br/> - [ ...<tp:dbus-ref namespace='ofdT.Channel'>TargetHandle</tp:dbus-ref>, - ...<tp:dbus-ref namespace='ofdT.Channel'>TargetID</tp:dbus-ref> ]),<br/> + [ ...<tp:dbus-ref namespace='imt1.Channel'>TargetHandle</tp:dbus-ref>, + ...<tp:dbus-ref namespace='imt1.Channel'>TargetID</tp:dbus-ref> ]),<br/> ] </code></blockquote> </tp:docstring> @@ -96,13 +96,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>If <code>True</code>, then this channel is exclusively for receiving class 0 SMSes (and no SMSes can be sent using <tp:dbus-ref - namespace='ofdT.Channel.Interface.Messages'>SendMessage</tp:dbus-ref> + namespace='imt1.Channel.Type.Text'>SendMessage</tp:dbus-ref> on this channel). If <code>False</code>, no incoming class 0 SMSes will appear on this channel.</p> <p>This property is immutable (cannot change), and therefore SHOULD appear wherever immutable properties are reported, e.g. <tp:dbus-ref - namespace="ofdT.Connection.Interface.Requests" + namespace="imt1.Connection.Interface.Requests" >NewChannels</tp:dbus-ref> signals.</p> <tp:rationale> @@ -114,9 +114,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <p>Separating class 0 SMSes into their own channel with this immutable property allows them to be dispatched to a different - <tp:dbus-ref namespace='ofdT.Client'>Handler</tp:dbus-ref>—which + <tp:dbus-ref namespace='imt1.Client'>Handler</tp:dbus-ref>—which would include this property in its <tp:dbus-ref - namespace='ofdT.Client.Handler' + namespace='imt1.Client.Handler' >HandlerChannelFilter</tp:dbus-ref>—avoiding the normal Text channel handler having to decide for each message whether it should be displayed to the user immediately or handled normally.</p> @@ -260,7 +260,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The estimated cost of sending this message. The currency and scale of this value are the same as the - <tp:dbus-ref namespace="ofdT.Connection.Interface">Balance.AccountBalance</tp:dbus-ref> + <tp:dbus-ref namespace="imt1.Connection.Interface">Balance1.AccountBalance</tp:dbus-ref> property.</p> <p>A value of <code>-1</code> indicates the cost could not be @@ -270,13 +270,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring> Raised when the method is not available on this channel. Clients MAY choose to make their own estimation. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> + <tp:error name="im.telepathy1.Error.InvalidArgument"> <tp:docstring> Raised when the content cannot be encoded into a valid SMS. </tp:docstring> diff --git a/spec/Channel_Interface_Securable.xml b/spec/Channel_Interface_Securable.xml index d9d971394..9e2dedc48 100644 --- a/spec/Channel_Interface_Securable.xml +++ b/spec/Channel_Interface_Securable.xml @@ -20,24 +20,24 @@ USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Channel.Interface.Securable"> + <interface name="im.telepathy1.Channel.Interface.Securable1"> <tp:added version="0.21.5">as stable API</tp:added> - <tp:requires interface="org.freedesktop.Telepathy.Channel"/> + <tp:requires interface="im.telepathy1.Channel"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>This interface exists to expose security information about - <tp:dbus-ref namespace="ofdT">Channel</tp:dbus-ref>s. The two + <tp:dbus-ref namespace="imt1">Channel</tp:dbus-ref>s. The two properties are sometimes immutable and can be used to make decisions on how cautious to be about transferring sensitive data. The special case of <tp:dbus-ref - namespace="ofdT.Channel.Type">ServerAuthentication</tp:dbus-ref> + namespace="imt1.Channel.Type">ServerAuthentication1</tp:dbus-ref> channels is one example of where the two properties are immutable.</p> <p>For example, clients MAY use these properties to decide whether the <code>PLAIN</code> mechanism is acceptable for a <tp:dbus-ref - namespace="ofdT.Channel.Interface">SASLAuthentication</tp:dbus-ref> + namespace="imt1.Channel.Interface">SASLAuthentication1</tp:dbus-ref> channel.</p> </tp:docstring> diff --git a/spec/Channel_Interface_Service_Point.xml b/spec/Channel_Interface_Service_Point.xml index 787397b20..732b0e689 100644 --- a/spec/Channel_Interface_Service_Point.xml +++ b/spec/Channel_Interface_Service_Point.xml @@ -17,7 +17,7 @@ Lesser General Public License for more details.</p> License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Channel.Interface.ServicePoint"> + <interface name="im.telepathy1.Channel.Interface.ServicePoint1"> <tp:added version="0.19.7">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> diff --git a/spec/Channel_Interface_Splittable.xml b/spec/Channel_Interface_Splittable.xml index 760c13406..4e29395ae 100644 --- a/spec/Channel_Interface_Splittable.xml +++ b/spec/Channel_Interface_Splittable.xml @@ -20,15 +20,15 @@ 02110-1301, USA.</p> </tp:license> <interface - name="org.freedesktop.Telepathy.Channel.Interface.Splittable.DRAFT" + name="im.telepathy1.Channel.Interface.Splittable1" tp:causes-havoc="experimental"> <tp:added version="0.19.0">(draft 1)</tp:added> - <tp:requires interface="org.freedesktop.Telepathy.Channel"/> + <tp:requires interface="im.telepathy1.Channel"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>An interface for channels that can be made conceptually part of a - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Interface" - >Conference</tp:dbus-ref>, and can then be detached from that + <tp:dbus-ref namespace="im.telepathy1.Channel.Interface" + >Conference1</tp:dbus-ref>, and can then be detached from that conference.</p> <tp:rationale> @@ -44,8 +44,8 @@ tp:name-for-bindings="Split"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Request that this channel is removed from any - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Interface" - >Conference</tp:dbus-ref> of which it is a part.</p> + <tp:dbus-ref namespace="im.telepathy1.Channel.Interface" + >Conference1</tp:dbus-ref> of which it is a part.</p> <p>This implies that the media streams within the conference are put on hold and the media streams within the member channel leaving the @@ -53,12 +53,12 @@ </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> + <tp:error name="im.telepathy1.Error.InvalidArgument"> <tp:docstring> This channel isn't in a conference. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring> This channel is in a conference but can't currently be split away from it. diff --git a/spec/Channel_Interface_Subject.xml b/spec/Channel_Interface_Subject.xml index fcaf39836..069a07476 100644 --- a/spec/Channel_Interface_Subject.xml +++ b/spec/Channel_Interface_Subject.xml @@ -20,8 +20,8 @@ 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Channel.Interface.Subject2"> - <tp:requires interface="org.freedesktop.Telepathy.Channel"/> + <interface name="im.telepathy1.Channel.Interface.Subject1"> + <tp:requires interface="im.telepathy1.Channel"/> <tp:added version="0.24.0">(version 2)</tp:added> <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/> @@ -30,7 +30,7 @@ <p>An interface channels can implement to support subjects. Most of the time this will be implemented by channels implementing the <tp:dbus-ref - namespace="ofdT.Channel.Interface">Room2</tp:dbus-ref> + namespace="imt1.Channel.Interface">Room1</tp:dbus-ref> interface, but some protocols support subjects in 1-to-1 chats (such as XMPP). Note that this interface is not restricted to Text channels, and can also be used on Call channels.</p> @@ -51,8 +51,8 @@ further changes by other users or the server.</p> </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"/> - <tp:error name="org.freedesktop.Telepathy.Error.PermissionDenied"/> + <tp:error name="im.telepathy1.Error.NotImplemented"/> + <tp:error name="im.telepathy1.Error.PermissionDenied"/> </tp:possible-errors> </method> diff --git a/spec/Channel_Interface_Tube.xml b/spec/Channel_Interface_Tube.xml index f31ab2138..25faccd9f 100644 --- a/spec/Channel_Interface_Tube.xml +++ b/spec/Channel_Interface_Tube.xml @@ -17,17 +17,17 @@ 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 Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:license> - <interface name="org.freedesktop.Telepathy.Channel.Interface.Tube"> - <tp:requires interface="org.freedesktop.Telepathy.Channel"/> + <interface name="im.telepathy1.Channel.Interface.Tube1"> + <tp:requires interface="im.telepathy1.Channel"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A <i>tube</i> is a mechanism for arbitrary data transfer between two or more IM users, used to allow applications on the users' systems to communicate without having to establish network connections themselves. Currently, two types of tube exist: - <tp:dbus-ref namespace="org.freedesktop.Telepathy" - >Channel.Type.DBusTube</tp:dbus-ref> and - <tp:dbus-ref namespace="org.freedesktop.Telepathy" - >Channel.Type.StreamTube</tp:dbus-ref>. This interface contains + <tp:dbus-ref namespace="im.telepathy1" + >Channel.Type.DBusTube1</tp:dbus-ref> and + <tp:dbus-ref namespace="im.telepathy1" + >Channel.Type.StreamTube1</tp:dbus-ref>. This interface contains the properties, signals and methods common to both types of tube; you can only create channels of a specific tube type, not of this type. A tube channel contains exactly one tube; if you need several @@ -36,27 +36,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <p>Tube channels can be requested for <tp:type>Handle_Type</tp:type> Contact (for 1-1 communication) or Room (to communicate with others in the room simultaneously).</p> - - <p>As an exception to the usual handling of capabilities, connection managers - for protocols with capability discovery (such as XMPP) SHOULD advertise the - capability representing each Tube type that they support - (<tp:dbus-ref namespace="org.freedesktop.Telepathy">Channel.Type.DBusTube</tp:dbus-ref> and/or - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Channel.Type.StreamTube</tp:dbus-ref>) - even if no client has indicated via - <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection.Interface.ContactCapabilities">UpdateCapabilities</tp:dbus-ref> - that such a tube is supported. They SHOULD also allow clients to offer tubes with any - <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Type.StreamTube">Service</tp:dbus-ref> or - <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Type.DBusTube">ServiceName</tp:dbus-ref> - to any contact which supports the corresponding tube capability.</p> - - <tp:rationale> - <p>This lowers the barrier to entry for those writing new tube - applications, and preserves interoperability with older versions of - the Telepathy stack which did not support rich capabilities.</p> - </tp:rationale> </tp:docstring> <property name="Parameters" type="a{sv}" tp:type="String_Variant_Map" @@ -76,7 +55,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. participants.</p> <p>For example, a stream tube for <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Type.StreamTube">Service</tp:dbus-ref> + namespace="im.telepathy1.Channel.Type.StreamTube1">Service</tp:dbus-ref> <tt>"smb"</tt> (<cite>Server Message Block over TCP/IP</cite>) might use the following properties, as defined in <a href="http://www.dns-sd.org/ServiceTypes.html">DNS SRV (RFC 2782) @@ -90,18 +69,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <p>When requesting a tube with <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>, + namespace="im.telepathy1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>, this property MUST NOT be included in the request; instead, it is set when <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Type">StreamTube.Offer</tp:dbus-ref> + namespace="im.telepathy1.Channel.Type">StreamTube1.Offer</tp:dbus-ref> or <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Type">DBusTube.Offer</tp:dbus-ref> + namespace="im.telepathy1.Channel.Type">DBusTube1.Offer</tp:dbus-ref> (as appropriate) is called. Its value is undefined until the tube is offered; once set, its value MUST NOT change.</p> <p>When receiving an incoming tube, this property is immutable and so advertised in the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection.Interface.Requests">NewChannels</tp:dbus-ref> + namespace="im.telepathy1.Connection.Interface.Requests">NewChannels</tp:dbus-ref> signal.</p> </tp:docstring> </property> @@ -113,7 +92,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <p>When requesting a tube with <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>, + namespace="im.telepathy1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>, this property MUST NOT be included in the request.</p> </tp:docstring> </property> @@ -202,6 +181,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:enum name="Socket_Access_Control" type="u" array-name="Socket_Access_Control_List"> + <tp:changed version="UNRELEASED">The deprecated Netmask enum + value has been removed.</tp:changed> <tp:enumvalue suffix="Localhost" value="0"> <tp:docstring> <p>The IP or Unix socket can be accessed by any local user (e.g. @@ -229,28 +210,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. connections will be rejected. </tp:docstring> </tp:enumvalue> - <tp:enumvalue suffix="Netmask" value="2"> - <tp:deprecated version="0.17.25">This has never been implemented. - If you want to share a service to your whole LAN, Telepathy is - not the way to do it.</tp:deprecated> - <tp:docstring> - May only be used on IP sockets. The associated variant must contain - a struct Socket_Netmask_IPv4 (or Socket_Netmask_IPv6) with - signature (sy), containing the string form of an - IP address of the appropriate version, and a prefix length "n". - The socket can only be accessed if the first n bits of the - connecting address match the first n bits of the given address. - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="Credentials" value="3"> + <tp:enumvalue suffix="Credentials" value="2"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The high-level meaning of this access control type is that only the same user (e.g. same numeric Unix uid) is allowed to interact with the tube. Exactly how this is achieved varies by channel type.</p> - <p>For <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Type" - >StreamTube</tp:dbus-ref> channels, this access control type + <p>For <tp:dbus-ref namespace="im.telepathy1.Channel.Type" + >StreamTube1</tp:dbus-ref> channels, this access control type may only be used on UNIX sockets. The connecting process must send a byte when it first connects, which is not considered to be part of the data @@ -262,8 +230,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. in D-Bus the byte is always zero, whereas in Tubes it can be nonzero.)</p> - <p>For <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Type" - >DBusTube</tp:dbus-ref> channels, this access control type + <p>For <tp:dbus-ref namespace="im.telepathy1.Channel.Type" + >DBusTube1</tp:dbus-ref> channels, this access control type may be used on any type of socket, and there is no extra byte added by Telepathy at the beginning of the stream: all bytes in the stream are part of the D-Bus tube connection. The connecting diff --git a/spec/Channel_Type_Call.xml b/spec/Channel_Type_Call.xml index 0ea1319c6..c406d0c3d 100644 --- a/spec/Channel_Type_Call.xml +++ b/spec/Channel_Type_Call.xml @@ -17,19 +17,18 @@ 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 Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:license> - <interface name="org.freedesktop.Telepathy.Channel.Type.Call1" + <interface name="im.telepathy1.Channel.Type.Call1" tp:causes-havoc="experimental"> <tp:added version="0.19.0">(draft 1)</tp:added> - <tp:requires interface="org.freedesktop.Telepathy.Channel"/> + <tp:requires interface="im.telepathy1.Channel"/> <tp:requires - interface="org.freedesktop.Telepathy.Call1.Interface.Mute"/> + interface="im.telepathy1.Call1.Interface.Mute"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - <p>A channel type for making audio and video calls. Call - channels supersede the old <tp:dbus-ref - namespace="ofdT.Channel.Type">StreamedMedia</tp:dbus-ref> - channel type. Call channels are much more flexible than its - predecessor and allow more than two participants.</p> + <p>A channel type for making audio and video calls. Call channels + supersede the old StreamedMedia channel type. Call channels + are much more flexible than its predecessor and allow more + than two participants.</p> <p>Handlers are advised against executing all the media signalling, codec and candidate negotiation themselves but @@ -42,8 +41,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. connection between the call participants is being made.</p> <p>The <tp:dbus-ref - namespace="ofdT.Channel">TargetHandle</tp:dbus-ref> and - <tp:dbus-ref namespace="ofdT.Channel">TargetID</tp:dbus-ref> + namespace="imt1.Channel">TargetHandle</tp:dbus-ref> and + <tp:dbus-ref namespace="imt1.Channel">TargetID</tp:dbus-ref> properties in a Call channel refer to the contact that the user initially called, or which contact initially called the user. Even in a conference call, where there are multiple @@ -54,7 +53,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <h4>Contents</h4> - <p><tp:dbus-ref namespace="ofdT.Call1">Content</tp:dbus-ref> + <p><tp:dbus-ref namespace="imt1.Call1">Content</tp:dbus-ref> objects represent the actual media that forms the Call (for example an audio content and a video content). Calls always have one or more Content objects associated with them. As a @@ -64,10 +63,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. as the Requestable Channel Classes will document.</p> <p><tp:dbus-ref - namespace="ofdT.Call1">Content</tp:dbus-ref> objects have + namespace="imt1.Call1">Content</tp:dbus-ref> objects have one or more stream associated with them. More information on these streams and how to maniuplate them can be found on the - <tp:dbus-ref namespace="ofdT.Call1">Content</tp:dbus-ref> + <tp:dbus-ref namespace="imt1.Call1">Content</tp:dbus-ref> interface page.</p> <h4>Outgoing calls</h4> @@ -77,27 +76,27 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <blockquote> <pre> -<tp:dbus-ref namespace="ofdT.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>({ - ...<tp:dbus-ref namespace="ofdT.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref - namespace="ofdT.Channel.Type">Call1</tp:dbus-ref>, - ...<tp:dbus-ref namespace="ofdT.Channel">TargetHandleType</tp:dbus-ref>: Contact, - ...<tp:dbus-ref namespace="ofdT.Channel">TargetID</tp:dbus-ref>: 'foo@example.com', +<tp:dbus-ref namespace="imt1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>({ + ...<tp:dbus-ref namespace="imt1.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref + namespace="imt1.Channel.Type">Call1</tp:dbus-ref>, + ...<tp:dbus-ref namespace="imt1.Channel">TargetHandleType</tp:dbus-ref>: Contact, + ...<tp:dbus-ref namespace="imt1.Channel">TargetID</tp:dbus-ref>: 'foo@example.com', ...<tp:member-ref>InitialAudio</tp:member-ref>: True, })</pre></blockquote> <p>As always, <tp:dbus-ref - namespace="ofdT.Channel">TargetHandle</tp:dbus-ref> may be used + namespace="imt1.Channel">TargetHandle</tp:dbus-ref> may be used in place of - <tp:dbus-ref namespace="ofdT.Channel">TargetID</tp:dbus-ref> + <tp:dbus-ref namespace="imt1.Channel">TargetID</tp:dbus-ref> if the contact's handle is already known. To make an audio and video call, the handler should also specify <tp:member-ref>InitialVideo</tp:member-ref> The connection manager SHOULD return a channel whose immutable properties contain the local user as the <tp:dbus-ref - namespace="ofdT.Channel">InitiatorHandle</tp:dbus-ref>, the + namespace="imt1.Channel">InitiatorHandle</tp:dbus-ref>, the remote contact as the <tp:dbus-ref - namespace="ofdT.Channel">TargetHandle</tp:dbus-ref>, - <tp:dbus-ref namespace="ofdT.Channel">Requested</tp:dbus-ref> = + namespace="imt1.Channel">TargetHandle</tp:dbus-ref>, + <tp:dbus-ref namespace="imt1.Channel">Requested</tp:dbus-ref> = <code>True</code> (indicating the call is outgoing).</p> <p>After a new Call channel is requested, the @@ -111,7 +110,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. something. When the CM has information indicating that the remote contact has been notified about the call (or immediately if the network is known not to convey such information) it should also change to - <tp:value-ref type="Call_State">Ringing</tp:value-ref>. All changes to + <tp:value-ref type="Call_State">Initialised</tp:value-ref>. All changes to the <tp:member-ref>CallState</tp:member-ref> property are signalled using the <tp:member-ref>CallStateChanged</tp:member-ref> signal.</p> @@ -151,26 +150,26 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:member-ref>CallStateReason</tp:member-ref> property changing to (remote contact, <tp:value-ref type="Call_State_Change_Reason">User_Requested</tp:value-ref>, - "org.freedesktop.Telepathy.Error.Rejected").</p> + "im.telepathy1.Error.Rejected").</p> <h4>Incoming calls</h4> <p>When an incoming call occurs, something like the following <tp:dbus-ref - namespace="ofdT.Connection.Interface.Requests">NewChannels</tp:dbus-ref> + namespace="imt1.Connection.Interface.Requests">NewChannels</tp:dbus-ref> signal will occur:</p> <blockquote> <pre> -<tp:dbus-ref namespace="ofdT.Connection.Interface.Requests">NewChannels</tp:dbus-ref>([ - /org/freedesktop/Telepathy/Connection/foo/bar/foo_40bar_2ecom/CallChannel, +<tp:dbus-ref namespace="imt1.Connection.Interface.Requests">NewChannels</tp:dbus-ref>([ + /im/telepathy/Connection/foo/bar/foo_40bar_2ecom/CallChannel, { - ...<tp:dbus-ref namespace="ofdT.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref - namespace="ofdT.Channel.Type">Call1</tp:dbus-ref>, - ...<tp:dbus-ref namespace="ofdT.Channel">TargetHandleType</tp:dbus-ref>: Contact, - ...<tp:dbus-ref namespace="ofdT.Channel">TargetID</tp:dbus-ref>: 'foo@example.com', - ...<tp:dbus-ref namespace="ofdT.Channel">TargetHandle</tp:dbus-ref>: 42, - ...<tp:dbus-ref namespace="ofdT.Channel">Requested</tp:dbus-ref>: False, + ...<tp:dbus-ref namespace="imt1.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref + namespace="imt1.Channel.Type">Call1</tp:dbus-ref>, + ...<tp:dbus-ref namespace="imt1.Channel">TargetHandleType</tp:dbus-ref>: Contact, + ...<tp:dbus-ref namespace="imt1.Channel">TargetID</tp:dbus-ref>: 'foo@example.com', + ...<tp:dbus-ref namespace="imt1.Channel">TargetHandle</tp:dbus-ref>: 42, + ...<tp:dbus-ref namespace="imt1.Channel">Requested</tp:dbus-ref>: False, ...<tp:member-ref>InitialAudio</tp:member-ref>: True, ...<tp:member-ref>InitialVideo</tp:member-ref>: True, ...<tp:member-ref>InitialAudioName</tp:member-ref>: "audio", @@ -193,7 +192,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. The new channel should also be given to telepathy-farstream to work out how the two participants will connect together. telepathy-farstream will call the appropriate methods on the call's - <tp:dbus-ref namespace="ofdT.Call1">Content</tp:dbus-ref>s + <tp:dbus-ref namespace="imt1.Call1">Content</tp:dbus-ref>s to negotiate codecs and transports.</p> <p>To pick up the call, the handler should call @@ -213,7 +212,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:member-ref>CallStateReason</tp:member-ref> property will change to (self handle, <tp:value-ref type="Call_State_Change_Reason">User_Requested</tp:value-ref>, - "org.freedesktop.Telepathy.Error.Rejected").</p> + "im.telepathy1.Error.Rejected").</p> <h4>Ongoing calls</h4> @@ -241,9 +240,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <p>A similar method is used for removing contents from a call, except that the <tp:dbus-ref - namespace="ofdT.Call1.Content">Remove</tp:dbus-ref> method + namespace="imt1.Call1.Content">Remove</tp:dbus-ref> method is on the <tp:dbus-ref - namespace="ofdT.Call1">Content</tp:dbus-ref> object.</p> + namespace="imt1.Call1">Content</tp:dbus-ref> object.</p> <h5>Ending the call</h5> @@ -254,7 +253,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:member-ref>CallStateReason</tp:member-ref> will change to (self handle, <tp:value-ref type="Call_State_Change_Reason">User_Requested</tp:value-ref>, - "org.freedesktop.Telepathy.Error.Cancelled").</p> + "im.telepathy1.Error.Cancelled").</p> <p>If the other participant hangs up first then the <tp:member-ref>CallState</tp:member-ref> property will change to @@ -262,22 +261,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:member-ref>CallStateReason</tp:member-ref> will change to (remote contact, <tp:value-ref type="Call_State_Change_Reason">User_Requested</tp:value-ref>, - "org.freedesktop.Telepathy.Error.Terminated").</p> + "im.telepathy1.Error.Terminated").</p> <h4>Multi-party calls</h4> <h4>Requestable channel classes</h4> <p>The <tp:dbus-ref - namespace="ofdT.Connection.Interface.Requests">RequestableChannelClasses</tp:dbus-ref> + namespace="imt1.Connection.Interface.Requests">RequestableChannelClasses</tp:dbus-ref> for <tp:dbus-ref - namespace="ofdT.Channel.Type">Call1</tp:dbus-ref> channels + namespace="imt1.Channel.Type">Call1</tp:dbus-ref> channels can be:</p> <blockquote> <pre> -[( Fixed = { ...<tp:dbus-ref namespace="ofdT.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="ofdT.Channel.Type">Call1</tp:dbus-ref>, - ...<tp:dbus-ref namespace="ofdT.Channel">TargetHandleType</tp:dbus-ref>: Contact, +[( Fixed = { ...<tp:dbus-ref namespace="imt1.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="imt1.Channel.Type">Call1</tp:dbus-ref>, + ...<tp:dbus-ref namespace="imt1.Channel">TargetHandleType</tp:dbus-ref>: Contact, ...<tp:member-ref>InitialVideo</tp:member-ref>: True }, Allowed = [ ...<tp:member-ref>InitialVideoName</tp:member-ref>, @@ -285,8 +284,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ...<tp:member-ref>InitialAudioName</tp:member-ref> ] ), -( Fixed = { ...<tp:dbus-ref namespace="ofdT.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="ofdT.Channel.Type">Call1</tp:dbus-ref>, - ...<tp:dbus-ref namespace="ofdT.Channel">TargetHandleType</tp:dbus-ref>: Contact, +( Fixed = { ...<tp:dbus-ref namespace="imt1.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="imt1.Channel.Type">Call1</tp:dbus-ref>, + ...<tp:dbus-ref namespace="imt1.Channel">TargetHandleType</tp:dbus-ref>: Contact, ...<tp:member-ref>InitialAudio</tp:member-ref>: True }, Allowed = [ ...<tp:member-ref>InitialAudioName</tp:member-ref>, @@ -302,14 +301,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class, and vice versa for CMs without audio support.</p> <p>Handlers should not close <tp:dbus-ref - namespace="ofdT.Channel.Type">Call1</tp:dbus-ref> channels + namespace="imt1.Channel.Type">Call1</tp:dbus-ref> channels without first calling <tp:member-ref>Hangup</tp:member-ref> on the channel. If a Call handler crashes, the <tp:dbus-ref - namespace="ofdT">ChannelDispatcher</tp:dbus-ref> will call - <tp:dbus-ref namespace="ofdT.Channel">Close</tp:dbus-ref> on the + namespace="imt1">ChannelDispatcher</tp:dbus-ref> will call + <tp:dbus-ref namespace="imt1.Channel">Close</tp:dbus-ref> on the channel which SHOULD also imply a call to <tp:member-ref>Hangup</tp:member-ref>(<tp:value-ref type="Call_State_Change_Reason">User_Requested</tp:value-ref>, - "org.freedesktop.Telepathy.Error.Terminated", "") before + "im.telepathy1.Error.Terminated", "") before actually closing the channel.</p> </tp:docstring> @@ -321,10 +320,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. call.</p> <p>This method is only useful if the - channel's <tp:dbus-ref namespace="ofdT.Channel">Requested</tp:dbus-ref> + channel's <tp:dbus-ref namespace="imt1.Channel">Requested</tp:dbus-ref> property is False, and the <tp:member-ref>CallState</tp:member-ref> is - <tp:value-ref type="Call_State">Ringing</tp:value-ref> (an incoming + <tp:value-ref type="Call_State">Initialised</tp:value-ref> (an incoming call is ready and waiting for the user to be notified). Calling this method SHOULD set <tp:member-ref>CallFlags</tp:member-ref>' bit <tp:value-ref type="Call_Flags">Locally_Ringing</tp:value-ref>, and notify the @@ -337,16 +336,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> + <tp:error name="im.telepathy1.Error.InvalidArgument"> <tp:docstring> - The call was <tp:dbus-ref namespace="ofdT.Channel" + The call was <tp:dbus-ref namespace="imt1.Channel" >Requested</tp:dbus-ref>, so ringing does not make sense. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring> The call is no longer in state - <tp:value-ref type="Call_State">Ringing</tp:value-ref>. + <tp:value-ref type="Call_State">Initialised</tp:value-ref>. </tp:docstring> </tp:error> </tp:possible-errors> @@ -359,11 +358,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. call has been put in a call-waiting style queue.</p> <p>This method is only useful if the - channel's <tp:dbus-ref namespace="ofdT.Channel">Requested</tp:dbus-ref> + channel's <tp:dbus-ref namespace="imt1.Channel">Requested</tp:dbus-ref> property is False, and the <tp:member-ref>CallState</tp:member-ref> is <tp:value-ref type="Call_State">Initialising</tp:value-ref> or - <tp:value-ref type="Call_State">Ringing</tp:value-ref>. Calling this method + <tp:value-ref type="Call_State">Initialised</tp:value-ref>. Calling this method SHOULD set <tp:member-ref>CallFlags</tp:member-ref>' bit <tp:value-ref type="Call_Flags">Locally_Queued</tp:value-ref>, and notify the remote contact that the call is in a queue (if the @@ -377,16 +376,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> + <tp:error name="im.telepathy1.Error.InvalidArgument"> <tp:docstring> - The call was <tp:dbus-ref namespace="ofdT.Channel" - >Requested</tp:dbus-ref>, so ringing does not make sense. + The call was <tp:dbus-ref namespace="imt1.Channel" + >Requested</tp:dbus-ref>, so queueing does not make sense. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring> The call is no longer in state - <tp:value-ref type="Call_State">Initialising</tp:value-ref> or _Ringing. + <tp:value-ref type="Call_State">Initialising</tp:value-ref> or + <tp:value-ref type="Call_State">Initialised</tp:value-ref>. </tp:docstring> </tp:error> </tp:possible-errors> @@ -395,7 +395,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <method name="Accept" tp:name-for-bindings="Accept"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>For incoming calls in state - <tp:value-ref type="Call_State">Ringing</tp:value-ref>, accept the incoming call. + <tp:value-ref type="Call_State">Initialised</tp:value-ref>, accept the incoming call. This changes the <tp:member-ref>CallState</tp:member-ref> to <tp:value-ref type="Call_State">Accepted</tp:value-ref>.</p> @@ -411,20 +411,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. client (user interface) is handling the channel.</p> <p>When this method is called, for each <tp:dbus-ref - namespace="ofdT.Call1" >Content</tp:dbus-ref> whose - <tp:dbus-ref namespace="ofdT.Call1.Content" + namespace="imt1.Call1" >Content</tp:dbus-ref> whose + <tp:dbus-ref namespace="imt1.Call1.Content" >Disposition</tp:dbus-ref> is <tp:value-ref type="Call_Content_Disposition">Initial</tp:value-ref>, any streams where the <tp:dbus-ref - namespace="ofdT.Call1.Stream">LocalSendingState</tp:dbus-ref> + namespace="imt1.Call1.Stream">LocalSendingState</tp:dbus-ref> is <tp:value-ref type="Sending_State">Pending_Send</tp:value-ref> will be moved to <tp:value-ref type="Sending_State">Sending</tp:value-ref> as if - <tp:dbus-ref namespace="ofdT.Call1.Stream" + <tp:dbus-ref namespace="imt1.Call1.Stream" >SetSending</tp:dbus-ref>(True) had been called.</p> </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring> The call is not in one of the states where this method makes sense. </tp:docstring> @@ -467,7 +467,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring> The call has already been ended. </tp:docstring> @@ -478,7 +478,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <method name="AddContent" tp:name-for-bindings="Add_Content"> <tp:docstring> Request that a new <tp:dbus-ref - namespace="ofdT.Call1">Content</tp:dbus-ref> of type + namespace="imt1.Call1">Content</tp:dbus-ref> of type Content_Type is added to the Call1. Handlers should check the value of the <tp:member-ref>MutableContents</tp:member-ref> property before trying to add another content as it might not @@ -515,30 +515,30 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <arg direction="out" name="Content" type="o"> <tp:docstring> Path to the newly-created <tp:dbus-ref - namespace="org.freedesktop.Telepathy" + namespace="im.telepathy1" >Call1.Content</tp:dbus-ref> object. </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> + <tp:error name="im.telepathy1.Error.InvalidArgument"> <tp:docstring> The media stream type given is invalid. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring> The media stream type requested is not implemented by the CM. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.Media.UnsupportedType"> + <tp:error name="im.telepathy1.Error.Media.UnsupportedType"> <tp:docstring> The media stream type requested is not supported by either the local or remote side. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotCapable"> + <tp:error name="im.telepathy1.Error.NotCapable"> <tp:docstring> The content type requested cannot be added to this call. Examples of why this might be the case include @@ -553,12 +553,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <signal name="ContentAdded" tp:name-for-bindings="Content_Added"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - <p>Emitted when a new <tp:dbus-ref namespace="ofdT.Call1" + <p>Emitted when a new <tp:dbus-ref namespace="imt1.Call1" >Content</tp:dbus-ref> is added to the call.</p> </tp:docstring> <arg name="Content" type="o"> <tp:docstring> - Path to the newly-created <tp:dbus-ref namespace="ofdT.Call1" + Path to the newly-created <tp:dbus-ref namespace="imt1.Call1" >Content</tp:dbus-ref> object. </tp:docstring> </arg> @@ -566,12 +566,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <signal name="ContentRemoved" tp:name-for-bindings="Content_Removed"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - <p>Emitted when a <tp:dbus-ref namespace="ofdT.Call1" + <p>Emitted when a <tp:dbus-ref namespace="imt1.Call1" >Content</tp:dbus-ref> is removed from the call.</p> </tp:docstring> <arg name="Content" type="o"> <tp:docstring> - The <tp:dbus-ref namespace="ofdT.Call1" + The <tp:dbus-ref namespace="imt1.Call1" >Content</tp:dbus-ref> which was removed. </tp:docstring> </arg> @@ -586,7 +586,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. tp:name-for-bindings="Contents"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The list of <tp:dbus-ref - namespace="ofdT.Call1">Content</tp:dbus-ref> objects that + namespace="imt1.Call1">Content</tp:dbus-ref> objects that are part of this call. Change notification is via the <tp:member-ref>ContentAdded</tp:member-ref> and <tp:member-ref>ContentRemoved</tp:member-ref> signals. @@ -594,6 +594,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> </property> + <tp:enum name="Media_Stream_Type" type="u" + array-name="Media_Stream_Type_List"> + <tp:enumvalue suffix="Audio" value="0"> + <tp:docstring>An audio stream</tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="Video" value="1"> + <tp:docstring>A video stream</tp:docstring> + </tp:enumvalue> + </tp:enum> + <tp:enum type="u" name="Call_State"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The state of a call, as a whole.</p> @@ -603,18 +613,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <ul> <li>Pending_Initiator → Initialising (for outgoing calls, when <tp:member-ref>Accept</tp:member-ref> is called)</li> - <li>Initialising → Ringing (for outgoing calls, when + <li>Initialising → Initialised (for outgoing calls, when the remote client indicates that the user has been notified about the call. If the network is known not to provide feedback about whether the remote side is ringing, then the call should immediately be set to Ringing.</li> - <li>Initialising → Ringing (for incoming calls, when e.g. the + <li>Initialising → Initialised (for incoming calls, when e.g. the implementation has been initialised far enough that it is sensible to notify the user about the call (to reduce the probability that the user will pick up the call and have it immediately fail). The UI should then alert the user about the call, and call <tp:member-ref>SetRinging</tp:member-ref>)</li> - <li>Ringing → Accepted (for outgoing calls to a contact, + <li>Initialised → Accepted (for outgoing calls to a contact, when the remote contact accepts the call; for incoming calls, when <tp:member-ref>Accept</tp:member-ref> is called.)</li> <li>Accepted → Active (when the local user successfully @@ -664,7 +674,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. this state. </tp:docstring> </tp:enumvalue> - <tp:enumvalue suffix="Ringing" value="3"> + <tp:enumvalue suffix="Initialised" value="3"> <tp:docstring> In the outgoing case: at least one called user has been alerted about the call (a SIP 180 (Ringing) packet or equivalent has been @@ -710,8 +720,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:flag suffix="Locally_Held" value="1"> <tp:docstring> The call has been put on hold by the local user, e.g. using - the <tp:dbus-ref namespace="ofdT.Channel.Interface" - >Hold</tp:dbus-ref> interface. This flag SHOULD only be set + the <tp:dbus-ref namespace="imt1.Channel.Interface" + >Hold1</tp:dbus-ref> interface. This flag SHOULD only be set if there is at least one Content, and all Contents are locally held. @@ -723,7 +733,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. hear them! This flag exists as a simplified proxy for <tp:dbus-ref - namespace="ofdT.Channel.Interface.Hold" + namespace="imt1.Channel.Interface.Hold1" >HoldStateChanged</tp:dbus-ref>, to reduce the number of signals that need to be listened to by a simple UI. @@ -734,14 +744,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:flag suffix="Locally_Muted" value="2"> <tp:docstring> The call has been muted by the local user, e.g. using the - <tp:dbus-ref namespace="ofdT.Call1.Interface" + <tp:dbus-ref namespace="imt1.Call1.Interface" >Mute</tp:dbus-ref> interface. This flag SHOULD only be set if there is at least one Content, and all Contents are locally muted (for the same reason as Locally_Held). <tp:rationale> This flag exists to provide a simplified verson of <tp:dbus-ref - namespace="ofdT.Call1.Interface.Mute" + namespace="imt1.Call1.Interface.Mute" >MuteStateChanged</tp:dbus-ref>, to reduce the number of signals that need to be listened to by a simple UI. @@ -756,7 +766,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. loggers can tell whether the call got as far as alerting the user, or whether something went wrong before then). It should be set when the SetRinging is called, and unset when the call leaves - <tp:value-ref type="Call_State">Ringing</tp:value-ref>. + <tp:value-ref type="Call_State">Initialised</tp:value-ref>. </tp:docstring> </tp:flag> @@ -765,7 +775,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. This flag exists for observability of the <tp:member-ref>SetQueued</tp:member-ref> method. It should be set when the SetQueued is called, and unset when the call leaves - <tp:value-ref type="Call_State">Ringing</tp:value-ref>. + <tp:value-ref type="Call_State">Initialising</tp:value-ref> or + <tp:value-ref type="Call_State">Initialised</tp:value-ref>. </tp:docstring> </tp:flag> @@ -840,7 +851,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. there is <tp:error-ref>InsufficientBalance</tp:error-ref>, indicating what the required balance would be to place this call. The value of this key has the same units and scale as - <tp:dbus-ref namespace="ofdT.Connection.Interface.Balance">AccountBalance</tp:dbus-ref>. + <tp:dbus-ref namespace="imt1.Connection.Interface.Balance1">AccountBalance</tp:dbus-ref>. </dd> </dl> </tp:docstring> @@ -930,7 +941,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:added version="0.21.2"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The <tp:member-ref>CallState</tp:member-ref> changed from - <tp:value-ref type="Call_State">Ringing</tp:value-ref> or + <tp:value-ref type="Call_State">Initialised</tp:value-ref> or <tp:value-ref type="Call_State">Ended</tp:value-ref> (or a content's direction changed) because it was rejected by the remote user.</p> <p>Corresponds to <tp:error-ref>Rejected</tp:error-ref></p> @@ -941,7 +952,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:added version="0.21.2"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The <tp:member-ref>CallState</tp:member-ref> changed from - <tp:value-ref type="Call_State">Ringing</tp:value-ref> or + <tp:value-ref type="Call_State">Initialised</tp:value-ref> or <tp:value-ref type="Call_State">Ended</tp:value-ref> because the initiator ended the call before the receiver accepted it. With an incoming call this state change reason signifies a missed @@ -976,7 +987,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:added version="0.21.2"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The <tp:member-ref>CallState</tp:member-ref> changed from - <tp:value-ref type="Call_State">Ringing</tp:value-ref> + <tp:value-ref type="Call_State">Initialised</tp:value-ref> <tp:value-ref type="Call_State">Ended</tp:value-ref> because the receiver is busy (e.g. is already engaged in another call, and has not placed the initiator in a call-waiting queue).</p> @@ -1157,7 +1168,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <p>If this is False, the handler is responsible for doing the actual media streaming for at least some contents itself. Those contents - will have the <tp:dbus-ref namespace="ofdT.Call1.Content.Interface" + will have the <tp:dbus-ref namespace="imt1.Call1.Content.Interface" >Media</tp:dbus-ref> interface, to communicate the necessary information to a streaming implementation. Connection managers SHOULD operate like this, if possible.</p> @@ -1296,8 +1307,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:member-ref>CallMembersChanged</tp:member-ref></p> <p>If the Call implements - <tp:dbus-ref namespace="ofdT.Channel.Interface" - >Group</tp:dbus-ref> and the Group members are + <tp:dbus-ref namespace="imt1.Channel.Interface" + >Group1</tp:dbus-ref> and the Group members are channel-specific handles, then this call SHOULD also use channel-specific handles.</p> @@ -1341,7 +1352,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. the connection manager should immediately attempt to establish an audio stream to the remote contact, making it unnecessary for the client to call <tp:dbus-ref - namespace="ofdT.Channel.Type.Call1">AddContent</tp:dbus-ref>.</p> + namespace="imt1.Channel.Type.Call1">AddContent</tp:dbus-ref>.</p> <p>If this property, or InitialVideo, is passed to EnsureChannel (as opposed to CreateChannel), the connection manager SHOULD ignore @@ -1356,14 +1367,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <p>If True on an unrequested (incoming) channel, this indicates that the remote contact initially requested an audio stream; this does not imply that that audio stream is still active (as indicated by - <tp:dbus-ref namespace="ofdT.Channel.Type.Call1" + <tp:dbus-ref namespace="imt1.Channel.Type.Call1" >Contents</tp:dbus-ref>).</p> <p>The name of this new content can be decided by using the <tp:member-ref>InitialAudioName</tp:member-ref> property.</p> <p>Connection managers that support the <tp:dbus-ref - namespace="ofdT.Connection.Interface">ContactCapabilities</tp:dbus-ref> + namespace="imt1.Connection.Interface">ContactCapabilities1</tp:dbus-ref> interface SHOULD represent the capabilities of receiving audio and/or video calls by including a channel class in a contact's capabilities with ChannelType = Call @@ -1381,12 +1392,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <p>Clients that are willing to receive audio and/or video calls SHOULD include the following among their channel classes if calling <tp:dbus-ref - namespace="ofdT.Connection.Interface.ContactCapabilities">UpdateCapabilities</tp:dbus-ref> + namespace="imt1.Connection.Interface.ContactCapabilities1">UpdateCapabilities</tp:dbus-ref> (clients of a <tp:dbus-ref - namespace="org.freedesktop.Telepathy">ChannelDispatcher</tp:dbus-ref> + namespace="im.telepathy1">ChannelDispatcher</tp:dbus-ref> SHOULD instead arrange for the ChannelDispatcher to do this, by including the filters in their <tp:dbus-ref - namespace="ofdT.Client.Handler">HandlerChannelFilter</tp:dbus-ref> + namespace="imt1.Client.Handler">HandlerChannelFilter</tp:dbus-ref> properties):</p> <ul> @@ -1499,7 +1510,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:hct name="gtalk-p2p"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The client can implement streaming for streams whose <tp:dbus-ref - namespace="ofdT.Call1.Stream.Interface.Media">Transport</tp:dbus-ref> + namespace="imt1.Call1.Stream.Interface.Media">Transport</tp:dbus-ref> property is <tp:value-ref type="Stream_Transport_Type">GTalk_P2P</tp:value-ref>.</p> </tp:docstring> </tp:hct> @@ -1507,7 +1518,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:hct name="ice"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The client can implement streaming for streams whose <tp:dbus-ref - namespace="ofdT.Call1.Stream.Interface.Media">Transport</tp:dbus-ref> + namespace="imt1.Call1.Stream.Interface.Media">Transport</tp:dbus-ref> property is <tp:value-ref type="Stream_Transport_Type">ICE</tp:value-ref>.</p> </tp:docstring> </tp:hct> @@ -1515,7 +1526,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:hct name="wlm-2009"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The client can implement streaming for streams whose <tp:dbus-ref - namespace="ofdT.Call1.Stream.Interface.Media">Transport</tp:dbus-ref> + namespace="imt1.Call1.Stream.Interface.Media">Transport</tp:dbus-ref> property is <tp:value-ref type="Stream_Transport_Type">WLM_2009</tp:value-ref>.</p> </tp:docstring> </tp:hct> @@ -1523,7 +1534,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:hct name="shm"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The client can implement streaming for streams whose <tp:dbus-ref - namespace="ofdT.Call1.Stream.Interface.Media">Transport</tp:dbus-ref> + namespace="imt1.Call1.Stream.Interface.Media">Transport</tp:dbus-ref> property is <tp:value-ref type="Stream_Transport_Type">SHM</tp:value-ref>.</p> </tp:docstring> </tp:hct> @@ -1555,15 +1566,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <p>For example, a client could advertise support for audio and video calls using Speex, Theora and H264 by having five handler capability tokens in its <tp:dbus-ref - namespace="ofdT.Client.Handler">Capabilities</tp:dbus-ref> + namespace="imt1.Client.Handler">Capabilities</tp:dbus-ref> property:</p> <ul> - <li><code>org.freedesktop.Telepathy.Channel.Type.Call1/audio</code></li> - <li><code>org.freedesktop.Telepathy.Channel.Type.Call1/audio/speex</code></li> - <li><code>org.freedesktop.Telepathy.Channel.Type.Call1/video</code></li> - <li><code>org.freedesktop.Telepathy.Channel.Type.Call1/video/theora</code></li> - <li><code>org.freedesktop.Telepathy.Channel.Type.Call1/video/h264</code></li> + <li><code>im.telepathy1.Channel.Type.Call1/audio</code></li> + <li><code>im.telepathy1.Channel.Type.Call1/audio/speex</code></li> + <li><code>im.telepathy1.Channel.Type.Call1/video</code></li> + <li><code>im.telepathy1.Channel.Type.Call1/video/theora</code></li> + <li><code>im.telepathy1.Channel.Type.Call1/video/h264</code></li> </ul> <p>Clients MAY have media signalling abilities without explicitly diff --git a/spec/Channel_Type_Contact_Search.xml b/spec/Channel_Type_Contact_Search.xml index 98789ab40..3ca8bc719 100644 --- a/spec/Channel_Type_Contact_Search.xml +++ b/spec/Channel_Type_Contact_Search.xml @@ -18,8 +18,8 @@ Lesser General Public License for more details.</p> License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Channel.Type.ContactSearch"> - <tp:requires interface="org.freedesktop.Telepathy.Channel"/> + <interface name="im.telepathy1.Channel.Type.ContactSearch1"> + <tp:requires interface="im.telepathy1.Channel"/> <tp:added version="0.19.10"> as stable API. Changes from draft 2: <tp:type>Contact_Search_Result_Map</tp:type> keys are now identifiers @@ -34,31 +34,31 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ found.</p> <p>Connections that support contact search channels SHOULD have an entry - in <tp:dbus-ref namespace='ofdT.Connection.Interface.Requests' + in <tp:dbus-ref namespace='imt1.Connection.Interface.Requests' >RequestableChannelClasses</tp:dbus-ref> with the <tp:dbus-ref - namespace='ofdT.Channel'>ChannelType</tp:dbus-ref> fixed to this + namespace='imt1.Channel'>ChannelType</tp:dbus-ref> fixed to this interface, and no other fixed properties. That requestable channel class MAY also have the Server and Limit properties in its list of allowed properties, depending on the protocol.</p> <tp:rationale> <p>The requestable channel class would normally also have <tp:dbus-ref - namespace='ofdT.Channel'>TargetHandleType</tp:dbus-ref> fixed to + namespace='imt1.Channel'>TargetHandleType</tp:dbus-ref> fixed to <code>None</code>, but the initial implementation of ContactSearch (in telepathy-gabble) didn't do this.</p> </tp:rationale> <p>All channels of this type should have <tp:dbus-ref - namespace='ofdT.Channel'>TargetHandleType</tp:dbus-ref> + namespace='imt1.Channel'>TargetHandleType</tp:dbus-ref> <code>None</code> (and hence <tp:dbus-ref - namespace='ofdT.Channel'>TargetHandle</tp:dbus-ref> <code>0</code> and - <tp:dbus-ref namespace='ofdT.Channel'>TargetID</tp:dbus-ref> + namespace='imt1.Channel'>TargetHandle</tp:dbus-ref> <code>0</code> and + <tp:dbus-ref namespace='imt1.Channel'>TargetID</tp:dbus-ref> <code>""</code>).</p> <p>Requests for channels of this type need only optionally specify the <tp:member-ref>Server</tp:member-ref> property (if it is an allowed property in the connection's <tp:dbus-ref - namespace='ofdT.Connection.Interface.Requests'>RequestableChannelClasses</tp:dbus-ref>).</p> + namespace='imt1.Connection.Interface.Requests'>RequestableChannelClasses</tp:dbus-ref>).</p> <p>Before searching, the <tp:member-ref>AvailableSearchKeys</tp:member-ref> property should be @@ -83,11 +83,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:member-ref>Limit</tp:member-ref> results. If allowed by the connection manager, clients may specify the "page size" by specifying <tp:member-ref>Limit</tp:member-ref> when calling - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>. + <tp:dbus-ref namespace="im.telepathy1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>. </p> <p>The client should call the channel's <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel">Close</tp:dbus-ref> + namespace="im.telepathy1.Channel">Close</tp:dbus-ref> method when it is finished with the channel.</p> <p>Each channel can only be used for a single search; a new channel @@ -96,10 +96,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ to the same server, if applicable).</p> <p>It does not make sense to request this channel type using <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection.Interface.Requests">EnsureChannel</tp:dbus-ref>; + namespace="im.telepathy1.Connection.Interface.Requests">EnsureChannel</tp:dbus-ref>; clients SHOULD request channels of this type using <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection.Interface.Requests">CreateChannel</tp:dbus-ref> + namespace="im.telepathy1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref> instead.</p> <tp:rationale> @@ -298,7 +298,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:rationale> It can be in the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection.Interface.Requests">NewChannels</tp:dbus-ref> + namespace="im.telepathy1.Connection.Interface.Requests">NewChannels</tp:dbus-ref> signal for round-trip reduction. </tp:rationale> </tp:docstring> @@ -337,19 +337,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ with the state In_Progress. </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring> The <tp:member-ref>SearchState</tp:member-ref> is no longer Not_Started, so this method is no longer available. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> + <tp:error name="im.telepathy1.Error.InvalidArgument"> <tp:docstring> The search terms included something this connection manager cannot search for. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> </tp:possible-errors> </method> @@ -360,7 +360,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ and continue listing up to <tp:member-ref>Limit</tp:member-ref> more results. </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring> The <tp:member-ref>SearchState</tp:member-ref> is not <code>More_Available</code>. @@ -376,7 +376,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ while the SearchState is In_Progress, <tp:member-ref>SearchStateChanged</tp:member-ref> will be emitted, with the state Failed and the error - <code>org.freedesktop.Telepathy.Error.<tp:error-ref>Cancelled</tp:error-ref></code>.</p> + <code>im.telepathy1.Error.<tp:error-ref>Cancelled</tp:error-ref></code>.</p> <p>Calling this method on a search in state Completed or Failed succeeds, but has no effect.</p> @@ -394,7 +394,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ results.</p> </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring> The <tp:member-ref>SearchState</tp:member-ref> is Not_Started, so this method is not yet available. @@ -427,9 +427,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>An array of fields representing information about this contact, in the same format used in the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection.Interface">ContactInfo</tp:dbus-ref> + namespace="im.telepathy1.Connection.Interface">ContactInfo1</tp:dbus-ref> interface. It is possible that a separate call to <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection.Interface.ContactInfo">RequestContactInfo</tp:dbus-ref> + namespace="im.telepathy1.Connection.Interface.ContactInfo1">RequestContactInfo</tp:dbus-ref> would return more information than this signal provides.</p> </tp:docstring> </tp:member> diff --git a/spec/Channel_Type_DBus_Tube.xml b/spec/Channel_Type_DBus_Tube.xml index 74e659514..5b4c74853 100644 --- a/spec/Channel_Type_DBus_Tube.xml +++ b/spec/Channel_Type_DBus_Tube.xml @@ -17,9 +17,9 @@ 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 Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:license> - <interface name="org.freedesktop.Telepathy.Channel.Type.DBusTube"> - <tp:requires interface="org.freedesktop.Telepathy.Channel"/> - <tp:requires interface="org.freedesktop.Telepathy.Channel.Interface.Tube"/> + <interface name="im.telepathy1.Channel.Type.DBusTube1"> + <tp:requires interface="im.telepathy1.Channel"/> + <tp:requires interface="im.telepathy1.Channel.Interface.Tube1"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A D-Bus tube is an ordered reliable transport, for transporting D-Bus traffic.</p> @@ -61,7 +61,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. tp:type="String_Variant_Map"> <tp:docstring> The dictionary of arbitrary - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Interface.Tube">Parameters</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1.Channel.Interface.Tube1">Parameters</tp:dbus-ref> to send with the tube offer. </tp:docstring> </arg> @@ -77,8 +77,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring> The contact associated with this channel doesn't have tubes capabilities. @@ -92,7 +92,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Accept a D-Bus tube that's in the "local pending" state. The connection manager will attempt to open the tube. The tube remains in the "local pending" state until the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Interface.Tube">TubeChannelStateChanged</tp:dbus-ref> + namespace="im.telepathy1.Channel.Interface.Tube1">TubeChannelStateChanged</tp:dbus-ref> signal is emitted. </tp:docstring> <arg direction="in" name="access_control" type="u" tp:type="Socket_Access_Control"> @@ -136,7 +136,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. other end.</p> <p>When requesting a channel with <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>, + namespace="im.telepathy1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>, this property MUST be included in the request.</p> </tp:docstring> </property> @@ -187,7 +187,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:rationale> <p>When requesting a channel with - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>, + <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>, this property MUST NOT be included in the request.</p> </tp:docstring> diff --git a/spec/Channel_Type_File_Transfer.xml b/spec/Channel_Type_File_Transfer.xml index f50b96344..cecd3c837 100644 --- a/spec/Channel_Type_File_Transfer.xml +++ b/spec/Channel_Type_File_Transfer.xml @@ -18,8 +18,8 @@ Library General Public License for more details.</p> License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Channel.Type.FileTransfer"> - <tp:requires interface="org.freedesktop.Telepathy.Channel"/> + <interface name="im.telepathy1.Channel.Type.FileTransfer1"> + <tp:requires interface="im.telepathy1.Channel"/> <tp:added version="0.17.18">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A channel type for transferring files. The @@ -70,7 +70,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </li></ul> <p>If something goes wrong with the transfer, - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Channel.Close</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1">Channel.Close</tp:dbus-ref> should be called on the channel.</p> <p>The File channel type may be requested for handles of type @@ -80,7 +80,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>Connection managers SHOULD NOT advertise support for file transfer to other contacts unless it has been indicated by a call to <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection.Interface.ContactCapabilities">UpdateCapabilities</tp:dbus-ref>. + namespace="im.telepathy1.Connection.Interface.ContactCapabilities1">UpdateCapabilities</tp:dbus-ref>. </p> <tp:rationale> <p>People would send us files, and it would always fail. That would be silly.</p> @@ -102,7 +102,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ been created.</p> <p>This property is mandatory when requesting the channel with the - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> method. Protocols which do not have a content-type property with file transfers should set this value to application/octet-stream.</p> </tp:docstring> @@ -120,7 +120,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ be set to monkey.pdf.</p> <p>This property is mandatory when requesting the channel with the - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> method. This property cannot be empty and MUST be set to a sensible value.</p> </tp:docstring> </property> @@ -138,7 +138,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ to the byte.</p> <p>This property is mandatory when requesting the channel with the - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> method. If this information isn't provided in the protocol, connection managers MUST set it to UINT64_MAX.</p> </tp:docstring> @@ -151,15 +151,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>The type of the <tp:member-ref>ContentHash</tp:member-ref> property.</p> <p>This property is optional when requesting the channel with the - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> method. However, if you wish to include the <tp:member-ref>ContentHash</tp:member-ref> property you MUST also include this property. If you omit this property from a - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> method call then its value will be assumed to be File_Hash_Type_None.</p> <p>For each supported hash type, implementations SHOULD include an entry in <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection.Interface.Requests">RequestableChannelClasses</tp:dbus-ref> + namespace="im.telepathy1.Connection.Interface.Requests">RequestableChannelClasses</tp:dbus-ref> with this property fixed to that hash type. If the protocol supports offering a file without a content hash, implementations SHOULD list this property in Allowed in a requestable channel class, mapping hash @@ -177,7 +177,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ property.</p> <p>This property is optional when requesting the channel with the - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> method. Its value MUST correspond to the appropriate type of the <tp:member-ref>ContentHashType</tp:member-ref> property. If the ContentHashType property is not set, or set to File_Hash_Type_None, @@ -192,7 +192,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ channel has been created.</p> <p>This property is optional when requesting the channel with the - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> method. If this property was not provided by the remote party, connection managers MUST set it to the empty string.</p> </tp:docstring> @@ -206,7 +206,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ cannot change once the channel has been created</p> <p>This property is optional when requesting the channel with the - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> method.</p> </tp:docstring> </property> @@ -440,18 +440,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring> The given address type or access-control mechanism is not supported. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.InvalidArgument"/> <tp:docstring> Your address type, access control, access control parameter, offset, or a combination of all four is invalid. </tp:docstring> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring> The file transfer is not in the Pending state, there isn't or there is a local error with acquiring a socket. @@ -492,17 +492,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring> The given address type or access-control mechanism is not supported. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"/> + <tp:error name="im.telepathy1.Error.InvalidArgument"/> <tp:docstring> Your address type, access control, access control parameter, or a combination of all three is invalid. </tp:docstring> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring> Channel is not an outgoing transfer, ProvideFile has already been called, or there was a local error acquiring the socket. diff --git a/spec/Channel_Type_Room_List.xml b/spec/Channel_Type_Room_List.xml index b2b886f14..c5567f802 100644 --- a/spec/Channel_Type_Room_List.xml +++ b/spec/Channel_Type_Room_List.xml @@ -18,8 +18,8 @@ Lesser General Public License for more details.</p> License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Channel.Type.RoomList"> - <tp:requires interface="org.freedesktop.Telepathy.Channel"/> + <interface name="im.telepathy1.Channel.Type.RoomList1"> + <tp:requires interface="im.telepathy1.Channel"/> <tp:struct name="Room_Info" array-name="Room_Info_List"> <tp:member type="u" tp:type="Room_Handle" name="Handle"/> @@ -63,19 +63,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:docstring> </arg> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - <p>Emitted when information about rooms on the server becomes available. - The array contains the room handle (as can be passed to the - <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection">RequestChannel</tp:dbus-ref> - method with HANDLE_TYPE_ROOM), the channel - type, and a dictionary containing further information about the - room as available. The following well-known keys and types are - recommended for use where appropriate:</p> + <p>Emitted when information about rooms on the server becomes + available. The array contains the room handle (as can be + passed to the <tp:dbus-ref + namespace="imt1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref> + method with <tp:dbus-ref + namespace="imt1.Channel">TargetHandleType</tp:dbus-ref>= + HANDLE_TYPE_ROOM), the channel type, and a dictionary + containing further information about the room as + available. The following well-known keys and types are + recommended for use where appropriate:</p> <dl> <dt>handle-name (s)</dt> <dd>The identifier of the room (as would be returned by - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection">InspectHandles</tp:dbus-ref>)</dd> + <tp:dbus-ref namespace="im.telepathy1.Connection">InspectHandles</tp:dbus-ref>)</dd> <dt>name (s)</dt> <dd>The human-readable name of the room if different from the handle</dd> @@ -86,7 +88,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <dt>subject (s)</dt> <dd>The current subject of conversation in the room (as would be returned by getting the string part of the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Interface.Subject2" + namespace="im.telepathy1.Channel.Interface.Subject1" >Subject</tp:dbus-ref> property)</dd> <dt>members (u)</dt> @@ -101,13 +103,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <dt>room-id (s)</dt> <dd>The human-readable identifier of a chat room (as would be returned by getting the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Interface.Room2" + namespace="im.telepathy1.Channel.Interface.Room1" >RoomName</tp:dbus-ref> property)</dd> <dt>server (s)</dt> <dd>The DNS name of the server hosting these channels (as would be returned by getting the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Interface.Room2" + namespace="im.telepathy1.Channel.Interface.Room1" >Server</tp:dbus-ref> property)</dd> </dl> </tp:docstring> @@ -122,10 +124,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ the request is complete. </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"/> - <tp:error name="org.freedesktop.Telepathy.Error.PermissionDenied"/> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.NotAvailable"/> + <tp:error name="im.telepathy1.Error.PermissionDenied"/> </tp:possible-errors> </method> <method name="StopListing" tp:name-for-bindings="Stop_Listing"> @@ -148,7 +150,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>A channel type for listing named channels available on the server. Once the <tp:member-ref>ListRooms</tp:member-ref> method is called, it emits signals for rooms present on the server, until you <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel">Close</tp:dbus-ref> this + namespace="im.telepathy1.Channel">Close</tp:dbus-ref> this channel. In some cases, it may not be possible to stop the deluge of information from the server. This channel should be closed when the room information is no longer being displayed, so that the diff --git a/spec/Channel_Type_Server_Authentication.xml b/spec/Channel_Type_Server_Authentication.xml index 76599aa35..eec13cd7c 100644 --- a/spec/Channel_Type_Server_Authentication.xml +++ b/spec/Channel_Type_Server_Authentication.xml @@ -16,17 +16,17 @@ Lesser General Public License for more details.</p> License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Channel.Type.ServerAuthentication"> + <interface name="im.telepathy1.Channel.Type.ServerAuthentication1"> <tp:added version="0.21.5">(as stable API)</tp:added> - <tp:requires interface="org.freedesktop.Telepathy.Channel"/> + <tp:requires interface="im.telepathy1.Channel"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The type for a channel representing an authentication step with the server. The actual authentication functionality is implemented by the additional interface named in <tp:member-ref>AuthenticationMethod</tp:member-ref>, - such as <tp:dbus-ref namespace="ofdT" - >Channel.Interface.SASLAuthentication</tp:dbus-ref>.</p> + such as <tp:dbus-ref namespace="imt1" + >Channel.Interface.SASLAuthentication1</tp:dbus-ref>.</p> <p>Future authentication steps also supported by this channel type might include solving a captcha and/or agreeing to an EULA or terms-of-use @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:member-ref>AuthenticationMethod</tp:member-ref>.</p> <p>Channels of this type will normally be be signalled and dispatched - while the <tp:dbus-ref namespace="ofdT">Connection</tp:dbus-ref> + while the <tp:dbus-ref namespace="imt1">Connection</tp:dbus-ref> owning them is in the CONNECTING state. They MAY also appear on a Connection in the CONNECTED state, for instance if periodic re-authentication is required.</p> @@ -46,24 +46,24 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>Channels of this type cannot be requested with methods such as <tp:dbus-ref - namespace="ofdT.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>. + namespace="imt1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>. They always have <tp:dbus-ref - namespace="ofdT.Channel">Requested</tp:dbus-ref> = False, + namespace="imt1.Channel">Requested</tp:dbus-ref> = False, <tp:dbus-ref - namespace="ofdT.Channel">TargetHandleType</tp:dbus-ref> = None + namespace="imt1.Channel">TargetHandleType</tp:dbus-ref> = None and <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel">TargetHandle</tp:dbus-ref> + namespace="im.telepathy1.Channel">TargetHandle</tp:dbus-ref> = 0.</p> <p>While it is CONNECTING, the Connection MUST NOT proceed with connection, or signal - <tp:dbus-ref namespace="ofdT.Connection">StatusChanged</tp:dbus-ref> + <tp:dbus-ref namespace="imt1.Connection">StatusChanged</tp:dbus-ref> to the CONNECTED state, until each channel of this type has either been accepted as having a positive result (for instance, on SASL channels this is done with the <tp:dbus-ref - namespace="ofdT.Channel.Interface.SASLAuthentication" + namespace="imt1.Channel.Interface.SASLAuthentication1" >AcceptSASL</tp:dbus-ref> method), or closed with the <tp:dbus-ref - namespace="ofdT.Channel">Close</tp:dbus-ref> method.</p> + namespace="imt1.Channel">Close</tp:dbus-ref> method.</p> <tp:rationale> <p>ServerAuthentication channels normally represent the client @@ -75,7 +75,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:rationale> <p>If a channel of this type is closed with the <tp:dbus-ref - namespace="ofdT.Channel">Close</tp:dbus-ref> method before + namespace="imt1.Channel">Close</tp:dbus-ref> method before authentication has succeeded, this indicates that the Handler has given up its attempts to authenticate or that no Handler is available.</p> @@ -83,16 +83,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>If this occurs, the connection manager MAY attempt to continue connection (for instance, performing SASL authentication by using any credentials passed to <tp:dbus-ref - namespace="ofdT.ConnectionManager">RequestConnection</tp:dbus-ref>, + namespace="imt1.ConnectionManager">RequestConnection</tp:dbus-ref>, for instance from the <tp:dbus-ref - namespace="ofdT">Account.Parameters</tp:dbus-ref>). If this fails + namespace="imt1">Account.Parameters</tp:dbus-ref>). If this fails or has already been tried, the <tp:dbus-ref - namespace="ofdT">Connection</tp:dbus-ref> will + namespace="imt1">Connection</tp:dbus-ref> will disconnect.</p> <tp:rationale> <p>In particular, the <tp:dbus-ref - namespace="ofdT">ChannelDispatcher</tp:dbus-ref> will close the + namespace="imt1">ChannelDispatcher</tp:dbus-ref> will close the channel if it cannot find a handler.</p> </tp:rationale> @@ -108,11 +108,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>This property defines the method used for the authentication step represented by this channel, which MUST be one of this channel's - <tp:dbus-ref namespace="ofdT.Channel">Interfaces</tp:dbus-ref>.</p> + <tp:dbus-ref namespace="imt1.Channel">Interfaces</tp:dbus-ref>.</p> <p>The initially-defined interface that can be used here is - <tp:dbus-ref namespace="ofdT" - >Channel.Interface.SASLAuthentication</tp:dbus-ref>.</p> + <tp:dbus-ref namespace="imt1" + >Channel.Interface.SASLAuthentication1</tp:dbus-ref>.</p> </tp:docstring> </property> diff --git a/spec/Channel_Type_Server_TLS_Connection.xml b/spec/Channel_Type_Server_TLS_Connection.xml index 97efd1b36..7d01a8e94 100644 --- a/spec/Channel_Type_Server_TLS_Connection.xml +++ b/spec/Channel_Type_Server_TLS_Connection.xml @@ -18,26 +18,26 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:license> - <interface name="org.freedesktop.Telepathy.Channel.Type.ServerTLSConnection"> + <interface name="im.telepathy1.Channel.Type.ServerTLSConnection1"> <tp:added version="0.19.13">(as stable API)</tp:added> - <tp:requires interface="org.freedesktop.Telepathy.Channel"/> + <tp:requires interface="im.telepathy1.Channel"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A channel type that carries a TLS certificate between a server and a client connecting to it.</p> <p>Channels of this kind always have <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel">Requested</tp:dbus-ref> = False, - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">TargetHandleType</tp:dbus-ref> - = None and <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">TargetHandle</tp:dbus-ref> + namespace="im.telepathy1.Channel">Requested</tp:dbus-ref> = False, + <tp:dbus-ref namespace="im.telepathy1.Channel">TargetHandleType</tp:dbus-ref> + = None and <tp:dbus-ref namespace="im.telepathy1.Channel">TargetHandle</tp:dbus-ref> = 0, and cannot be requested with methods such as <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>. + namespace="im.telepathy1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>. Also, they SHOULD be dispatched while the - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1">Connection</tp:dbus-ref> owning them is in the CONNECTING state.</p> <p>In this case, handlers SHOULD accept or reject the certificate, using the relevant methods on the provided object, or MAY just <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel">Close</tp:dbus-ref> the channel before doing so, to fall + namespace="im.telepathy1.Channel">Close</tp:dbus-ref> the channel before doing so, to fall back to a non-interactive verification process done inside the CM.</p> <p>For example, channels of this kind can pop up while a client is connecting to an XMPP server.</p> @@ -48,7 +48,7 @@ tp:immutable='yeah'> <tp:docstring> <p>A <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Authentication">TLSCertificate</tp:dbus-ref> + namespace="im.telepathy1.Authentication">TLSCertificate</tp:dbus-ref> containing the certificate chain as sent by the server, and other relevant information.</p> </tp:docstring> @@ -87,9 +87,9 @@ contain the value of the <tp:member-ref>Hostname</tp:member-ref> property. All other identities included in this property MUST be derived from explicit user input or choices, such as <tp:dbus-ref - namespace='ofdT.Account'>Parameters</tp:dbus-ref> passed to + namespace='imt1.Account'>Parameters</tp:dbus-ref> passed to <tp:dbus-ref - namespace='ofdT.ConnectionManager'>RequestConnection</tp:dbus-ref>.</p> + namespace='imt1.ConnectionManager'>RequestConnection</tp:dbus-ref>.</p> <tp:rationale> <p>The primary use for this property is for XMPP services hosted by diff --git a/spec/Channel_Type_Stream_Tube.xml b/spec/Channel_Type_Stream_Tube.xml index 63e7b2f50..548ea1d5b 100644 --- a/spec/Channel_Type_Stream_Tube.xml +++ b/spec/Channel_Type_Stream_Tube.xml @@ -17,9 +17,9 @@ 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 Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:license> - <interface name="org.freedesktop.Telepathy.Channel.Type.StreamTube"> - <tp:requires interface="org.freedesktop.Telepathy.Channel"/> - <tp:requires interface="org.freedesktop.Telepathy.Channel.Interface.Tube"/> + <interface name="im.telepathy1.Channel.Type.StreamTube1"> + <tp:requires interface="im.telepathy1.Channel"/> + <tp:requires interface="im.telepathy1.Channel.Interface.Tube1"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A stream tube is a transport for ordered, reliable data transfer, similar to SOCK_STREAM sockets.</p> @@ -63,19 +63,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. tp:type="String_Variant_Map"> <tp:docstring> The dictionary of arbitrary - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Interface.Tube">Parameters</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1.Channel.Interface.Tube1">Parameters</tp:dbus-ref> to send with the tube offer. </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring> The contact associated with this channel doesn't have tube capabilities. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring> The connection manager doesn't support the given address type or access-control type. @@ -89,7 +89,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Accept a stream tube that's in the "local pending" state. The connection manager will attempt to open the tube. The tube remains in the "local pending" state until the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Interface.Tube">TubeChannelStateChanged</tp:dbus-ref> + namespace="im.telepathy1.Channel.Interface.Tube1">TubeChannelStateChanged</tp:dbus-ref> signal is emitted. </tp:docstring> <arg direction="in" name="address_type" type="u" tp:type="Socket_Address_Type"> @@ -123,12 +123,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> + <tp:error name="im.telepathy1.Error.InvalidArgument"> <tp:docstring> The access_control_param is invalid with the given access_control. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring> The given address type or access-control mechanism is not supported. </tp:docstring> @@ -210,11 +210,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <p>The following errors can be used:</p> <ul> - <li><code>org.freedesktop.Telepathy.Error.Cancelled</code>: + <li><code>im.telepathy1.Error.Cancelled</code>: user closed the socket or the tube.</li> - <li><code>org.freedesktop.Telepathy.Error.ConnectionLost</code>: + <li><code>im.telepathy1.Error.ConnectionLost</code>: the bytestream relaying connection's data has been broken.</li> - <li><code>org.freedesktop.Telepathy.Error.ConnectionRefused</code>: + <li><code>im.telepathy1.Error.ConnectionRefused</code>: the tube offer refused the connection.</li> </ul> </tp:docstring> @@ -239,11 +239,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <p>When the tube is offered, the service name is transmitted to the other end.</p> <p>When requesting a channel with - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>, + <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>, this property MUST be included in the request.</p> </tp:docstring> </property> + <tp:mapping name="Supported_Socket_Map"> + <tp:docstring>The supported socket address and access-control types + for tubes. See GetAvailableStreamTubeTypes.</tp:docstring> + <tp:member name="Address_Type" type="u" tp:type="Socket_Address_Type"/> + <tp:member name="Access_Control" type="au" + tp:type="Socket_Access_Control[]"/> + </tp:mapping> + <property name="SupportedSocketTypes" type="a{uau}" tp:type="Supported_Socket_Map" access="read" tp:name-for-bindings="Supported_Socket_Types"> @@ -270,7 +278,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. access control.</p> <p>When requesting a channel with - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>, + <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>, this property MUST NOT be included in the request.</p> </tp:docstring> diff --git a/spec/Client.xml b/spec/Client.xml index 19f691495..ce5a4da49 100644 --- a/spec/Client.xml +++ b/spec/Client.xml @@ -20,7 +20,7 @@ 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Client"> + <interface name="im.telepathy1.Client"> <tp:added version="0.17.26">(as a stable interface)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -33,7 +33,7 @@ address-book synchronization.</p> <p>Every running or activatable process with a well-known - name of the form org.freedesktop.Telepathy.Client.<em>clientname</em> + name of the form im.telepathy1.Client.<em>clientname</em> should be probed by the channel dispatcher to discover its capabilities. Each client is either an <em>observer</em>, an <em>approver</em>, a <em>channel handler</em>, or some combination @@ -62,7 +62,7 @@ <p>If each of a client Foo's instances should be able to manipulate channels separately, the instance with unique name <code>:1.25</code> might request a well-known name like - <code>org.freedesktop.Telepathy.Client.Foo._1._25</code>.</p> + <code>im.telepathy1.Client.Foo._1._25</code>.</p> <p>(Note that well-known bus-name components may not start with a digit, so o.f.T.Client.Foo.1.25 would not be acceptable.)</p> @@ -104,9 +104,9 @@ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A list of the extra interfaces provided by this client. This SHOULD include at least one of - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Client.Observer</tp:dbus-ref>, - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Client.Approver</tp:dbus-ref> or - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Client.Handler</tp:dbus-ref>.</p> + <tp:dbus-ref namespace="im.telepathy1">Client.Observer</tp:dbus-ref>, + <tp:dbus-ref namespace="im.telepathy1">Client.Approver</tp:dbus-ref> or + <tp:dbus-ref namespace="im.telepathy1">Client.Handler</tp:dbus-ref>.</p> <p>In the <code>.client</code> file, this is represented by key "<code>Interfaces</code>" in the group named after this interface. diff --git a/spec/Client_Approver.xml b/spec/Client_Approver.xml index 12cbc76ac..828066787 100644 --- a/spec/Client_Approver.xml +++ b/spec/Client_Approver.xml @@ -20,16 +20,16 @@ 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Client.Approver"> + <interface name="im.telepathy1.Client.Approver"> <tp:added version="0.17.26">(as a stable interface)</tp:added> - <tp:requires interface="org.freedesktop.Telepathy.Client"/> + <tp:requires interface="im.telepathy1.Client"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Approvers are clients that notify the user that new channels have been created by a contact, and allow the user to accept or reject those channels. The new channels are represented by a <tp:dbus-ref - namespace="org.freedesktop.Telepathy">ChannelDispatchOperation</tp:dbus-ref> + namespace="im.telepathy1">ChannelDispatchOperation</tp:dbus-ref> object, which is passed to the <tp:member-ref>AddDispatchOperation</tp:member-ref> method.</p> @@ -59,9 +59,9 @@ <p>Any approver can approve the handling of a channel dispatch operation with a particular channel handler by calling the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.ChannelDispatchOperation">HandleWith</tp:dbus-ref> + namespace="im.telepathy1.ChannelDispatchOperation">HandleWith</tp:dbus-ref> method. Approvers can also attempt to <tp:dbus-ref - namespace="org.freedesktop.Telepathy.ChannelDispatchOperation">Claim</tp:dbus-ref> + namespace="im.telepathy1.ChannelDispatchOperation">Claim</tp:dbus-ref> channels; if this succeeds, the approver may handle the channels itself (if it is also a Handler), or close the channels in order to reject them.</p> @@ -79,7 +79,7 @@ straight away.</p> <p>Non-interactive approvers can also be implemented as - <tp:dbus-ref namespace="ofdT.Client">Observer</tp:dbus-ref>s as + <tp:dbus-ref namespace="imt1.Client">Observer</tp:dbus-ref>s as described in the interface description.</p> </tp:docstring> @@ -94,7 +94,7 @@ description.</p> <p>This property works in exactly the same way as the - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Client.Observer.ObserverChannelFilter</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1">Client.Observer.ObserverChannelFilter</tp:dbus-ref> property. In particular, it cannot change while the approver process continues to own the corresponding Client bus name.</p> @@ -134,9 +134,9 @@ type="a(oa{sv})" tp:type="Channel_Details[]"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The initial value of the <tp:dbus-ref - namespace="org.freedesktop.Telepathy">ChannelDispatchOperation.Channels</tp:dbus-ref> + namespace="im.telepathy1">ChannelDispatchOperation.Channels</tp:dbus-ref> property, containing the <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Channel</tp:dbus-ref>s + namespace="im.telepathy1">Channel</tp:dbus-ref>s to be dispatched and their properties.</p> <tp:rationale> @@ -158,11 +158,11 @@ <p>The actual channels to be dispatched may reduce as channels are closed: this is signalled by <tp:dbus-ref - namespace="org.freedesktop.Telepathy">ChannelDispatchOperation.ChannelLost</tp:dbus-ref>. + namespace="im.telepathy1">ChannelDispatchOperation.ChannelLost</tp:dbus-ref>. </p> <p>Approvers SHOULD connect to ChannelLost and <tp:dbus-ref - namespace="org.freedesktop.Telepathy">ChannelDispatchOperation.Finished</tp:dbus-ref>. + namespace="im.telepathy1">ChannelDispatchOperation.Finished</tp:dbus-ref>. (if desired) before returning from AddDispatchOperation, since those signals are guaranteed not to be emitted until after all AddDispatchOperation calls have returned (with success or failure) @@ -173,7 +173,7 @@ <arg name="DispatchOperation" type="o" direction="in"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The - <tp:dbus-ref namespace="org.freedesktop.Telepathy">ChannelDispatchOperation</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1">ChannelDispatchOperation</tp:dbus-ref> to be processed.</p> </tp:docstring> </arg> @@ -186,11 +186,11 @@ properties that could change, SHOULD include as many properties as possible given that constraint, and MUST include at least the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.ChannelDispatchOperation">Account</tp:dbus-ref>, + namespace="im.telepathy1.ChannelDispatchOperation">Account</tp:dbus-ref>, <tp:dbus-ref - namespace="org.freedesktop.Telepathy.ChannelDispatchOperation">Connection</tp:dbus-ref> + namespace="im.telepathy1.ChannelDispatchOperation">Connection</tp:dbus-ref> and <tp:dbus-ref - namespace="org.freedesktop.Telepathy.ChannelDispatchOperation">PossibleHandlers</tp:dbus-ref> + namespace="im.telepathy1.ChannelDispatchOperation">PossibleHandlers</tp:dbus-ref> properties.</p> </tp:docstring> </arg> diff --git a/spec/Client_Handler.xml b/spec/Client_Handler.xml index 3a922e8cc..f1ff37d36 100644 --- a/spec/Client_Handler.xml +++ b/spec/Client_Handler.xml @@ -20,10 +20,10 @@ 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Client.Handler"> + <interface name="im.telepathy1.Client.Handler"> <tp:added version="0.17.26">(as a stable interface)</tp:added> - <tp:requires interface="org.freedesktop.Telepathy.Client"/> + <tp:requires interface="im.telepathy1.Client"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Handlers are the user interface for a channel. They turn an abstract @@ -36,19 +36,17 @@ <p>Because each channel is only handled by one Handler, handlers may perform actions that only make sense to do once, such as acknowledging - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Type">Text</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1.Channel.Type">Text</tp:dbus-ref> messages, doing the actual streaming for <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Type">StreamedMedia</tp:dbus-ref> - channels with the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Interface">MediaSignalling</tp:dbus-ref> - interface, or transferring the file in <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Type">FileTransfer</tp:dbus-ref> + namespace="im.telepathy1.Channel.Type">Call1</tp:dbus-ref> + channels, or transferring the file in <tp:dbus-ref + namespace="im.telepathy1.Channel.Type">FileTransfer1</tp:dbus-ref> channels.</p> <p>When a new incoming channel (one with - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">Requested</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1.Channel">Requested</tp:dbus-ref> = FALSE) is offered to - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Client">Approver</tp:dbus-ref>s + <tp:dbus-ref namespace="im.telepathy1.Client">Approver</tp:dbus-ref>s by the channel dispatcher, it also offers the Approvers a list of all the running or activatable handlers whose <tp:member-ref>HandlerChannelFilter</tp:member-ref> property @@ -57,7 +55,7 @@ those channel handlers to handle the channel.</p> <p>When a new outgoing channel (one with - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">Requested</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1.Channel">Requested</tp:dbus-ref> = TRUE) appears, the channel dispatcher passes it to an appropriate channel handler automatically. </p> @@ -69,12 +67,10 @@ type="aa{sv}" access="read" tp:type="Channel_Class[]"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A specification of the channels that this channel handler can - deal with. It will be offered to approvers as a potential - channel handler for bundles that contain only suitable channels, - or for suitable channels that must be handled separately.</p> + deal with.</p> <p>This property works in exactly the same way as the - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Client.Observer.ObserverChannelFilter</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1">Client.Observer.ObserverChannelFilter</tp:dbus-ref> property. In particular, it cannot change while the handler process continues to own the corresponding Client bus name.</p> @@ -91,26 +87,11 @@ <p>If true, channels destined for this handler are automatically handled, without invoking approvers.</p> - <tp:rationale> - <p>The intended usage is to allow a client handling one channel to - pick up closely related channels. Suppose a client capable of - handling both Text and StreamedMedia, - <code>org.freedesktop.Telepathy.Client.Empathy</code>, is - handling a StreamedMedia channel. That client can take a second - well-known bus name, say - <code>org.freedesktop.Telepathy.Client.Empathy._1._42.Bundle1</code>, - and configure an object at - <code>/org/freedesktop/Telepathy/Client/Empathy/_1/_42/Bundle1</code> - with BypassApproval = TRUE, - whose <tp:member-ref>HandlerChannelFilter</tp:member-ref> - matches closely related Text channels by their Bundle property.</p> - </tp:rationale> - <p>For service-activatable handlers, this property should be specified in the handler's <tt>.client</tt> file as follows:</p> <pre> -[org.freedesktop.Telepathy.Client.Handler] +[im.telepathy1.Client.Handler] BypassApproval=true </pre> </tp:docstring> @@ -133,7 +114,7 @@ BypassApproval=true </tp:rationale> <p>So far, all client capabilities are defined by the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Interface">MediaSignalling</tp:dbus-ref> + namespace="im.telepathy1.Channel.Type">Call1</tp:dbus-ref> interface.</p> </tp:docstring> </tp:simple-type> @@ -148,7 +129,7 @@ BypassApproval=true <p>For handlers that have a <code>.client</code> file, the channel dispatcher may discover this property from the - <code>org.freedesktop.Telepathy.Client.Handler.Capabilities</code> + <code>im.telepathy1.Client.Handler.Capabilities</code> group; for each capability, that group contains a key whose name is the capability, with value <code>true</code>. Keys with other values SHOULD NOT appear in this group.</p> @@ -158,11 +139,11 @@ BypassApproval=true and Theora and H264 video might contain this group:</p> <pre> -[org.freedesktop.Telepathy.Client.Handler.Capabilities] -org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/ice-udp=true -org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/audio/speex=true -org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/video/theora=true -org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/video/h264=true +[im.telepathy1.Client.Handler.Capabilities] +im.telepathy1.Channel.Interface.MediaSignalling/ice-udp=true +im.telepathy1.Channel.Interface.MediaSignalling/audio/speex=true +im.telepathy1.Channel.Interface.MediaSignalling/video/theora=true +im.telepathy1.Channel.Interface.MediaSignalling/video/h264=true </pre> <p>Like the <tp:member-ref>HandlerChannelFilter</tp:member-ref> @@ -203,10 +184,10 @@ org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/video/h264=true <p>If closing the channels, it is RECOMMENDED that the channel dispatcher attempts to close the channels using <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Channel.Close</tp:dbus-ref>, + namespace="im.telepathy1">Channel.Close</tp:dbus-ref>, but resorts to calling <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Channel.Interface.Destroyable.Destroy</tp:dbus-ref> + namespace="im.telepathy1">Channel.Interface.Destroyable1.Destroy</tp:dbus-ref> (if available) or ignoring the channel (if not) if the same handler repeatedly fails to handle channels.</p> @@ -225,10 +206,10 @@ org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/video/h264=true <arg name="Account" type="o" direction="in"> <tp:docstring> The - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Account</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1">Account</tp:dbus-ref> with which the channels are associated. The well-known bus name to use is that of the - <tp:dbus-ref namespace="org.freedesktop.Telepathy">AccountManager</tp:dbus-ref>. + <tp:dbus-ref namespace="im.telepathy1">AccountManager</tp:dbus-ref>. </tp:docstring> </arg> @@ -256,7 +237,7 @@ org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/video/h264=true <tp:rationale> <p>If the handler implements Requests, this tells it that these channels match previous <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Client.Interface.Requests">AddRequest</tp:dbus-ref> + namespace="im.telepathy1.Client.Interface.Requests">AddRequest</tp:dbus-ref> calls that it may have received.</p> <p>There can be more than one, if they were EnsureChannel @@ -284,7 +265,7 @@ org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/video/h264=true <dl> <dt><code>request-properties</code> - a{oa{sv}}</dt> <dd>A map from <tp:dbus-ref - namespace="org.freedesktop.Telepathy">ChannelRequest</tp:dbus-ref> + namespace="im.telepathy1">ChannelRequest</tp:dbus-ref> paths listed in <var>Requests_Satisfied</var> to <tp:type>Qualified_Property_Value_Map</tp:type>s containing namespaced immutable properties of each request.</dd> diff --git a/spec/Client_Handler_Future.xml b/spec/Client_Handler_Future.xml index 4c1a8b761..dbb9b348d 100644 --- a/spec/Client_Handler_Future.xml +++ b/spec/Client_Handler_Future.xml @@ -20,14 +20,14 @@ 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Client.Handler.FUTURE" + <interface name="im.telepathy1.Client.Handler.FUTURE" tp:causes-havoc="a staging area for future Handler functionality"> - <tp:requires interface="org.freedesktop.Telepathy.Client.Handler"/> + <tp:requires interface="im.telepathy1.Client.Handler"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>This interface contains functionality which we intend to incorporate into the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Client">Handler</tp:dbus-ref> + namespace="im.telepathy1.Client">Handler</tp:dbus-ref> interface in future. It should be considered to be conceptually part of the core Handler interface, but without API or ABI guarantees.</p> @@ -50,7 +50,7 @@ in the handler's <tt>.client</tt> file as follows:</p> <pre> -[org.freedesktop.Telepathy.Client.Handler] +[im.telepathy1.Client.Handler] BypassObservers=true </pre> </tp:docstring> @@ -61,13 +61,13 @@ BypassObservers=true type="b" access="read"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>If true, channels destined for this handler that have the - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Interface" - >Conference</tp:dbus-ref> interface, with a channel that + <tp:dbus-ref namespace="im.telepathy1.Channel.Interface" + >Conference1</tp:dbus-ref> interface, with a channel that was previously handled by the same client process in their - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Interface.Conference" + <tp:dbus-ref namespace="im.telepathy1.Channel.Interface.Conference1" >InitialChannels</tp:dbus-ref> property, should bypass the approval stage. In effect, this is a weaker form of - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Client.Handler" + <tp:dbus-ref namespace="im.telepathy1.Client.Handler" >BypassApproval</tp:dbus-ref>.</p> <tp:rationale> diff --git a/spec/Client_Interface_Requests.xml b/spec/Client_Interface_Requests.xml index 3cecfce49..609e1bb3a 100644 --- a/spec/Client_Interface_Requests.xml +++ b/spec/Client_Interface_Requests.xml @@ -20,11 +20,11 @@ 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Client.Interface.Requests"> + <interface name="im.telepathy1.Client.Interface.Requests"> <tp:added version="0.17.26">(as a stable interface)</tp:added> - <tp:requires interface="org.freedesktop.Telepathy.Client"/> - <tp:requires interface="org.freedesktop.Telepathy.Client.Handler"/> + <tp:requires interface="im.telepathy1.Client"/> + <tp:requires interface="im.telepathy1.Client.Handler"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>This interface can be implemented by a Handler to be notified about @@ -47,14 +47,14 @@ a channel request which handler will handle particular channels. A reasonable heuristic would be to match the request against the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Client.Handler">HandlerChannelFilter</tp:dbus-ref>, + namespace="im.telepathy1.Client.Handler">HandlerChannelFilter</tp:dbus-ref>, and respect the preferred handler (if any).</p> </tp:rationale> <p>If the request succeeds and is given to the expected Handler, the Requests_Satisfied parameter to <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Client.Handler">HandleChannels</tp:dbus-ref> + namespace="im.telepathy1.Client.Handler">HandleChannels</tp:dbus-ref> can be used to match the channel to a previous AddRequest call.</p> <tp:rationale> @@ -74,7 +74,7 @@ and if the channel request succeeds, it SHOULD dispatch the channels to the expected handler, unless the channels do not match that handler's <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Client.Handler">HandlerChannelFilter</tp:dbus-ref>. + namespace="im.telepathy1.Client.Handler">HandlerChannelFilter</tp:dbus-ref>. If the channels are not dispatched to the expected handler, the handler that was expected is notified by the channel dispatcher calling its <tp:member-ref>RemoveRequest</tp:member-ref> method @@ -97,11 +97,11 @@ <arg name="Request" type="o" direction="in"> <tp:docstring> The <tp:dbus-ref - namespace="org.freedesktop.Telepathy">ChannelRequest</tp:dbus-ref> + namespace="im.telepathy1">ChannelRequest</tp:dbus-ref> object, which MUST have been returned by <tp:dbus-ref - namespace="org.freedesktop.Telepathy.ChannelDispatcher">CreateChannel</tp:dbus-ref> + namespace="im.telepathy1.ChannelDispatcher">CreateChannel</tp:dbus-ref> or <tp:dbus-ref - namespace="org.freedesktop.Telepathy.ChannelDispatcher">EnsureChannel</tp:dbus-ref> + namespace="im.telepathy1.ChannelDispatcher">EnsureChannel</tp:dbus-ref> before this method is called. <tp:rationale> @@ -119,13 +119,13 @@ properties as possible, given that constraint.</p> <p>In particular, the properties <tp:dbus-ref - namespace="org.freedesktop.Telepathy.ChannelRequest">Requests</tp:dbus-ref>, + namespace="im.telepathy1.ChannelRequest">Requests</tp:dbus-ref>, <tp:dbus-ref - namespace="org.freedesktop.Telepathy.ChannelRequest">UserActionTime</tp:dbus-ref> + namespace="im.telepathy1.ChannelRequest">UserActionTime</tp:dbus-ref> and <tp:dbus-ref - namespace="org.freedesktop.Telepathy.ChannelRequest">Account</tp:dbus-ref> + namespace="im.telepathy1.ChannelRequest">Account</tp:dbus-ref> MUST be included, and <tp:dbus-ref - namespace="ofdT.ChannelRequest">Hints</tp:dbus-ref> + namespace="imt1.ChannelRequest">Hints</tp:dbus-ref> MUST be included if implemented.</p> </tp:docstring> </arg> @@ -157,7 +157,7 @@ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The name of the D-Bus error with which the request failed.</p> - <p>If this is <code>org.freedesktop.Telepathy.Error.NotYours</code>, + <p>If this is <code>im.telepathy1.Error.NotYours</code>, this indicates that the request succeeded, but all the resulting channels were given to some other handler.</p> </tp:docstring> diff --git a/spec/Client_Observer.xml b/spec/Client_Observer.xml index b42b3b1df..8be9e4f5c 100644 --- a/spec/Client_Observer.xml +++ b/spec/Client_Observer.xml @@ -20,10 +20,10 @@ 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Client.Observer"> + <interface name="im.telepathy1.Client.Observer"> <tp:added version="0.17.26">(as a stable interface)</tp:added> - <tp:requires interface="org.freedesktop.Telepathy.Client"/> + <tp:requires interface="im.telepathy1.Client"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Observers monitor the creation of new channels. This @@ -48,14 +48,14 @@ each channel, it would not make sense for observers to do things that can only be done by one process (acknowledging <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Type">Text</tp:dbus-ref> + namespace="im.telepathy1.Channel.Type">Text</tp:dbus-ref> messages, carrying out streaming for <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Type">StreamedMedia</tp:dbus-ref> + namespace="im.telepathy1.Channel.Type">Call1</tp:dbus-ref> channels, doing the actual data transfer for file transfers, setting up the out-of-band connection for Tubes). The <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Client">Handler</tp:dbus-ref> + namespace="im.telepathy1.Client">Handler</tp:dbus-ref> is responsible for such tasks.</p> <p>Handlers MAY, of course, delegate responsibility for these @@ -75,7 +75,7 @@ although of course the ObserverChannelFilter property can be set to filter on the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel">Requested</tp:dbus-ref> + namespace="im.telepathy1.Channel">Requested</tp:dbus-ref> property.</p> <p>Because it might take time for an observer to become ready (for @@ -96,12 +96,12 @@ <li><tp:member-ref>ObserveChannels</tp:member-ref>() is called on the observer.</li> <li>The observer calls <tp:dbus-ref - namespace="ofdT.ChannelDispatchOperation">Claim</tp:dbus-ref>() + namespace="imt1.ChannelDispatchOperation">Claim</tp:dbus-ref>() on the CDO.</li> <li>The observer then returns from <tp:member-ref>ObserveChannels</tp:member-ref>().</li> <li><tp:dbus-ref - namespace="ofdT.ChannelDispatchOperation">Claim</tp:dbus-ref> + namespace="imt1.ChannelDispatchOperation">Claim</tp:dbus-ref> will return successfully if the channels were successfully claimed, or failure if someone else got there first.</li> </ol> @@ -122,7 +122,7 @@ interested. The <tp:member-ref>ObserveChannels</tp:member-ref> method should be called by the channel dispatcher whenever any of the new channels in a <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection.Interface.Requests">NewChannels</tp:dbus-ref> + namespace="im.telepathy1.Connection.Interface.Requests">NewChannels</tp:dbus-ref> signal match this description.</p> <p>Only certain D-Bus types have useful semantics for matching like this, @@ -161,9 +161,9 @@ <p>If an Observer wants to add extra channels to its list of interests at runtime, it can register an additional Client bus name - (for instance, the org.freedesktop.Telepathy.Client.Empathy process + (for instance, the im.telepathy1.Client.Empathy process with unique name :1.42 could additionally register - org.freedesktop.Telepathy.Client.Empathy._1_42) with additional + im.telepathy1.Client.Empathy._1_42) with additional filters. To remove those filters, it can release the bus name; it could even re-claim the bus name immediately, with different filters.</p> @@ -180,7 +180,7 @@ <p>Values in the .client file are encoded in exactly the same way as the <code>default-<em>p</em></code> keys in .manager files, as - described in the <tp:dbus-ref namespace="org.freedesktop.Telepathy" + described in the <tp:dbus-ref namespace="im.telepathy1" >ConnectionManager</tp:dbus-ref> interface (but note that not all types supported in .manager files can appear in .client files).</p> @@ -189,18 +189,18 @@ a local client:</p> <pre> -[org.freedesktop.Telepathy.Client] -Interfaces=org.freedesktop.Telepathy.Client.Observer; - -[org.freedesktop.Telepathy.Client.Observer.ObserverChannelFilter 0] -org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Text -org.freedesktop.Telepathy.Channel.TargetHandleType u=1 -org.freedesktop.Telepathy.Channel.Requested b=true - -[org.freedesktop.Telepathy.Client.Observer.ObserverChannelFilter 1] -org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Text -org.freedesktop.Telepathy.Channel.TargetHandleType u=2 -org.freedesktop.Telepathy.Channel.Requested b=true +[im.telepathy1.Client] +Interfaces=im.telepathy1.Client.Observer; + +[im.telepathy1.Client.Observer.ObserverChannelFilter 0] +im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.Text +im.telepathy1.Channel.TargetHandleType u=1 +im.telepathy1.Channel.Requested b=true + +[im.telepathy1.Client.Observer.ObserverChannelFilter 1] +im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.Text +im.telepathy1.Channel.TargetHandleType u=2 +im.telepathy1.Channel.Requested b=true </pre> </tp:docstring> @@ -215,10 +215,10 @@ org.freedesktop.Telepathy.Channel.Requested b=true <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>If true, upon the startup of this observer, <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Client.Observer">ObserveChannels</tp:dbus-ref> + namespace="im.telepathy1.Client.Observer">ObserveChannels</tp:dbus-ref> will be called for every already existing channel matching its <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Client.Observer">ObserverChannelFilter</tp:dbus-ref></p> + namespace="im.telepathy1.Client.Observer">ObserverChannelFilter</tp:dbus-ref></p> <p>When an activatable client having this property disappears from the bus and there are channels matching its ObserverChannelFilter, @@ -227,7 +227,7 @@ org.freedesktop.Telepathy.Channel.Requested b=true <tt>.client</tt> file as follows:</p> <pre> -[org.freedesktop.Telepathy.Client.Observer] +[im.telepathy1.Client.Observer] Recover=true </pre> @@ -236,7 +236,7 @@ Recover=true be restarted as soon as possible; while there is an unavoidable possibility that it will miss some events during this process (particularly <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Type">Text</tp:dbus-ref> + namespace="im.telepathy1.Channel.Type">Text</tp:dbus-ref> messages), this window of event loss is kept to a minimum.</p> <p>Non-activatable observers can't take advantage of this @@ -255,7 +255,7 @@ Recover=true <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Called by the channel dispatcher when channels in which the observer has registered an interest are announced in a <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection.Interface.Requests">NewChannels</tp:dbus-ref> + namespace="im.telepathy1.Connection.Interface.Requests">NewChannels</tp:dbus-ref> signal.</p> <p>If the same NewChannels signal announces some channels that match @@ -276,7 +276,7 @@ Recover=true to avoid the following race: text channel logger (observer) gets ObserveChannels, text channel handler gets <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Client.Handler">HandleChannels</tp:dbus-ref> + namespace="im.telepathy1.Client.Handler">HandleChannels</tp:dbus-ref> channel handler starts up faster and acknowledges messages, logger never sees those messages.</p> </tp:rationale> @@ -296,17 +296,17 @@ Recover=true <arg name="Account" type="o" direction="in"> <tp:docstring> The - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Account</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1">Account</tp:dbus-ref> with which the channels are associated. The well-known bus name to use is that of the - <tp:dbus-ref namespace="org.freedesktop.Telepathy">AccountManager</tp:dbus-ref>. + <tp:dbus-ref namespace="im.telepathy1">AccountManager</tp:dbus-ref>. </tp:docstring> </arg> <arg name="Connection" type="o" direction="in"> <tp:docstring> The - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1">Connection</tp:dbus-ref> with which the channels are associated. The well-known bus name to use can be derived from this object path by removing the leading '/' and replacing all subsequent @@ -318,7 +318,7 @@ Recover=true direction="in"> <tp:docstring> The <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Channel</tp:dbus-ref>s + namespace="im.telepathy1">Channel</tp:dbus-ref>s and their properties. Their well-known bus names are all the same as that of the Connection. </tp:docstring> @@ -327,25 +327,25 @@ Recover=true <arg name="Dispatch_Operation" type="o" direction="in"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The path to the <tp:dbus-ref - namespace="org.freedesktop.Telepathy">ChannelDispatchOperation</tp:dbus-ref> + namespace="im.telepathy1">ChannelDispatchOperation</tp:dbus-ref> for these channels, or the special value '/' if there is no ChannelDispatchOperation (because the channels were requested, not incoming).</p> <p>If the Observer calls <tp:dbus-ref - namespace="org.freedesktop.Telepathy.ChannelDispatchOperation">Claim</tp:dbus-ref> + namespace="im.telepathy1.ChannelDispatchOperation">Claim</tp:dbus-ref> or <tp:dbus-ref - namespace="org.freedesktop.Telepathy.ChannelDispatchOperation">HandleWith</tp:dbus-ref> + namespace="im.telepathy1.ChannelDispatchOperation">HandleWith</tp:dbus-ref> on the dispatch operation, it MUST be careful to avoid deadlock, since these methods cannot return until the Observer has returned from <tp:member-ref>ObserveChannels</tp:member-ref>.</p> <tp:rationale> <p>This allows an Observer to <tp:dbus-ref - namespace="org.freedesktop.Telepathy.ChannelDispatchOperation">Claim</tp:dbus-ref> + namespace="im.telepathy1.ChannelDispatchOperation">Claim</tp:dbus-ref> a set of channels without having to match up calls to this method with calls to <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Client.Approver">AddDispatchOperation</tp:dbus-ref>.</p> + namespace="im.telepathy1.Client.Approver">AddDispatchOperation</tp:dbus-ref>.</p> </tp:rationale> </tp:docstring> </arg> @@ -353,14 +353,14 @@ Recover=true <arg name="Requests_Satisfied" type="ao" direction="in"> <tp:docstring> The <tp:dbus-ref - namespace="org.freedesktop.Telepathy">ChannelRequest</tp:dbus-ref>s + namespace="im.telepathy1">ChannelRequest</tp:dbus-ref>s satisfied by these channels. <tp:rationale> If the same process is an Observer and a Handler, it can be useful to be given this information as soon as possible (it will also be passed to <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Client">Handler.HandleChannels</tp:dbus-ref>). + namespace="im.telepathy1.Client">Handler.HandleChannels</tp:dbus-ref>). </tp:rationale> </tp:docstring> </arg> @@ -387,7 +387,7 @@ Recover=true <dt><code>request-properties</code> - a{oa{sv}}</dt> <dd>A map from <tp:dbus-ref - namespace="org.freedesktop.Telepathy">ChannelRequest</tp:dbus-ref> + namespace="im.telepathy1">ChannelRequest</tp:dbus-ref> paths listed in <var>Requests_Satisfied</var> to <tp:type>Qualified_Property_Value_Map</tp:type>s containing namespaced immutable properties of each request.</dd> @@ -407,14 +407,14 @@ Recover=true <p>If true, the channel dispatcher will wait for <tp:member-ref>ObserveChannels</tp:member-ref> to return before calling <tp:dbus-ref - namespace="ofdT.Client">Approver.AddDispatchOperation</tp:dbus-ref> + namespace="imt1.Client">Approver.AddDispatchOperation</tp:dbus-ref> on appropriate Approvers.</p> <p>This property SHOULD be false unless there is a reason why a channel should not be given to approvers. An example of this is if an Observer is also a Handler and wants to <tp:dbus-ref - namespace="ofdT.ChannelDispatchOperation">Claim</tp:dbus-ref> + namespace="imt1.ChannelDispatchOperation">Claim</tp:dbus-ref> a channel so that it becomes its handler and doesn't want any approver to be called, this property should be true.</p> @@ -431,12 +431,8 @@ Recover=true specified in the observer's <tt>.client</tt> file as follows:</p> - <p>If this property is not implemented (telepathy-mission-control - 5.7.5 and older), the channel dispatcher SHOULD consider it as - being false.</p> - <pre> -[org.freedesktop.Telepathy.Client.Observer] +[im.telepathy1.Client.Observer] DelayApprovers=true </pre> </tp:docstring> diff --git a/spec/Connection_Future.xml b/spec/Connection_Future.xml index 6b5291efd..bf6b2f2d1 100644 --- a/spec/Connection_Future.xml +++ b/spec/Connection_Future.xml @@ -20,9 +20,9 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Connection.FUTURE" + <interface name="im.telepathy1.Connection.FUTURE" tp:causes-havoc='experimental'> - <tp:requires interface="org.freedesktop.Telepathy.Connection"/> + <tp:requires interface="im.telepathy1.Connection"/> <method name="EnsureSidecar" tp:name-for-bindings="Ensure_Sidecar"> <tp:added version="0.19.0">(as a draft)</tp:added> @@ -75,12 +75,12 @@ USA.</p> in a dictionary, build a proxy object from the value). More “plural” plugins are likely to want to implement new types of <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Channel</tp:dbus-ref> + namespace="im.telepathy1">Channel</tp:dbus-ref> instead.</p> </tp:rationale> </tp:docstring> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring> The requested sidecar is not implemented by this connection manager, or a necessary server-side component does not exist. (FIXME: split @@ -91,7 +91,7 @@ USA.</p> </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.ServiceBusy"> + <tp:error name="im.telepathy1.Error.ServiceBusy"> <tp:docstring> A server-side component needed by the requested sidecar reported it is currently too busy, or did not respond for some @@ -99,7 +99,7 @@ USA.</p> </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.Cancelled"> + <tp:error name="im.telepathy1.Error.Cancelled"> <tp:docstring> The connection was disconnected while the sidecar was being set up. </tp:docstring> diff --git a/spec/Connection_Interface_Addressing.xml b/spec/Connection_Interface_Addressing.xml index ef9df3eee..b61713499 100644 --- a/spec/Connection_Interface_Addressing.xml +++ b/spec/Connection_Interface_Addressing.xml @@ -16,12 +16,14 @@ along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Connection.Interface.Addressing.DRAFT" + <interface name="im.telepathy1.Connection.Interface.Addressing1" tp:causes-havoc="experimental"> - <tp:requires interface="org.freedesktop.Telepathy.Connection"/> - <tp:requires interface="org.freedesktop.Telepathy.Connection.Interface.Contacts"/> + <tp:requires interface="im.telepathy1.Connection"/> + <tp:requires interface="im.telepathy1.Connection.Interface.Contacts"/> <tp:added version="0.19.12">(as draft)</tp:added> <tp:changed version="0.25.1">Both methods now return two dictionaries.</tp:changed> + <tp:changed version="0.25.UNRELEASED">Replaced DRAFT with a version number + (still keeping the causes-havoc annotation)</tp:changed> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>This interface deals with the multiple address types that can refer to the same contact, such as vCard fields and URIs.</p> @@ -40,7 +42,7 @@ <p>The vCard field of the addresses we are requesting. The field name SHOULD be in lower case. Supported fields can be found in - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Protocol.Interface.Addressing">AddressableVCardFields</tp:dbus-ref>.</p> + <tp:dbus-ref namespace="im.telepathy1.Protocol.Interface.Addressing1">AddressableVCardFields</tp:dbus-ref>.</p> <p>The <code>url</code> vCard field MUST NOT appear here; see <tp:member-ref>GetContactsByURI</tp:member-ref> instead.</p> @@ -67,13 +69,13 @@ activity, will be in the reply.</p> <p>Attributes from this interface and from - <tp:dbus-ref>org.freedesktop.Telepathy.Connection</tp:dbus-ref> + <tp:dbus-ref>im.telepathy1.Connection</tp:dbus-ref> are always returned, and need not be requested explicitly.</p> <p>The behavior of this parameter is similar to the same parameter in - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface">Contacts.GetContactAttributes</tp:dbus-ref>.</p> + <tp:dbus-ref namespace="im.telepathy1.Connection.Interface">Contacts.GetContactAttributes</tp:dbus-ref>.</p> </tp:docstring> </arg> @@ -103,7 +105,7 @@ <p>Each contact's attributes will always include at least the identifier that would be obtained by inspecting the handle - (<code>org.freedesktop.Telepathy.Connection/contact-id</code>). + (<code>im.telepathy1.Connection/contact-id</code>). </p> </tp:docstring> </arg> @@ -111,17 +113,10 @@ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Request contacts and retrieve their attributes using a given field in their vCards.</p> - - <p>The connection manager should record that these handles are in - use by the client who invokes this method, and must not - deallocate the handles until the client disconnects from the - bus or calls the - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.ReleaseHandles</tp:dbus-ref> - method.</p> </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.Disconnected"/> </tp:possible-errors> </method> @@ -131,7 +126,7 @@ <tp:docstring> The URI addresses to get contact handles for. Supported schemes can be found in - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Protocol.Interface.Addressing">AddressableURISchemes</tp:dbus-ref>. + <tp:dbus-ref namespace="im.telepathy1.Protocol.Interface.Addressing1">AddressableURISchemes</tp:dbus-ref>. </tp:docstring> </arg> <arg direction="in" name="Interfaces" type="as" @@ -143,13 +138,13 @@ activity, will be in the reply.</p> <p>Attributes from this interface and from - <tp:dbus-ref>org.freedesktop.Telepathy.Connection</tp:dbus-ref> + <tp:dbus-ref>im.telepathy1.Connection</tp:dbus-ref> are always returned, and need not be requested explicitly.</p> <p>The behavior of this parameter is similar to the same parameter in - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface">Contacts.GetContactAttributes</tp:dbus-ref>.</p> + <tp:dbus-ref namespace="im.telepathy1.Connection.Interface">Contacts.GetContactAttributes</tp:dbus-ref>.</p> </tp:docstring> </arg> @@ -178,24 +173,17 @@ <p>Each contact's attributes will always include at least the identifier that would be obtained by inspecting the handle - (<code>org.freedesktop.Telepathy.Connection/contact-id</code>). + (<code>im.telepathy1.Connection/contact-id</code>). </p> </tp:docstring> </arg> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Request contacts and retrieve their attributes using URI addresses.</p> - - <p>The connection manager should record that these handles are in - use by the client who invokes this method, and must not - deallocate the handles until the client disconnects from the - bus or calls the - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.ReleaseHandles</tp:dbus-ref> - method.</p> </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.Disconnected"/> </tp:possible-errors> </method> diff --git a/spec/Connection_Interface_Aliasing.xml b/spec/Connection_Interface_Aliasing.xml index 967577135..7fa5bccfd 100644 --- a/spec/Connection_Interface_Aliasing.xml +++ b/spec/Connection_Interface_Aliasing.xml @@ -18,8 +18,8 @@ Lesser General Public License for more details.</p> License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Connection.Interface.Aliasing"> - <tp:requires interface="org.freedesktop.Telepathy.Connection"/> + <interface name="im.telepathy1.Connection.Interface.Aliasing1"> + <tp:requires interface="im.telepathy1.Connection"/> <tp:mapping name="Alias_Map" array-name=""> <tp:docstring>A dictionary whose keys are contact handles and whose @@ -82,7 +82,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ connection. </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.Disconnected"/> </tp:possible-errors> </method> <method name="RequestAliases" tp:name-for-bindings="Request_Aliases"> @@ -100,10 +100,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ Request the value of several contacts' aliases at once. </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"/> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidHandle"/> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.NotAvailable"/> + <tp:error name="im.telepathy1.Error.InvalidHandle"/> </tp:possible-errors> </method> <method name="GetAliases" tp:name-for-bindings="Get_Aliases"> @@ -126,8 +126,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:member-ref>AliasesChanged</tp:member-ref>. </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidHandle"/> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.InvalidHandle"/> </tp:possible-errors> </method> <method name="SetAliases" tp:name-for-bindings="Set_Aliases"> @@ -142,15 +142,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ indicated by emitting an <tp:member-ref>AliasesChanged</tp:member-ref> signal. On connections where the CONNECTION_ALIAS_FLAG_USER_SET flag is not set, this method will only ever succeed if the contact is the - user's own handle (as returned by <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Connection.GetSelfHandle</tp:dbus-ref>). + user's own handle (as returned by the <tp:dbus-ref + namespace="im.telepathy1">Connection.SelfHandle</tp:dbus-ref> + property). </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"/> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"/> - <tp:error name="org.freedesktop.Telepathy.Error.PermissionDenied"/> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.NotAvailable"/> + <tp:error name="im.telepathy1.Error.InvalidArgument"/> + <tp:error name="im.telepathy1.Error.PermissionDenied"/> </tp:possible-errors> </method> diff --git a/spec/Connection_Interface_Anonymity.xml b/spec/Connection_Interface_Anonymity.xml index 704263cb9..788610a0a 100644 --- a/spec/Connection_Interface_Anonymity.xml +++ b/spec/Connection_Interface_Anonymity.xml @@ -21,7 +21,7 @@ 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Connection.Interface.Anonymity"> + <interface name="im.telepathy1.Connection.Interface.Anonymity1"> <tp:added version="0.19.7">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -118,7 +118,7 @@ by the CM and any intermediaries between the local and remote contacts. If this is set to true but anonymity settings cannot be followed, then the session MUST be denied with a - <code>org.freedesktop.Telepathy.Error.<tp:error-ref>WouldBreakAnonymity</tp:error-ref></code> + <code>im.telepathy1.Error.<tp:error-ref>WouldBreakAnonymity</tp:error-ref></code> error. Any client that sets <tp:member-ref>AnonymityModes</tp:member-ref> SHOULD also set this property first (rather than accepting the CM's @@ -137,7 +137,7 @@ <tp:member-ref>AnonymityModesChanged</tp:member-ref> signal.</p> </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> + <tp:error name="im.telepathy1.Error.InvalidArgument"> <tp:docstring> An unsupported mode was supplied. Supported modes are specified in the SupportedAnonymityModes property, and this should be diff --git a/spec/Connection_Interface_Avatars.xml b/spec/Connection_Interface_Avatars.xml index 3b9290e1d..81ddc4950 100644 --- a/spec/Connection_Interface_Avatars.xml +++ b/spec/Connection_Interface_Avatars.xml @@ -18,8 +18,11 @@ Lesser General Public License for more details.</p> License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Connection.Interface.Avatars"> - <tp:requires interface="org.freedesktop.Telepathy.Connection"/> + <interface name="im.telepathy1.Connection.Interface.Avatars1"> + <tp:requires interface="im.telepathy1.Connection"/> + <tp:changed version="UNRELEASED">The deprecated method, + GetAvatarRequirements, has been removed in favour of using the + D-Bus properties instead.</tp:changed> <tp:simple-type name="Avatar_Token" type="s" array-name="Avatar_Token_List"> @@ -128,9 +131,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <property name="SupportedAvatarMIMETypes" tp:name-for-bindings="Supported_Avatar_MIME_Types" type="as" access="read"> - <tp:added version="0.17.22">Fall back to calling - <tp:member-ref>GetAvatarRequirements</tp:member-ref> if getting this - property fails.</tp:added> + <tp:added version="0.17.22"/> <tp:docstring> An array of supported MIME types (e.g. "image/jpeg"). Clients MAY assume that the first type in this array is preferred. @@ -142,9 +143,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <property name="MinimumAvatarHeight" tp:name-for-bindings="Minimum_Avatar_Height" type="u" access="read"> - <tp:added version="0.17.22">Fall back to calling - <tp:member-ref>GetAvatarRequirements</tp:member-ref> if getting this - property fails.</tp:added> + <tp:added version="0.17.22"/> <tp:docstring> The minimum height in pixels of an avatar on this protocol, which MAY be 0. @@ -156,9 +155,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <property name="MinimumAvatarWidth" tp:name-for-bindings="Minimum_Avatar_Width" type="u" access="read"> - <tp:added version="0.17.22">Fall back to calling - <tp:member-ref>GetAvatarRequirements</tp:member-ref> if getting this - property fails.</tp:added> + <tp:added version="0.17.22"/> <tp:docstring> The minimum width in pixels of an avatar on this protocol, which MAY be 0. @@ -206,9 +203,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <property name="MaximumAvatarHeight" tp:name-for-bindings="Maximum_Avatar_Height" type="u" access="read"> - <tp:added version="0.17.22">Fall back to calling - <tp:member-ref>GetAvatarRequirements</tp:member-ref> if getting this - property fails.</tp:added> + <tp:added version="0.17.22"/> <tp:docstring> The maximum height in pixels of an avatar on this protocol, or 0 if there is no limit. @@ -220,9 +215,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <property name="MaximumAvatarWidth" tp:name-for-bindings="Maximum_Avatar_Width" type="u" access="read"> - <tp:added version="0.17.22">Fall back to calling - <tp:member-ref>GetAvatarRequirements</tp:member-ref> if getting this - property fails.</tp:added> + <tp:added version="0.17.22"/> <tp:docstring> The maximum width in pixels of an avatar on this protocol, or 0 if there is no limit. @@ -234,9 +227,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <property name="MaximumAvatarBytes" tp:name-for-bindings="Maximum_Avatar_Bytes" type="u" access="read"> - <tp:added version="0.17.22">Fall back to calling - <tp:member-ref>GetAvatarRequirements</tp:member-ref> if getting this - property fails.</tp:added> + <tp:added version="0.17.22"/> <tp:docstring> The maximum size in bytes of an avatar on this protocol, or 0 if there is no limit. @@ -245,81 +236,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:docstring> </property> - <method name="GetAvatarRequirements" - tp:name-for-bindings="Get_Avatar_Requirements"> - <tp:deprecated version="0.17.22">Use GetAll to retrieve the - D-Bus properties on this interface, falling back to this method - on failure.</tp:deprecated> - <arg direction="out" type="as" name="MIME_Types"> - <tp:docstring> - An array of supported MIME types (eg image/jpeg) - </tp:docstring> - </arg> - <arg direction="out" type="q" name="Min_Width"> - <tp:docstring> - The minimum image width in pixels - </tp:docstring> - </arg> - <arg direction="out" type="q" name="Min_Height"> - <tp:docstring> - The minimum image height in pixels - </tp:docstring> - </arg> - <arg direction="out" type="q" name="Max_Width"> - <tp:docstring> - The maximum image width in pixels, or 0 if there is no limit - </tp:docstring> - </arg> - <arg direction="out" type="q" name="Max_Height"> - <tp:docstring> - The maximum image height in pixels, or 0 if there is no limit - </tp:docstring> - </arg> - <arg direction="out" type="u" name="Max_Bytes"> - <tp:docstring> - The maximum image size in bytes, or 0 if there is no limit - </tp:docstring> - </arg> - <tp:docstring> - Get the required format of avatars on this connection. - </tp:docstring> - <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.PermissionDenied"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"/> - </tp:possible-errors> - </method> - - <method name="GetAvatarTokens" tp:name-for-bindings="Get_Avatar_Tokens"> - <arg direction="in" name="Contacts" type="au" tp:type="Contact_Handle[]"> - <tp:docstring> - An array of handles representing contacts - </tp:docstring> - </arg> - <arg direction="out" type="as" name="Tokens" tp:type="Avatar_Token[]"> - <tp:docstring> - An array of avatar tokens or empty strings (if no avatar is set) in the - same order as the given array of contact handles - </tp:docstring> - </arg> - <tp:deprecated version="0.15.5">Use GetKnownAvatarTokens - instead.</tp:deprecated> - <tp:docstring> - Get the unique tokens for all of the given contacts' avatars. - - Using this method in new Telepathy clients is deprecated; use - <tp:member-ref>GetKnownAvatarTokens</tp:member-ref> instead. - </tp:docstring> - <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"/> - <tp:error name="org.freedesktop.Telepathy.Error.PermissionDenied"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"/> - </tp:possible-errors> - </method> - <method name="GetKnownAvatarTokens" tp:name-for-bindings="Get_Known_Avatar_Tokens"> <arg direction="in" name="Contacts" type="au" tp:type="Contact_Handle[]"> @@ -345,47 +261,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ map until an avatar is explicitly set or cleared. </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"/> - <tp:error name="org.freedesktop.Telepathy.Error.PermissionDenied"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"/> - </tp:possible-errors> - </method> - - <method name="RequestAvatar" tp:name-for-bindings="Request_Avatar"> - <arg direction="in" name="Contact" type="u" tp:type="Contact_Handle"> - <tp:docstring> - An integer handle for the contact to request the avatar for - </tp:docstring> - </arg> - <arg direction="out" type="ay" name="Data"> - <tp:docstring> - An array of bytes containing the image data - </tp:docstring> - </arg> - <arg direction="out" type="s" name="MIME_Type"> - <tp:docstring> - A string containing the image MIME type (eg image/jpeg), or empty if - unknown - </tp:docstring> - </arg> - <tp:deprecated version="0.15.5">Use RequestAvatars - instead.</tp:deprecated> - <tp:docstring> - Request the avatar for a given contact. Using this method in new - Telepathy clients is deprecated; use RequestAvatars instead. - </tp:docstring> - <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidHandle"/> - <tp:error name="org.freedesktop.Telepathy.Error.PermissionDenied"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> - <tp:docstring> - The contact does not currently have an avatar. - </tp:docstring> - </tp:error> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.InvalidArgument"/> + <tp:error name="im.telepathy1.Error.PermissionDenied"/> + <tp:error name="im.telepathy1.Error.NotAvailable"/> </tp:possible-errors> </method> @@ -404,8 +284,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ avatar) the AvatarRetrieved signal is not emitted for that contact. </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidHandle"/> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.InvalidHandle"/> </tp:possible-errors> </method> @@ -427,15 +307,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </arg> <tp:docstring> Set a new avatar image for this connection. The avatar image must - respect the requirements obtained by - <tp:member-ref>GetAvatarRequirements</tp:member-ref>. + respect the requirements obtained by the properties on this + interface. </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"/> - <tp:error name="org.freedesktop.Telepathy.Error.PermissionDenied"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"/> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.InvalidArgument"/> + <tp:error name="im.telepathy1.Error.PermissionDenied"/> + <tp:error name="im.telepathy1.Error.NotAvailable"/> </tp:possible-errors> </method> @@ -445,8 +325,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ Remove the avatar image for this connection. </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> </tp:possible-errors> </method> @@ -492,9 +372,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>To publish an avatar, a client should use <tp:member-ref>SetAvatar</tp:member-ref> to provide an image which meets - the requirements returned by the - <tp:member-ref>GetAvatarRequirements</tp:member-ref> - function. On some protocols the avatar is stored on the server, so setting + the requirements returned by the the properties on the interface. + On some protocols the avatar is stored on the server, so setting the avatar is persistent, but on others it is transferred via a peer to peer mechanism, so needs to be set every connection. Hence, on every connection, clients should inspect the avatar token of the connection's diff --git a/spec/Connection_Interface_Balance.xml b/spec/Connection_Interface_Balance.xml index 974c651fd..8e737aa98 100644 --- a/spec/Connection_Interface_Balance.xml +++ b/spec/Connection_Interface_Balance.xml @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Connection.Interface.Balance"> - <tp:requires interface="org.freedesktop.Telepathy.Connection"/> + <interface name="im.telepathy1.Connection.Interface.Balance1"> + <tp:requires interface="im.telepathy1.Connection"/> <tp:added version="0.19.0">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -82,7 +82,7 @@ access="read" type="(ius)" tp:type="Currency_Amount"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The user's balance on the account corresponding to this <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Connection</tp:dbus-ref>. + namespace="im.telepathy1">Connection</tp:dbus-ref>. A negative amount may be possible on some services, and indicates that the user owes money to the service provider.</p> diff --git a/spec/Connection_Interface_Cellular.xml b/spec/Connection_Interface_Cellular.xml index e9b10e3c5..83ba19d52 100644 --- a/spec/Connection_Interface_Cellular.xml +++ b/spec/Connection_Interface_Cellular.xml @@ -21,7 +21,7 @@ 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Connection.Interface.Cellular"> + <interface name="im.telepathy1.Connection.Interface.Cellular1"> <tp:added version="0.19.8">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> diff --git a/spec/Connection_Interface_Client_Types.xml b/spec/Connection_Interface_Client_Types.xml index 97908561a..c08d8c152 100644 --- a/spec/Connection_Interface_Client_Types.xml +++ b/spec/Connection_Interface_Client_Types.xml @@ -17,9 +17,9 @@ Lesser General Public License for more details.</p> License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Connection.Interface.ClientTypes"> + <interface name="im.telepathy1.Connection.Interface.ClientTypes1"> <tp:added version="0.21.1">(as stable API)</tp:added> - <tp:requires interface="org.freedesktop.Telepathy.Connection"/> + <tp:requires interface="im.telepathy1.Connection"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>An interface on connections to support protocols which allows users to @@ -61,7 +61,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ client types of the most available resource will be returned. In other words, the returned client types are those for the resource whose presence will be retreived using the - <tp:dbus-ref namespace="ofdT.Connection.Interface">SimplePresence</tp:dbus-ref> + <tp:dbus-ref namespace="imt1.Connection.Interface">Presence1</tp:dbus-ref> interface.</p> <p>For example, if a contact has two resources:</p> @@ -133,8 +133,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidHandle"/> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.InvalidHandle"/> </tp:possible-errors> </method> @@ -167,10 +167,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidHandle"/> - <tp:error name="org.freedesktop.Telepathy.Error.PermissionDenied"> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.InvalidHandle"/> + <tp:error name="im.telepathy1.Error.PermissionDenied"> <tp:docstring> The requested contact does not allow the local user to see their client type information. diff --git a/spec/Connection_Interface_Communication_Policy.xml b/spec/Connection_Interface_Communication_Policy.xml index 31343de68..e9797ab53 100644 --- a/spec/Connection_Interface_Communication_Policy.xml +++ b/spec/Connection_Interface_Communication_Policy.xml @@ -19,10 +19,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:license> <interface - name="org.freedesktop.Telepathy.Connection.Interface.CommunicationPolicy.DRAFT" + name="im.telepathy1.Connection.Interface.CommunicationPolicy1" tp:causes-havoc="experimental"> <tp:added version="0.21.1">(draft 1)</tp:added> - <tp:requires interface="org.freedesktop.Telepathy.Connection.Interface.SimplePresence"/> + <tp:requires interface="im.telepathy1.Connection.Interface.Presence1"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p> @@ -79,8 +79,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <pre> { - 'org.freedesktop.Telepathy.Channel.Type.Text' : Access_Control_Type_Open, - 'org.freedesktop.Telepathy.Channel.Type.Call' : Access_Control_Type_Publish_List + 'im.telepathy1.Channel.Type.Text' : Access_Control_Type_Open, + 'im.telepathy1.Channel.Type.Call' : Access_Control_Type_Publish_List } </pre> diff --git a/spec/Connection_Interface_Contact_Blocking.xml b/spec/Connection_Interface_Contact_Blocking.xml index 756fd4db8..c524a0740 100644 --- a/spec/Connection_Interface_Contact_Blocking.xml +++ b/spec/Connection_Interface_Contact_Blocking.xml @@ -18,9 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Connection.Interface.ContactBlocking"> - <tp:requires interface="org.freedesktop.Telepathy.Connection"/> - <tp:requires interface="org.freedesktop.Telepathy.Connection.Interface.ContactList"/> + <interface name="im.telepathy1.Connection.Interface.ContactBlocking1"> + <tp:requires interface="im.telepathy1.Connection"/> <tp:added version='0.21.13'>Changes from the draft: methods and signals now return <tp:type>Handle_Identifier_Map</tp:type> (<code>a{us}</code>) rather than bare lists of contact handles @@ -46,22 +45,6 @@ to implement this interface using an on-disk file of blocked contacts or some other means to store blocked contacts between connections.</p> - - <p>This interface is intended to replace the - <tp:dbus-ref namespace="ofdT.Channel.Type">ContactList</tp:dbus-ref> - channel with <tp:dbus-ref - namespace='ofdT.Channel'>TargetHandleType</tp:dbus-ref> - <code>List</code> and <tp:dbus-ref - namespace='ofdT.Channel'>TargetID</tp:dbus-ref> <code>"deny"</code> - (along with the <tp:dbus-ref - namespace='ofdT.Connection.Interface'>ContactList</tp:dbus-ref> and - <tp:dbus-ref - namespace='ofdT.Connection.Interface'>ContactGroups</tp:dbus-ref> - interfaces replacing other channels with <tp:dbus-ref - namespace='ofdT.Channel'>TargetHandleType</tp:dbus-ref> - <code>List</code> and <tp:dbus-ref - namespace='ofdT.Channel'>TargetHandleType</tp:dbus-ref> - <code>Group</code>, respectively).</p> </tp:docstring> <method name="BlockContacts" tp:name-for-bindings="Block_Contacts"> @@ -186,7 +169,7 @@ <p>Note that there is no capability for supporting blocking itself: the presence of this interface on a <tp:dbus-ref - namespace='ofdT'>Connection</tp:dbus-ref> indicates that blocking + namespace='imt1'>Connection</tp:dbus-ref> indicates that blocking contacts is supported.</p> </tp:docstring> </property> diff --git a/spec/Connection_Interface_Contact_Capabilities.xml b/spec/Connection_Interface_Contact_Capabilities.xml index fb13c37d7..bddc35c1b 100644 --- a/spec/Connection_Interface_Contact_Capabilities.xml +++ b/spec/Connection_Interface_Contact_Capabilities.xml @@ -18,8 +18,8 @@ Lesser General Public License for more details.</p> License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Connection.Interface.ContactCapabilities"> - <tp:requires interface="org.freedesktop.Telepathy.Connection"/> + <interface name="im.telepathy1.Connection.Interface.ContactCapabilities1"> + <tp:requires interface="im.telepathy1.Connection"/> <tp:added version="0.17.28">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -58,7 +58,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:member name="Well_Known_Name" type="s" tp:type="DBus_Well_Known_Name"> <tp:docstring> For implementations of the <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Client</tp:dbus-ref> + namespace="im.telepathy1">Client</tp:dbus-ref> interface, the well-known bus name name of the client; for any other process, any other reversed domain name that uniquely identifies it. </tp:docstring> @@ -69,7 +69,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> An array of channel classes that can be handled by this client. This will usually be a copy of the client's <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Client.Handler">HandlerChannelFilter</tp:dbus-ref> + namespace="im.telepathy1.Client.Handler">HandlerChannelFilter</tp:dbus-ref> property. </tp:docstring> </tp:member> @@ -80,7 +80,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ An array of client capabilities supported by this client, to be used by the connection manager to determine what capabilities to advertise. This will usually be a copy of the client's <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Client.Handler">Capabilities</tp:dbus-ref> + namespace="im.telepathy1.Client.Handler">Capabilities</tp:dbus-ref> property. </tp:docstring> </tp:member> @@ -96,7 +96,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ than the ChannelDispatcher SHOULD NOT call this method, and the ChannelDispatcher SHOULD use this method to advertise the capabilities of all the registered <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Client.Handler</tp:dbus-ref> + namespace="im.telepathy1">Client.Handler</tp:dbus-ref> implementations.On connections not managed by the ChannelDispatcher, clients MAY use this method directly, to indicate the channels they will handle and the extra capabilities they have.</p> @@ -105,7 +105,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ will only emit the <tp:member-ref>ContactCapabilitiesChanged</tp:member-ref> signal for the user's <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection">SelfHandle</tp:dbus-ref> + namespace="im.telepathy1.Connection">SelfHandle</tp:dbus-ref> if, in the underlying protocol, the new capabilities are distinct from the previous state.</p> @@ -155,7 +155,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> </tp:possible-errors> </method> @@ -187,8 +187,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ expected to succeed.</p> </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidHandle"> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.InvalidHandle"> <tp:docstring> The handle does not represent a contact. Zero is always invalid. </tp:docstring> @@ -231,7 +231,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The contact's capabilities. These should be represented in the same way as in <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection.Interface.Requests" + namespace="im.telepathy1.Connection.Interface.Requests" >RequestableChannelClasses</tp:dbus-ref>, except that they may have more fixed properties or fewer allowed properties, to represent contacts who do not have all the @@ -239,7 +239,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>In particular, requestable channel classes for channels with target handle type Contact MUST list <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel" + namespace="im.telepathy1.Channel" >TargetHandleType</tp:dbus-ref> among their fixed properties when they appear here, and clients MAY assume that this will be the case.</p> @@ -254,9 +254,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>Channel classes with target handle type Handle_Type_Contact indicate that a request that matches the channel class, and also either has the contact's handle as <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel" + namespace="im.telepathy1.Channel" >TargetHandle</tp:dbus-ref> or the contact's identifier as - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel" + <tp:dbus-ref namespace="im.telepathy1.Channel" >TargetID</tp:dbus-ref>, can be expected to succeed. Connection managers SHOULD NOT include the TargetHandle or TargetID as a fixed property in contact capabilities.</p> diff --git a/spec/Connection_Interface_Contact_Groups.xml b/spec/Connection_Interface_Contact_Groups.xml index 5282a8272..cd86c75fe 100644 --- a/spec/Connection_Interface_Contact_Groups.xml +++ b/spec/Connection_Interface_Contact_Groups.xml @@ -18,9 +18,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Connection.Interface.ContactGroups"> - <tp:requires interface="org.freedesktop.Telepathy.Connection"/> - <tp:requires interface="org.freedesktop.Telepathy.Connection.Interface.ContactList"/> + <interface name="im.telepathy1.Connection.Interface.ContactGroups1"> + <tp:requires interface="im.telepathy1.Connection"/> + <tp:requires interface="im.telepathy1.Connection.Interface.ContactList1"/> <tp:added version="0.21.0">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -33,7 +33,7 @@ <tp:token-ref>groups</tp:token-ref> contact attribute (this should usually be done by connecting to the GroupsChanged signal, then calling <tp:dbus-ref - namespace="ofdT.Connection.Interface.ContactList" + namespace="imt1.Connection.Interface.ContactList1" >GetContactListAttributes</tp:dbus-ref> with this interface included in the Interfaces argument). Simple user interfaces can limit themselves to displaying that information, and ignore the rest @@ -148,7 +148,7 @@ receiving <tp:member-ref>GroupRenamed</tp:member-ref>.</p> <p>This property's value is not meaningful until the - <tp:dbus-ref namespace="ofdT.Connection.Interface.ContactList" + <tp:dbus-ref namespace="imt1.Connection.Interface.ContactList1" >ContactListState</tp:dbus-ref> has become Success.</p> </tp:docstring> </property> @@ -263,11 +263,11 @@ this method call MUST be emitted before the method returns.</p> <p>This method SHOULD NOT be called until the - <tp:dbus-ref namespace="ofdT.Connection.Interface.ContactList" + <tp:dbus-ref namespace="imt1.Connection.Interface.ContactList1" >ContactListState</tp:dbus-ref> changes to Success. If the ContactListState is Failure, this method SHOULD raise the same error as - <tp:dbus-ref namespace="ofdT.Connection.Interface.ContactList" + <tp:dbus-ref namespace="imt1.Connection.Interface.ContactList1" >GetContactListAttributes</tp:dbus-ref>.</p> </tp:docstring> @@ -281,21 +281,21 @@ </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidHandle"/> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.InvalidHandle"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring>Raised if <tp:member-ref>DisjointGroups</tp:member-ref> is true and the list of groups has more than one member.</tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring> Raised if <tp:member-ref>GroupStorage</tp:member-ref> is Contact_Metadata_Storage_Type_None, i.e. groups cannot be edited. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotYet"/> + <tp:error name="im.telepathy1.Error.NotYet"/> </tp:possible-errors> </method> @@ -324,11 +324,11 @@ this method call MUST be emitted before the method returns.</p> <p>This method SHOULD NOT be called until the - <tp:dbus-ref namespace="ofdT.Connection.Interface.ContactList" + <tp:dbus-ref namespace="imt1.Connection.Interface.ContactList1" >ContactListState</tp:dbus-ref> changes to Success. If the ContactListState is Failure, this method SHOULD raise the same error as - <tp:dbus-ref namespace="ofdT.Connection.Interface.ContactList" + <tp:dbus-ref namespace="imt1.Connection.Interface.ContactList1" >GetContactListAttributes</tp:dbus-ref>.</p> </tp:docstring> @@ -342,16 +342,16 @@ </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidHandle"/> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.InvalidHandle"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring> Raised if <tp:member-ref>GroupStorage</tp:member-ref> is Contact_Metadata_Storage_Type_None, i.e. groups cannot be edited. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotYet"/> + <tp:error name="im.telepathy1.Error.NotYet"/> </tp:possible-errors> </method> @@ -374,11 +374,11 @@ this method call MUST be emitted before the method returns.</p> <p>This method SHOULD NOT be called until the - <tp:dbus-ref namespace="ofdT.Connection.Interface.ContactList" + <tp:dbus-ref namespace="imt1.Connection.Interface.ContactList1" >ContactListState</tp:dbus-ref> changes to Success. If the ContactListState is Failure, this method SHOULD raise the same error as - <tp:dbus-ref namespace="ofdT.Connection.Interface.ContactList" + <tp:dbus-ref namespace="imt1.Connection.Interface.ContactList1" >GetContactListAttributes</tp:dbus-ref>.</p> </tp:docstring> @@ -391,16 +391,16 @@ </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidHandle"/> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.InvalidHandle"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring> Raised if <tp:member-ref>GroupStorage</tp:member-ref> is Contact_Metadata_Storage_Type_None, i.e. groups cannot be edited. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotYet"/> + <tp:error name="im.telepathy1.Error.NotYet"/> </tp:possible-errors> </method> @@ -418,11 +418,11 @@ this method call MUST be emitted before the method returns.</p> <p>This method SHOULD NOT be called until the - <tp:dbus-ref namespace="ofdT.Connection.Interface.ContactList" + <tp:dbus-ref namespace="imt1.Connection.Interface.ContactList1" >ContactListState</tp:dbus-ref> changes to Success. If the ContactListState is Failure, this method SHOULD raise the same error as - <tp:dbus-ref namespace="ofdT.Connection.Interface.ContactList" + <tp:dbus-ref namespace="imt1.Connection.Interface.ContactList1" >GetContactListAttributes</tp:dbus-ref>.</p> </tp:docstring> @@ -440,16 +440,16 @@ </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidHandle"/> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.InvalidHandle"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring> Raised if <tp:member-ref>GroupStorage</tp:member-ref> is Contact_Metadata_Storage_Type_None, i.e. groups cannot be edited. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotYet"/> + <tp:error name="im.telepathy1.Error.NotYet"/> </tp:possible-errors> </method> @@ -464,11 +464,11 @@ this method call MUST be emitted before the method returns.</p> <p>This method SHOULD NOT be called until the - <tp:dbus-ref namespace="ofdT.Connection.Interface.ContactList" + <tp:dbus-ref namespace="imt1.Connection.Interface.ContactList1" >ContactListState</tp:dbus-ref> changes to Success. If the ContactListState is Failure, this method SHOULD raise the same error as - <tp:dbus-ref namespace="ofdT.Connection.Interface.ContactList" + <tp:dbus-ref namespace="imt1.Connection.Interface.ContactList1" >GetContactListAttributes</tp:dbus-ref>.</p> </tp:docstring> @@ -477,15 +477,15 @@ </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring> Raised if <tp:member-ref>GroupStorage</tp:member-ref> is Contact_Metadata_Storage_Type_None, i.e. groups cannot be edited. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotYet"/> + <tp:error name="im.telepathy1.Error.NotYet"/> </tp:possible-errors> </method> @@ -507,11 +507,11 @@ this method call MUST be emitted before the method returns.</p> <p>This method SHOULD NOT be called until the - <tp:dbus-ref namespace="ofdT.Connection.Interface.ContactList" + <tp:dbus-ref namespace="imt1.Connection.Interface.ContactList1" >ContactListState</tp:dbus-ref> changes to Success. If the ContactListState is Failure, this method SHOULD raise the same error as - <tp:dbus-ref namespace="ofdT.Connection.Interface.ContactList" + <tp:dbus-ref namespace="imt1.Connection.Interface.ContactList1" >GetContactListAttributes</tp:dbus-ref>.</p> </tp:docstring> @@ -524,23 +524,23 @@ </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring> Raised if <tp:member-ref>GroupStorage</tp:member-ref> is Contact_Metadata_Storage_Type_None, i.e. groups cannot be edited. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.DoesNotExist"> + <tp:error name="im.telepathy1.Error.DoesNotExist"> <tp:docstring>Raised if there is no group with that name.</tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring>Raised if there is already a group with the new name.</tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotYet"/> + <tp:error name="im.telepathy1.Error.NotYet"/> </tp:possible-errors> </method> diff --git a/spec/Connection_Interface_Contact_Info.xml b/spec/Connection_Interface_Contact_Info.xml index 527d32522..88812cab5 100644 --- a/spec/Connection_Interface_Contact_Info.xml +++ b/spec/Connection_Interface_Contact_Info.xml @@ -17,9 +17,9 @@ Lesser General Public License for more details.</p> License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Connection.Interface.ContactInfo"> + <interface name="im.telepathy1.Connection.Interface.ContactInfo1"> <tp:added version="0.19.4">(as stable API)</tp:added> - <tp:requires interface="org.freedesktop.Telepathy.Connection"/> + <tp:requires interface="im.telepathy1.Connection"/> <tp:struct name="Contact_Info_Field" array-name="Contact_Info_Field_List"> <tp:member type="s" name="Field_Name"> @@ -233,8 +233,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:rationale> </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidHandle"/> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.InvalidHandle"/> </tp:possible-errors> </method> @@ -262,10 +262,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:rationale> </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidHandle"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.InvalidHandle"/> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring> The contact's information could not be retrieved. </tp:docstring> @@ -288,16 +288,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.PermissionDenied"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.PermissionDenied"/> + <tp:error name="im.telepathy1.Error.NotAvailable"/> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring> Setting your own information is not supported on this protocol. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> + <tp:error name="im.telepathy1.Error.InvalidArgument"> <tp:docstring> The supplied fields do not match the restrictions specified by <tp:member-ref>SupportedFields</tp:member-ref>. @@ -475,9 +475,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Indicates that this field will be overwritten when the user's alias is changed with <tp:dbus-ref - namespace="ofdT.Connection.Interface.Aliasing">SetAliases</tp:dbus-ref> + namespace="imt1.Connection.Interface.Aliasing1">SetAliases</tp:dbus-ref> or when the Account's <tp:dbus-ref - namespace="ofdT.Account">Nickname</tp:dbus-ref> + namespace="imt1.Account">Nickname</tp:dbus-ref> is updated. Clients that allow the editing of the Alias and the ContactInfo in the same location should hide fields with this flag.</p> <tp:rationale> diff --git a/spec/Connection_Interface_Contacts.xml b/spec/Connection_Interface_Contacts.xml index 1020190d4..1a16d2468 100644 --- a/spec/Connection_Interface_Contacts.xml +++ b/spec/Connection_Interface_Contacts.xml @@ -18,8 +18,8 @@ along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Connection.Interface.Contacts"> - <tp:requires interface="org.freedesktop.Telepathy.Connection"/> + <interface name="im.telepathy1.Connection.Interface.Contacts"> + <tp:requires interface="im.telepathy1.Connection"/> <tp:added version="0.17.9"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -126,7 +126,7 @@ </tp:rationale> <p>Attributes from the interface - <tp:dbus-ref>org.freedesktop.Telepathy.Connection</tp:dbus-ref> + <tp:dbus-ref>im.telepathy1.Connection</tp:dbus-ref> are always returned, and need not be requested explicitly.</p> <p>As well as returning cached information immediately, the @@ -134,12 +134,12 @@ values for the contact attributes. If better values are later obtained by this process, they will be indicated with the usual signals (such as <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection.Interface.Aliasing">AliasesChanged</tp:dbus-ref>).</p> + namespace="im.telepathy1.Connection.Interface.Aliasing1">AliasesChanged</tp:dbus-ref>).</p> <tp:rationale> For instance, an XMPP connection manager could download vCards in response to a request for <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection.Interface">Aliasing</tp:dbus-ref> + namespace="im.telepathy1.Connection.Interface">Aliasing1</tp:dbus-ref> attributes. </tp:rationale> </tp:docstring> @@ -151,21 +151,6 @@ </tp:changed> </arg> - <arg direction="in" name="Hold" type="b"> - <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - <p>If true, all handles that appear as keys in the result have been - held on behalf of the calling process, as if by a call to - <tp:dbus-ref namespace="ofdT">Connection.HoldHandles</tp:dbus-ref>. - (If <tp:dbus-ref namespace="ofdT.Connection" - >HasImmortalHandles</tp:dbus-ref> is true, which SHOULD be the - case in all new connection managers, this has no effect.)</p> - - <tp:rationale> - <p>For further round-trip avoidance.</p> - </tp:rationale> - </tp:docstring> - </arg> - <arg direction="out" type="a{ua{sv}}" name="Attributes" tp:type="Contact_Attributes_Map"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -178,12 +163,12 @@ <p>Each contact's attributes will always include at least the identifier that would be obtained by inspecting the handle - (<code>org.freedesktop.Telepathy.Connection/contact-id</code>).</p> + (<code>im.telepathy1.Connection/contact-id</code>).</p> </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.Disconnected"/> </tp:possible-errors> </method> </interface> diff --git a/spec/Connection_Interface_Forwarding.xml b/spec/Connection_Interface_Forwarding.xml index 32c7e1cbb..ab680ef33 100644 --- a/spec/Connection_Interface_Forwarding.xml +++ b/spec/Connection_Interface_Forwarding.xml @@ -22,7 +22,7 @@ 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Connection.Interface.Forwarding.DRAFT" + <interface name="im.telepathy1.Connection.Interface.Forwarding1" tp:causes-havoc="experimental"> <tp:added version="0.19.6">(draft version, not API-stable)</tp:added> @@ -87,12 +87,12 @@ 20s to accept the channel.</p> <p>When an unanswered <tp:dbus-ref - namespace='ofdT.Channel.Type'>StreamedMedia</tp:dbus-ref> call is + namespace='imt1.Channel.Type'>Call1</tp:dbus-ref> call is forwarded, both the contact and the self handle should be removed from the group with the self handle as the actor, and <tp:type>Channel_Group_Change_Reason</tp:type> <code>No_Answer</code> or <code>Busy</code>, as appropriate. For <tp:dbus-ref - namespace='ofdT.Channel.Type'>Call1</tp:dbus-ref> channels, the + namespace='imt1.Channel.Type'>Call1</tp:dbus-ref> channels, the <tp:type>Call_State_Change_Reason</tp:type> <code>Forwarded</code> should be used.</p> </tp:docstring> @@ -322,9 +322,9 @@ </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring> The specified Condition is not supported by this connection, or the number of chained @@ -333,7 +333,7 @@ <tp:member-ref>SetForwardingRule</tp:member-ref>. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidHandle"> + <tp:error name="im.telepathy1.Error.InvalidHandle"> <tp:docstring> A Handle that has been supplied is invalid. </tp:docstring> diff --git a/spec/Connection_Interface_Keepalive.xml b/spec/Connection_Interface_Keepalive.xml index 9f4ac6833..f39b23aa2 100644 --- a/spec/Connection_Interface_Keepalive.xml +++ b/spec/Connection_Interface_Keepalive.xml @@ -21,9 +21,9 @@ 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Connection.Interface.Keepalive.DRAFT" + <interface name="im.telepathy1.Connection.Interface.Keepalive1" tp:causes-havoc="experimental"> - <tp:requires interface="org.freedesktop.Telepathy.Connection"/> + <tp:requires interface="im.telepathy1.Connection"/> <tp:added version="0.21.2">(draft 1)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -47,10 +47,10 @@ <tp:member-ref>KeepaliveInterval</tp:member-ref> property which controls the frequency of keepalive pings, if any. Connection managers implementing this property should also include it in <tp:dbus-ref - namespace='org.freedesktop.Telepathy'>Protocol.Parameters</tp:dbus-ref> + namespace='im.telepathy1'>Protocol.Parameters</tp:dbus-ref> with the <code>DBus_Property</code> flag, allowing the desired value to be stored in <tp:dbus-ref - namespace='org.freedesktop.Telepathy'>Account.Parameters</tp:dbus-ref> + namespace='im.telepathy1'>Account.Parameters</tp:dbus-ref> and passed onto the connection by the account manager.</p> </tp:docstring> diff --git a/spec/Connection_Interface_Location.xml b/spec/Connection_Interface_Location.xml index c4fd68c3b..3decab5fe 100644 --- a/spec/Connection_Interface_Location.xml +++ b/spec/Connection_Interface_Location.xml @@ -18,9 +18,9 @@ Lesser General Public License for more details.</p> License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Connection.Interface.Location"> + <interface name="im.telepathy1.Connection.Interface.Location1"> <tp:added version="0.17.27">(as stable API)</tp:added> - <tp:requires interface="org.freedesktop.Telepathy.Connection"/> + <tp:requires interface="im.telepathy1.Connection"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>An interface on connections to support protocols which allow users to @@ -49,11 +49,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ possible.</p> <p>Clients of this interface SHOULD register an interest in it by calling - <tp:dbus-ref namespace="org.freedesktop.Telepathy" + <tp:dbus-ref namespace="im.telepathy1" >Connection.AddClientInterest</tp:dbus-ref> with an argument containing the name of this interface, before calling any Location method. If they do so, they SHOULD also call - <tp:dbus-ref namespace="org.freedesktop.Telepathy" + <tp:dbus-ref namespace="im.telepathy1" >Connection.RemoveClientInterest</tp:dbus-ref> after use to allow the CM to release resources associated with this interface.</p> </tp:docstring> @@ -275,12 +275,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>For backwards compatibility, if this method is called by a client whose "interest count" for this interface, as defined by <tp:dbus-ref - namespace="org.freedesktop.Telepathy" + namespace="im.telepathy1" >Connection.AddClientInterest</tp:dbus-ref>, is zero, the Connection SHOULD behave as if AddClientInterest had been called for this interface just before that method call. Clients that do not explicitly call AddClientInterest SHOULD NOT call <tp:dbus-ref - namespace="org.freedesktop.Telepathy" + namespace="im.telepathy1" >Connection.RemoveClientInterest</tp:dbus-ref> either.</p> </tp:docstring> @@ -301,8 +301,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidHandle"/> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.InvalidHandle"/> </tp:possible-errors> </method> @@ -334,10 +334,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidHandle"/> - <tp:error name="org.freedesktop.Telepathy.Error.PermissionDenied"> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.InvalidHandle"/> + <tp:error name="im.telepathy1.Error.PermissionDenied"> <tp:docstring> The requested contact does not allow the local user to see their location information. @@ -383,8 +383,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring> The user's server does not support publishing their own location. If it is possible to determine this ahead of time, the @@ -392,7 +392,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:member-ref>SupportedLocationFeatures</tp:member-ref>. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.PermissionDenied"/> + <tp:error name="im.telepathy1.Error.PermissionDenied"/> </tp:possible-errors> </method> @@ -418,7 +418,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> Indicates the Location features supported by this connection. This property MAY be undefined before <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection">Status</tp:dbus-ref> + namespace="im.telepathy1.Connection">Status</tp:dbus-ref> becomes <code>Connected</code>, but MUST remain constant thereafter. </tp:docstring> </property> @@ -449,12 +449,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>For backwards compatibility, if contact attributes that include this interface are requested by a client whose "interest count" for this interface, as defined by - <tp:dbus-ref namespace="org.freedesktop.Telepathy" + <tp:dbus-ref namespace="im.telepathy1" >Connection.AddClientInterest</tp:dbus-ref>, is zero, the Connection SHOULD behave as if AddClientInterest was called for this interface just before that request. Clients that do not explicitly call AddClientInterest SHOULD NOT call <tp:dbus-ref - namespace="org.freedesktop.Telepathy" + namespace="im.telepathy1" >Connection.RemoveClientInterest</tp:dbus-ref> either.</p> </tp:docstring> </tp:contact-attribute> diff --git a/spec/Connection_Interface_Mail_Notification.xml b/spec/Connection_Interface_Mail_Notification.xml index 395e1019d..0fff4f36d 100644 --- a/spec/Connection_Interface_Mail_Notification.xml +++ b/spec/Connection_Interface_Mail_Notification.xml @@ -19,8 +19,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> <interface - name="org.freedesktop.Telepathy.Connection.Interface.MailNotification"> - <tp:requires interface="org.freedesktop.Telepathy.Connection"/> + name="im.telepathy1.Connection.Interface.MailNotification1"> + <tp:requires interface="im.telepathy1.Connection"/> <tp:added version="0.21.3">(as stable API)</tp:added> <tp:client-interest> @@ -500,9 +500,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:rationale> </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"/> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.NotImplemented"/> </tp:possible-errors> </method> @@ -538,10 +538,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:rationale> </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"/> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"/> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.NotImplemented"/> + <tp:error name="im.telepathy1.Error.InvalidArgument"/> </tp:possible-errors> </method> @@ -555,12 +555,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>To use this interface, a client MUST first subscribe by passing the name of this interface to the <tp:dbus-ref - namespace="org.freedesktop.Telepathy" + namespace="im.telepathy1" >Connection.AddClientInterest</tp:dbus-ref> method. The subscription mechanic aims at reducing network traffic and memory footprint in the situation where nobody is currently interesting in provided information. When done with this interface, clients SHOULD call - <tp:dbus-ref namespace="org.freedesktop.Telepathy" + <tp:dbus-ref namespace="im.telepathy1" >Connection.RemoveClientInterest</tp:dbus-ref> to allow the CM to release resources.</p> diff --git a/spec/Connection_Interface_Power_Saving.xml b/spec/Connection_Interface_Power_Saving.xml index 571bf6d51..80879ca6d 100644 --- a/spec/Connection_Interface_Power_Saving.xml +++ b/spec/Connection_Interface_Power_Saving.xml @@ -19,7 +19,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> <interface - name="org.freedesktop.Telepathy.Connection.Interface.PowerSaving"> + name="im.telepathy1.Connection.Interface.PowerSaving1"> <tp:added version="0.21.5">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Some protocols support mechanisms for reducing bandwidth usage—and @@ -72,12 +72,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring> The current connection has no power saving features. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"/> + <tp:error name="im.telepathy1.Error.NotImplemented"/> </tp:possible-errors> </method> diff --git a/spec/Connection_Interface_Renaming.xml b/spec/Connection_Interface_Renaming.xml index d08b748d9..1fd748882 100644 --- a/spec/Connection_Interface_Renaming.xml +++ b/spec/Connection_Interface_Renaming.xml @@ -18,9 +18,9 @@ Lesser General Public License for more details.</p> License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Connection.Interface.Renaming" + <interface name="im.telepathy1.Connection.Interface.Renaming1" tp:causes-havoc='not well-tested'> - <tp:requires interface="org.freedesktop.Telepathy.Connection"/> + <tp:requires interface="im.telepathy1.Connection"/> <signal name="Renamed" tp:name-for-bindings="Renamed"> <arg name="Original" type="u" tp:type="Contact_Handle"> <tp:docstring> @@ -51,7 +51,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ a channel which has the groups interface, it will be removed from the channel and the new handle will be added. The resulting <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Interface.Group">MembersChanged</tp:dbus-ref> + namespace="im.telepathy1.Channel.Interface.Group1">MembersChanged</tp:dbus-ref> signal must be emitted <em>after</em> the <tp:member-ref>Renamed</tp:member-ref> signal; the reason should be RENAMED. @@ -73,18 +73,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Request that the user's own identifier is changed on the server. If successful, a <tp:member-ref>Renamed</tp:member-ref> signal will - be emitted for the current "self handle" as returned by <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection">GetSelfHandle</tp:dbus-ref>.</p> + be emitted for the current "self handle" as returned by the <tp:dbus-ref + namespace="im.telepathy1.Connection">SelfHandle</tp:dbus-ref> + property.</p> <p>It is protocol-dependent how the identifier that's actually used will be derived from the supplied identifier; some sort of normalization might take place.</p> </tp:docstring> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"/> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"/> - <tp:error name="org.freedesktop.Telepathy.Error.PermissionDenied"/> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.NotAvailable"/> + <tp:error name="im.telepathy1.Error.InvalidArgument"/> + <tp:error name="im.telepathy1.Error.PermissionDenied"/> </tp:possible-errors> </method> <tp:docstring> diff --git a/spec/Connection_Interface_Requests.xml b/spec/Connection_Interface_Requests.xml index c8dc32804..f9c751f64 100644 --- a/spec/Connection_Interface_Requests.xml +++ b/spec/Connection_Interface_Requests.xml @@ -21,8 +21,8 @@ USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Connection.Interface.Requests"> - <tp:requires interface="org.freedesktop.Telepathy.Connection"/> + <interface name="im.telepathy1.Connection.Interface.Requests"> + <tp:requires interface="im.telepathy1.Connection"/> <tp:added version="0.17.11">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -30,12 +30,6 @@ represent bundles of channels that should be dispatched together, and does not assume any particular properties by which channels are uniquely identifiable.</p> - - <p>If this interface is implemented on a connection, then - <tp:member-ref>NewChannels</tp:member-ref> MUST be emitted for - all new channels, even those created with <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection" - >RequestChannel</tp:dbus-ref>.</p> </tp:docstring> <tp:struct name="Channel_Details" array-name="Channel_Details_List"> @@ -84,12 +78,12 @@ </tp:rationale> <p>Each dictionary MUST contain the keys - <tp:dbus-ref>org.freedesktop.Telepathy.Channel.ChannelType</tp:dbus-ref>, - <tp:dbus-ref>org.freedesktop.Telepathy.Channel.TargetHandleType</tp:dbus-ref>, - <tp:dbus-ref>org.freedesktop.Telepathy.Channel.TargetHandle</tp:dbus-ref>, - <tp:dbus-ref>org.freedesktop.Telepathy.Channel.TargetID</tp:dbus-ref> + <tp:dbus-ref>im.telepathy1.Channel.ChannelType</tp:dbus-ref>, + <tp:dbus-ref>im.telepathy1.Channel.TargetHandleType</tp:dbus-ref>, + <tp:dbus-ref>im.telepathy1.Channel.TargetHandle</tp:dbus-ref>, + <tp:dbus-ref>im.telepathy1.Channel.TargetID</tp:dbus-ref> and - <tp:dbus-ref>org.freedesktop.Telepathy.Channel.Requested</tp:dbus-ref>. + <tp:dbus-ref>im.telepathy1.Channel.Requested</tp:dbus-ref>. </p> <tp:rationale> @@ -108,16 +102,6 @@ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Request that an entirely new channel is created.</p> - - <tp:rationale> - <p>There is deliberately no flag corresponding to the - suppress_handler argument to - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.RequestChannel</tp:dbus-ref>, - because passing a FALSE value for that argument is deprecated. - Requests made using this interface always behave as though - suppress_handler was TRUE.</p> - </tp:rationale> - </tp:docstring> <arg direction="in" name="Request" type="a{sv}" @@ -125,7 +109,7 @@ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A dictionary containing desirable properties, which MUST include <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel">ChannelType</tp:dbus-ref>. + namespace="im.telepathy1.Channel">ChannelType</tp:dbus-ref>. Some properties are defined such that only an exact match makes sense, and connection managers MUST NOT satisfy a request with a channel @@ -184,9 +168,9 @@ </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring> The channel request was one that can never succeed, such as requesting an unsupported channel type, or requesting @@ -194,42 +178,42 @@ the given target handle type. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidHandle"> + <tp:error name="im.telepathy1.Error.InvalidHandle"> <tp:docstring> An invalid handle was requested as the value of a property whose value is a handle (like - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Channel.TargetHandle</tp:dbus-ref>), + <tp:dbus-ref namespace="im.telepathy1">Channel.TargetHandle</tp:dbus-ref>), or a syntactically invalid identifier was requested as the value of a property whose value is the string corresponding to a handle (like <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Channel.TargetID</tp:dbus-ref>). + namespace="im.telepathy1">Channel.TargetID</tp:dbus-ref>). </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> + <tp:error name="im.telepathy1.Error.InvalidArgument"> <tp:docstring> The request matched the fixed properties of a <tp:type>Requestable_Channel_Class</tp:type> in <tp:member-ref>RequestableChannelClasses</tp:member-ref>, but the allowed arguments did not make sense; for example, a <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Type">RoomList</tp:dbus-ref> + namespace="im.telepathy1.Channel.Type">RoomList1</tp:dbus-ref> was requested, but the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Type.RoomList">Server</tp:dbus-ref> + namespace="im.telepathy1.Channel.Type.RoomList1">Server</tp:dbus-ref> property provided was not a valid DNS name. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotCapable"> + <tp:error name="im.telepathy1.Error.NotCapable"> <tp:docstring> The requested channel cannot be created because the requested contact is using a client that lacks a particular feature. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.Offline"> + <tp:error name="im.telepathy1.Error.Offline"> <tp:docstring> The requested channel cannot be created because the target is offline. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The requested channel cannot be created, but in principle, a similar request might succeed in future. @@ -242,17 +226,15 @@ <li>a channel matching the request has already been requested (by a previous call to CreateChannel, <tp:member-ref>EnsureChannel</tp:member-ref>, - <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Connection.RequestChannel</tp:dbus-ref> or similar) and the protocol requires that only one such channel can exist at a time</li> </ul> </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.Channel.Banned"/> - <tp:error name="org.freedesktop.Telepathy.Error.Channel.Full"/> - <tp:error name="org.freedesktop.Telepathy.Error.Channel.InviteOnly"/> - <tp:error name="org.freedesktop.Telepathy.Error.PermissionDenied"/> + <tp:error name="im.telepathy1.Error.Channel.Banned"/> + <tp:error name="im.telepathy1.Error.Channel.Full"/> + <tp:error name="im.telepathy1.Error.Channel.InviteOnly"/> + <tp:error name="im.telepathy1.Error.PermissionDenied"/> </tp:possible-errors> </method> @@ -330,9 +312,9 @@ </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring> The channel request was one that can never succeed, such as requesting an unsupported channel type, or requesting @@ -340,58 +322,58 @@ the given target handle type. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidHandle"> + <tp:error name="im.telepathy1.Error.InvalidHandle"> <tp:docstring> An invalid handle was requested as the value of a property whose value is a handle (like - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Channel.TargetHandle</tp:dbus-ref>), + <tp:dbus-ref namespace="im.telepathy1">Channel.TargetHandle</tp:dbus-ref>), or a syntactically invalid identifier was requested as the value of a property whose value is the string corresponding to a handle (like <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Channel.TargetID</tp:dbus-ref>). + namespace="im.telepathy1">Channel.TargetID</tp:dbus-ref>). </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> + <tp:error name="im.telepathy1.Error.InvalidArgument"> <tp:docstring> The request matched the fixed properties of a <tp:type>Requestable_Channel_Class</tp:type> in <tp:member-ref>RequestableChannelClasses</tp:member-ref>, but the allowed arguments did not make sense; for example, a <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Type">RoomList</tp:dbus-ref> + namespace="im.telepathy1.Channel.Type">RoomList1</tp:dbus-ref> was requested, but the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Type.RoomList">Server</tp:dbus-ref> + namespace="im.telepathy1.Channel.Type.RoomList1">Server</tp:dbus-ref> property provided was not a valid DNS name. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotCapable"> + <tp:error name="im.telepathy1.Error.NotCapable"> <tp:docstring> The requested channel cannot be created because the requested contact is using a client that lacks a particular feature. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.Offline"> + <tp:error name="im.telepathy1.Error.Offline"> <tp:docstring> The requested channel cannot be created because the target is offline. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> + <tp:error name="im.telepathy1.Error.NotAvailable"> <tp:docstring> The requested channel cannot be created, but in principle, a similar request might succeed in future. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.Channel.Banned"/> - <tp:error name="org.freedesktop.Telepathy.Error.Channel.Full"/> - <tp:error name="org.freedesktop.Telepathy.Error.Channel.InviteOnly"/> - <tp:error name="org.freedesktop.Telepathy.Error.PermissionDenied"/> + <tp:error name="im.telepathy1.Error.Channel.Banned"/> + <tp:error name="im.telepathy1.Error.Channel.Full"/> + <tp:error name="im.telepathy1.Error.Channel.InviteOnly"/> + <tp:error name="im.telepathy1.Error.PermissionDenied"/> </tp:possible-errors> </method> <signal name="NewChannels" tp:name-for-bindings="New_Channels"> <tp:added version="0.17.11">(as stable API)</tp:added> <tp:changed version="0.17.14">Added a guarantee of ordering - relative to NewChannel</tp:changed> + relative to the old NewChannel signal (now removed)</tp:changed> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>New channels have been created. The connection manager SHOULD emit @@ -407,35 +389,14 @@ <tp:rationale> <p>Joining a MUC Tube in XMPP requires joining the corresponding MUC (chatroom), so a <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Type">Text</tp:dbus-ref> + namespace="im.telepathy1.Channel.Type">Text</tp:dbus-ref> channel can be created as a side-effect.</p> </tp:rationale> - - <p>Every time NewChannels is emitted, it MUST be followed by - a <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Connection.NewChannel</tp:dbus-ref> - signal for each channel.</p> - - <tp:rationale> - <p>The double signal emission is for the benefit of older Telepathy - clients, which won't be listening for NewChannels.</p> - - <p>The more informative NewChannels signal comes first so that - clients that did not examine the connection to find - out whether Requests is supported will see the more informative - signal for each channel first, and then ignore the less - informative signal because it announces a new channel of which - they are already aware.</p> - </tp:rationale> </tp:docstring> <arg name="Channels" type="a(oa{sv})" tp:type="Channel_Details[]"> <tp:docstring> - The channels and their details. All channels that are signalled - together like this MUST have the same - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.FUTURE">Bundle</tp:dbus-ref> - property, which may - either refer to an existing bundle, or establish a new bundle. + The channels and their details. </tp:docstring> </arg> </signal> @@ -459,7 +420,7 @@ <tp:rationale> This is redundant with the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel">Closed</tp:dbus-ref> + namespace="im.telepathy1.Channel">Closed</tp:dbus-ref> signal on the channel itself, but it does provide full change notification for the Channels property. </tp:rationale> @@ -483,11 +444,11 @@ a subset of their properties.</p> <p>Channel classes SHOULD always include the keys - <tp:dbus-ref>org.freedesktop.Telepathy.Channel.ChannelType</tp:dbus-ref> + <tp:dbus-ref>im.telepathy1.Channel.ChannelType</tp:dbus-ref> and - <tp:dbus-ref>org.freedesktop.Telepathy.Channel.TargetHandleType</tp:dbus-ref>. - (One exception is that <tp:dbus-ref namespace="ofdT.Channel.Type" - >ContactSearch</tp:dbus-ref> channels do not have TargetHandleType + <tp:dbus-ref>im.telepathy1.Channel.TargetHandleType</tp:dbus-ref>. + (One exception is that <tp:dbus-ref namespace="imt1.Channel.Type" + >ContactSearch1</tp:dbus-ref> channels do not have TargetHandleType <code>None</code> in their requestable channel classes, for historical reasons.)</p> </tp:docstring> @@ -586,15 +547,6 @@ between the properties, so we do not have separate arrays of required and optional properties.</p> </tp:rationale> - - <p>If this array contains the - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.FUTURE">Bundle</tp:dbus-ref> - property, then this class of channel can be combined with other - channels with that property in a request, or added to an existing - bundle. If not, this signifies that the connection manager is - unable to mark channels of this class as part of a bundle - this - means that to the remote contact they are likely to be - indistinguishable from channels requested separately.</p> </tp:docstring> </tp:member> </tp:struct> diff --git a/spec/Connection_Interface_Resources.xml b/spec/Connection_Interface_Resources.xml index 716089cd6..0f39ba2ea 100644 --- a/spec/Connection_Interface_Resources.xml +++ b/spec/Connection_Interface_Resources.xml @@ -17,10 +17,10 @@ Lesser General Public License for more details.</p> License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Connection.Interface.Resources.DRAFT" + <interface name="im.telepathy1.Connection.Interface.Resources1" tp:causes-havoc="experimental"> <tp:added version="0.21.1">(draft 1)</tp:added> - <tp:requires interface="org.freedesktop.Telepathy.Connection"/> + <tp:requires interface="im.telepathy1.Connection"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>An interface on connections to show contact attributes for @@ -45,16 +45,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ attempts to change this.</p> <p>When using this interface, it is a little like using the - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface" + <tp:dbus-ref namespace="im.telepathy1.Connection.Interface" >Contacts</tp:dbus-ref> interface, but only resource-specific attributes are ever returned. The resource-specific contact attributes are decided on by the CM, but XMPP's are listed below:</p> <ul> - <li><tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface">SimplePresence/presence</tp:dbus-ref></li> - <li><tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface">ContactCapabilities/capabilities</tp:dbus-ref></li> - <li><tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface">ClientTypes/client-types</tp:dbus-ref></li> + <li><tp:dbus-ref namespace="im.telepathy1.Connection.Interface">Presence1/presence</tp:dbus-ref></li> + <li><tp:dbus-ref namespace="im.telepathy1.Connection.Interface">ContactCapabilities1/capabilities</tp:dbus-ref></li> + <li><tp:dbus-ref namespace="im.telepathy1.Connection.Interface">ClientTypes1/client-types</tp:dbus-ref></li> </ul> </tp:docstring> @@ -91,8 +91,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidHandle"/> + <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy1.Error.InvalidHandle"/> </tp:possible-errors> </method> diff --git a/spec/Connection_Interface_Service_Point.xml b/spec/Connection_Interface_Service_Point.xml index b135c04c7..9daf3e982 100644 --- a/spec/Connection_Interface_Service_Point.xml +++ b/spec/Connection_Interface_Service_Point.xml @@ -17,7 +17,7 @@ Lesser General Public License for more details.</p> License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Connection.Interface.ServicePoint"> + <interface name="im.telepathy1.Connection.Interface.ServicePoint1"> <tp:added version="0.19.7">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -43,7 +43,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ A list of IDs that are mapped to this service. This is provided as a convenience for the UIs, but the preferred method for requesting channel to a service is by setting the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Channel.Interface.ServicePoint">InitialServicePoint</tp:dbus-ref> + namespace="im.telepathy1.Channel.Interface.ServicePoint1">InitialServicePoint</tp:dbus-ref> property in a channel request. </tp:docstring> </tp:member> diff --git a/spec/Connection_Manager_Interface_Account_Storage.xml b/spec/Connection_Manager_Interface_Account_Storage.xml index 2f4f4bf78..2229afe87 100644 --- a/spec/Connection_Manager_Interface_Account_Storage.xml +++ b/spec/Connection_Manager_Interface_Account_Storage.xml @@ -20,20 +20,20 @@ 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.ConnectionManager.Interface.AccountStorage.DRAFT" + <interface name="im.telepathy1.ConnectionManager.Interface.AccountStorage1" tp:causes-havoc="experimental"> <tp:added version="0.21.10">(draft 1)</tp:added> - <tp:requires interface="org.freedesktop.Telepathy.ConnectionManager"/> + <tp:requires interface="im.telepathy1.ConnectionManager"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>An interface for connection managers that store account details internally. At the moment this consists only of storing an account's credentials, but other functionality may be added in the future.</p> - <p><tp:dbus-ref namespace="ofdT">Account</tp:dbus-ref> objects + <p><tp:dbus-ref namespace="imt1">Account</tp:dbus-ref> objects representing accounts on a connection manager that implements this interface should implement the - <tp:dbus-ref namespace="ofdT.Account.Interface">ExternalPasswordStorage.DRAFT</tp:dbus-ref> + <tp:dbus-ref namespace="imt1.Account.Interface">ExternalPasswordStorage1</tp:dbus-ref> interface.</p> </tp:docstring> @@ -80,12 +80,12 @@ type="s"> <tp:docstring> An account id as returned from - <tp:dbus-ref namespace="ofdT">Protocol.IdentifyAccount</tp:dbus-ref>. + <tp:dbus-ref namespace="imt1">Protocol.IdentifyAccount</tp:dbus-ref>. </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> + <tp:error name="im.telepathy1.Error.InvalidArgument"> <tp:docstring> The account id is invalid. </tp:docstring> @@ -103,12 +103,12 @@ type="s"> <tp:docstring> An account id as returned from - <tp:dbus-ref namespace="ofdT">Protocol.IdentifyAccount</tp:dbus-ref>. + <tp:dbus-ref namespace="imt1">Protocol.IdentifyAccount</tp:dbus-ref>. </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> + <tp:error name="im.telepathy1.Error.InvalidArgument"> <tp:docstring> The account id is invalid. </tp:docstring> diff --git a/spec/Debug.xml b/spec/Debug.xml index 70a82e903..e61625957 100644 --- a/spec/Debug.xml +++ b/spec/Debug.xml @@ -17,14 +17,14 @@ Lesser General Public License for more details.</p> License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Debug"> + <interface name="im.telepathy1.Debug1"> <tp:added version="0.17.27">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>An interface for providing debug messages.</p> <p>This interface is primarily provided by one object per - service, at the path <tt>/org/freedesktop/Telepathy/debug</tt>.</p> + service, at the path <tt>/im/telepathy/debug</tt>.</p> </tp:docstring> <property name="Enabled" type="b" access="readwrite" diff --git a/spec/Makefile.am b/spec/Makefile.am index 8f138d97a..6755cd97b 100644 --- a/spec/Makefile.am +++ b/spec/Makefile.am @@ -9,6 +9,7 @@ EXTRA_DIST = \ Account_Manager_Interface_Hidden.xml \ Authentication_TLS_Certificate.xml \ Call_Content.xml \ + Call_Content_Interface_Audio_Control.xml \ Call_Content_Interface_Media.xml \ Call_Content_Interface_Video_Control.xml \ Call_Content_Media_Description.xml \ diff --git a/spec/Protocol.xml b/spec/Protocol.xml index f779492f3..315c10706 100644 --- a/spec/Protocol.xml +++ b/spec/Protocol.xml @@ -20,14 +20,14 @@ 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Protocol"> + <interface name="im.telepathy1.Protocol"> <tp:added version="0.19.10">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>An object representing a protocol for which this <tp:dbus-ref - namespace="org.freedesktop.Telepathy">ConnectionManager</tp:dbus-ref> + namespace="im.telepathy1">ConnectionManager</tp:dbus-ref> can create <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Connection</tp:dbus-ref>s.</p> + namespace="im.telepathy1">Connection</tp:dbus-ref>s.</p> <p>Each Protocol object has the same well-known bus name as its parent ConnectionManager. Its object path is formed by taking the @@ -40,9 +40,9 @@ in Account object paths, and in Connection object paths and bus names. For instance, telepathy-gabble and telepathy-salut would implement objects at - <code>/org/freedesktop/Telepathy/ConnectionManager/gabble/jabber</code> + <code>/im/telepathy/ConnectionManager/gabble/jabber</code> and - <code>/org/freedesktop/Telepathy/ConnectionManager/salut/local_xmpp</code>, + <code>/im/telepathy/ConnectionManager/salut/local_xmpp</code>, respectively.</p> </tp:rationale> @@ -58,19 +58,19 @@ Interfaces= [Protocol example] Interfaces= -ConnectionInterfaces=org.freedesktop.Telepathy.Connection.Interface.Requests; +ConnectionInterfaces=im.telepathy1.Connection.Interface.Requests; param-account=s required param-password=s required secret RequestableChannelClasses=text; VCardField=x-example EnglishName=Example Icon=im-example -AuthenticationTypes=org.freedesktop.Telepathy.Channel.Type.ServerTLSConnection;org.freedesktop.Telepathy.Channel.Interface.SASLAuthentication; +AuthenticationTypes=im.telepathy1.Channel.Type.ServerTLSConnection;im.telepathy1.Channel.Interface.SASLAuthentication; [text] -org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Text -org.freedesktop.Telepathy.Channel.TargetHandleType u=1 -allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy.Channel.TargetID; +im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.Text +im.telepathy1.Channel.TargetHandleType u=1 +allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID; </pre> </tp:docstring> @@ -87,7 +87,7 @@ allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy <p>Connection managers with a <code>.manager</code> file (as described as part of the - <tp:dbus-ref namespace="org.freedesktop.Telepathy" + <tp:dbus-ref namespace="im.telepathy1" >ConnectionManager</tp:dbus-ref> interface) MUST cache this property in the protocol's section of the <code>.manager</code> file, using the key <code>Interfaces</code>. The corresponding value @@ -100,23 +100,23 @@ allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy tp:immutable="yes"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The parameters which may be specified in the - <tp:dbus-ref namespace='ofdT.Account'>Parameters</tp:dbus-ref> of an - <tp:dbus-ref namespace='ofdT'>Account</tp:dbus-ref> (or, for + <tp:dbus-ref namespace='imt1.Account'>Parameters</tp:dbus-ref> of an + <tp:dbus-ref namespace='imt1'>Account</tp:dbus-ref> (or, for specialised applications which do not use the account manager, passed to <tp:dbus-ref - namespace='ofdT.ConnectionManager'>RequestConnection</tp:dbus-ref>). + namespace='imt1.ConnectionManager'>RequestConnection</tp:dbus-ref>). Some parameters are mandatory, and some parameters only make sense when registering new accounts with the server; see the <tp:type>Param_Spec</tp:type> documentation for more details.</p> <p>Connection managers with a <code>.manager</code> file (as described as part of the - <tp:dbus-ref namespace="org.freedesktop.Telepathy" + <tp:dbus-ref namespace="im.telepathy1" >ConnectionManager</tp:dbus-ref> interface) MUST cache this property in the protocol's section of the <code>.manager</code> file via keys of the form <code>param-<em>p</em></code> and <code>default-<em>p</em></code>, as documented in the - <tp:dbus-ref namespace="org.freedesktop.Telepathy" + <tp:dbus-ref namespace="im.telepathy1" >ConnectionManager</tp:dbus-ref> interface.</p> </tp:docstring> </property> @@ -127,9 +127,9 @@ allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy tp:immutable="yes"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A list of interface names which might be in the - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection" + <tp:dbus-ref namespace="im.telepathy1.Connection" >Interfaces</tp:dbus-ref> property of a - <tp:dbus-ref namespace="org.freedesktop.Telepathy" + <tp:dbus-ref namespace="im.telepathy1" >Connection</tp:dbus-ref> to this protocol. Whether a Connection will have all, some or none of these interfaces depends on server capabilities.</p> @@ -151,10 +151,10 @@ allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy tp:immutable="yes"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A list of channel classes which might be requestable from a - <tp:dbus-ref namespace="org.freedesktop.Telepathy" + <tp:dbus-ref namespace="im.telepathy1" >Connection</tp:dbus-ref> to this protocol (i.e. they will, or might, appear in the Connection's <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection.Interface.Requests" + namespace="im.telepathy1.Connection.Interface.Requests" >RequestableChannelClasses</tp:dbus-ref> property).</p> <p>Whether a Connection will have all, some or none of these @@ -184,7 +184,7 @@ allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy "<code><em>propertyname</em> <em>type</em></code>", and the value is encoded in the same way as for the <code>default-<em>p</em></code> keys described in the <tp:dbus-ref - namespace="org.freedesktop.Telepathy" + namespace="im.telepathy1" >ConnectionManager</tp:dbus-ref> documentation.</p> <p>Connection managers that have channel classes whose fixed @@ -193,7 +193,7 @@ allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy <p>For instance, this <code>.manager</code> file could represent a connection manager that supports 1-1 Text messages and - StreamedMedia audio calls:</p> + Call audio calls:</p> <pre>[Protocol jabber] param-account=s required @@ -201,14 +201,14 @@ param-password=s required RequestableChannelClasses=rcc0;rcc1; [rcc0] -org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Text -org.freedesktop.Telepathy.Channel.TargetHandleType u=1 -allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy.Channel.TargetID; +im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.Text +im.telepathy1.Channel.TargetHandleType u=1 +allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID; [rcc1] -org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.StreamedMedia -org.freedesktop.Telepathy.Channel.TargetHandleType u=1 -allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy.Channel.TargetID;org.freedesktop.Telepathy.Channel.Type.StreamedMedia.InitialAudio; +im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.Call1 +im.telepathy1.Channel.TargetHandleType u=1 +allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID;im.telepathy1.Channel.Type.Call1.InitialAudio; </pre> </tp:docstring> </property> @@ -226,7 +226,7 @@ allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy <p>A more exhaustive list of addressable vCard fields can be found in the Protocol's Addressing interface's - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Protocol.Interface.Addressing">AddressableVCardFields</tp:dbus-ref>.</p> + <tp:dbus-ref namespace="im.telepathy1.Protocol.Interface.Addressing1">AddressableVCardFields</tp:dbus-ref>.</p> <p>It is not necessarily valid to interpret contacts' identifiers as values of this vCard field. For instance, telepathy-sofiasip @@ -235,7 +235,7 @@ allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy both be represented by any single vCard field. Arbitrary handles/identifiers as vCard fields are represented through the Connection's - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface">Addressing.DRAFT</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1.Connection.Interface">Addressing1</tp:dbus-ref> contact attributes.</p> <tp:rationale> @@ -300,9 +300,9 @@ allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy <tp:rationale> <p>This can be used as a default if the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Account">Icon</tp:dbus-ref> + namespace="im.telepathy1.Account">Icon</tp:dbus-ref> property is not set on an Account, or used by the <tp:dbus-ref - namespace="org.freedesktop.Telepathy">AccountManager</tp:dbus-ref> + namespace="im.telepathy1">AccountManager</tp:dbus-ref> to choose a default icon if none is set during account creation.</p> </tp:rationale> @@ -338,7 +338,7 @@ allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy type="a{sv}" tp:type="String_Variant_Map"> <tp:docstring> A set of parameters as would be provided to <tp:dbus-ref - namespace="org.freedesktop.Telepathy.ConnectionManager" + namespace="im.telepathy1.ConnectionManager" >RequestConnection</tp:dbus-ref> </tp:docstring> </arg> @@ -346,7 +346,7 @@ allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy <arg direction="out" name="Account_ID" type="s"> <tp:docstring> <p>An opaque string suitable for use as the account-specific part of - an <tp:dbus-ref namespace="org.freedesktop.Telepathy" + an <tp:dbus-ref namespace="im.telepathy1" >Account</tp:dbus-ref>'s object path. This is not necessarily globally unique, but should represent a "best-effort" identification of the account.</p> @@ -363,7 +363,7 @@ allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring> The IdentifyAccount method is not supported by this connection manager. The caller SHOULD fall back to deriving identification @@ -379,12 +379,12 @@ allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy <p>Attempt to normalize the given contact ID. Where possible, this SHOULD return the same thing that would be returned by InspectHandles(RequestHandles(CONTACT, [Contact_ID])) on a connected - <tp:dbus-ref namespace="org.freedesktop.Telepathy" + <tp:dbus-ref namespace="im.telepathy1" >Connection</tp:dbus-ref>.</p> <p>If full normalization requires network activity or is otherwise impossible to do without a <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Connection</tp:dbus-ref>, + namespace="im.telepathy1">Connection</tp:dbus-ref>, this method SHOULD perform a best-effort normalization.</p> <tp:rationale> @@ -428,7 +428,7 @@ allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring> The NormalizeContact method is not supported by this connection manager. The caller MAY recover by using the contact ID as-is. @@ -449,14 +449,14 @@ allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy <p>These can either be channel types, or where the channel type isn't enough information to be useful, interfaces indicating a specific use of a channel type. For example, - <tp:dbus-ref namespace="ofdT.Channel.Type">ServerTLSConnection</tp:dbus-ref> + <tp:dbus-ref namespace="imt1.Channel.Type">ServerTLSConnection1</tp:dbus-ref> channels are obviously about TLS certificates so the channel type would appear in this list. However, a - <tp:dbus-ref namespace="ofdT.Channel.Type">ServerAuthentication</tp:dbus-ref> + <tp:dbus-ref namespace="imt1.Channel.Type">ServerAuthentication1</tp:dbus-ref> channel type alone does not explain enough about the authentication type in use as it is merely a base for the channel interfaces that appear in said channels. In this case, CMs should use the value of the - <tp:dbus-ref namespace="ofdT.Channel.Type">ServerAuthentication.AuthenticationMethod</tp:dbus-ref> + <tp:dbus-ref namespace="imt1.Channel.Type">ServerAuthentication1.AuthenticationMethod</tp:dbus-ref> property in this list.</p> <p>For example, if a protocol's @@ -465,19 +465,19 @@ allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy <blockquote> <pre> -[ ...<tp:dbus-ref namespace="ofdT">Channel.Type.ServerTLSConnection</tp:dbus-ref>, - ...<tp:dbus-ref namespace="ofdT">Channel.Interface.SASLAuthentication</tp:dbus-ref> ]</pre></blockquote> +[ ...<tp:dbus-ref namespace="imt1">Channel.Type.ServerTLSConnection1</tp:dbus-ref>, + ...<tp:dbus-ref namespace="imt1">Channel.Interface.SASLAuthentication1</tp:dbus-ref> ]</pre></blockquote> <p>This tells a client that before the connection status reached CONNECTED, a <tp:dbus-ref - namespace="ofdT.Channel.Type">ServerTLSConnection</tp:dbus-ref> + namespace="imt1.Channel.Type">ServerTLSConnection1</tp:dbus-ref> could appear carrying a TLS certificate. It also tells the client that before the connection status reaches CONNECTED, a <tp:dbus-ref - namespace="ofdT.Channel.Type">ServerAuthentication</tp:dbus-ref> + namespace="imt1.Channel.Type">ServerAuthentication1</tp:dbus-ref> channel could also appear, where <tp:dbus-ref - namespace="ofdT.Channel.Type">ServerAuthentication.AuthenticationMethod</tp:dbus-ref>=<tp:dbus-ref - namespace="ofdT.Channel.Interface">SASLAuthentication</tp:dbus-ref>. A + namespace="imt1.Channel.Type">ServerAuthentication1.AuthenticationMethod</tp:dbus-ref>=<tp:dbus-ref + namespace="imt1.Channel.Interface">SASLAuthentication1</tp:dbus-ref>. A hypothetical future Channel.Interface.Captcha interface would also appear in this list if the CM might require the user solve a captcha before connecting.</p> diff --git a/spec/Protocol_Interface_Addressing.xml b/spec/Protocol_Interface_Addressing.xml index 0c62e1bd9..84501b4f0 100644 --- a/spec/Protocol_Interface_Addressing.xml +++ b/spec/Protocol_Interface_Addressing.xml @@ -21,7 +21,7 @@ </tp:license> <interface - name="org.freedesktop.Telepathy.Protocol.Interface.Addressing"> + name="im.telepathy1.Protocol.Interface.Addressing1"> <tp:added version="0.25.1">(as stable API). From the draft, NormalizeURI was renamed to NormalizeContactURI, clarifying that it removes any actions from the URI.</tp:added> @@ -116,7 +116,7 @@ AddressableURISchemes=tel;sip; offline. When it is connected the addressable URI schemes should be retrieved from the <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Connection.Interface">Requests.RequestableChannelClasses</tp:dbus-ref>'s + namespace="im.telepathy1.Connection.Interface">Requests.RequestableChannelClasses</tp:dbus-ref>'s TargetURIScheme fixed-property instead.</p> <p>Connection managers with a <code>.manager</code> file @@ -144,20 +144,20 @@ AddressableURISchemes=tel;sip; For example: <code>xmpp:julien@example.com</code>.</dd> <dt><code>msnim</code></dt> <dd>For the purposes of - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Protocol.Interface.Addressing</tp:dbus-ref>, - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Addressing.DRAFT</tp:dbus-ref>, + <tp:dbus-ref namespace="im.telepathy1">Protocol.Interface.Addressing1</tp:dbus-ref>, + <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Addressing1</tp:dbus-ref>, and - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Channel.Interface.Addressing.DRAFT</tp:dbus-ref>, + <tp:dbus-ref namespace="im.telepathy1">Channel.Interface.Addressing1</tp:dbus-ref>, the verb part is ignored, and SHOULD be <code>add</code>; the <code>contact</code> field in the query string is used to identify the contact. For example: <code>msnim:add?contact=julien</code>.</dd> <dt><code>aim</code></dt> <dd>For the purposes of - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Protocol.Interface.Addressing</tp:dbus-ref>, - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Addressing.DRAFT</tp:dbus-ref>, + <tp:dbus-ref namespace="im.telepathy1">Protocol.Interface.Addressing1</tp:dbus-ref>, + <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Addressing1</tp:dbus-ref>, and - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Channel.Interface.Addressing.DRAFT</tp:dbus-ref>, + <tp:dbus-ref namespace="im.telepathy1">Channel.Interface.Addressing1</tp:dbus-ref>, the verb part is ignored, and SHOULD be <code>addbuddy</code>; the <code>screenname</code> field in the query string is used to identify the contact. @@ -167,10 +167,10 @@ AddressableURISchemes=tel;sip; For example: <code>skype:julien</code>.</dd> <dt><code>ymsgr</code></dt> <dd>For the purposes of - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Protocol.Interface.Addressing</tp:dbus-ref>, - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Addressing.DRAFT</tp:dbus-ref>, + <tp:dbus-ref namespace="im.telepathy1">Protocol.Interface.Addressing1</tp:dbus-ref>, + <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Addressing1</tp:dbus-ref>, and - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Channel.Interface.Addressing.DRAFT</tp:dbus-ref>, + <tp:dbus-ref namespace="im.telepathy1">Channel.Interface.Addressing1</tp:dbus-ref>, the verb part is ignored, and SHOULD be <code>addfriend</code>; the query string is used to identify the contact. For example: <code>ymsgr:addfriend?julien</code>.</dd> @@ -186,14 +186,14 @@ AddressableURISchemes=tel;sip; <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Attempt to normalize the given vCard address. Where possible, this SHOULD return an address that would appear in the - <code>org.freedesktop.Telepathy.Connection.Interface.Addressing.DRAFT/addresses</code> + <code>im.telepathy1.Connection.Interface.Addressing1/addresses</code> attribute for a contact on a connected - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection</tp:dbus-ref>. + <tp:dbus-ref namespace="im.telepathy1">Connection</tp:dbus-ref>. </p> <p>If full normalization requires network activity or is otherwise impossible to do without a <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Connection</tp:dbus-ref>, + namespace="im.telepathy1">Connection</tp:dbus-ref>, this method SHOULD perform a best-effort normalization.</p> <p>An example would be a vCard TEL field with a formatted @@ -226,14 +226,14 @@ AddressableURISchemes=tel;sip; </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring> The vCard field is not supported (it is not in <tp:member-ref>AddressableVCardFields</tp:member-ref>). </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> + <tp:error name="im.telepathy1.Error.InvalidArgument"> <tp:docstring> The address is syntactically incorrect. </tp:docstring> @@ -247,14 +247,14 @@ AddressableURISchemes=tel;sip; <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Attempt to normalize the given contact URI. Where possible, this SHOULD return an address that would appear in the - <code>org.freedesktop.Telepathy.Connection.Interface.Addressing.DRAFT/uris</code> + <code>im.telepathy1.Connection.Interface.Addressing1/uris</code> attribute for a contact on a connected - <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection</tp:dbus-ref>. + <tp:dbus-ref namespace="im.telepathy1">Connection</tp:dbus-ref>. </p> <p>If full normalization requires network activity or is otherwise impossible to do without a <tp:dbus-ref - namespace="org.freedesktop.Telepathy">Connection</tp:dbus-ref>, + namespace="im.telepathy1">Connection</tp:dbus-ref>, this method SHOULD perform a best-effort normalization.</p> <p>If the URI has extra information beyond what's necessary to @@ -308,14 +308,14 @@ AddressableURISchemes=tel;sip; </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> + <tp:error name="im.telepathy1.Error.NotImplemented"> <tp:docstring> The URI scheme is not supported (it is not in <tp:member-ref>AddressableURISchemes</tp:member-ref>). </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> + <tp:error name="im.telepathy1.Error.InvalidArgument"> <tp:docstring> <p>The URI is syntactically incorrect or cannot be interpreted as a reference to a contact.</p> diff --git a/spec/Protocol_Interface_Avatars.xml b/spec/Protocol_Interface_Avatars.xml index 1bf0515ef..661242905 100644 --- a/spec/Protocol_Interface_Avatars.xml +++ b/spec/Protocol_Interface_Avatars.xml @@ -20,9 +20,9 @@ 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Protocol.Interface.Avatars"> + <interface name="im.telepathy1.Protocol.Interface.Avatars1"> <tp:added version="0.21.5">(as stable API)</tp:added> - <tp:requires interface="org.freedesktop.Telepathy.Protocol"/> + <tp:requires interface="im.telepathy1.Protocol"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>An interface for protocols where it might be possible to set the @@ -32,9 +32,9 @@ <tp:rationale> <p>If the avatar requirements cannot be discovered while offline, it's impossible to avoid setting the <tp:dbus-ref - namespace="org.freedesktop.Telepathy" + namespace="im.telepathy1" >Account</tp:dbus-ref>'s <tp:dbus-ref - namespace="org.freedesktop.Telepathy.Account.Interface.Avatar" + namespace="im.telepathy1.Account.Interface.Avatar1" >Avatar</tp:dbus-ref> property to an unsupported avatar.</p> </tp:rationale> @@ -52,7 +52,7 @@ <code>.manager</code> file:</p> <pre>[Protocol jabber] -Interfaces=org.freedesktop.Telepathy.Protocol.Interface.Avatars; +Interfaces=im.telepathy1.Protocol.Interface.Avatars; param-account=s required param-password=s required SupportedAvatarMIMETypes=image/png;image/jpeg;image/gif; @@ -71,8 +71,8 @@ MaximumAvatarBytes=8192 type="as" access="read" tp:immutable="yes"> <tp:docstring> The expected value of the <tp:dbus-ref - namespace="org.freedesktop.Telepathy" - >Connection.Interface.Avatars.SupportedAvatarMIMETypes</tp:dbus-ref> + namespace="im.telepathy1" + >Connection.Interface.Avatars1.SupportedAvatarMIMETypes</tp:dbus-ref> property on connections to this protocol. </tp:docstring> </property> @@ -82,8 +82,8 @@ MaximumAvatarBytes=8192 type="u" access="read" tp:immutable="yes"> <tp:docstring> The expected value of the <tp:dbus-ref - namespace="org.freedesktop.Telepathy" - >Connection.Interface.Avatars.MinimumAvatarHeight</tp:dbus-ref> + namespace="im.telepathy1" + >Connection.Interface.Avatars1.MinimumAvatarHeight</tp:dbus-ref> property on connections to this protocol. </tp:docstring> </property> @@ -93,8 +93,8 @@ MaximumAvatarBytes=8192 type="u" access="read" tp:immutable="yes"> <tp:docstring> The expected value of the <tp:dbus-ref - namespace="org.freedesktop.Telepathy" - >Connection.Interface.Avatars.MinimumAvatarWidth</tp:dbus-ref> + namespace="im.telepathy1" + >Connection.Interface.Avatars1.MinimumAvatarWidth</tp:dbus-ref> property on connections to this protocol. </tp:docstring> </property> @@ -104,8 +104,8 @@ MaximumAvatarBytes=8192 type="u" access="read" tp:immutable="yes"> <tp:docstring> The expected value of the <tp:dbus-ref - namespace="org.freedesktop.Telepathy" - >Connection.Interface.Avatars.RecommendedAvatarHeight</tp:dbus-ref> + namespace="im.telepathy1" + >Connection.Interface.Avatars1.RecommendedAvatarHeight</tp:dbus-ref> property on connections to this protocol. </tp:docstring> </property> @@ -115,8 +115,8 @@ MaximumAvatarBytes=8192 type="u" access="read" tp:immutable="yes"> <tp:docstring> The expected value of the <tp:dbus-ref - namespace="org.freedesktop.Telepathy" - >Connection.Interface.Avatars.RecommendedAvatarWidth</tp:dbus-ref> + namespace="im.telepathy1" + >Connection.Interface.Avatars1.RecommendedAvatarWidth</tp:dbus-ref> property on connections to this protocol. </tp:docstring> </property> @@ -126,8 +126,8 @@ MaximumAvatarBytes=8192 type="u" access="read" tp:immutable="yes"> <tp:docstring> The expected value of the <tp:dbus-ref - namespace="org.freedesktop.Telepathy" - >Connection.Interface.Avatars.MaximumAvatarHeight</tp:dbus-ref> + namespace="im.telepathy1" + >Connection.Interface.Avatars1.MaximumAvatarHeight</tp:dbus-ref> property on connections to this protocol. </tp:docstring> </property> @@ -137,8 +137,8 @@ MaximumAvatarBytes=8192 type="u" access="read" tp:immutable="yes"> <tp:docstring> The expected value of the <tp:dbus-ref - namespace="org.freedesktop.Telepathy" - >Connection.Interface.Avatars.MaximumAvatarWidth</tp:dbus-ref> + namespace="im.telepathy1" + >Connection.Interface.Avatars1.MaximumAvatarWidth</tp:dbus-ref> property on connections to this protocol. </tp:docstring> </property> @@ -148,8 +148,8 @@ MaximumAvatarBytes=8192 type="u" access="read" tp:immutable="yes"> <tp:docstring> The expected value of the <tp:dbus-ref - namespace="org.freedesktop.Telepathy" - >Connection.Interface.Avatars.MaximumAvatarBytes</tp:dbus-ref> + namespace="im.telepathy1" + >Connection.Interface.Avatars1.MaximumAvatarBytes</tp:dbus-ref> property on connections to this protocol. </tp:docstring> </property> diff --git a/spec/Protocol_Interface_Presence.xml b/spec/Protocol_Interface_Presence.xml index ddff33263..d202e8080 100644 --- a/spec/Protocol_Interface_Presence.xml +++ b/spec/Protocol_Interface_Presence.xml @@ -20,9 +20,9 @@ 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Protocol.Interface.Presence"> + <interface name="im.telepathy1.Protocol.Interface.Presence1"> <tp:added version="0.21.3">(as stable API)</tp:added> - <tp:requires interface="org.freedesktop.Telepathy.Protocol"/> + <tp:requires interface="im.telepathy1.Protocol"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>An interface for protocols where it might be possible to set the @@ -47,7 +47,7 @@ <dl> <dt>settable</dt> <dd>If present, the user can set this status on themselves using - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface.SimplePresence" + <tp:dbus-ref namespace="im.telepathy1.Connection.Interface.Presence1" >SetPresence</tp:dbus-ref>; this corresponds to May_Set_On_Self in the <tp:type>Simple_Status_Spec</tp:type> struct.</dd> @@ -63,7 +63,7 @@ <code>.manager</code> file:</p> <pre>[Protocol jabber] -Interfaces=org.freedesktop.Telepathy.Protocol.Interface.Presence; +Interfaces=im.telepathy1.Protocol.Interface.Presence; param-account=s required param-password=s required status-offline=1 @@ -99,10 +99,10 @@ status-chat=2 settable message type="a{s(ubb)}" tp:type="Simple_Status_Spec_Map" access="read"> <tp:docstring> <p>The statuses that might appear in the <tp:dbus-ref - namespace="org.freedesktop.Telepathy" - >Connection.Interface.SimplePresence.Statuses</tp:dbus-ref> + namespace="im.telepathy1" + >Connection.Interface.Presence1.Statuses</tp:dbus-ref> property on a connection to this protocol that supports - SimplePresence. This property is immutable.</p> + Presence. This property is immutable.</p> <p>Depending on server capabilities, it is possible that not all of these will actually appear on the Connection.</p> diff --git a/spec/all.xml b/spec/all.xml index 3dda0fb14..fbb10499a 100644 --- a/spec/all.xml +++ b/spec/all.xml @@ -3,7 +3,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude"> <tp:title>Telepathy D-Bus Interface Specification</tp:title> -<tp:version>0.25.1</tp:version> +<tp:version>0.25.1.1</tp:version> <tp:copyright>Copyright © 2005-2011 Collabora Limited</tp:copyright> <tp:copyright>Copyright © 2005-2011 Nokia Corporation</tp:copyright> @@ -181,7 +181,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:section name="Call-related interfaces"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>These interfaces are only applicable to channels of type <tp:dbus-ref - namespace='ofdT.Channel.Type'>Call1</tp:dbus-ref>.</p> + namespace='imt1.Channel.Type'>Call1</tp:dbus-ref>.</p> </tp:docstring> <xi:include href="Channel_Interface_DTMF.xml"/> @@ -192,8 +192,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>These interfaces provide functionality for ad-hoc conference calls and chat rooms. They are primarily intended for <tp:dbus-ref - namespace='ofdT.Channel.Type'>Text</tp:dbus-ref> and - <tp:dbus-ref namespace='ofdT.Channel.Type'>Call1</tp:dbus-ref> + namespace='imt1.Channel.Type'>Text</tp:dbus-ref> and + <tp:dbus-ref namespace='imt1.Channel.Type'>Call1</tp:dbus-ref> channels, but may also appear on other types of channel.</p> </tp:docstring> diff --git a/spec/errors.xml b/spec/errors.xml index 7726f3cfd..facfa4813 100644 --- a/spec/errors.xml +++ b/spec/errors.xml @@ -1,9 +1,9 @@ <?xml version="1.0" ?> -<tp:errors xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0" namespace="org.freedesktop.Telepathy.Error"> +<tp:errors xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0" namespace="im.telepathy1.Error"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The D-Bus errors used in Telepathy all start with - <code>org.freedesktop.Telepathy.Error.</code>. They are used in + <code>im.telepathy1.Error.</code>. They are used in D-Bus messages of type ERROR, and also as plain strings annotated with the <tp:type>DBus_Error_Name</tp:type> type.</p> @@ -16,7 +16,7 @@ indicate specialized failure conditions. For better interoperability, if a suitable Telepathy error exists, it should be preferred.</p> - <p>The namespace <code>org.freedesktop.Telepathy.Qt4.Error.</code> + <p>The namespace <code>im.telepathy1.Qt4.Error.</code> is reserved for use by the D-Bus client implementation in telepathy-qt4, which uses it to represent certain error situations that did not involve a D-Bus ERROR message. These errors are defined and documented as part of @@ -58,7 +58,7 @@ The connection is not currently connected and cannot be used. This error may also be raised when operations are performed on a Connection for which - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection">StatusChanged</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy1.Connection">StatusChanged</tp:dbus-ref> has signalled status Disconnected for reason None. <tp:rationale> @@ -502,7 +502,7 @@ <tp:rationale> For instance, the <tp:dbus-ref - namespace="org.freedesktop.Telepathy">ChannelDispatcher</tp:dbus-ref> + namespace="im.telepathy1">ChannelDispatcher</tp:dbus-ref> might raise this error for some or all channel requests if it has detected that there is not enough free memory. </tp:rationale> @@ -515,10 +515,10 @@ Raised if a request cannot be satisfied without violating an earlier request for anonymity, and the earlier request specified that raising an error is preferable to disclosing the user's identity (for instance - via <tp:dbus-ref namespace="org.freedesktop.Telepathy" - >Connection.Interface.Anonymity.AnonymityMandatory</tp:dbus-ref> or - <tp:dbus-ref namespace="org.freedesktop.Telepathy" - >Channel.Interface.Anonymity.AnonymityMandatory</tp:dbus-ref>). + via <tp:dbus-ref namespace="im.telepathy1" + >Connection.Interface.Anonymity1.AnonymityMandatory</tp:dbus-ref> or + <tp:dbus-ref namespace="im.telepathy1" + >Channel.Interface.Anonymity1.AnonymityMandatory</tp:dbus-ref>). </tp:docstring> </tp:error> @@ -534,7 +534,7 @@ <tp:added version="0.21.2"/> <tp:docstring> Raised when an incoming or outgoing <tp:dbus-ref - namespace="ofdT.Channel.Type">Call1</tp:dbus-ref> is + namespace="imt1.Channel.Type">Call1</tp:dbus-ref> is rejected by the the receiver. </tp:docstring> </tp:error> @@ -573,12 +573,13 @@ <tp:rationale> For instance, this would be an appropriate mapping for XMPP's - errors bad-format, invalid-xml, etc., which can't happen unless - the local (or remote) XMPP implementation is faulty. This is - also analogous to - <tp:value-ref type="Media_Stream_Error">Invalid_CM_Behavior</tp:value-ref>, + errors bad-format, invalid-xml, etc., which can't happen + unless the local (or remote) XMPP implementation is + faulty. This is also analogous to + Media_Stream_Error_Invalid_CM_Behavior, <code>TP_DBUS_ERROR_INCONSISTENT</code> in telepathy-glib, and - <code>TELEPATHY_QT4_ERROR_INCONSISTENT</code> in telepathy-qt4. + <code>TELEPATHY_QT4_ERROR_INCONSISTENT</code> in + telepathy-qt4. </tp:rationale> </tp:docstring> </tp:error> @@ -587,7 +588,7 @@ <tp:added version="0.21.12"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Raised as a - <tp:dbus-ref namespace="ofdT.Connection">ConnectionError</tp:dbus-ref> + <tp:dbus-ref namespace="imt1.Connection">ConnectionError</tp:dbus-ref> when a Connection cannot be established because either the Connection Manager or its support library (e.g. wocky, papyon, sofiasip) requires upgrading to support a newer protocol version.</p> @@ -624,14 +625,14 @@ <tp:added version="0.22.1"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Raised if the user has insufficient - <tp:dbus-ref namespace="ofdT.Connection.Interface">Balance</tp:dbus-ref> + <tp:dbus-ref namespace="imt1.Connection.Interface">Balance1</tp:dbus-ref> to place a call or send a message.</p> <p>The key 'balance-required' MAY be included in - <tp:dbus-ref namespace="ofdT.Channel.Type.Call1">CallStateDetails</tp:dbus-ref> + <tp:dbus-ref namespace="imt1.Channel.Type.Call1">CallStateDetails</tp:dbus-ref> or a delivery report's <tp:type>Message_Part</tp:type> (with the same units and scale as - <tp:dbus-ref namespace="ofdT.Connection.Interface.Balance">AccountBalance</tp:dbus-ref>) + <tp:dbus-ref namespace="imt1.Connection.Interface.Balance1">AccountBalance</tp:dbus-ref>) to indicate how much credit is required to make this call or send this message.</p> </tp:docstring> diff --git a/spec/generic-types.xml b/spec/generic-types.xml index 014f8ada4..11ef6667d 100644 --- a/spec/generic-types.xml +++ b/spec/generic-types.xml @@ -20,14 +20,14 @@ <tp:simple-type name="DBus_Bus_Name" type="s" array-name="DBus_Bus_Name_List"> <tp:docstring>A string representing a D-Bus bus name - either a well-known - name like "org.freedesktop.Telepathy.MissionControl" or a unique name + name like "im.telepathy1.MissionControl" or a unique name like ":1.123"</tp:docstring> </tp:simple-type> <tp:simple-type name="DBus_Well_Known_Name" type="s" array-name="DBus_Well_Known_Name_List"> <tp:docstring>A string representing a D-Bus well-known - name like "org.freedesktop.Telepathy.MissionControl".</tp:docstring> + name like "im.telepathy1.MissionControl".</tp:docstring> </tp:simple-type> <tp:simple-type name="DBus_Unique_Name" type="s" diff --git a/spec/template.xml b/spec/template.xml index 283804a94..33cc0e1f7 100644 --- a/spec/template.xml +++ b/spec/template.xml @@ -20,7 +20,7 @@ 02110-1301, USA.</p> </tp:license> - <interface name="org.freedesktop.Telepathy.Foo.DRAFT" + <interface name="im.telepathy1.Foo1" tp:causes-havoc="experimental"> <tp:added version="0.UNRELEASED">(draft 1)</tp:added> diff --git a/telepathy-glib/account-channel-request.c b/telepathy-glib/account-channel-request.c index 30db3a3cc..4a65c8837 100644 --- a/telepathy-glib/account-channel-request.c +++ b/telepathy-glib/account-channel-request.c @@ -1601,7 +1601,7 @@ tp_account_channel_request_set_delegate_to_preferred_handler ( g_return_if_fail (!self->priv->requested); tp_asv_set_boolean (self->priv->hints, - "org.freedesktop.Telepathy.ChannelRequest.DelegateToPreferredHandler", + "im.telepathy1.ChannelRequest.DelegateToPreferredHandler", delegate); } @@ -1614,7 +1614,7 @@ tp_account_channel_request_set_delegate_to_preferred_handler ( * @destroy: called with the @user_data as argument, when @self is destroyed * * Turn on support for - * the org.freedesktop.Telepathy.ChannelRequest.DelegateToPreferredHandler + * the im.telepathy1.ChannelRequest.DelegateToPreferredHandler * hint. * * When receiving a request containing this hint, @self will automatically diff --git a/telepathy-glib/account-manager.c b/telepathy-glib/account-manager.c index 5fc244985..8acfcef7d 100644 --- a/telepathy-glib/account-manager.c +++ b/telepathy-glib/account-manager.c @@ -107,7 +107,7 @@ typedef struct { GArray *features; } TpAccountManagerFeatureCallback; -#define MC5_BUS_NAME "org.freedesktop.Telepathy.MissionControl5" +#define MC5_BUS_NAME "im.telepathy1.MissionControl5" enum { ACCOUNT_VALIDITY_CHANGED, diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c index 62cbb718b..d76d806c5 100644 --- a/telepathy-glib/account.c +++ b/telepathy-glib/account.c @@ -2228,7 +2228,7 @@ tp_account_get_icon_name (TpAccount *account) * via tp_connection_manager_get_protocol() and * tp_connection_manager_protocol_get_param(). Well-known parameters are * listed - * <ulink url="http://telepathy.freedesktop.org/spec/org.freedesktop.Telepathy.ConnectionManager.html#org.freedesktop.Telepathy.ConnectionManager.RequestConnection">in + * <ulink url="http://telepathy.freedesktop.org/spec/im.telepathy1.ConnectionManager.html#im.telepathy1.ConnectionManager.RequestConnection">in * the Telepathy D-Bus Interface Specification</ulink>. * * Returns: (transfer none) (element-type utf8 GObject.Value): the hash table of diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c index 557feefcd..27ff42709 100644 --- a/telepathy-glib/base-client.c +++ b/telepathy-glib/base-client.c @@ -2141,7 +2141,7 @@ delegate_channels_if_needed (TpBaseClient *self, continue; should_delegate = tp_asv_get_boolean (hints, - "org.freedesktop.Telepathy.ChannelRequest.DelegateToPreferredHandler", + "im.telepathy1.ChannelRequest.DelegateToPreferredHandler", NULL); if (!should_delegate) @@ -3314,7 +3314,7 @@ tp_base_client_delegate_channels_finish (TpBaseClient *self, * @destroy: called with the @user_data as argument, when @self is destroyed * * Turn on support for - * the org.freedesktop.Telepathy.ChannelRequest.DelegateToPreferredHandler + * the im.telepathy1.ChannelRequest.DelegateToPreferredHandler * hint. * * When receiving a request containing this hint, @self will automatically diff --git a/telepathy-glib/base-connection-manager.c b/telepathy-glib/base-connection-manager.c index 29ec7744b..d8f9336de 100644 --- a/telepathy-glib/base-connection-manager.c +++ b/telepathy-glib/base-connection-manager.c @@ -855,7 +855,7 @@ parse_parameters (const TpCMParamSpec *paramspec, * tp_base_connection_manager_request_connection * * Implements D-Bus method RequestConnection - * on interface org.freedesktop.Telepathy.ConnectionManager + * on interface im.telepathy1.ConnectionManager * * @error: Used to return a pointer to a GError detailing any error * that occurred, D-Bus will throw the error only if this diff --git a/telepathy-glib/connection.c b/telepathy-glib/connection.c index 486742800..82dec89e9 100644 --- a/telepathy-glib/connection.c +++ b/telepathy-glib/connection.c @@ -2564,8 +2564,8 @@ _tp_connection_parse (const gchar *path_or_bus_name, g_return_val_if_fail (delimiter == '.' || delimiter == '/', FALSE); /* If CM respects the spec, object path and bus name should be in the form: - * /org/freedesktop/Telepathy/Connection/cmname/proto/account - * org.freedesktop.Telepathy.Connection.cmname.proto.account + * /im/telepathy1/Connection/cmname/proto/account + * im.telepathy1.Connection.cmname.proto.account */ if (delimiter == '.') prefix = TP_CONN_BUS_NAME_BASE; diff --git a/telepathy-glib/debug-sender.c b/telepathy-glib/debug-sender.c index f7800bb8a..1e3cea2ec 100644 --- a/telepathy-glib/debug-sender.c +++ b/telepathy-glib/debug-sender.c @@ -33,7 +33,7 @@ * * A #TpDebugSender object is an object exposing the Telepathy debug interface. * There should be one object per process as it registers the object path - * /org/freedesktop/Telepathy/debug. Once the object exists and has the object + * /im/telepathy1/debug. Once the object exists and has the object * path, messages can be passed to it using tp_debug_sender_add_message and * signals will automatically be fired. * @@ -229,7 +229,7 @@ tp_debug_sender_constructed (GObject *object) if (dbus_daemon != NULL) { tp_dbus_daemon_register_object (dbus_daemon, - "/org/freedesktop/Telepathy/debug", debug_sender); + "/im/telepathy1/debug", debug_sender); g_object_unref (dbus_daemon); } diff --git a/telepathy-glib/defs.h b/telepathy-glib/defs.h index 535e19937..7585ca6b8 100644 --- a/telepathy-glib/defs.h +++ b/telepathy-glib/defs.h @@ -32,7 +32,7 @@ G_BEGIN_DECLS * The prefix for a connection manager's bus name, to which the CM's name * (e.g. "gabble") should be appended. */ -#define TP_CM_BUS_NAME_BASE "org.freedesktop.Telepathy.ConnectionManager." +#define TP_CM_BUS_NAME_BASE "im.telepathy1.ConnectionManager." /** * TP_CM_OBJECT_PATH_BASE: @@ -40,7 +40,7 @@ G_BEGIN_DECLS * The prefix for a connection manager's object path, to which the CM's name * (e.g. "gabble") should be appended. */ -#define TP_CM_OBJECT_PATH_BASE "/org/freedesktop/Telepathy/ConnectionManager/" +#define TP_CM_OBJECT_PATH_BASE "/im/telepathy1/ConnectionManager/" /** * TP_CONN_BUS_NAME_BASE: @@ -49,7 +49,7 @@ G_BEGIN_DECLS * (e.g. "gabble"), the protocol (e.g. "jabber") and an element or sequence * of elements representing the account should be appended. */ -#define TP_CONN_BUS_NAME_BASE "org.freedesktop.Telepathy.Connection." +#define TP_CONN_BUS_NAME_BASE "im.telepathy1.Connection." /** * TP_CONN_OBJECT_PATH_BASE: @@ -58,56 +58,56 @@ G_BEGIN_DECLS * (e.g. "gabble"), the protocol (e.g. "jabber") and an element or sequence * of elements representing the account should be appended. */ -#define TP_CONN_OBJECT_PATH_BASE "/org/freedesktop/Telepathy/Connection/" +#define TP_CONN_OBJECT_PATH_BASE "/im/telepathy1/Connection/" /** * TP_ACCOUNT_MANAGER_BUS_NAME: * * The account manager's well-known bus name */ -#define TP_ACCOUNT_MANAGER_BUS_NAME "org.freedesktop.Telepathy.AccountManager" +#define TP_ACCOUNT_MANAGER_BUS_NAME "im.telepathy1.AccountManager" /** * TP_ACCOUNT_MANAGER_OBJECT_PATH: * * The account manager's standard object path */ -#define TP_ACCOUNT_MANAGER_OBJECT_PATH "/org/freedesktop/Telepathy/AccountManager" +#define TP_ACCOUNT_MANAGER_OBJECT_PATH "/im/telepathy1/AccountManager" /** * TP_ACCOUNT_OBJECT_PATH_BASE: * * The common prefix of the object path for all Account objects. */ -#define TP_ACCOUNT_OBJECT_PATH_BASE "/org/freedesktop/Telepathy/Account/" +#define TP_ACCOUNT_OBJECT_PATH_BASE "/im/telepathy1/Account/" /** * TP_CHANNEL_DISPATCHER_BUS_NAME: * * The channel dispatcher's well-known bus name */ -#define TP_CHANNEL_DISPATCHER_BUS_NAME "org.freedesktop.Telepathy.ChannelDispatcher" +#define TP_CHANNEL_DISPATCHER_BUS_NAME "im.telepathy1.ChannelDispatcher" /** * TP_CHANNEL_DISPATCHER_OBJECT_PATH: * * The channel dispatcher's standard object path */ -#define TP_CHANNEL_DISPATCHER_OBJECT_PATH "/org/freedesktop/Telepathy/ChannelDispatcher" +#define TP_CHANNEL_DISPATCHER_OBJECT_PATH "/im/telepathy1/ChannelDispatcher" /** * TP_CLIENT_BUS_NAME_BASE: * * The common prefix of the well-known bus name for any Telepathy Client. */ -#define TP_CLIENT_BUS_NAME_BASE "org.freedesktop.Telepathy.Client." +#define TP_CLIENT_BUS_NAME_BASE "im.telepathy1.Client." /** * TP_CLIENT_OBJECT_PATH_BASE: * * The common prefix of the well-known object path for any Telepathy Client. */ -#define TP_CLIENT_OBJECT_PATH_BASE "/org/freedesktop/Telepathy/Client/" +#define TP_CLIENT_OBJECT_PATH_BASE "/im/telepathy1/Client/" /** * TP_USER_ACTION_TIME_NOT_USER_ACTION: diff --git a/telepathy-glib/errors.c b/telepathy-glib/errors.c index 9255067a0..7d3a480af 100644 --- a/telepathy-glib/errors.c +++ b/telepathy-glib/errors.c @@ -60,188 +60,188 @@ /** * TpError: - * @TP_ERROR_NETWORK_ERROR: org.freedesktop.Telepathy.Error.NetworkError: + * @TP_ERROR_NETWORK_ERROR: im.telepathy1.Error.NetworkError: * Raised when there is an error reading from or writing to the network. - * @TP_ERROR_NOT_IMPLEMENTED: org.freedesktop.Telepathy.Error.NotImplemented: + * @TP_ERROR_NOT_IMPLEMENTED: im.telepathy1.Error.NotImplemented: * Raised when the requested method, channel, etc is not available on this * connection. - * @TP_ERROR_INVALID_ARGUMENT: org.freedesktop.Telepathy.Error.InvalidArgument: + * @TP_ERROR_INVALID_ARGUMENT: im.telepathy1.Error.InvalidArgument: * Raised when one of the provided arguments is invalid. - * @TP_ERROR_NOT_AVAILABLE: org.freedesktop.Telepathy.Error.NotAvailable: + * @TP_ERROR_NOT_AVAILABLE: im.telepathy1.Error.NotAvailable: * Raised when the requested functionality is temporarily unavailable. - * @TP_ERROR_PERMISSION_DENIED: org.freedesktop.Telepathy.Error.PermissionDenied: + * @TP_ERROR_PERMISSION_DENIED: im.telepathy1.Error.PermissionDenied: * The user is not permitted to perform the requested operation. - * @TP_ERROR_DISCONNECTED: org.freedesktop.Telepathy.Error.Disconnected: + * @TP_ERROR_DISCONNECTED: im.telepathy1.Error.Disconnected: * The connection is not currently connected and cannot be used. * This error may also be raised when operations are performed on a * Connection for which StatusChanged has signalled status Disconnected * for reason None. - * @TP_ERROR_INVALID_HANDLE: org.freedesktop.Telepathy.Error.InvalidHandle: + * @TP_ERROR_INVALID_HANDLE: im.telepathy1.Error.InvalidHandle: * An identifier being converted to a handle was syntactically invalid, * or an invalid handle was used. - * @TP_ERROR_CHANNEL_BANNED: org.freedesktop.Telepathy.Error.Channel.Banned: + * @TP_ERROR_CHANNEL_BANNED: im.telepathy1.Error.Channel.Banned: * You are banned from the channel. - * @TP_ERROR_CHANNEL_FULL: org.freedesktop.Telepathy.Error.Channel.Full: + * @TP_ERROR_CHANNEL_FULL: im.telepathy1.Error.Channel.Full: * The channel is full. - * @TP_ERROR_CHANNEL_INVITE_ONLY: org.freedesktop.Telepathy.Error.Channel.InviteOnly: + * @TP_ERROR_CHANNEL_INVITE_ONLY: im.telepathy1.Error.Channel.InviteOnly: * The requested channel is invite-only. - * @TP_ERROR_NOT_YOURS: org.freedesktop.Telepathy.Error.NotYours: + * @TP_ERROR_NOT_YOURS: im.telepathy1.Error.NotYours: * The requested channel or other resource already exists, and another * client is responsible for it - * @TP_ERROR_CANCELLED: org.freedesktop.Telepathy.Error.Cancelled: + * @TP_ERROR_CANCELLED: im.telepathy1.Error.Cancelled: * Raised by an ongoing request if it is cancelled by user request before * it has completed, or when operations are performed on an object which * the user has asked to close (for instance, a Connection where the user * has called Disconnect, or a Channel where the user has called Close). - * @TP_ERROR_AUTHENTICATION_FAILED: org.freedesktop.Telepathy.Error.AuthenticationFailed: + * @TP_ERROR_AUTHENTICATION_FAILED: im.telepathy1.Error.AuthenticationFailed: * Raised when authentication with a service was unsuccessful. - * @TP_ERROR_ENCRYPTION_NOT_AVAILABLE: org.freedesktop.Telepathy.Error.EncryptionNotAvailable: + * @TP_ERROR_ENCRYPTION_NOT_AVAILABLE: im.telepathy1.Error.EncryptionNotAvailable: * Raised if a user request insisted that encryption should be used, * but encryption was not actually available. - * @TP_ERROR_ENCRYPTION_ERROR: org.freedesktop.Telepathy.Error.EncryptionError: + * @TP_ERROR_ENCRYPTION_ERROR: im.telepathy1.Error.EncryptionError: * Raised if encryption appears to be available, but could not actually be * used (for instance if SSL/TLS negotiation fails). - * @TP_ERROR_CERT_NOT_PROVIDED: org.freedesktop.Telepathy.Error.Cert.NotProvided: + * @TP_ERROR_CERT_NOT_PROVIDED: im.telepathy1.Error.Cert.NotProvided: * Raised if the server did not provide a SSL/TLS certificate. - * @TP_ERROR_CERT_UNTRUSTED: org.freedesktop.Telepathy.Error.Cert.Untrusted: + * @TP_ERROR_CERT_UNTRUSTED: im.telepathy1.Error.Cert.Untrusted: * Raised if the server provided a SSL/TLS certificate signed by an * untrusted certifying authority. - * @TP_ERROR_CERT_EXPIRED: org.freedesktop.Telepathy.Error.Cert.Expired: + * @TP_ERROR_CERT_EXPIRED: im.telepathy1.Error.Cert.Expired: * Raised if the server provided an expired SSL/TLS certificate. - * @TP_ERROR_CERT_NOT_ACTIVATED: org.freedesktop.Telepathy.Error.Cert.NotActivated: + * @TP_ERROR_CERT_NOT_ACTIVATED: im.telepathy1.Error.Cert.NotActivated: * Raised if the server provided an SSL/TLS certificate that will become * valid at some point in the future. - * @TP_ERROR_CERT_FINGERPRINT_MISMATCH: org.freedesktop.Telepathy.Error.Cert.FingerprintMismatch: + * @TP_ERROR_CERT_FINGERPRINT_MISMATCH: im.telepathy1.Error.Cert.FingerprintMismatch: * Raised if the server provided an SSL/TLS certificate that did not have * the expected fingerprint. - * @TP_ERROR_CERT_HOSTNAME_MISMATCH: org.freedesktop.Telepathy.Error.Cert.HostnameMismatch: + * @TP_ERROR_CERT_HOSTNAME_MISMATCH: im.telepathy1.Error.Cert.HostnameMismatch: * Raised if the server provided an SSL/TLS certificate that did not * match its hostname. - * @TP_ERROR_CERT_SELF_SIGNED: org.freedesktop.Telepathy.Error.Cert.SelfSigned: + * @TP_ERROR_CERT_SELF_SIGNED: im.telepathy1.Error.Cert.SelfSigned: * Raised if the server provided an SSL/TLS certificate that is * self-signed and untrusted. - * @TP_ERROR_CERT_INVALID: org.freedesktop.Telepathy.Error.Cert.Invalid: + * @TP_ERROR_CERT_INVALID: im.telepathy1.Error.Cert.Invalid: * Raised if the server provided an SSL/TLS certificate that is * unacceptable in some way that does not have a more specific error. - * @TP_ERROR_NOT_CAPABLE: org.freedesktop.Telepathy.Error.NotCapable: + * @TP_ERROR_NOT_CAPABLE: im.telepathy1.Error.NotCapable: * Raised when requested functionality is unavailable due to a contact * not having the required capabilities. - * @TP_ERROR_OFFLINE: org.freedesktop.Telepathy.Error.Offline: + * @TP_ERROR_OFFLINE: im.telepathy1.Error.Offline: * Raised when requested functionality is unavailable because a contact is * offline. - * @TP_ERROR_CHANNEL_KICKED: org.freedesktop.Telepathy.Error.Channel.Kicked: + * @TP_ERROR_CHANNEL_KICKED: im.telepathy1.Error.Channel.Kicked: * Used to represent a user being ejected from a channel by another user, * for instance being kicked from a chatroom. - * @TP_ERROR_BUSY: org.freedesktop.Telepathy.Error.Busy: + * @TP_ERROR_BUSY: im.telepathy1.Error.Busy: * Used to represent a user being removed from a channel because of a * "busy" indication. - * @TP_ERROR_NO_ANSWER: org.freedesktop.Telepathy.Error.NoAnswer: + * @TP_ERROR_NO_ANSWER: im.telepathy1.Error.NoAnswer: * Used to represent a user being removed from a channel because they did * not respond, e.g. to a StreamedMedia call. - * @TP_ERROR_DOES_NOT_EXIST: org.freedesktop.Telepathy.Error.DoesNotExist: + * @TP_ERROR_DOES_NOT_EXIST: im.telepathy1.Error.DoesNotExist: * Raised when the requested user does not, in fact, exist. - * @TP_ERROR_TERMINATED: org.freedesktop.Telepathy.Error.Terminated: + * @TP_ERROR_TERMINATED: im.telepathy1.Error.Terminated: * Raised when a channel is terminated for an unspecified reason. In * particular, this error SHOULD be used whenever normal termination of a * 1-1 StreamedMedia call by the remote user is represented as a D-Bus * error name. - * @TP_ERROR_CONNECTION_REFUSED: org.freedesktop.Telepathy.Error.ConnectionRefused: + * @TP_ERROR_CONNECTION_REFUSED: im.telepathy1.Error.ConnectionRefused: * Raised when a connection is refused. - * @TP_ERROR_CONNECTION_FAILED: org.freedesktop.Telepathy.Error.ConnectionFailed: + * @TP_ERROR_CONNECTION_FAILED: im.telepathy1.Error.ConnectionFailed: * Raised when a connection can't be established. - * @TP_ERROR_CONNECTION_LOST: org.freedesktop.Telepathy.Error.ConnectionLost: + * @TP_ERROR_CONNECTION_LOST: im.telepathy1.Error.ConnectionLost: * Raised when a connection is broken. - * @TP_ERROR_ALREADY_CONNECTED: org.freedesktop.Telepathy.Error.AlreadyConnected: + * @TP_ERROR_ALREADY_CONNECTED: im.telepathy1.Error.AlreadyConnected: * Raised on attempts to connect again to an account that is already * connected, if the protocol or server does not allow this. * Since 0.7.34 - * @TP_ERROR_CONNECTION_REPLACED: org.freedesktop.Telepathy.Error.ConnectionReplaced: + * @TP_ERROR_CONNECTION_REPLACED: im.telepathy1.Error.ConnectionReplaced: * Used as disconnection reason for an existing connection if it is * disconnected because a second connection to the same account is made. * Since 0.7.34 - * @TP_ERROR_REGISTRATION_EXISTS: org.freedesktop.Telepathy.Error.RegistrationExists: + * @TP_ERROR_REGISTRATION_EXISTS: im.telepathy1.Error.RegistrationExists: * Raised on attempts to register an account on a server when the account * already exists. * Since 0.7.34 - * @TP_ERROR_SERVICE_BUSY: org.freedesktop.Telepathy.Error.ServiceBusy: + * @TP_ERROR_SERVICE_BUSY: im.telepathy1.Error.ServiceBusy: * Raised when a server or other infrastructure rejects a request because * it is too busy. * Since 0.7.34 - * @TP_ERROR_RESOURCE_UNAVAILABLE: org.freedesktop.Telepathy.Error.ResourceUnavailable: + * @TP_ERROR_RESOURCE_UNAVAILABLE: im.telepathy1.Error.ResourceUnavailable: * Raised when a local process rejects a request because it does not have * enough of a resource, such as memory. * Since 0.7.34 - * @TP_ERROR_WOULD_BREAK_ANONYMITY: org.freedesktop.Telepathy.Error.WouldBreakAnonymity: + * @TP_ERROR_WOULD_BREAK_ANONYMITY: im.telepathy1.Error.WouldBreakAnonymity: * Raised when a request cannot be satisfied without violating an * earlier request for anonymity, and the earlier request specified * that raising an error is preferable to disclosing the user's * identity * Since 0.11.7 - * @TP_ERROR_CERT_REVOKED: org.freedesktop.Telepathy.Error.Cert.Revoked: + * @TP_ERROR_CERT_REVOKED: im.telepathy1.Error.Cert.Revoked: * Raised if the server provided an SSL/TLS certificate that has been * revoked. * Since: 0.11.12 - * @TP_ERROR_CERT_INSECURE: org.freedesktop.Telepathy.Error.Cert.Insecure: + * @TP_ERROR_CERT_INSECURE: im.telepathy1.Error.Cert.Insecure: * Raised if the server provided an SSL/TLS certificate that uses an * insecure cipher algorithm or is cryptographically weak. * Since: 0.11.12 - * @TP_ERROR_CERT_LIMIT_EXCEEDED: org.freedesktop.Telepathy.Error.Cert.LimitExceeded: + * @TP_ERROR_CERT_LIMIT_EXCEEDED: im.telepathy1.Error.Cert.LimitExceeded: * Raised if the length in bytes of the server certificate, or the depth * of the server certificate chain, exceed the limits imposed by the * crypto library. * Since: 0.11.12 - * @TP_ERROR_NOT_YET: org.freedesktop.Telepathy.Error.NotYet: + * @TP_ERROR_NOT_YET: im.telepathy1.Error.NotYet: * Raised when the requested functionality is not yet available, but is * likely to become available after some time has passed. * Since: 0.11.15 - * @TP_ERROR_REJECTED: org.freedesktop.Telepathy.Error.Rejected: + * @TP_ERROR_REJECTED: im.telepathy1.Error.Rejected: * Raised when an incoming or outgoing call is rejected by the receiving * contact. * Since: 0.13.2 - * @TP_ERROR_PICKED_UP_ELSEWHERE: org.freedesktop.Telepathy.Error.PickedUpElsewhere: + * @TP_ERROR_PICKED_UP_ELSEWHERE: im.telepathy1.Error.PickedUpElsewhere: * Raised when a call was terminated as a result of the local user * picking up the call on a different resource. * Since: 0.13.3 - * @TP_ERROR_CONFUSED: org.freedesktop.Telepathy.Error.Confused: + * @TP_ERROR_CONFUSED: im.telepathy1.Error.Confused: * Raised if a server rejects protocol messages from a connection manager * claiming that they do not make sense, two local processes fail to * understand each other, or an apparently impossible situation is * reached. This has a similar meaning to %TP_DBUS_ERROR_INCONSISTENT but * can be passed between processes via D-Bus. * Since: 0.13.7 - * @TP_ERROR_SERVICE_CONFUSED: org.freedesktop.Telepathy.Error.ServiceConfused: + * @TP_ERROR_SERVICE_CONFUSED: im.telepathy1.Error.ServiceConfused: * Raised when a server or other piece of infrastructure indicates an * internal error, or when a message that makes no sense is received from * a server or other piece of infrastructure. * Since: 0.13.7 * @TP_ERROR_EMERGENCY_CALLS_NOT_SUPPORTED: - * org.freedesktop.Telepathy.Error.EmergencyCallsNotSupported: + * im.telepathy1.Error.EmergencyCallsNotSupported: * Raised when a client attempts to dial a number that is recognized as an * emergency number (e.g. '911' in the USA), but the Connection * Manager or provider does not support dialling emergency numbers. * @TP_ERROR_SOFTWARE_UPGRADE_REQUIRED: - * org.freedesktop.Telepathy.Error.SoftwareUpgradeRequired: + * im.telepathy1.Error.SoftwareUpgradeRequired: * Raised when a Connection cannot be established because either the * Connection Manager or its support library (e.g. wocky, papyon, sofiasip) * requires upgrading to support a newer protocol version. * @TP_ERROR_INSUFFICIENT_BALANCE: - * <code>org.freedesktop.Telepathy.Error.InsufficientBalance</code>: + * <code>im.telepathy1.Error.InsufficientBalance</code>: * Raised if the user has insufficient balance to place a call. The key * 'balance-required' MAY be included in CallStateDetails on a Call channel * (with the same units and scale as AccountBalance) to indicate how much * credit is required to make this call. * @TP_ERROR_MEDIA_CODECS_INCOMPATIBLE: - * <code>org.freedesktop.Telepathy.Error.Media.CodecsIncompatible</code>: + * <code>im.telepathy1.Error.Media.CodecsIncompatible</code>: * Raised when the local streaming implementation has no codecs in common * with the remote side. * Since: 0.15.6 * @TP_ERROR_MEDIA_UNSUPPORTED_TYPE: - * <code>org.freedesktop.Telepathy.Error.Media.UnsupportedType</code>: + * <code>im.telepathy1.Error.Media.UnsupportedType</code>: * The media stream type requested is not supported by either the local or * remote side. * Since: 0.15.6 * @TP_ERROR_MEDIA_STREAMING_ERROR: - * <code>org.freedesktop.Telepathy.Error.Media.StreamingError</code>: + * <code>im.telepathy1.Error.Media.StreamingError</code>: * Raised when the call's streaming implementation has some kind of internal * error. * Since: 0.15.6 diff --git a/telepathy-glib/errors.h b/telepathy-glib/errors.h index 81dc22996..2635ab2e9 100644 --- a/telepathy-glib/errors.h +++ b/telepathy-glib/errors.h @@ -31,7 +31,7 @@ G_BEGIN_DECLS GQuark tp_errors_quark (void) G_GNUC_DEPRECATED_FOR(tp_error_quark); GQuark tp_error_quark (void); -#define TP_ERROR_PREFIX "org.freedesktop.Telepathy.Error" +#define TP_ERROR_PREFIX "im.telepathy1.Error" #define TP_ERRORS TP_ERROR #define TP_ERROR (tp_error_quark ()) diff --git a/telepathy-glib/extra-gtkdoc.h b/telepathy-glib/extra-gtkdoc.h index f04a7c690..2a8c84eb5 100644 --- a/telepathy-glib/extra-gtkdoc.h +++ b/telepathy-glib/extra-gtkdoc.h @@ -353,15 +353,15 @@ * Since 0.9.2 it also provides cpp defines like * %TP_PROP_CHANNEL_INTERFACE_GROUP_GROUP_FLAGS, which expand to string * constants representing fully-qualified D-Bus property names, like - * <literal>org.freedesktop.Telepathy.Channel.Interface.Group.GroupFlags</literal>. + * <literal>im.telepathy1.Channel.Interface.Group.GroupFlags</literal>. * * Since 0.11.5 it also provides cpp defines like * %TP_TOKEN_CONNECTION_INTERFACE_ALIASING_ALIAS for contact attributes like - * "org.freedesktop.Telepathy.Connection.Interface.Aliasing/alias", + * "im.telepathy1.Connection.Interface.Aliasing/alias", * and defines like * %TP_TOKEN_CHANNEL_INTERFACE_MEDIA_SIGNALLING_ICE_UDP * for handler capability tokens like - * "org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/gtalk-p2p". + * "im.telepathy1.Channel.Interface.MediaSignalling/gtalk-p2p". * (These were present in an incorrect form since 0.11.3.) */ diff --git a/telepathy-glib/signals-marshal.list b/telepathy-glib/signals-marshal.list index 6d264305e..3a4256a53 100644 --- a/telepathy-glib/signals-marshal.list +++ b/telepathy-glib/signals-marshal.list @@ -19,4 +19,5 @@ VOID:UINT,INT,STRING VOID:UINT,OBJECT VOID:UINT,STRING,STRING VOID:UINT,UINT,UINT,STRING,BOXED +VOID:UINT,UINT,STRING VOID:VOID diff --git a/tests/dbus/account-channel-request.c b/tests/dbus/account-channel-request.c index bb9708482..aedb8d176 100644 --- a/tests/dbus/account-channel-request.c +++ b/tests/dbus/account-channel-request.c @@ -209,7 +209,6 @@ test_handle_create_success (Test *test, NULL, create_and_handle_cb, test); g_hash_table_unref (request); - g_object_unref (req); g_main_loop_run (test->mainloop); g_assert_no_error (test->error); @@ -219,6 +218,8 @@ test_handle_create_success (Test *test, g_assert (TP_IS_CHANNEL_REQUEST (chan_req)); g_assert (tp_account_channel_request_get_channel_request (req) == chan_req); g_object_unref (chan_req); + + g_object_unref (req); } /* ChannelDispatcher.CreateChannel() call fails */ @@ -627,7 +628,7 @@ test_handle_delegated (Test *test, requests = g_ptr_array_new (); hints = tp_asv_new ( - "org.freedesktop.Telepathy.ChannelRequest.DelegateToPreferredHandler", + "im.telepathy1.ChannelRequest.DelegateToPreferredHandler", G_TYPE_BOOLEAN, TRUE, NULL); diff --git a/tests/dbus/account-manager.c b/tests/dbus/account-manager.c index 75b3bc568..9ca56c54f 100644 --- a/tests/dbus/account-manager.c +++ b/tests/dbus/account-manager.c @@ -285,7 +285,7 @@ finish_assert_am_not_activatable_action (TpDBusDaemon *proxy, for (i=0; names[i] != NULL; i++) { g_assert_cmpstr (names[i], !=, TP_ACCOUNT_MANAGER_BUS_NAME); - g_assert_cmpstr (names[i], !=, "org.freedesktop.Telepathy.MissionControl5"); + g_assert_cmpstr (names[i], !=, "im.telepathy1.MissionControl5"); } script_continue (user_data); diff --git a/tests/dbus/account.c b/tests/dbus/account.c index 77c0c519a..c2a183212 100644 --- a/tests/dbus/account.c +++ b/tests/dbus/account.c @@ -231,7 +231,7 @@ test_new (Test *test, g_assert (test->account == NULL); test->account = tp_account_new (test->dbus, - "/org/freedesktop/Telepathy/Account/what/ev/er", NULL); + "/im/telepathy1/Account/what/ev/er", NULL); g_assert (test->account != NULL); } @@ -240,7 +240,7 @@ test_setters (Test *test, gconstpointer data G_GNUC_UNUSED) { test->account = tp_account_new (test->dbus, - "/org/freedesktop/Telepathy/Account/what/ev/er", NULL); + "/im/telepathy1/Account/what/ev/er", NULL); g_assert (test->account != NULL); tp_account_set_enabled_async (test->account, TRUE, tp_tests_result_ready_cb, @@ -474,9 +474,9 @@ test_storage (Test *test, g_main_loop_run (test->mainloop); g_assert_cmpstr (tp_account_get_storage_provider (test->account), ==, - "org.freedesktop.Telepathy.glib.test"); + "im.telepathy1.glib.test"); assert_strprop (test->account, "storage-provider", - "org.freedesktop.Telepathy.glib.test"); + "im.telepathy1.glib.test"); g_assert_cmpstr ( g_value_get_string (tp_account_get_storage_identifier (test->account)), ==, "unique-identifier"); @@ -722,11 +722,11 @@ main (int argc, g_test_add_data_func ("/account/parse/no-prefix", "/this/is/not/an/account/path", test_parse_failure); g_test_add_data_func ("/account/parse/too-few-components", - "/org/freedesktop/Telepathy/Account/wrong", test_parse_failure); + "/im/telepathy1/Account/wrong", test_parse_failure); g_test_add_data_func ("/account/parse/too-many-components", - "/org/freedesktop/Telepathy/Account/a/b/c/d", test_parse_failure); + "/im/telepathy1/Account/a/b/c/d", test_parse_failure); g_test_add_data_func ("/account/parse/illegal-components", - "/org/freedesktop/Telepathy/Account/1/2/3", test_parse_failure); + "/im/telepathy1/Account/1/2/3", test_parse_failure); g_test_add_data_func ("/account/parse/legal", test_parse_data_new ( diff --git a/tests/dbus/base-client.c b/tests/dbus/base-client.c index 18539a0b0..93674d62a 100644 --- a/tests/dbus/base-client.c +++ b/tests/dbus/base-client.c @@ -1495,7 +1495,7 @@ delegate_to_preferred_handler (Test *test, requests = g_ptr_array_new (); hints = tp_asv_new ( - "org.freedesktop.Telepathy.ChannelRequest.DelegateToPreferredHandler", + "im.telepathy1.ChannelRequest.DelegateToPreferredHandler", G_TYPE_BOOLEAN, TRUE, NULL); diff --git a/tests/dbus/call-example.c b/tests/dbus/call-example.c index df4117f8b..eb4692a5f 100644 --- a/tests/dbus/call-example.c +++ b/tests/dbus/call-example.c @@ -70,8 +70,8 @@ setup (Test *test, gchar *bus_name; gchar *object_path; GHashTable *parameters; - guint audio = TP_MEDIA_STREAM_TYPE_AUDIO; - guint video = TP_MEDIA_STREAM_TYPE_VIDEO; + guint audio = FUTURE_MEDIA_STREAM_TYPE_AUDIO; + guint video = FUTURE_MEDIA_STREAM_TYPE_VIDEO; guint not_a_media_type = 31337; GQuark conn_features[] = { TP_CONNECTION_FEATURE_CONNECTED, 0 }; @@ -383,7 +383,7 @@ assert_call_properties (GHashTable *get_all_return, static void assert_content_properties (GHashTable *get_all_return, - TpMediaStreamType type, + FutureMediaStreamType type, FutureCallContentDisposition disposition) { gboolean valid; @@ -425,7 +425,7 @@ loop_until_answered (Test *test) g_assert_no_error (test->error); if (tp_asv_get_uint32 (test->get_all_return, "CallState", - NULL) != FUTURE_CALL_STATE_RINGING) + NULL) != FUTURE_CALL_STATE_INITIALISED) return; } } @@ -510,7 +510,7 @@ test_basics (Test *test, g_main_loop_run (test->mainloop); g_assert_no_error (test->error); assert_content_properties (test->get_all_return, - TP_MEDIA_STREAM_TYPE_AUDIO, + FUTURE_MEDIA_STREAM_TYPE_AUDIO, FUTURE_CALL_CONTENT_DISPOSITION_INITIAL); stream_paths = tp_asv_get_boxed (test->get_all_return, "Streams", @@ -629,7 +629,7 @@ test_basics (Test *test, /* AddContent again, to add a video stream */ future_cli_channel_type_call_call_add_content (test->chan, -1, - "", TP_MEDIA_STREAM_TYPE_VIDEO, added_content_cb, + "", FUTURE_MEDIA_STREAM_TYPE_VIDEO, added_content_cb, test, NULL, NULL); g_main_loop_run (test->mainloop); g_assert_no_error (test->error); @@ -668,7 +668,7 @@ test_basics (Test *test, g_main_loop_run (test->mainloop); g_assert_no_error (test->error); assert_content_properties (test->get_all_return, - TP_MEDIA_STREAM_TYPE_VIDEO, + FUTURE_MEDIA_STREAM_TYPE_VIDEO, FUTURE_CALL_CONTENT_DISPOSITION_NONE); stream_paths = tp_asv_get_boxed (test->get_all_return, "Streams", @@ -789,7 +789,7 @@ test_no_answer (Test *test, g_assert_no_error (test->error); assert_call_properties (test->get_all_return, - FUTURE_CALL_STATE_RINGING, test->self_handle, + FUTURE_CALL_STATE_INITIALISED, test->self_handle, FUTURE_CALL_STATE_CHANGE_REASON_USER_REQUESTED, "", TRUE, 0, /* call flags */ TRUE, TRUE, FALSE); /* initial audio/video must be TRUE, FALSE */ @@ -990,7 +990,7 @@ test_incoming (Test *test, g_main_loop_run (test->mainloop); g_assert_no_error (test->error); assert_call_properties (test->get_all_return, - FUTURE_CALL_STATE_RINGING, test->peer_handle, + FUTURE_CALL_STATE_INITIALISED, test->peer_handle, FUTURE_CALL_STATE_CHANGE_REASON_USER_REQUESTED, "", TRUE, 0, /* call flags */ TRUE, TRUE, FALSE); /* initial audio/video must be TRUE, FALSE */ diff --git a/tests/dbus/client.c b/tests/dbus/client.c index 4b88ddae0..bf2ba3b5a 100644 --- a/tests/dbus/client.c +++ b/tests/dbus/client.c @@ -56,8 +56,8 @@ test_new (Test *test, { test->client = tp_tests_object_new_static_class (TP_TYPE_CLIENT, "dbus-daemon", test->dbus, - "object-path", "/org/freedesktop/Telepathy/Client/whatever", - "bus-name", "org.freedesktop.Telepathy.Client.whatever", + "object-path", "/im/telepathy1/Client/whatever", + "bus-name", "im.telepathy1.Client.whatever", NULL); g_assert (test->client != NULL); } diff --git a/tests/dbus/dbus-installed/services/spurious.service b/tests/dbus/dbus-installed/services/spurious.service index d0d70aa04..f7488c681 100644 --- a/tests/dbus/dbus-installed/services/spurious.service +++ b/tests/dbus/dbus-installed/services/spurious.service @@ -1,3 +1,3 @@ [D-BUS Service] -Name=org.freedesktop.Telepathy.ConnectionManager.spurious +Name=im.telepathy1.ConnectionManager.spurious Exec=/bin/false diff --git a/tests/dbus/dbus-uninstalled/services/spurious.service b/tests/dbus/dbus-uninstalled/services/spurious.service index d0d70aa04..f7488c681 100644 --- a/tests/dbus/dbus-uninstalled/services/spurious.service +++ b/tests/dbus/dbus-uninstalled/services/spurious.service @@ -1,3 +1,3 @@ [D-BUS Service] -Name=org.freedesktop.Telepathy.ConnectionManager.spurious +Name=im.telepathy1.ConnectionManager.spurious Exec=/bin/false diff --git a/tests/dbus/telepathy/managers/test_manager_file.manager b/tests/dbus/telepathy/managers/test_manager_file.manager index b1629d17a..a14ba70ce 100644 --- a/tests/dbus/telepathy/managers/test_manager_file.manager +++ b/tests/dbus/telepathy/managers/test_manager_file.manager @@ -11,8 +11,8 @@ param-server-list = as default-account = foo@default default-port = 1234 default-server-list = foo;bar; -Interfaces=org.freedesktop.Telepathy.Protocol.Interface.Avatars; -ConnectionInterfaces=org.freedesktop.Telepathy.Connection.Interface.Requests;org.freedesktop.Telepathy.Connection.Interface.Contacts; +Interfaces=im.telepathy1.Protocol.Interface.Avatars1; +ConnectionInterfaces=im.telepathy1.Connection.Interface.Requests;im.telepathy1.Connection.Interface.Contacts; RequestableChannelClasses=1-1-text; VCardField=x-telepathy-tests EnglishName=Regression tests @@ -27,9 +27,9 @@ MaximumAvatarWidth=96 MaximumAvatarBytes=37748736 [1-1-text] -org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Text -org.freedesktop.Telepathy.Channel.TargetHandleType u=1 -allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy.Channel.TargetID; +im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.Text +im.telepathy1.Channel.TargetHandleType u=1 +allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID; [Protocol bar] param-account = s required diff --git a/tests/lib/simple-account-manager.c b/tests/lib/simple-account-manager.c index e1d1611f2..ec93e3974 100644 --- a/tests/lib/simple-account-manager.c +++ b/tests/lib/simple-account-manager.c @@ -32,11 +32,11 @@ G_DEFINE_TYPE_WITH_CODE (TpTestsSimpleAccountManager, static const char *ACCOUNT_MANAGER_INTERFACES[] = { NULL }; static gchar *VALID_ACCOUNTS[] = { - "/org/freedesktop/Telepathy/Account/fakecm/fakeproto/validaccount", + "/im/telepathy1/Account/fakecm/fakeproto/validaccount", NULL }; static gchar *INVALID_ACCOUNTS[] = { - "/org/freedesktop/Telepathy/Account/fakecm/fakeproto/invalidaccount", + "/im/telepathy1/Account/fakecm/fakeproto/invalidaccount", NULL }; enum diff --git a/tests/lib/simple-account.c b/tests/lib/simple-account.c index ce08468fb..44da2be4f 100644 --- a/tests/lib/simple-account.c +++ b/tests/lib/simple-account.c @@ -165,7 +165,7 @@ tp_tests_simple_account_get_property (GObject *object, g_value_set_boolean (value, TRUE); break; case PROP_STORAGE_PROVIDER: - g_value_set_string (value, "org.freedesktop.Telepathy.glib.test"); + g_value_set_string (value, "im.telepathy1.glib.test"); break; case PROP_STORAGE_IDENTIFIER: g_value_set_boxed (value, &identifier); diff --git a/tools/manager-file.py b/tools/manager-file.py index 45f640403..a97a16601 100644 --- a/tools/manager-file.py +++ b/tools/manager-file.py @@ -88,8 +88,8 @@ gflags = { def write_manager(f, manager, protos): # pointless backwards compat section print >> f, '[ConnectionManager]' - print >> f, 'BusName=org.freedesktop.Telepathy.ConnectionManager.' + manager - print >> f, 'ObjectPath=/org/freedesktop/Telepathy/ConnectionManager/' + manager + print >> f, 'BusName=im.telepathy1.ConnectionManager.' + manager + print >> f, 'ObjectPath=/im/telepathy1/ConnectionManager/' + manager # protocols for proto, params in protos.iteritems(): |