GNOME.org
 

[empathy/next] im.telepathy1 -> im.telepathy.v1

commit ab72801ad586d719042aad95c9728ff069869bc9
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Thu Jan 30 17:31:52 2014 +0100

    im.telepathy1 -> im.telepathy.v1

 data/.gitignore                                    |    8 ++--
 data/Empathy.Auth.client                           |   24 ++++++------
 data/Empathy.Call.client                           |   38 ++++++++++----------
 data/Empathy.Chat.client                           |   22 ++++++------
 data/Empathy.FileTransfer.client                   |   12 +++---
 data/Makefile.am                                   |   16 ++++----
 .../im.telepathy.v1.Client.Empathy.Auth.service.in |    3 ++
 ...im.telepathy.v1.Client.Empathy.Call.service.in} |    2 +-
 ...im.telepathy.v1.Client.Empathy.Chat.service.in} |    2 +-
 ...pathy.v1.Client.Empathy.FileTransfer.service.in |    3 ++
 data/im.telepathy1.Client.Empathy.Auth.service.in  |    3 --
 ...lepathy1.Client.Empathy.FileTransfer.service.in |    3 --
 .../Channel_Interface_Credentials_Storage.xml      |    6 ++--
 extensions/Connection_Interface_Renaming.xml       |   18 +++++-----
 extensions/Logger.xml                              |   10 +++---
 extensions/generic-types.xml                       |    4 +-
 libempathy-gtk/empathy-log-window.c                |    4 +-
 libempathy/empathy-ft-handler.c                    |    2 +-
 libempathy/empathy-gsettings.h                     |    2 +-
 src/empathy-call-factory.c                         |    2 +-
 src/empathy-debug-window.h                         |    2 +-
 tools/manager-file.py                              |    4 +-
 22 files changed, 95 insertions(+), 95 deletions(-)
---
diff --git a/data/.gitignore b/data/.gitignore
index dde0792..5b1f806 100644
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -2,8 +2,8 @@ empathy.desktop
 empathy.desktop.in
 org.gnome.Empathy.gschema.valid
 gschemas.compiled
