Attachment 88711 Details for Bug 71262 – [tp-glib next 3/4] Replace im.telepathy1 with im.telepathy.v1

[patch] [tp-glib next 3/4] Replace im.telepathy1 with im.telepathy.v1

0003-Replace-im.telepathy1-with-im.telepathy.v1.patch (text/plain), 50.47 KB, created by Simon McVittie on 2013-11-05 16:04:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-11-05 16:04:12 UTC

Size: 50.47 KB

patch

obsolete

>From 6c9aeb3dec9223f7b0163217068400b73cef3fcb Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 5 Nov 2013 15:49:10 +0000
>Subject: [PATCH 3/4] Replace im.telepathy1 with im.telepathy.v1
>
>This also fixes a few uses of im.telepathy1 in object paths in Logger code,
>which was presumably a misuse of sed.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71262
>---
> data/Logger.Call.client.in                         |  12 +--
> data/Logger.Observer.client.in                     |   4 +-
> data/Logger.Recover.client.in                      |   2 +-
> data/Logger.Text.client.in                         |  12 +--
> data/Makefile.am                                   |   5 +-
> data/im.telepathy.v1.Client.Logger.service.in      |   3 +
> data/im.telepathy.v1.Logger.service.in             |   3 +
> data/im.telepathy1.Client.Logger.service.in        |   3 -
> data/im.telepathy1.Logger.service.in               |   3 -
> docs/templates/interface.html                      |   4 +-
> examples/cm/call/example_call.manager              |  18 ++--
> .../cm/contactlist/example_contact_list.manager    |  14 +--
> telepathy-glib/account-channel-request.c           |   4 +-
> telepathy-glib/base-client.c                       |   4 +-
> telepathy-glib/base-connection-manager.c           |   2 +-
> telepathy-glib/base-connection.c                   |   4 +-
> telepathy-glib/connection.c                        |   4 +-
> telepathy-glib/debug-sender.c                      |   2 +-
> telepathy-glib/errors.c                            | 108 ++++++++++-----------
> telepathy-glib/errors.h                            |   2 +-
> telepathy-glib/interfaces.c                        |   6 +-
> telepathy-glib/interfaces.h                        |  24 ++---
> telepathy-glib/presence-mixin.c                    |   2 +-
> telepathy-logger/dbus-service-internal.h           |   4 +-
> telepathy-logger/extensions/Logger.xml             |   2 +-
> telepathy-logger/observer-internal.h               |   4 +-
> telepathy-logger/observer.c                        |   8 +-
> tests/dbus/account-channel-request.c               |   2 +-
> tests/dbus/account-manager.c                       |   2 +-
> tests/dbus/account.c                               |  14 +--
> tests/dbus/base-client.c                           |   2 +-
> tests/dbus/client.c                                |   4 +-
> tests/dbus/dbus-1/services/spurious.service        |   2 +-
> .../telepathy-1/managers/test_manager_file.manager |  10 +-
> tests/lib/simple-account.c                         |   2 +-
> tests/logger/constants.h                           |   2 +-
> tests/logger/dbus/test-log-manager.c               |   4 +-
> .../user3@collabora.co.uk/20100113.call.log        |   2 +-
> .../user4@collabora.co.uk/20100113.call.log        |   4 +-
> .../user5@collabora.co.uk/20100113.call.log        |   2 +-
> tools/manager-file.py                              |   4 +-
> 41 files changed, 160 insertions(+), 159 deletions(-)
> create mode 100644 data/im.telepathy.v1.Client.Logger.service.in
> create mode 100644 data/im.telepathy.v1.Logger.service.in
> delete mode 100644 data/im.telepathy1.Client.Logger.service.in
> delete mode 100644 data/im.telepathy1.Logger.service.in
>
>diff --git a/data/Logger.Call.client.in b/data/Logger.Call.client.in
>index 0ae64b9..41be1d7 100644
>--- a/data/Logger.Call.client.in
>+++ b/data/Logger.Call.client.in
>@@ -1,8 +1,8 @@
>-[im.telepathy1.Client.Observer.ObserverChannelFilter 3]
>-im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.Call1
>-im.telepathy1.Channel.TargetHandleType u=1
>+[im.telepathy.v1.Client.Observer.ObserverChannelFilter 3]
>+im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Call1
>+im.telepathy.v1.Channel.TargetHandleType u=1
> 
>-[im.telepathy1.Client.Observer.ObserverChannelFilter 4]
>-im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.Call1
>-im.telepathy1.Channel.TargetHandleType u=2
>+[im.telepathy.v1.Client.Observer.ObserverChannelFilter 4]
>+im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Call1
>+im.telepathy.v1.Channel.TargetHandleType u=2
> 
>diff --git a/data/Logger.Observer.client.in b/data/Logger.Observer.client.in
>index a1c9dfa..4e86add 100644
>--- a/data/Logger.Observer.client.in
>+++ b/data/Logger.Observer.client.in
>@@ -1,3 +1,3 @@
>-[im.telepathy1.Client]
>-Interfaces=im.telepathy1.Client.Observer
>+[im.telepathy.v1.Client]
>+Interfaces=im.telepathy.v1.Client.Observer
> 
>diff --git a/data/Logger.Recover.client.in b/data/Logger.Recover.client.in
>index f18cd72..0fec86f 100644
>--- a/data/Logger.Recover.client.in
>+++ b/data/Logger.Recover.client.in
>@@ -1,2 +1,2 @@
>-[im.telepathy1.Client.Observer]
>+[im.telepathy.v1.Client.Observer]
> Recover=true
>diff --git a/data/Logger.Text.client.in b/data/Logger.Text.client.in
>index eae677c..82a1871 100644
>--- a/data/Logger.Text.client.in
>+++ b/data/Logger.Text.client.in
>@@ -1,8 +1,8 @@
>-[im.telepathy1.Client.Observer.ObserverChannelFilter 0]
>-im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.Text
>-im.telepathy1.Channel.TargetHandleType u=1
>+[im.telepathy.v1.Client.Observer.ObserverChannelFilter 0]
>+im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Text
>+im.telepathy.v1.Channel.TargetHandleType u=1
> 
>-[im.telepathy1.Client.Observer.ObserverChannelFilter 1]
>-im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.Text
>-im.telepathy1.Channel.TargetHandleType u=2
>+[im.telepathy.v1.Client.Observer.ObserverChannelFilter 1]
>+im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Text
>+im.telepathy.v1.Channel.TargetHandleType u=2
> 
>diff --git a/data/Makefile.am b/data/Makefile.am
>index 92533b6..a675e9a 100644
>--- a/data/Makefile.am
>+++ b/data/Makefile.am
>@@ -9,8 +9,9 @@ gsettings_SCHEMAS = $(gsettings_files:.xml.in=.xml)
> 
> servicefiledir = $(datadir)/dbus-1/services
> servicefile_in_files = \
>-	im.telepathy1.Client.Logger.service.in	\
>-	im.telepathy1.Logger.service.in
>+	im.telepathy.v1.Client.Logger.service.in \
>+	im.telepathy.v1.Logger.service.in \
>+	$(NULL)
> servicefile_DATA = $(servicefile_in_files:.service.in=.service)
> %.service: %.service.in Makefile
> 	$(AM_V_GEN)sed -e "s|[@]libexecdir[@]|$(libexecdir)|" $< > $@
>diff --git a/data/im.telepathy.v1.Client.Logger.service.in b/data/im.telepathy.v1.Client.Logger.service.in
>new file mode 100644
>index 0000000..d225222
>--- /dev/null
>+++ b/data/im.telepathy.v1.Client.Logger.service.in
>@@ -0,0 +1,3 @@
>+[D-BUS Service]
>+Name=im.telepathy.v1.Client.Logger
>+Exec=@libexecdir@/telepathy-logger
>diff --git a/data/im.telepathy.v1.Logger.service.in b/data/im.telepathy.v1.Logger.service.in
>new file mode 100644
>index 0000000..88cb02a
>--- /dev/null
>+++ b/data/im.telepathy.v1.Logger.service.in
>@@ -0,0 +1,3 @@
>+[D-BUS Service]
>+Name=im.telepathy.v1.Logger
>+Exec=@libexecdir@/telepathy-logger
>diff --git a/data/im.telepathy1.Client.Logger.service.in b/data/im.telepathy1.Client.Logger.service.in
>deleted file mode 100644
>index cf6f348..0000000
>--- a/data/im.telepathy1.Client.Logger.service.in
>+++ /dev/null
>@@ -1,3 +0,0 @@
>-[D-BUS Service]
>-Name=im.telepathy1.Client.Logger
>-Exec=@libexecdir@/telepathy-logger
>diff --git a/data/im.telepathy1.Logger.service.in b/data/im.telepathy1.Logger.service.in
>deleted file mode 100644
>index 118e00d..0000000
>--- a/data/im.telepathy1.Logger.service.in
>+++ /dev/null
>@@ -1,3 +0,0 @@
>-[D-BUS Service]
>-Name=im.telepathy1.Logger
>-Exec=@libexecdir@/telepathy-logger
>diff --git a/docs/templates/interface.html b/docs/templates/interface.html
>index 42ad0ce..94aee69 100644
>--- a/docs/templates/interface.html
>+++ b/docs/templates/interface.html
>@@ -326,7 +326,7 @@
>     <a name="tpproperties"></a>
>     <h1>Telepathy Properties</h1>
>     <div>
>-     Accessed using the im.telepathy1.Properties interface.
>+     Accessed using the im.telepathy.v1.Properties interface.
>     </div>
>     #for $property in $interface.tpproperties
>     <div class="inset tpproperty">
>@@ -351,7 +351,7 @@
>     <h1>Contact Attributes</h1>
>     <div>
>       Attributes that a contact can have, accessed with the
>-      im.telepathy1.Connection.Interface.Contacts interface.
>+      im.telepathy.v1.Connection.Interface.Contacts interface.
>     </div>
>     #for $token in $interface.contact_attributes
>     <div class="inset contact-attribute">
>diff --git a/examples/cm/call/example_call.manager b/examples/cm/call/example_call.manager
>index e1acc0e..e5c0000 100644
>--- a/examples/cm/call/example_call.manager
>+++ b/examples/cm/call/example_call.manager
>@@ -3,7 +3,7 @@ Interfaces=
> 
> [Protocol example]
> Interfaces=
>-ConnectionInterfaces=im.telepathy1.Connection.Interface.Requests;im.telepathy1.Connection.Interface.Contacts;im.telepathy1.Connection.Interface.Presence;
>+ConnectionInterfaces=im.telepathy.v1.Connection.Interface.Requests;im.telepathy.v1.Connection.Interface.Contacts;im.telepathy.v1.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]
>-im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.Call1
>-im.telepathy1.Channel.TargetHandleType u=1
>-im.telepathy1.Channel.Type.Call1.InitialAudio b=1
>-allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID;im.telepathy1.Channel.Type.Call1.InitialVideo;
>+im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Call1
>+im.telepathy.v1.Channel.TargetHandleType u=1
>+im.telepathy.v1.Channel.Type.Call1.InitialAudio b=1
>+allowed=im.telepathy.v1.Channel.TargetHandle;im.telepathy.v1.Channel.TargetID;im.telepathy.v1.Channel.Type.Call1.InitialVideo;
> 
> [video]
>-im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.Call1
>-im.telepathy1.Channel.TargetHandleType u=1
>-im.telepathy1.Channel.Type.Call1.InitialVideo b=1
>-allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID;im.telepathy1.Channel.Type.Call1.InitialAudio;
>+im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Call1
>+im.telepathy.v1.Channel.TargetHandleType u=1
>+im.telepathy.v1.Channel.Type.Call1.InitialVideo b=1
>+allowed=im.telepathy.v1.Channel.TargetHandle;im.telepathy.v1.Channel.TargetID;im.telepathy.v1.Channel.Type.Call1.InitialAudio;
>diff --git a/examples/cm/contactlist/example_contact_list.manager b/examples/cm/contactlist/example_contact_list.manager
>index e5216af..121fc37 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=im.telepathy1.Connection.Interface.Requests;im.telepathy1.Connection.Interface.Contacts;im.telepathy1.Connection.Interface.Presence;
>+ConnectionInterfaces=im.telepathy.v1.Connection.Interface.Requests;im.telepathy.v1.Connection.Interface.Contacts;im.telepathy.v1.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]
>-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;
>+im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.ContactList
>+im.telepathy.v1.Channel.TargetHandleType u=3
>+allowed=im.telepathy.v1.Channel.TargetHandle;im.telepathy.v1.Channel.TargetID;
> 
> [contactgroup]
>-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;
>+im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.ContactList
>+im.telepathy.v1.Channel.TargetHandleType u=4
>+allowed=im.telepathy.v1.Channel.TargetHandle;im.telepathy.v1.Channel.TargetID;
>diff --git a/telepathy-glib/account-channel-request.c b/telepathy-glib/account-channel-request.c
>index 546aafd..379bd9c 100644
>--- a/telepathy-glib/account-channel-request.c
>+++ b/telepathy-glib/account-channel-request.c
>@@ -1541,7 +1541,7 @@ tp_account_channel_request_set_delegate_to_preferred_handler (
>   g_return_if_fail (!self->priv->requested);
> 
>   tp_asv_set_boolean (self->priv->hints,
>-      "im.telepathy1.ChannelRequest.DelegateToPreferredHandler",
>+      "im.telepathy.v1.ChannelRequest.DelegateToPreferredHandler",
>       delegate);
> }
> 
>@@ -1554,7 +1554,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 im.telepathy1.ChannelRequest.DelegateToPreferredHandler
>+ * the im.telepathy.v1.ChannelRequest.DelegateToPreferredHandler
>  * hint.
>  *
>  * When receiving a request containing this hint, @self will automatically
>diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c
>index d34388c..a543319 100644
>--- a/telepathy-glib/base-client.c
>+++ b/telepathy-glib/base-client.c
>@@ -2082,7 +2082,7 @@ delegate_channels_if_needed (TpBaseClient *self,
>         continue;
> 
>       should_delegate = tp_asv_get_boolean (hints,
>-          "im.telepathy1.ChannelRequest.DelegateToPreferredHandler",
>+          "im.telepathy.v1.ChannelRequest.DelegateToPreferredHandler",
>           NULL);
> 
>       if (!should_delegate)
>@@ -2980,7 +2980,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 im.telepathy1.ChannelRequest.DelegateToPreferredHandler
>+ * the im.telepathy.v1.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 1b8998b..b68d442 100644
>--- a/telepathy-glib/base-connection-manager.c
>+++ b/telepathy-glib/base-connection-manager.c
>@@ -728,7 +728,7 @@ tp_cm_param_setter_offset (const TpCMParamSpec *paramspec,
>  * tp_base_connection_manager_request_connection
>  *
>  * Implements D-Bus method RequestConnection
>- * on interface im.telepathy1.ConnectionManager
>+ * on interface im.telepathy.v1.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/base-connection.c b/telepathy-glib/base-connection.c
>index 66fe68d..006be9c 100644
>--- a/telepathy-glib/base-connection.c
>+++ b/telepathy-glib/base-connection.c
>@@ -1276,7 +1276,7 @@ tp_base_connection_class_init (TpBaseConnectionClass *klass)
>    * The "signal detail" is a GQuark representing @token. Modules implementing
>    * an interface (Location, say) should typically connect to a detailed signal
>    * like
>-   * "clients-interested::im.telepathy1.Connection.Interface.Location"
>+   * "clients-interested::im.telepathy.v1.Connection.Interface.Location"
>    * rather than receiving all emissions of this signal.
>    */
>   signals[CLIENTS_INTERESTED] =
>@@ -1300,7 +1300,7 @@ tp_base_connection_class_init (TpBaseConnectionClass *klass)
>    * As with #TpBaseConnection::clients-interested, the "signal detail" is a
>    * GQuark representing @token. Modules implementing an interface (Location,
>    * say) should typically connect to a detailed signal like
>-   * "clients-uninterested::im.telepathy1.Connection.Interface.Location"
>+   * "clients-uninterested::im.telepathy.v1.Connection.Interface.Location"
>    * rather than receiving all emissions of this signal.
>    */
>   signals[CLIENTS_UNINTERESTED] =
>diff --git a/telepathy-glib/connection.c b/telepathy-glib/connection.c
>index a63798b..4e362c5 100644
>--- a/telepathy-glib/connection.c
>+++ b/telepathy-glib/connection.c
>@@ -2212,8 +2212,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:
>-   * /im/telepathy1/Connection/cmname/proto/account
>-   * im.telepathy1.Connection.cmname.proto.account
>+   * /im/telepathy/v1/Connection/cmname/proto/account
>+   * im.telepathy.v1.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 e404799..7cbc053 100644
>--- a/telepathy-glib/debug-sender.c
>+++ b/telepathy-glib/debug-sender.c
>@@ -36,7 +36,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
>- * /im/telepathy1/debug. Once the object exists and has the object
>+ * /im/telepathy/v1/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.
>  *
>diff --git a/telepathy-glib/errors.c b/telepathy-glib/errors.c
>index 23ca70c..198b864 100644
>--- a/telepathy-glib/errors.c
>+++ b/telepathy-glib/errors.c
>@@ -61,193 +61,193 @@
> 
> /**
>  * TpError:
>- * @TP_ERROR_NETWORK_ERROR: im.telepathy1.Error.NetworkError:
>+ * @TP_ERROR_NETWORK_ERROR: im.telepathy.v1.Error.NetworkError:
>  *     Raised when there is an error reading from or writing to the network.
>- * @TP_ERROR_NOT_IMPLEMENTED: im.telepathy1.Error.NotImplemented:
>+ * @TP_ERROR_NOT_IMPLEMENTED: im.telepathy.v1.Error.NotImplemented:
>  *     Raised when the requested method, channel, etc is not available on this
>  *     connection.
>- * @TP_ERROR_INVALID_ARGUMENT: im.telepathy1.Error.InvalidArgument:
>+ * @TP_ERROR_INVALID_ARGUMENT: im.telepathy.v1.Error.InvalidArgument:
>  *     Raised when one of the provided arguments is invalid.
>- * @TP_ERROR_NOT_AVAILABLE: im.telepathy1.Error.NotAvailable:
>+ * @TP_ERROR_NOT_AVAILABLE: im.telepathy.v1.Error.NotAvailable:
>  *     Raised when the requested functionality is temporarily unavailable.
>- * @TP_ERROR_PERMISSION_DENIED: im.telepathy1.Error.PermissionDenied:
>+ * @TP_ERROR_PERMISSION_DENIED: im.telepathy.v1.Error.PermissionDenied:
>  *     The user is not permitted to perform the requested operation.
>- * @TP_ERROR_DISCONNECTED: im.telepathy1.Error.Disconnected:
>+ * @TP_ERROR_DISCONNECTED: im.telepathy.v1.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: im.telepathy1.Error.InvalidHandle:
>+ * @TP_ERROR_INVALID_HANDLE: im.telepathy.v1.Error.InvalidHandle:
>  *     An identifier being converted to a handle was syntactically invalid,
>  *     or an invalid handle was used.
>- * @TP_ERROR_CHANNEL_BANNED: im.telepathy1.Error.Channel.Banned:
>+ * @TP_ERROR_CHANNEL_BANNED: im.telepathy.v1.Error.Channel.Banned:
>  *     You are banned from the channel.
>- * @TP_ERROR_CHANNEL_FULL: im.telepathy1.Error.Channel.Full:
>+ * @TP_ERROR_CHANNEL_FULL: im.telepathy.v1.Error.Channel.Full:
>  *     The channel is full.
>- * @TP_ERROR_CHANNEL_INVITE_ONLY: im.telepathy1.Error.Channel.InviteOnly:
>+ * @TP_ERROR_CHANNEL_INVITE_ONLY: im.telepathy.v1.Error.Channel.InviteOnly:
>  *     The requested channel is invite-only.
>- * @TP_ERROR_NOT_YOURS: im.telepathy1.Error.NotYours:
>+ * @TP_ERROR_NOT_YOURS: im.telepathy.v1.Error.NotYours:
>  *     The requested channel or other resource already exists, and another
>  *     client is responsible for it
>- * @TP_ERROR_CANCELLED: im.telepathy1.Error.Cancelled:
>+ * @TP_ERROR_CANCELLED: im.telepathy.v1.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: im.telepathy1.Error.AuthenticationFailed:
>+ * @TP_ERROR_AUTHENTICATION_FAILED: im.telepathy.v1.Error.AuthenticationFailed:
>  *     Raised when authentication with a service was unsuccessful.
>- * @TP_ERROR_ENCRYPTION_NOT_AVAILABLE: im.telepathy1.Error.EncryptionNotAvailable:
>+ * @TP_ERROR_ENCRYPTION_NOT_AVAILABLE: im.telepathy.v1.Error.EncryptionNotAvailable:
>  *     Raised if a user request insisted that encryption should be used,
>  *     but encryption was not actually available.
>- * @TP_ERROR_ENCRYPTION_ERROR: im.telepathy1.Error.EncryptionError:
>+ * @TP_ERROR_ENCRYPTION_ERROR: im.telepathy.v1.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: im.telepathy1.Error.Cert.NotProvided:
>+ * @TP_ERROR_CERT_NOT_PROVIDED: im.telepathy.v1.Error.Cert.NotProvided:
>  *     Raised if the server did not provide a SSL/TLS certificate.
>- * @TP_ERROR_CERT_UNTRUSTED: im.telepathy1.Error.Cert.Untrusted:
>+ * @TP_ERROR_CERT_UNTRUSTED: im.telepathy.v1.Error.Cert.Untrusted:
>  *     Raised if the server provided a SSL/TLS certificate signed by an
>  *     untrusted certifying authority.
>- * @TP_ERROR_CERT_EXPIRED: im.telepathy1.Error.Cert.Expired:
>+ * @TP_ERROR_CERT_EXPIRED: im.telepathy.v1.Error.Cert.Expired:
>  *     Raised if the server provided an expired SSL/TLS certificate.
>- * @TP_ERROR_CERT_NOT_ACTIVATED: im.telepathy1.Error.Cert.NotActivated:
>+ * @TP_ERROR_CERT_NOT_ACTIVATED: im.telepathy.v1.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: im.telepathy1.Error.Cert.FingerprintMismatch:
>+ * @TP_ERROR_CERT_FINGERPRINT_MISMATCH: im.telepathy.v1.Error.Cert.FingerprintMismatch:
>  *     Raised if the server provided an SSL/TLS certificate that did not have
>  *     the expected fingerprint.
>- * @TP_ERROR_CERT_HOSTNAME_MISMATCH: im.telepathy1.Error.Cert.HostnameMismatch:
>+ * @TP_ERROR_CERT_HOSTNAME_MISMATCH: im.telepathy.v1.Error.Cert.HostnameMismatch:
>  *     Raised if the server provided an SSL/TLS certificate that did not
>  *     match its hostname.
>- * @TP_ERROR_CERT_SELF_SIGNED: im.telepathy1.Error.Cert.SelfSigned:
>+ * @TP_ERROR_CERT_SELF_SIGNED: im.telepathy.v1.Error.Cert.SelfSigned:
>  *     Raised if the server provided an SSL/TLS certificate that is
>  *     self-signed and untrusted.
>- * @TP_ERROR_CERT_INVALID: im.telepathy1.Error.Cert.Invalid:
>+ * @TP_ERROR_CERT_INVALID: im.telepathy.v1.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: im.telepathy1.Error.NotCapable:
>+ * @TP_ERROR_NOT_CAPABLE: im.telepathy.v1.Error.NotCapable:
>  *     Raised when requested functionality is unavailable due to a contact
>  *     not having the required capabilities.
>- * @TP_ERROR_OFFLINE: im.telepathy1.Error.Offline:
>+ * @TP_ERROR_OFFLINE: im.telepathy.v1.Error.Offline:
>  *     Raised when requested functionality is unavailable because a contact is
>  *     offline.
>- * @TP_ERROR_CHANNEL_KICKED: im.telepathy1.Error.Channel.Kicked:
>+ * @TP_ERROR_CHANNEL_KICKED: im.telepathy.v1.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: im.telepathy1.Error.Busy:
>+ * @TP_ERROR_BUSY: im.telepathy.v1.Error.Busy:
>  *     Used to represent a user being removed from a channel because of a
>  *     "busy" indication.
>- * @TP_ERROR_NO_ANSWER: im.telepathy1.Error.NoAnswer:
>+ * @TP_ERROR_NO_ANSWER: im.telepathy.v1.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: im.telepathy1.Error.DoesNotExist:
>+ * @TP_ERROR_DOES_NOT_EXIST: im.telepathy.v1.Error.DoesNotExist:
>  *     Raised when the requested user does not, in fact, exist.
>- * @TP_ERROR_TERMINATED: im.telepathy1.Error.Terminated:
>+ * @TP_ERROR_TERMINATED: im.telepathy.v1.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: im.telepathy1.Error.ConnectionRefused:
>+ * @TP_ERROR_CONNECTION_REFUSED: im.telepathy.v1.Error.ConnectionRefused:
>  *     Raised when a connection is refused.
>- * @TP_ERROR_CONNECTION_FAILED: im.telepathy1.Error.ConnectionFailed:
>+ * @TP_ERROR_CONNECTION_FAILED: im.telepathy.v1.Error.ConnectionFailed:
>  *     Raised when a connection can't be established.
>- * @TP_ERROR_CONNECTION_LOST: im.telepathy1.Error.ConnectionLost:
>+ * @TP_ERROR_CONNECTION_LOST: im.telepathy.v1.Error.ConnectionLost:
>  *     Raised when a connection is broken.
>- * @TP_ERROR_ALREADY_CONNECTED: im.telepathy1.Error.AlreadyConnected:
>+ * @TP_ERROR_ALREADY_CONNECTED: im.telepathy.v1.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: im.telepathy1.Error.ConnectionReplaced:
>+ * @TP_ERROR_CONNECTION_REPLACED: im.telepathy.v1.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: im.telepathy1.Error.RegistrationExists:
>+ * @TP_ERROR_REGISTRATION_EXISTS: im.telepathy.v1.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: im.telepathy1.Error.ServiceBusy:
>+ * @TP_ERROR_SERVICE_BUSY: im.telepathy.v1.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: im.telepathy1.Error.ResourceUnavailable:
>+ * @TP_ERROR_RESOURCE_UNAVAILABLE: im.telepathy.v1.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: im.telepathy1.Error.WouldBreakAnonymity:
>+ * @TP_ERROR_WOULD_BREAK_ANONYMITY: im.telepathy.v1.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: im.telepathy1.Error.Cert.Revoked:
>+ * @TP_ERROR_CERT_REVOKED: im.telepathy.v1.Error.Cert.Revoked:
>  *     Raised if the server provided an SSL/TLS certificate that has been
>  *     revoked.
>  *     Since 0.11.12
>- * @TP_ERROR_CERT_INSECURE: im.telepathy1.Error.Cert.Insecure:
>+ * @TP_ERROR_CERT_INSECURE: im.telepathy.v1.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: im.telepathy1.Error.Cert.LimitExceeded:
>+ * @TP_ERROR_CERT_LIMIT_EXCEEDED: im.telepathy.v1.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: im.telepathy1.Error.NotYet:
>+ * @TP_ERROR_NOT_YET: im.telepathy.v1.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: im.telepathy1.Error.Rejected:
>+ * @TP_ERROR_REJECTED: im.telepathy.v1.Error.Rejected:
>  *     Raised when an incoming or outgoing call is rejected by the receiving
>  *     contact.
>  *     Since 0.13.2
>- * @TP_ERROR_PICKED_UP_ELSEWHERE: im.telepathy1.Error.PickedUpElsewhere:
>+ * @TP_ERROR_PICKED_UP_ELSEWHERE: im.telepathy.v1.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: im.telepathy1.Error.Confused:
>+ * @TP_ERROR_CONFUSED: im.telepathy.v1.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: im.telepathy1.Error.ServiceConfused:
>+ * @TP_ERROR_SERVICE_CONFUSED: im.telepathy.v1.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:
>- *   im.telepathy1.Error.EmergencyCallsNotSupported:
>+ *   im.telepathy.v1.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:
>- *   im.telepathy1.Error.SoftwareUpgradeRequired:
>+ *   im.telepathy.v1.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>im.telepathy1.Error.InsufficientBalance</code>:
>+ *   <code>im.telepathy.v1.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>im.telepathy1.Error.Media.CodecsIncompatible</code>:
>+ *   <code>im.telepathy.v1.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>im.telepathy1.Error.Media.UnsupportedType</code>:
>+ *   <code>im.telepathy.v1.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>im.telepathy1.Error.Media.StreamingError</code>:
>+ *   <code>im.telepathy.v1.Error.Media.StreamingError</code>:
>  *     Raised when the call's streaming implementation has some kind of internal
>  *     error.
>  *     Since 0.15.6
>  * @TP_ERROR_CAPTCHA_NOT_SUPPORTED:
>- *   <code>im.telepathy1.Error.Media.CaptchaNotSupported</code>:
>+ *   <code>im.telepathy.v1.Error.Media.CaptchaNotSupported</code>:
>  *     Raised if no UI is available to present captchas, or if one is
>  *     available but it is unable to answer any of the captchas given.
>  *
>diff --git a/telepathy-glib/errors.h b/telepathy-glib/errors.h
>index 522b0e4..01f5d46 100644
>--- a/telepathy-glib/errors.h
>+++ b/telepathy-glib/errors.h
>@@ -36,7 +36,7 @@ G_BEGIN_DECLS
> 
> GQuark tp_error_quark (void);
> 
>-#define TP_ERROR_PREFIX "im.telepathy1.Error"
>+#define TP_ERROR_PREFIX "im.telepathy.v1.Error"
> 
> #define TP_ERROR (tp_error_quark ())
> 
>diff --git a/telepathy-glib/interfaces.c b/telepathy-glib/interfaces.c
>index be5d8aa..4a2a7a4 100644
>--- a/telepathy-glib/interfaces.c
>+++ b/telepathy-glib/interfaces.c
>@@ -44,15 +44,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>im.telepathy1.Channel.Interface.Group.GroupFlags</literal>.
>+ * <literal>im.telepathy.v1.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
>- * "im.telepathy1.Connection.Interface.Aliasing/alias",
>+ * "im.telepathy.v1.Connection.Interface.Aliasing/alias",
>  * and defines like
>  * %TP_TOKEN_CHANNEL_INTERFACE_MEDIA_SIGNALLING_ICE_UDP
>  * for handler capability tokens like
>- * "im.telepathy1.Channel.Interface.MediaSignalling/gtalk-p2p".
>+ * "im.telepathy.v1.Channel.Interface.MediaSignalling/gtalk-p2p".
>  * (These were present in an incorrect form since 0.11.3.)
>  */
> 
>diff --git a/telepathy-glib/interfaces.h b/telepathy-glib/interfaces.h
>index b895318..bbfff6e 100644
>--- a/telepathy-glib/interfaces.h
>+++ b/telepathy-glib/interfaces.h
>@@ -9,18 +9,18 @@
> 
> G_BEGIN_DECLS
> 
>-#define TP_CM_BUS_NAME_BASE    "im.telepathy1.ConnectionManager."
>-#define TP_CM_OBJECT_PATH_BASE "/im/telepathy1/ConnectionManager/"
>-#define TP_CONN_BUS_NAME_BASE "im.telepathy1.Connection."
>-#define TP_CONN_OBJECT_PATH_BASE "/im/telepathy1/Connection/"
>-#define TP_ACCOUNT_MANAGER_BUS_NAME "im.telepathy1.AccountManager"
>-#define TP_ACCOUNT_MANAGER_OBJECT_PATH "/im/telepathy1/AccountManager"
>-#define TP_ACCOUNT_OBJECT_PATH_BASE "/im/telepathy1/Account/"
>-#define TP_CHANNEL_DISPATCHER_BUS_NAME "im.telepathy1.ChannelDispatcher"
>-#define TP_CHANNEL_DISPATCHER_OBJECT_PATH "/im/telepathy1/ChannelDispatcher"
>-#define TP_CLIENT_BUS_NAME_BASE "im.telepathy1.Client."
>-#define TP_CLIENT_OBJECT_PATH_BASE "/im/telepathy1/Client/"
>-#define TP_DEBUG_OBJECT_PATH "/im/telepathy1/debug"
>+#define TP_CM_BUS_NAME_BASE    "im.telepathy.v1.ConnectionManager."
>+#define TP_CM_OBJECT_PATH_BASE "/im/telepathy/v1/ConnectionManager/"
>+#define TP_CONN_BUS_NAME_BASE "im.telepathy.v1.Connection."
>+#define TP_CONN_OBJECT_PATH_BASE "/im/telepathy/v1/Connection/"
>+#define TP_ACCOUNT_MANAGER_BUS_NAME "im.telepathy.v1.AccountManager"
>+#define TP_ACCOUNT_MANAGER_OBJECT_PATH "/im/telepathy/v1/AccountManager"
>+#define TP_ACCOUNT_OBJECT_PATH_BASE "/im/telepathy/v1/Account/"
>+#define TP_CHANNEL_DISPATCHER_BUS_NAME "im.telepathy.v1.ChannelDispatcher"
>+#define TP_CHANNEL_DISPATCHER_OBJECT_PATH "/im/telepathy/v1/ChannelDispatcher"
>+#define TP_CLIENT_BUS_NAME_BASE "im.telepathy.v1.Client."
>+#define TP_CLIENT_OBJECT_PATH_BASE "/im/telepathy/v1/Client/"
>+#define TP_DEBUG_OBJECT_PATH "/im/telepathy/v1/debug"
> 
> #include <telepathy-glib/_gen/telepathy-interfaces.h>
> 
>diff --git a/telepathy-glib/presence-mixin.c b/telepathy-glib/presence-mixin.c
>index c4f57c7..44e57eb 100644
>--- a/telepathy-glib/presence-mixin.c
>+++ b/telepathy-glib/presence-mixin.c
>@@ -744,7 +744,7 @@ tp_presence_mixin_init_dbus_properties (GObjectClass *cls)
>  * tp_presence_mixin_set_presence:
>  *
>  * Implements D-Bus method SetPresence
>- * on interface im.telepathy1.Connection.Interface.Presence
>+ * on interface im.telepathy.v1.Connection.Interface.Presence
>  *
>  * @context: The D-Bus invocation context to use to return values
>  *           or throw an error.
>diff --git a/telepathy-logger/dbus-service-internal.h b/telepathy-logger/dbus-service-internal.h
>index b2dc657..b588b41 100644
>--- a/telepathy-logger/dbus-service-internal.h
>+++ b/telepathy-logger/dbus-service-internal.h
>@@ -27,9 +27,9 @@
> #include <telepathy-logger/log-manager.h>
> 
> #define TPL_DBUS_SRV_WELL_KNOWN_BUS_NAME \
>-  "im.telepathy1.Logger"
>+  "im.telepathy.v1.Logger"
> #define TPL_DBUS_SRV_OBJECT_PATH \
>-  "/im.telepathy1/Logger"
>+  "/im/telepathy/v1/Logger"
> 
> G_BEGIN_DECLS
> 
>diff --git a/telepathy-logger/extensions/Logger.xml b/telepathy-logger/extensions/Logger.xml
>index fcfd36d..9c3afdf 100644
>--- a/telepathy-logger/extensions/Logger.xml
>+++ b/telepathy-logger/extensions/Logger.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="im.telepathy1.Logger1"
>+  <interface name="im.telepathy.v1.Logger1"
>     tp:causes-havoc="experimental">
>     <tp:added version="0.3">(as a draft)</tp:added>
> 
>diff --git a/telepathy-logger/observer-internal.h b/telepathy-logger/observer-internal.h
>index a0f1acf..545badc 100644
>--- a/telepathy-logger/observer-internal.h
>+++ b/telepathy-logger/observer-internal.h
>@@ -26,9 +26,9 @@
> #include <telepathy-glib/telepathy-glib.h>
> 
> #define TPL_OBSERVER_WELL_KNOWN_BUS_NAME \
>-  "im.telepathy1.Client.Logger"
>+  "im.telepathy.v1.Client.Logger"
> #define TPL_OBSERVER_OBJECT_PATH \
>-  "/im.telepathy1/Client/Logger"
>+  "/im/telepathy/v1/Client/Logger"
> 
> 
> G_BEGIN_DECLS
>diff --git a/telepathy-logger/observer.c b/telepathy-logger/observer.c
>index 7307ffb..e7f83fd 100644
>--- a/telepathy-logger/observer.c
>+++ b/telepathy-logger/observer.c
>@@ -41,7 +41,7 @@
>  * @see_also: #TpSvcClientObserver
>  *
>  * The Telepathy Logger's Observer implements
>- * im.telepathy1.Client.Observer DBus interface and is called by
>+ * im.telepathy.v1.Client.Observer DBus interface and is called by
>  * the Channel Dispatcher when a new channel is created, in order to log
>  * received signals.
>  *
>@@ -52,7 +52,7 @@
>  * TplObserver:
>  *
>  * The Telepathy Logger's Observer implements
>- * im.telepathy1.Client.Observer DBus interface and is called by
>+ * im.telepathy.v1.Client.Observer DBus interface and is called by
>  * the Channel Dispatcher when a new channel is created, in order to log
>  * received signals using its #LogManager.
>  *
>@@ -243,7 +243,7 @@ _tpl_observer_init (TplObserver *self)
>   tp_base_client_take_observer_filter (TP_BASE_CLIENT (self),
>       tp_asv_new (
>        TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
>-           "im.telepathy1.Channel.Type.Call1",
>+           "im.telepathy.v1.Channel.Type.Call1",
>        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
>            TP_HANDLE_TYPE_CONTACT,
>       NULL));
>@@ -252,7 +252,7 @@ _tpl_observer_init (TplObserver *self)
>   tp_base_client_take_observer_filter (TP_BASE_CLIENT (self),
>       tp_asv_new (
>        TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
>-           "im.telepathy1.Channel.Type.Call1",
>+           "im.telepathy.v1.Channel.Type.Call1",
>        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
>            TP_HANDLE_TYPE_ROOM,
>       NULL));
>diff --git a/tests/dbus/account-channel-request.c b/tests/dbus/account-channel-request.c
>index aae03a7..87c5572 100644
>--- a/tests/dbus/account-channel-request.c
>+++ b/tests/dbus/account-channel-request.c
>@@ -757,7 +757,7 @@ test_handle_delegated (Test *test,
>   requests = g_ptr_array_new ();
> 
>   hints = tp_asv_new (
>-      "im.telepathy1.ChannelRequest.DelegateToPreferredHandler",
>+      "im.telepathy.v1.ChannelRequest.DelegateToPreferredHandler",
>         G_TYPE_BOOLEAN, TRUE,
>       NULL);
> 
>diff --git a/tests/dbus/account-manager.c b/tests/dbus/account-manager.c
>index 40949d0..74342d5 100644
>--- a/tests/dbus/account-manager.c
>+++ b/tests/dbus/account-manager.c
>@@ -318,7 +318,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], !=, "im.telepathy1.MissionControl5");
>+      g_assert_cmpstr (names[i], !=, "im.telepathy.v1.MissionControl5");
>     }
> 
>   script_continue (user_data);
>diff --git a/tests/dbus/account.c b/tests/dbus/account.c
>index e372e3c..dd7175d 100644
>--- a/tests/dbus/account.c
>+++ b/tests/dbus/account.c
>@@ -246,7 +246,7 @@ test_new (Test *test,
>   g_assert (test->account == NULL);
> 
>   test->account = tp_tests_account_new (test->dbus,
>-      "/im/telepathy1/Account/what/ev/er", NULL);
>+      "/im/telepathy/v1/Account/what/ev/er", NULL);
>   g_assert (test->account != NULL);
> }
> 
>@@ -255,7 +255,7 @@ test_setters (Test *test,
>     gconstpointer data G_GNUC_UNUSED)
> {
>   test->account = tp_tests_account_new (test->dbus,
>-      "/im/telepathy1/Account/what/ev/er", NULL);
>+      "/im/telepathy/v1/Account/what/ev/er", NULL);
>   g_assert (test->account != NULL);
> 
>   tp_account_set_enabled_async (test->account, TRUE, tp_tests_result_ready_cb,
>@@ -550,9 +550,9 @@ test_storage (Test *test,
>   g_main_loop_run (test->mainloop);
> 
>   g_assert_cmpstr (tp_account_get_storage_provider (test->account), ==,
>-      "im.telepathy1.glib.test");
>+      "im.telepathy.v1.glib.test");
>   assert_strprop (test->account, "storage-provider",
>-      "im.telepathy1.glib.test");
>+      "im.telepathy.v1.glib.test");
> 
>   g_assert_cmpstr (
>       g_value_get_string (tp_account_get_storage_identifier (test->account)),
>@@ -939,11 +939,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",
>-      "/im/telepathy1/Account/wrong", test_parse_failure);
>+      "/im/telepathy/v1/Account/wrong", test_parse_failure);
>   g_test_add_data_func ("/account/parse/too-many-components",
>-      "/im/telepathy1/Account/a/b/c/d", test_parse_failure);
>+      "/im/telepathy/v1/Account/a/b/c/d", test_parse_failure);
>   g_test_add_data_func ("/account/parse/illegal-components",
>-      "/im/telepathy1/Account/1/2/3", test_parse_failure);
>+      "/im/telepathy/v1/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 1024462..5e2c9d0 100644
>--- a/tests/dbus/base-client.c
>+++ b/tests/dbus/base-client.c
>@@ -1482,7 +1482,7 @@ delegate_to_preferred_handler (Test *test,
>   requests = g_ptr_array_new ();
> 
>   hints = tp_asv_new (
>-      "im.telepathy1.ChannelRequest.DelegateToPreferredHandler",
>+      "im.telepathy.v1.ChannelRequest.DelegateToPreferredHandler",
>         G_TYPE_BOOLEAN, TRUE,
>       NULL);
> 
>diff --git a/tests/dbus/client.c b/tests/dbus/client.c
>index d3e0556..29fa466 100644
>--- a/tests/dbus/client.c
>+++ b/tests/dbus/client.c
>@@ -58,8 +58,8 @@ test_new (Test *test,
> {
>   test->client = tp_tests_object_new_static_class (TP_TYPE_CLIENT,
>       "dbus-daemon", test->dbus,
>-      "object-path", "/im/telepathy1/Client/whatever",
>-      "bus-name", "im.telepathy1.Client.whatever",
>+      "object-path", "/im/telepathy/v1/Client/whatever",
>+      "bus-name", "im.telepathy.v1.Client.whatever",
>       NULL);
>   g_assert (test->client != NULL);
> }
>diff --git a/tests/dbus/dbus-1/services/spurious.service b/tests/dbus/dbus-1/services/spurious.service
>index f7488c6..4965265 100644
>--- a/tests/dbus/dbus-1/services/spurious.service
>+++ b/tests/dbus/dbus-1/services/spurious.service
>@@ -1,3 +1,3 @@
> [D-BUS Service]
>-Name=im.telepathy1.ConnectionManager.spurious
>+Name=im.telepathy.v1.ConnectionManager.spurious
> Exec=/bin/false
>diff --git a/tests/dbus/telepathy-1/managers/test_manager_file.manager b/tests/dbus/telepathy-1/managers/test_manager_file.manager
>index bff055a..e4139b6 100644
>--- a/tests/dbus/telepathy-1/managers/test_manager_file.manager
>+++ b/tests/dbus/telepathy-1/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=im.telepathy1.Protocol.Interface.Avatars1;
>-ConnectionInterfaces=im.telepathy1.Connection.Interface.Requests;im.telepathy1.Connection.Interface.Contacts;
>+Interfaces=im.telepathy.v1.Protocol.Interface.Avatars1;
>+ConnectionInterfaces=im.telepathy.v1.Connection.Interface.Requests;im.telepathy.v1.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]
>-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;
>+im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Text
>+im.telepathy.v1.Channel.TargetHandleType u=1
>+allowed=im.telepathy.v1.Channel.TargetHandle;im.telepathy.v1.Channel.TargetID;
> 
> [Protocol bar]
> param-account = s required
>diff --git a/tests/lib/simple-account.c b/tests/lib/simple-account.c
>index 27d2fc5..79e1450 100644
>--- a/tests/lib/simple-account.c
>+++ b/tests/lib/simple-account.c
>@@ -224,7 +224,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, "im.telepathy1.glib.test");
>+      g_value_set_string (value, "im.telepathy.v1.glib.test");
>       break;
>     case PROP_STORAGE_IDENTIFIER:
>       g_value_set_boxed (value, &identifier);
>diff --git a/tests/logger/constants.h b/tests/logger/constants.h
>index 7eb4b9e..c2cd85c 100644
>--- a/tests/logger/constants.h
>+++ b/tests/logger/constants.h
>@@ -1,2 +1,2 @@
>-#define ACCOUNT_PATH "/im.telepathy1/Account/gabble/jabber/cosimo_2ealfarano_40collabora_2eco_2euk0"
>+#define ACCOUNT_PATH "/im/telepathy/v1/Account/gabble/jabber/cosimo_2ealfarano_40collabora_2eco_2euk0"
> #define ID "echo@test.collabora.co.uk"
>diff --git a/tests/logger/dbus/test-log-manager.c b/tests/logger/dbus/test-log-manager.c
>index c09dfd9..53a7545 100644
>--- a/tests/logger/dbus/test-log-manager.c
>+++ b/tests/logger/dbus/test-log-manager.c
>@@ -646,7 +646,7 @@ test_ignorelist (TestCaseFixture *fixture,
> 
>   event1 = g_object_new (TPL_TYPE_TEXT_EVENT,
>     "account", fixture->account,
>-    "channel-path", "im.telepathy1.channel.path",
>+    "channel-path", "im.telepathy.v1.channel.path",
>     "receiver", receiver,
>     "sender", sender,
>     "timestamp", (gint64) 1,
>@@ -659,7 +659,7 @@ test_ignorelist (TestCaseFixture *fixture,
> 
>   event2 = g_object_new (TPL_TYPE_TEXT_EVENT,
>     "account", fixture->account,
>-    "channel-path", "im.telepathy1.channel.path",
>+    "channel-path", "im.telepathy.v1.channel.path",
>     "receiver", sender,
>     "sender", receiver,
>     "timestamp", (gint64) 2,
>diff --git a/tests/logger/logs/TpLogger/logs/gabble_jabber_user_40collabora_2eco_2euk/user3@collabora.co.uk/20100113.call.log b/tests/logger/logs/TpLogger/logs/gabble_jabber_user_40collabora_2eco_2euk/user3@collabora.co.uk/20100113.call.log
>index 7ab442a..737c1ad 100644
>--- a/tests/logger/logs/TpLogger/logs/gabble_jabber_user_40collabora_2eco_2euk/user3@collabora.co.uk/20100113.call.log
>+++ b/tests/logger/logs/TpLogger/logs/gabble_jabber_user_40collabora_2eco_2euk/user3@collabora.co.uk/20100113.call.log
>@@ -1,5 +1,5 @@
> <?xml version='1.0' encoding='utf-8'?>
> <?xml-stylesheet type="text/xsl" href="empathy-log.xsl"?>
> <log>
>-<call time='20100113T23:11:15' id='user@collabora.co.uk' name='Nicolas1' isuser='false' token='' duration='12' actor='user@collabora.co.uk' actortype='contact' actorname='User1' actortoken='' reason='user-requested' detail='im.telepathy1.Error.Cancelled' />
>+<call time='20100113T23:11:15' id='user@collabora.co.uk' name='Nicolas1' isuser='false' token='' duration='12' actor='user@collabora.co.uk' actortype='contact' actorname='User1' actortoken='' reason='user-requested' detail='im.telepathy.v1.Error.Cancelled' />
> </log>
>diff --git a/tests/logger/logs/TpLogger/logs/gabble_jabber_user_40collabora_2eco_2euk/user4@collabora.co.uk/20100113.call.log b/tests/logger/logs/TpLogger/logs/gabble_jabber_user_40collabora_2eco_2euk/user4@collabora.co.uk/20100113.call.log
>index dfb79cb..a979f95 100644
>--- a/tests/logger/logs/TpLogger/logs/gabble_jabber_user_40collabora_2eco_2euk/user4@collabora.co.uk/20100113.call.log
>+++ b/tests/logger/logs/TpLogger/logs/gabble_jabber_user_40collabora_2eco_2euk/user4@collabora.co.uk/20100113.call.log
>@@ -1,8 +1,8 @@
> <?xml version='1.0' encoding='utf-8'?>
> <?xml-stylesheet type="text/xsl" href="empathy-log.xsl"?>
> <log>
>-<call time='20100113T17:48:01' id='user@collabora.co.uk' name='Nicolas1' isuser='false' token='' duration='1' actor='user@collabora.co.uk' actortype='contact' actorname='User1' actortoken='' reason='user-requested' detail='im.telepathy1.Error.Cancelled' />
>-<call time='20100113T17:48:01' id='user@collabora.co.uk' name='Nicolas1' isuser='false' token='' duration='2' actor='user@collabora.co.uk' actortype='contact' actorname='User1' actortoken='' reason='user-requested' detail='im.telepathy1.Error.Cancelled' />
>+<call time='20100113T17:48:01' id='user@collabora.co.uk' name='Nicolas1' isuser='false' token='' duration='1' actor='user@collabora.co.uk' actortype='contact' actorname='User1' actortoken='' reason='user-requested' detail='im.telepathy.v1.Error.Cancelled' />
>+<call time='20100113T17:48:01' id='user@collabora.co.uk' name='Nicolas1' isuser='false' token='' duration='2' actor='user@collabora.co.uk' actortype='contact' actorname='User1' actortoken='' reason='user-requested' detail='im.telepathy.v1.Error.Cancelled' />
> 
> <call time='20100113T17:48:01' id='user@collabora.co.uk' name='Nicolas1' isuser='false' token='' duration='3' actor='user@collabora.co.uk' actortype='contact' actorname='User1' actortoken='' reason='user-requested' detail='org.freedesktop.Telepathy.Error.Cancelled' />
> </log>
>diff --git a/tests/logger/logs/TpLogger/logs/gabble_jabber_user_40collabora_2eco_2euk/user5@collabora.co.uk/20100113.call.log b/tests/logger/logs/TpLogger/logs/gabble_jabber_user_40collabora_2eco_2euk/user5@collabora.co.uk/20100113.call.log
>index 34e5e6a..257047c 100644
>--- a/tests/logger/logs/TpLogger/logs/gabble_jabber_user_40collabora_2eco_2euk/user5@collabora.co.uk/20100113.call.log
>+++ b/tests/logger/logs/TpLogger/logs/gabble_jabber_user_40collabora_2eco_2euk/user5@collabora.co.uk/20100113.call.log
>@@ -1,5 +1,5 @@
> <?xml version='1.0' encoding='utf-8'?>
> <?xml-stylesheet type="text/xsl" href="empathy-log.xsl"?>
> <log>
>-<call time='20100113T17:48:01' id='user@collabora.co.uk' name='Nicolas1' isuser='false' token='' duration='1' actor='user@collabora.co.uk' actortype='contact' actorname='User1' actortoken='' reason='user-requested' detail='im.telepathy1.Error.Cancelled' />
>+<call time='20100113T17:48:01' id='user@collabora.co.uk' name='Nicolas1' isuser='false' token='' duration='1' actor='user@collabora.co.uk' actortype='contact' actorname='User1' actortoken='' reason='user-requested' detail='im.telepathy.v1.Error.Cancelled' />
> </log>
>diff --git a/tools/manager-file.py b/tools/manager-file.py
>index 1d7078f..d6eda06 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=im.telepathy1.ConnectionManager.' + manager
>-    print >> f, 'ObjectPath=/im/telepathy1/ConnectionManager/' + manager
>+    print >> f, 'BusName=im.telepathy.v1.ConnectionManager.' + manager
>+    print >> f, 'ObjectPath=/im/telepathy/v1/ConnectionManager/' + manager
> 
>     # protocols
>     for proto, params in protos.iteritems():
>-- 
>1.8.4.2
>

Actions: View | Splinter Review

Attachments on bug 71262: 88707 | 88708 | 88709 | 88710 | 88711 | 88713 | 88714 | 88715 | 88717 | 88718 | 88724 | 88833 | 88834 | 89079 | 89080 | 89081 | 89082

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