diff --git a/bin/dbus/Makefile.am b/bin/dbus/Makefile.am
index 965e4588bc316d7f324848ea68e0ff07aae69d34..fda17a225baafb22a418c816119e322d0b71c669 100644
--- a/bin/dbus/Makefile.am
+++ b/bin/dbus/Makefile.am
@@ -8,25 +8,25 @@ BUILT_SOURCES= \
dbusinstance.adaptor.h
BUILT_SOURCES+=dbuspresencemanager.adaptor.h
-dbuspresencemanager.adaptor.h: presencemanager-introspec.xml Makefile.am
+dbuspresencemanager.adaptor.h: cx.ring.Ring.PresenceManager.xml Makefile.am
dbusxx-xml2cpp $< --adaptor=$@
if RING_VIDEO
BUILT_SOURCES+=dbusvideomanager.adaptor.h
-dbusvideomanager.adaptor.h: videomanager-introspec.xml Makefile.am
+dbusvideomanager.adaptor.h: cx.ring.Ring.VideoManager.xml Makefile.am
dbusxx-xml2cpp $< --adaptor=$@
endif
# Rule to generate the binding headers
-dbuscallmanager.adaptor.h: callmanager-introspec.xml Makefile.am
+dbuscallmanager.adaptor.h: cx.ring.Ring.CallManager.xml Makefile.am
dbusxx-xml2cpp $< --adaptor=$@
# Rule to generate the binding headers
-dbusconfigurationmanager.adaptor.h: configurationmanager-introspec.xml Makefile.am
+dbusconfigurationmanager.adaptor.h: cx.ring.Ring.ConfigurationManager.xml Makefile.am
dbusxx-xml2cpp $< --adaptor=$@
# Rule to generate the binding headers
-dbusinstance.adaptor.h: instance-introspec.xml Makefile.am
+dbusinstance.adaptor.h: cx.ring.Ring.Instance.xml Makefile.am
dbusxx-xml2cpp $< --adaptor=$@
libclient_dbus_la_SOURCES = \
@@ -58,13 +58,16 @@ libclient_dbus_la_CXXFLAGS = -I../ \
servicedir = $(datadir)/dbus-1/services
service_DATA = cx.ring.Ring.service
-EXTRA_DIST = callmanager-introspec.xml \
- configurationmanager-introspec.xml \
- instance-introspec.xml \
- presencemanager-introspec.xml
+# Dbus interface files
+# https://dbus.freedesktop.org/doc/dbus-api-design.html#interface-files
+interfacedir = $(datadir)/dbus-1/interfaces
+interface_DATA = cx.ring.Ring.CallManager.xml \
+ cx.ring.Ring.ConfigurationManager.xml \
+ cx.ring.Ring.Instance.xml \
+ cx.ring.Ring.PresenceManager.xml
if RING_VIDEO
-EXTRA_DIST += videomanager-introspec.xml
+interface_DATA += cx.ring.Ring.VideoManager.xml
endif
CLEANFILES= \
diff --git a/bin/dbus/callmanager-introspec.xml b/bin/dbus/cx.ring.Ring.CallManager.xml
similarity index 99%
rename from bin/dbus/callmanager-introspec.xml
rename to bin/dbus/cx.ring.Ring.CallManager.xml
index 2109f2d8c71b01fa2ced1b3890ceac3525201872..526ace11aa45535d1e3378c771e22517e22d7dc7 100644
--- a/bin/dbus/callmanager-introspec.xml
+++ b/bin/dbus/cx.ring.Ring.CallManager.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<node name="/callmanager-introspec" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/cx.ring.Ring.CallManager" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
<interface name="cx.ring.Ring.CallManager">
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
diff --git a/bin/dbus/configurationmanager-introspec.xml b/bin/dbus/cx.ring.Ring.ConfigurationManager.xml
similarity index 99%
rename from bin/dbus/configurationmanager-introspec.xml
rename to bin/dbus/cx.ring.Ring.ConfigurationManager.xml
index 66a28150523ae6b875fa922010f5629478a7b8ad..3dcd1014fdfc31009dd706b5570e6ee2fad92222 100644
--- a/bin/dbus/configurationmanager-introspec.xml
+++ b/bin/dbus/cx.ring.Ring.ConfigurationManager.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<node name="/configurationmanager-introspec" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/cx.ring.Ring.ConfigurationManager" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
<interface name="cx.ring.Ring.ConfigurationManager">
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
diff --git a/bin/dbus/instance-introspec.xml b/bin/dbus/cx.ring.Ring.Instance.xml
similarity index 92%
rename from bin/dbus/instance-introspec.xml
rename to bin/dbus/cx.ring.Ring.Instance.xml
index d8a620bc218c9122ed38a22450286a31273df92b..99b4609d7e03a90ec65f83764261a800c037d3d4 100644
--- a/bin/dbus/instance-introspec.xml
+++ b/bin/dbus/cx.ring.Ring.Instance.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<node name="/instance-introspec" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/cx.ring.Ring.Instance" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
<interface name="cx.ring.Ring.Instance">
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
<p>Count the number of clients actually registered to the core. When initializing your client, you need to register it against the core by using this interface.</p>
diff --git a/bin/dbus/presencemanager-introspec.xml b/bin/dbus/cx.ring.Ring.PresenceManager.xml
similarity index 98%
rename from bin/dbus/presencemanager-introspec.xml
rename to bin/dbus/cx.ring.Ring.PresenceManager.xml
index 7aad39b0eee257dd9faaed1de01886726a7a8347..711a6cb14a72c6b8cf150f6a4c03365675c78234 100644
--- a/bin/dbus/presencemanager-introspec.xml
+++ b/bin/dbus/cx.ring.Ring.PresenceManager.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<node name="/presencemanager-introspec" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/cx.ring.Ring.PresenceManager" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
<interface name="cx.ring.Ring.PresenceManager">
<!-- METHODS !-->
<method name="publish" tp:name-for-bindings="publish">
diff --git a/bin/dbus/videomanager-introspec.xml b/bin/dbus/cx.ring.Ring.VideoManager.xml
similarity index 98%
rename from bin/dbus/videomanager-introspec.xml
rename to bin/dbus/cx.ring.Ring.VideoManager.xml
index 56cea1548578bc5447bdc9ab0e546b36770d753b..bb24dab4dc77b14ff998936cf05244b4830df5b3 100644
--- a/bin/dbus/videomanager-introspec.xml
+++ b/bin/dbus/cx.ring.Ring.VideoManager.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<node name="/videomanager-introspec" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/cx.ring.Ring.VideoManager" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
<interface name="cx.ring.Ring.VideoManager">
<!-- Video device methods -->
diff --git a/doc/dbus-api/spec/all.xml b/doc/dbus-api/spec/all.xml
index ec96488d175fbb336b5d30084046b06658bace06..3b24e8231f8d3c0772781b2cb390a3208eea0a77 100644
--- a/doc/dbus-api/spec/all.xml
+++ b/doc/dbus-api/spec/all.xml
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</
An Instance Manager to handle multiple clients connections. Count the number of clients actually registered to the core. When initializing your client, you need to register it against the core by using this interface.
</p>
</tp:docstring>
- <xi:include href="instance-introspec.xml"/>
+ <xi:include href="cx.ring.Ring.Instance.xml"/>
</tp:section>
<tp:section name="Call Manager">
@@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</
A Call Manager to handle call-related features.
</p>
</tp:docstring>
- <xi:include href="callmanager-introspec.xml"/>
+ <xi:include href="cx.ring.Ring.CallManager.xml"/>
</tp:section>
<tp:section name="Configuration Manager">
@@ -47,7 +47,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</
A Configuration Manager to handle account configuration, user preferences, ...
</p>
</tp:docstring>
- <xi:include href="configurationmanager-introspec.xml"/>
+ <xi:include href="cx.ring.Ring.ConfigurationManager.xml"/>
</tp:section>
<xi:include href="generic-types.xml"/>