-im.telepathy1.Client.Empathy.Chat.service
-im.telepathy1.Client.Empathy.Call.service
-im.telepathy1.Client.Empathy.Auth.service
-im.telepathy1.Client.Empathy.FileTransfer.service
+im.telepathy.v1.Client.Empathy.Chat.service
+im.telepathy.v1.Client.Empathy.Call.service
+im.telepathy.v1.Client.Empathy.Auth.service
+im.telepathy.v1.Client.Empathy.FileTransfer.service
 icons/local-copy/*
diff --git a/data/Empathy.Auth.client b/data/Empathy.Auth.client
index 659ed09..018d802 100644
--- a/data/Empathy.Auth.client
+++ b/data/Empathy.Auth.client
@@ -1,17 +1,17 @@
-[im.telepathy1.Client]
-Interfaces=im.telepathy1.Client.Handler;im.telepathy1.Client.Observer
+[im.telepathy.v1.Client]
+Interfaces=im.telepathy.v1.Client.Handler;im.telepathy.v1.Client.Observer
 
-[im.telepathy1.Client.Observer]
+[im.telepathy.v1.Client.Observer]
 DelayApprovers=true
 
-[im.telepathy1.Client.Handler.HandlerChannelFilter 0]
-im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.ServerTLSConnection
-im.telepathy1.Channel.TargetHandleType u=0
+[im.telepathy.v1.Client.Handler.HandlerChannelFilter 0]
+im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.ServerTLSConnection
+im.telepathy.v1.Channel.TargetHandleType u=0
 
-[im.telepathy1.Client.Handler.HandlerChannelFilter 1]
-im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.ServerAuthentication
-im.telepathy1.Channel.Type.ServerAuthentication.AuthenticationMethod 
s=im.telepathy1.Channel.Interface.SASLAuthentication
+[im.telepathy.v1.Client.Handler.HandlerChannelFilter 1]
+im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.ServerAuthentication
+im.telepathy.v1.Channel.Type.ServerAuthentication.AuthenticationMethod 
s=im.telepathy.v1.Channel.Interface.SASLAuthentication
 
-[im.telepathy1.Client.Observer.ObserverChannelFilter 0]
-im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.ServerAuthentication
-im.telepathy1.Channel.Type.ServerAuthentication.AuthenticationMethod 
s=im.telepathy1.Channel.Interface.SASLAuthentication
+[im.telepathy.v1.Client.Observer.ObserverChannelFilter 0]
+im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.ServerAuthentication
+im.telepathy.v1.Channel.Type.ServerAuthentication.AuthenticationMethod 
s=im.telepathy.v1.Channel.Interface.SASLAuthentication
diff --git a/data/Empathy.Call.client b/data/Empathy.Call.client
index 4283a56..49bd7f8 100644
--- a/data/Empathy.Call.client
+++ b/data/Empathy.Call.client
@@ -1,23 +1,23 @@
-[im.telepathy1.Client]
-Interfaces=im.telepathy1.Client.Handler
+[im.telepathy.v1.Client]
+Interfaces=im.telepathy.v1.Client.Handler
 
-[im.telepathy1.Client.Handler.HandlerChannelFilter 0]
-im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.Call1
-im.telepathy1.Channel.TargetHandleType u=1
+[im.telepathy.v1.Client.Handler.HandlerChannelFilter 0]
+im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Call1
+im.telepathy.v1.Channel.TargetHandleType u=1
 
-[im.telepathy1.Client.Handler.HandlerChannelFilter 1]
-im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.Call1
-im.telepathy1.Channel.TargetHandleType u=1
-im.telepathy1.Channel.Type.Call1.InitialAudio b=true
+[im.telepathy.v1.Client.Handler.HandlerChannelFilter 1]
+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=true
 
-[im.telepathy1.Client.Handler.HandlerChannelFilter 2]
-im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.Call1
-im.telepathy1.Channel.TargetHandleType u=1
-im.telepathy1.Channel.Type.Call1.InitialVideo b=true
+[im.telepathy.v1.Client.Handler.HandlerChannelFilter 2]
+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=true
 
-[im.telepathy1.Client.Handler.Capabilities]
-im.telepathy1.Channel.Type.Call1/audio=true
-im.telepathy1.Channel.Type.Call1/video=true
-im.telepathy1.Channel.Type.Call1/ice=true
-im.telepathy1.Channel.Type.Call1/gtalk-p2p=true
-im.telepathy1.Channel.Type.Call1/video/h264=true
+[im.telepathy.v1.Client.Handler.Capabilities]
+im.telepathy.v1.Channel.Type.Call1/audio=true
+im.telepathy.v1.Channel.Type.Call1/video=true
+im.telepathy.v1.Channel.Type.Call1/ice=true
+im.telepathy.v1.Channel.Type.Call1/gtalk-p2p=true
+im.telepathy.v1.Channel.Type.Call1/video/h264=true
diff --git a/data/Empathy.Chat.client b/data/Empathy.Chat.client
index 8b745ce..0ef4410 100644
--- a/data/Empathy.Chat.client
+++ b/data/Empathy.Chat.client
@@ -1,14 +1,14 @@
-[im.telepathy1.Client]
-Interfaces=im.telepathy1.Client.Handler
+[im.telepathy.v1.Client]
+Interfaces=im.telepathy.v1.Client.Handler
 
-[im.telepathy1.Client.Handler.HandlerChannelFilter 0]
-im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.Text
-im.telepathy1.Channel.TargetHandleType u=0
+[im.telepathy.v1.Client.Handler.HandlerChannelFilter 0]
+im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Text
+im.telepathy.v1.Channel.TargetHandleType u=0
 
-[im.telepathy1.Client.Handler.HandlerChannelFilter 1]
-im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.Text
-im.telepathy1.Channel.TargetHandleType u=1
+[im.telepathy.v1.Client.Handler.HandlerChannelFilter 1]
+im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Text
+im.telepathy.v1.Channel.TargetHandleType u=1
 
-[im.telepathy1.Client.Handler.HandlerChannelFilter 2]
-im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.Text
-im.telepathy1.Channel.TargetHandleType u=2
+[im.telepathy.v1.Client.Handler.HandlerChannelFilter 2]
+im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Text
+im.telepathy.v1.Channel.TargetHandleType u=2
diff --git a/data/Empathy.FileTransfer.client b/data/Empathy.FileTransfer.client
index afad91d..283aec9 100644
--- a/data/Empathy.FileTransfer.client
+++ b/data/Empathy.FileTransfer.client
@@ -1,7 +1,7 @@
-[im.telepathy1.Client]
-Interfaces=im.telepathy1.Client.Handler
+[im.telepathy.v1.Client]
+Interfaces=im.telepathy.v1.Client.Handler
 
-[im.telepathy1.Client.Handler.HandlerChannelFilter 0]
-im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.FileTransfer
-im.telepathy1.Channel.TargetHandleType u=1
-im.telepathy1.Channel.Requested b=false
+[im.telepathy.v1.Client.Handler.HandlerChannelFilter 0]
+im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.FileTransfer
+im.telepathy.v1.Channel.TargetHandleType u=1
+im.telepathy.v1.Channel.Requested b=false
diff --git a/data/Makefile.am b/data/Makefile.am
index 1205d68..52c5e25 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -23,23 +23,23 @@ convert_DATA = \
 
 servicefiledir = $(datadir)/dbus-1/services
 servicefile_in_files = \
-       im.telepathy1.Client.Empathy.Chat.service.in \
-       im.telepathy1.Client.Empathy.Auth.service.in \
-       im.telepathy1.Client.Empathy.Call.service.in \
-       im.telepathy1.Client.Empathy.FileTransfer.service.in
+       im.telepathy.v1.Client.Empathy.Chat.service.in \
+       im.telepathy.v1.Client.Empathy.Auth.service.in \
+       im.telepathy.v1.Client.Empathy.Call.service.in \
+       im.telepathy.v1.Client.Empathy.FileTransfer.service.in
 
 servicefile_DATA = $(servicefile_in_files:.service.in=.service)
 
-im.telepathy1.Client.Empathy.Chat.service: im.telepathy1.Client.Empathy.Chat.service.in
+im.telepathy.v1.Client.Empathy.Chat.service: im.telepathy.v1.Client.Empathy.Chat.service.in
        $(AM_V_GEN)sed -e "s|[ ]libexecdir[@]|$(libexecdir)|" $< > $@
 
-im.telepathy1.Client.Empathy.Auth.service: im.telepathy1.Client.Empathy.Auth.service.in
+im.telepathy.v1.Client.Empathy.Auth.service: im.telepathy.v1.Client.Empathy.Auth.service.in
        $(AM_V_GEN)sed -e "s|[ ]libexecdir[@]|$(libexecdir)|" $< > $@
 
-im.telepathy1.Client.Empathy.Call.service: im.telepathy1.Client.Empathy.Call.service.in
+im.telepathy.v1.Client.Empathy.Call.service: im.telepathy.v1.Client.Empathy.Call.service.in
        $(AM_V_GEN)sed -e "s|[ ]libexecdir[@]|$(libexecdir)|" $< > $@
 
-im.telepathy1.Client.Empathy.FileTransfer.service: im.telepathy1.Client.Empathy.FileTransfer.service.in
+im.telepathy.v1.Client.Empathy.FileTransfer.service: im.telepathy.v1.Client.Empathy.FileTransfer.service.in
        $(AM_V_GEN)sed -e "s|[ ]bindir[@]|$(bindir)|" $< > $@
 
 clientfiledir = $(datarootdir)/telepathy-1/clients
diff --git a/data/im.telepathy.v1.Client.Empathy.Auth.service.in 
b/data/im.telepathy.v1.Client.Empathy.Auth.service.in
new file mode 100644
index 0000000..4f8c884
--- /dev/null
+++ b/data/im.telepathy.v1.Client.Empathy.Auth.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=im.telepathy.v1.Client.Empathy.Auth
+Exec= libexecdir@/empathy-auth-client
\ No newline at end of file
diff --git a/data/im.telepathy1.Client.Empathy.Call.service.in 
b/data/im.telepathy.v1.Client.Empathy.Call.service.in
similarity index 53%
rename from data/im.telepathy1.Client.Empathy.Call.service.in
rename to data/im.telepathy.v1.Client.Empathy.Call.service.in
index 81393d7..d5b3ad5 100644
--- a/data/im.telepathy1.Client.Empathy.Call.service.in
+++ b/data/im.telepathy.v1.Client.Empathy.Call.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=im.telepathy1.Client.Empathy.Call
+Name=im.telepathy.v1.Client.Empathy.Call
 Exec= libexecdir@/empathy-call
diff --git a/data/im.telepathy1.Client.Empathy.Chat.service.in 
b/data/im.telepathy.v1.Client.Empathy.Chat.service.in
similarity index 53%
rename from data/im.telepathy1.Client.Empathy.Chat.service.in
rename to data/im.telepathy.v1.Client.Empathy.Chat.service.in
index 2ff7a6b..9b3ac18 100644
--- a/data/im.telepathy1.Client.Empathy.Chat.service.in
+++ b/data/im.telepathy.v1.Client.Empathy.Chat.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=im.telepathy1.Client.Empathy.Chat
+Name=im.telepathy.v1.Client.Empathy.Chat
 Exec= libexecdir@/empathy-chat
diff --git a/data/im.telepathy.v1.Client.Empathy.FileTransfer.service.in 
b/data/im.telepathy.v1.Client.Empathy.FileTransfer.service.in
new file mode 100644
index 0000000..8fd2691
--- /dev/null
+++ b/data/im.telepathy.v1.Client.Empathy.FileTransfer.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=im.telepathy.v1.Client.Empathy.FileTransfer
+Exec= bindir@/empathy -h
diff --git a/extensions/Channel_Interface_Credentials_Storage.xml 
b/extensions/Channel_Interface_Credentials_Storage.xml
index 7cd1868..5a46957 100644
--- a/extensions/Channel_Interface_Credentials_Storage.xml
+++ b/extensions/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="im.telepathy1.Channel.Interface.CredentialsStorage.DRAFT"
+  <interface name="im.telepathy.v1.Channel.Interface.CredentialsStorage.DRAFT"
     tp:causes-havoc="experimental">
     <tp:added version="0.21.10">(draft 1)</tp:added>
-    <tp:requires interface="im.telepathy1.Channel.Interface.SASLAuthentication"/>
+    <tp:requires interface="im.telepathy.v1.Channel.Interface.SASLAuthentication"/>
     <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>
@@ -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="im.telepathy1.Channel.Interface.SASLAuthentication">AcceptSASL</tp:dbus-ref>
+            namespace="im.telepathy.v1.Channel.Interface.SASLAuthentication">AcceptSASL</tp:dbus-ref>
           is called or it will have no effect.</p>
       </tp:docstring>
     </method>
diff --git a/extensions/Connection_Interface_Renaming.xml b/extensions/Connection_Interface_Renaming.xml
index 0c7ae5d..e4bf0e7 100644
--- a/extensions/Connection_Interface_Renaming.xml
+++ b/extensions/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="im.telepathy1.Connection.Interface.Renaming"
+  <interface name="im.telepathy.v1.Connection.Interface.Renaming"
     tp:causes-havoc='not well-tested'>
-    <tp:requires interface="im.telepathy1.Connection"/>
+    <tp:requires interface="im.telepathy.v1.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="im.telepathy1.Channel.Interface.Group">MembersChanged</tp:dbus-ref>
+            namespace="im.telepathy.v1.Channel.Interface.Group">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.
@@ -74,17 +74,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         <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="im.telepathy1.Connection">GetSelfHandle</tp:dbus-ref>.</p>
+            namespace="im.telepathy.v1.Connection">GetSelfHandle</tp:dbus-ref>.</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="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:error name="im.telepathy.v1.Error.Disconnected"/>
+        <tp:error name="im.telepathy.v1.Error.NetworkError"/>
+        <tp:error name="im.telepathy.v1.Error.NotAvailable"/>
+        <tp:error name="im.telepathy.v1.Error.InvalidArgument"/>
+        <tp:error name="im.telepathy.v1.Error.PermissionDenied"/>
       </tp:possible-errors>
     </method>
     <tp:docstring>
diff --git a/extensions/Logger.xml b/extensions/Logger.xml
index ecfcdf1..ba4e99f 100644
--- a/extensions/Logger.xml
+++ b/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.Logger.DRAFT"
+  <interface name="im.telepathy.v1.Logger.DRAFT"
     tp:causes-havoc="experimental">
     <tp:added version="0.3">(as a draft)</tp:added>
 
@@ -57,8 +57,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       <tp:docstring>
         Add a contact's designation as a favourite. This method may not be
         called until the service is ready. See the <tp:dbus-ref
-        namespace="im.telepathy1.Logger.DRAFT">FavouriteContactsReady</tp:dbus-ref> signal and <tp:dbus-ref
-        namespace="im.telepathy1.Logger.DRAFT">FavouriteContactsIsReady</tp:dbus-ref> property.
+        namespace="im.telepathy.v1.Logger.DRAFT">FavouriteContactsReady</tp:dbus-ref> signal and <tp:dbus-ref
+        namespace="im.telepathy.v1.Logger.DRAFT">FavouriteContactsIsReady</tp:dbus-ref> property.
       </tp:docstring>
     </method>
 
@@ -79,8 +79,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       <tp:docstring>
         Remove a contact's designation as a favourite. This method may not be
         called until the service is ready. See the <tp:dbus-ref
-        namespace="im.telepathy1.Logger.DRAFT">FavouriteContactsReady</tp:dbus-ref> signal and <tp:dbus-ref
-        namespace="im.telepathy1.Logger.DRAFT">FavouriteContactsIsReady</tp:dbus-ref> property.
+        namespace="im.telepathy.v1.Logger.DRAFT">FavouriteContactsReady</tp:dbus-ref> signal and <tp:dbus-ref
+        namespace="im.telepathy.v1.Logger.DRAFT">FavouriteContactsIsReady</tp:dbus-ref> property.
       </tp:docstring>
     </method>
 
diff --git a/extensions/generic-types.xml b/extensions/generic-types.xml
index f56469a..8949210 100644
--- a/extensions/generic-types.xml
+++ b/extensions/generic-types.xml
@@ -19,13 +19,13 @@
 
   <tp:simple-type name="DBus_Bus_Name" type="s">
     <tp:docstring>A string representing a D-Bus bus name - either a well-known
-      name like "im.telepathy1.MissionControl" or a unique name
+      name like "im.telepathy.v1.MissionControl" or a unique name
       like ":1.123"</tp:docstring>
   </tp:simple-type>
 
   <tp:simple-type name="DBus_Well_Known_Name" type="s">
     <tp:docstring>A string representing a D-Bus well-known
-      name like "im.telepathy1.MissionControl".</tp:docstring>
+      name like "im.telepathy.v1.MissionControl".</tp:docstring>
   </tp:simple-type>
 
   <tp:simple-type name="DBus_Unique_Name" type="s">
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index 8f1f9b3..1bb5faa 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -3781,8 +3781,8 @@ log_window_delete_menu_clicked_cb (GtkMenuItem *menuitem,
     }
 
   logger = g_object_new (TP_TYPE_PROXY,
-      "bus-name", "im.telepathy1.Logger",
-      "object-path", "/im/telepathy1/Logger",
+      "bus-name", "im.telepathy.v1.Logger",
+      "object-path", "/im/telepathy/v1/Logger",
       "dbus-daemon", bus,
       NULL);
   g_object_unref (bus);
diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c
index 9a965ed..bf3d6c8 100644
--- a/libempathy/empathy-ft-handler.c
+++ b/libempathy/empathy-ft-handler.c
@@ -925,7 +925,7 @@ hash_job_done (gpointer user_data)
   else
     {
       /* set the checksum in the request...
-       * im.telepathy1.Channel.Type.FileTransfer.ContentHash
+       * im.telepathy.v1.Channel.Type.FileTransfer.ContentHash
        */
       tp_asv_set_string (priv->request,
           TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_CONTENT_HASH,
diff --git a/libempathy/empathy-gsettings.h b/libempathy/empathy-gsettings.h
index 4e32f5a..7ef9b33 100644
--- a/libempathy/empathy-gsettings.h
+++ b/libempathy/empathy-gsettings.h
@@ -85,7 +85,7 @@ G_BEGIN_DECLS
 #define EMPATHY_PREFS_LOCATION_PUBLISH             "publish"
 #define EMPATHY_PREFS_LOCATION_REDUCE_ACCURACY     "reduce-accuracy"
 
-#define EMPATHY_PREFS_LOGGER_SCHEMA "im.telepathy1.Logger"
+#define EMPATHY_PREFS_LOGGER_SCHEMA "im.telepathy.v1.Logger"
 #define EMPATHY_PREFS_LOGGER_ENABLED "enabled"
 
 #define EMPATHY_PREFS_DESKTOP_INTERFACE_SCHEMA "org.gnome.desktop.interface"
diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c
index 4738740..d660560 100644
--- a/src/empathy-call-factory.c
+++ b/src/empathy-call-factory.c
@@ -99,7 +99,7 @@ empathy_call_factory_init (EmpathyCallFactory *obj)
       TP_TOKEN_CHANNEL_TYPE_CALL1_VIDEO,
       TP_TOKEN_CHANNEL_TYPE_CALL1_ICE,
       TP_TOKEN_CHANNEL_TYPE_CALL1_GTALK_P2P,
-      "im.telepathy1.Channel.Type.Call1/video/h264",
+      "im.telepathy.v1.Channel.Type.Call1/video/h264",
       NULL);
 }
 
diff --git a/src/empathy-debug-window.h b/src/empathy-debug-window.h
index e280394..a7a6fe8 100644
--- a/src/empathy-debug-window.h
+++ b/src/empathy-debug-window.h
@@ -37,7 +37,7 @@ G_BEGIN_DECLS
 #define EMPATHY_DEBUG_WINDOW_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS \
     ((object), EMPATHY_TYPE_DEBUG_WINDOW, EmpathyDebugWindowClass))
 
-#define DEBUG_OBJECT_PATH "/im/telepathy1/debug"
+#define DEBUG_OBJECT_PATH "/im/telepathy/v1/debug"
 
 typedef struct _EmpathyDebugWindow EmpathyDebugWindow;
 typedef struct _EmpathyDebugWindowClass EmpathyDebugWindowClass;
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():
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]