telepathy-mission-control: Don't generate code for Account.I.Addressing, use telepathy-glib's
Simon McVittie
smcv at kemper.freedesktop.org
Fri Sep 7 06:30:39 PDT 2012
Module: telepathy-mission-control
Branch: master
Commit: 0675c366c5b326d50a1ad7f368ee47c4219a47bd
URL: http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=0675c366c5b326d50a1ad7f368ee47c4219a47bd
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date: Fri Sep 7 11:29:53 2012 +0100
Don't generate code for Account.I.Addressing, use telepathy-glib's
Signed-off-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
Reviewed-by: Xavier Claessens <xavier.claessens at collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54633
---
src/Makefile.am | 2 -
src/mcd-account-addressing.c | 10 ++--
src/mcd-account-addressing.h | 2 +-
src/mcd-account-priv.h | 1 -
src/mcd-account.c | 4 +-
src/mcd.xml | 1 -
xml/Account_Interface_Addressing.xml | 76 ----------------------------------
xml/Makefile.am | 1 -
xml/nmc5.xml | 1 -
9 files changed, 8 insertions(+), 90 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index baa7784..041b770 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,7 +52,6 @@ mc_gen_headers = \
_gen/enums.h \
_gen/gtypes.h \
_gen/interfaces.h \
- _gen/svc-Account_Interface_Addressing.h \
_gen/svc-Account_Interface_Conditions.h \
_gen/svc-Account_Interface_External_Password_Storage.h \
_gen/svc-Account_Interface_Hidden.h \
@@ -67,7 +66,6 @@ nodist_libmcd_convenience_la_SOURCES = \
_gen/signals-marshal.c \
_gen/signals-marshal.h \
_gen/signals-marshal.list \
- _gen/svc-Account_Interface_Addressing.c \
_gen/svc-Account_Interface_Conditions.c \
_gen/svc-Account_Interface_External_Password_Storage.c \
_gen/svc-Account_Interface_Hidden.c \
diff --git a/src/mcd-account-addressing.c b/src/mcd-account-addressing.c
index 490a9da..fe9ce6a 100644
--- a/src/mcd-account-addressing.c
+++ b/src/mcd-account-addressing.c
@@ -32,10 +32,10 @@
#include "mcd-account-priv.h"
#include "_gen/interfaces.h"
-#define SCHEMES MC_IFACE_ACCOUNT_INTERFACE_ADDRESSING ".URISchemes"
+#define SCHEMES TP_IFACE_ACCOUNT_INTERFACE_ADDRESSING ".URISchemes"
static void
-addressing_set_uri_scheme_association (McSvcAccountInterfaceAddressing *iface,
+addressing_set_uri_scheme_association (TpSvcAccountInterfaceAddressing *iface,
const gchar *uri_scheme,
gboolean association,
DBusGMethodInvocation *context)
@@ -78,7 +78,7 @@ addressing_set_uri_scheme_association (McSvcAccountInterfaceAddressing *iface,
}
tp_g_value_slice_free (stored_value);
- mc_svc_account_interface_addressing_return_from_set_uri_scheme_association (
+ tp_svc_account_interface_addressing_return_from_set_uri_scheme_association (
context);
}
@@ -105,10 +105,10 @@ const McdDBusProp account_addressing_properties[] = {
};
void
-account_addressing_iface_init (McSvcAccountInterfaceAddressingClass *iface,
+account_addressing_iface_init (TpSvcAccountInterfaceAddressingClass *iface,
gpointer data)
{
- #define IMPLEMENT(x) mc_svc_account_interface_addressing_implement_##x (\
+ #define IMPLEMENT(x) tp_svc_account_interface_addressing_implement_##x (\
iface, addressing_##x)
IMPLEMENT(set_uri_scheme_association);
#undef IMPLEMENT
diff --git a/src/mcd-account-addressing.h b/src/mcd-account-addressing.h
index a91e110..6174046 100644
--- a/src/mcd-account-addressing.h
+++ b/src/mcd-account-addressing.h
@@ -32,7 +32,7 @@ G_BEGIN_DECLS
G_GNUC_INTERNAL extern const McdDBusProp account_addressing_properties[];
G_GNUC_INTERNAL void account_addressing_iface_init (
- McSvcAccountInterfaceAddressingClass *iface,
+ TpSvcAccountInterfaceAddressingClass *iface,
gpointer data);
G_END_DECLS
diff --git a/src/mcd-account-priv.h b/src/mcd-account-priv.h
index 0c8a4d6..a00b398 100644
--- a/src/mcd-account-priv.h
+++ b/src/mcd-account-priv.h
@@ -36,7 +36,6 @@
#include <telepathy-glib/proxy-subclass.h>
/* auto-generated stubs */
-#include "_gen/svc-Account_Interface_Addressing.h"
#include "_gen/svc-Account_Interface_Conditions.h"
#include "_gen/svc-Account_Interface_External_Password_Storage.h"
#include "_gen/svc-Account_Interface_Hidden.h"
diff --git a/src/mcd-account.c b/src/mcd-account.c
index 9a34323..ecc1035 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -88,9 +88,9 @@ static const McdInterfaceData account_interfaces[] = {
MCD_IMPLEMENT_IFACE (tp_svc_account_interface_storage_get_type,
account_storage,
TP_IFACE_ACCOUNT_INTERFACE_STORAGE),
- MCD_IMPLEMENT_IFACE (mc_svc_account_interface_addressing_get_type,
+ MCD_IMPLEMENT_IFACE (tp_svc_account_interface_addressing_get_type,
account_addressing,
- MC_IFACE_ACCOUNT_INTERFACE_ADDRESSING),
+ TP_IFACE_ACCOUNT_INTERFACE_ADDRESSING),
MCD_IMPLEMENT_IFACE (mc_svc_account_interface_hidden_get_type,
account_hidden,
MC_IFACE_ACCOUNT_INTERFACE_HIDDEN),
diff --git a/src/mcd.xml b/src/mcd.xml
index b0b626a..27ae8d6 100644
--- a/src/mcd.xml
+++ b/src/mcd.xml
@@ -6,7 +6,6 @@
<xi:include href="../xml/Connection_Manager_Interface_Account_Storage.xml"/>
-<xi:include href="../xml/Account_Interface_Addressing.xml"/>
<xi:include href="../xml/Account_Interface_Conditions.xml"/>
<xi:include href="../xml/Account_Interface_External_Password_Storage.xml"/>
<xi:include href="../xml/Account_Interface_Hidden.xml"/>
diff --git a/xml/Account_Interface_Addressing.xml b/xml/Account_Interface_Addressing.xml
deleted file mode 100644
index 2241fb8..0000000
--- a/xml/Account_Interface_Addressing.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" ?>
-<node name="/Account_Interface_Addressing" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
- <tp:copyright>Copyright © 2010 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="org.freedesktop.Telepathy.Account.Interface.Addressing">
- <tp:requires interface="org.freedesktop.Telepathy.Account"/>
- <tp:added version="0.21.UNRELEASED">(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
- and Skype accounts can often be used to contact the PSTN, MSN and
- Yahoo accounts can contact each other, and XMPP accounts can
- potentially contact many protocols via a transport.</p>
- <p>However, if the user does not intend to make use of this functionality,
- user interfaces can improve clarity by not displaying it: for instance,
- if a user prefers to call phone numbers via a particular SIP account,
- when an address book displays a contact with a phone number, it is
- desirable to display a "call with SIP" button for that account, but
- avoid displaying similar buttons for any other configured SIP or
- Skype accounts.</p>
- <p>The purpose of this interface is to allow this "for use with" information
- to be recorded and retrieved.</p>
- </tp:docstring>
-
- <property name="URISchemes" type="as" access="read"
- tp:name-for-bindings="URI_Schemes">
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>A list of fields indicating the type of URI addressing scheme
- the the account should be used for (eg 'tel') indicating the
- account is intended for use by applications offering a telephony
- UI, or 'sip' or 'xmpp' for those protocols</p>
- <p>Note that these fields signify intent, not ability: It is
- entirely possible that an account which can be used for a
- given URI scheme is not wanted for it by the user, and
- therefore not flagged as such in this field.</p>
- </tp:docstring>
- </property>
-
- <method name="SetURISchemeAssociation"
- tp:name-for-bindings="Set_URI_Scheme_Association">
- <tp:docstring>
- <p>Associate (or disassociate) an account with a particular
- URI addressing scheme, (such as 'tel' for telephony)</p>
- </tp:docstring>
-
- <arg name="URI_Scheme" direction="in" type="s">
- <tp:docstring>
- <p>URI scheme to associate/disassociate the account with/from</p>
- </tp:docstring>
- </arg>
-
- <arg name="Association" direction="in" type="b">
- <tp:docstring>
- <p>True to associate this account with a given addressing scheme</p>
- <p>False if the account should not be associated with said scheme</p>
- </tp:docstring>
- </arg>
-
- </method>
-
- </interface>
-</node>
-<!-- vim:set sw=2 sts=2 et ft=xml: -->
diff --git a/xml/Makefile.am b/xml/Makefile.am
index 1b6c8ae..50ef1d5 100644
--- a/xml/Makefile.am
+++ b/xml/Makefile.am
@@ -6,7 +6,6 @@ DROP_TPTYPE = sed -e 's at tp:type="[^"]*"@@g'
SPECS = \
Account_Manager_Interface_Hidden.xml \
- Account_Interface_Addressing.xml \
Account_Interface_Conditions.xml \
Account_Interface_External_Password_Storage.xml \
Account_Interface_Hidden.xml \
diff --git a/xml/nmc5.xml b/xml/nmc5.xml
index 9f17722..130fd3f 100644
--- a/xml/nmc5.xml
+++ b/xml/nmc5.xml
@@ -4,7 +4,6 @@
<tp:copyright>Copyright (C) 2008 Nokia Corporation</tp:copyright>
-<xi:include href="Account_Interface_Addressing.xml"/>
<xi:include href="Account_Interface_Conditions.xml"/>
<xi:include href="Account_Interface_External_Password_Storage.xml"/>
<xi:include href="Account_Interface_Hidden.xml"/>
More information about the telepathy-commits
mailing list