[telepathy-mission-control/master] Re-namespace ContactCapabilities to Contact_Capabilities_Draft1
Simon McVittie
simon.mcvittie at collabora.co.uk
Fri Sep 11 11:17:22 PDT 2009
This is necessary so we can support draft 2 at the same time.
---
src/Makefile.am | 4 ++--
src/mcd-connection.c | 18 +++++++++---------
src/mcd.xml | 2 +-
...tion_Interface_Contact_Capabilities_Draft1.xml} | 10 +++++-----
xml/Makefile.am | 2 +-
xml/nmc5.xml | 2 +-
6 files changed, 19 insertions(+), 19 deletions(-)
rename xml/{Connection_Interface_Contact_Capabilities.xml => Connection_Interface_Contact_Capabilities_Draft1.xml} (95%)
diff --git a/src/Makefile.am b/src/Makefile.am
index b4c9db1..2cae9d2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,7 +31,7 @@ mc_headers = \
mcd-provisioning-factory.h
mc_gen_headers = \
- _gen/cli-Connection_Interface_Contact_Capabilities.h \
+ _gen/cli-Connection_Interface_Contact_Capabilities_Draft1.h \
_gen/enums.h \
_gen/svc-Account_Interface_ChannelRequests.h \
_gen/svc-Account_Interface_Compat.h \
@@ -41,7 +41,7 @@ mc_gen_headers = \
_gen/svc-Account_Manager_Interface_Query.h
nodist_libmcd_convenience_la_SOURCES = \
- _gen/cli-Connection_Interface_Contact_Capabilities-body.h \
+ _gen/cli-Connection_Interface_Contact_Capabilities_Draft1-body.h \
_gen/register-dbus-glib-marshallers-body.h \
_gen/signals-marshal.c \
_gen/signals-marshal.h \
diff --git a/src/mcd-connection.c b/src/mcd-connection.c
index 2057330..c1e4a37 100644
--- a/src/mcd-connection.c
+++ b/src/mcd-connection.c
@@ -70,8 +70,8 @@
#include "sp_timestamp.h"
#include "mcd-signals-marshal.h"
-#include "_gen/cli-Connection_Interface_Contact_Capabilities.h"
-#include "_gen/cli-Connection_Interface_Contact_Capabilities-body.h"
+#include "_gen/cli-Connection_Interface_Contact_Capabilities_Draft1.h"
+#include "_gen/cli-Connection_Interface_Contact_Capabilities_Draft1-body.h"
#define INITIAL_RECONNECTION_TIME 1 /* 1 second */
@@ -113,7 +113,7 @@ struct _McdConnectionPrivate
guint has_avatars_if : 1;
guint has_alias_if : 1;
guint has_capabilities_if : 1;
- guint has_contact_capabilities_if : 1;
+ guint has_contact_capabilities_draft1_if : 1;
guint has_requests_if : 1;
/* FALSE until the dispatcher has said it's ready for us */
@@ -596,7 +596,7 @@ _mcd_connection_setup_contact_capabilities (McdConnection *connection)
McdConnectionPrivate *priv = MCD_CONNECTION_PRIV (connection);
GPtrArray *contact_capabilities;
- if (!priv->has_contact_capabilities_if)
+ if (!priv->has_contact_capabilities_draft1_if)
{
DEBUG ("connection does not support contact capabilities interface");
priv->got_contact_capabilities = TRUE;
@@ -607,7 +607,7 @@ _mcd_connection_setup_contact_capabilities (McdConnection *connection)
DEBUG ("advertising capabilities");
- mc_cli_connection_interface_contact_capabilities_call_set_self_capabilities
+ mc_cli_connection_interface_contact_capabilities_draft1_call_set_self_capabilities
(priv->tp_conn, -1, contact_capabilities, NULL, NULL, NULL, NULL);
DEBUG ("SetSelfCapabilities: Called.");
@@ -1376,8 +1376,8 @@ on_connection_ready (TpConnection *tp_conn, const GError *error,
TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING);
priv->has_capabilities_if = tp_proxy_has_interface_by_id (tp_conn,
TP_IFACE_QUARK_CONNECTION_INTERFACE_CAPABILITIES);
- priv->has_contact_capabilities_if = tp_proxy_has_interface_by_id (tp_conn,
- MC_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_CAPABILITIES);
+ priv->has_contact_capabilities_draft1_if = tp_proxy_has_interface_by_id (tp_conn,
+ MC_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_CAPABILITIES_DRAFT1);
priv->has_requests_if = tp_proxy_has_interface_by_id (tp_conn,
TP_IFACE_QUARK_CONNECTION_INTERFACE_REQUESTS);
@@ -1387,7 +1387,7 @@ on_connection_ready (TpConnection *tp_conn, const GError *error,
if (priv->has_capabilities_if)
_mcd_connection_setup_capabilities (connection);
- if (priv->has_contact_capabilities_if)
+ if (priv->has_contact_capabilities_draft1_if)
_mcd_connection_setup_contact_capabilities (connection);
if (priv->has_avatars_if)
@@ -1775,7 +1775,7 @@ mcd_connection_class_init (McdConnectionClass * klass)
tp_connection_init_known_interfaces ();
tp_proxy_or_subclass_hook_on_interface_add
(TP_TYPE_CONNECTION,
- mc_cli_Connection_Interface_Contact_Capabilities_add_signals);
+ mc_cli_Connection_Interface_Contact_Capabilities_Draft1_add_signals);
/* Properties */
g_object_class_install_property
diff --git a/src/mcd.xml b/src/mcd.xml
index a324381..4951f88 100644
--- a/src/mcd.xml
+++ b/src/mcd.xml
@@ -12,6 +12,6 @@
<xi:include href="../xml/Account_Manager_Interface_Query.xml"/>
<xi:include href="../xml/Account_Manager_Interface_Creation.xml"/>
-<xi:include href="../xml/Connection_Interface_Contact_Capabilities.xml"/>
+<xi:include href="../xml/Connection_Interface_Contact_Capabilities_Draft1.xml"/>
</tp:spec>
diff --git a/xml/Connection_Interface_Contact_Capabilities.xml b/xml/Connection_Interface_Contact_Capabilities_Draft1.xml
similarity index 95%
rename from xml/Connection_Interface_Contact_Capabilities.xml
rename to xml/Connection_Interface_Contact_Capabilities_Draft1.xml
index 042b24b..18e78ca 100644
--- a/xml/Connection_Interface_Contact_Capabilities.xml
+++ b/xml/Connection_Interface_Contact_Capabilities_Draft1.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<node name="/Connection_Interface_Contact_Capabilities" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Connection_Interface_Contact_Capabilities_Draft1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
<tp:copyright> Copyright (C) 2005, 2006, 2008 Collabora Limited </tp:copyright>
<tp:copyright> Copyright (C) 2005, 2006, 2008 Nokia Corporation </tp:copyright>
<tp:copyright> Copyright (C) 2006 INdT </tp:copyright>
@@ -101,7 +101,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
Now there is a fix, so we don't use the workaround anymore.
-->
<arg direction="out" type="a{ua(a{sv}as)}"
- tp:type="Contact_Capabilities_Map" name="Contact_Capabilities">
+ tp:type="Contact_Capabilities_Map_1" name="Contact_Capabilities">
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
An array of structures containing:
<ul>
@@ -126,7 +126,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
<signal name="ContactCapabilitiesChanged"
tp:name-for-bindings="Contact_Capabilities_Changed">
<arg name="caps" type="a{ua(a{sv}as)}"
- tp:type="Contact_Capabilities_Map">
+ tp:type="Contact_Capabilities_Map_1">
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
All the capabilities of the contacts
</tp:docstring>
@@ -144,8 +144,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
</tp:docstring>
</signal>
- <tp:mapping name="Contact_Capabilities_Map"
- array-name="Contact_Capabilities_Map_List">
+ <tp:mapping name="Contact_Capabilities_Map_1"
+ array-name="Contact_Capabilities_Map_1_List">
<tp:docstring>A mapping from contact handle to their capabilities.
</tp:docstring>
<tp:member type="u" name="Key" tp:type="Contact_Handle">
diff --git a/xml/Makefile.am b/xml/Makefile.am
index ef83840..6363fa1 100644
--- a/xml/Makefile.am
+++ b/xml/Makefile.am
@@ -23,7 +23,7 @@ SPECS = \
Client_Handler.xml \
Client_Interface_Requests.xml \
Client_Observer.xml \
- Connection_Interface_Contact_Capabilities.xml
+ Connection_Interface_Contact_Capabilities_Draft1.xml
SPECS_GEN = ${SPECS:%.xml=_gen/introspect-%.xml}
diff --git a/xml/nmc5.xml b/xml/nmc5.xml
index 3c09ca7..c4838df 100644
--- a/xml/nmc5.xml
+++ b/xml/nmc5.xml
@@ -25,6 +25,6 @@
<xi:include href="Channel_Request.xml"/>
<xi:include href="Channel_Dispatch_Operation.xml"/>
-<xi:include href="Connection_Interface_Contact_Capabilities.xml"/>
+<xi:include href="Connection_Interface_Contact_Capabilities_Draft1.xml"/>
</tp:spec>
--
1.5.6.5
More information about the telepathy-commits
mailing list