[telepathy-mission-control/master] Remove the Creation interface altogether
Simon McVittie
simon.mcvittie at collabora.co.uk
Wed Sep 16 09:09:51 PDT 2009
---
.../libmcclient/tmpl/interfaces-body.sgml | 8 --
doc/reference/libmcclient/tmpl/interfaces.sgml | 22 ------
.../libmcclient/tmpl/libmcclient-unused.sgml | 48 ++++++++++++
.../libmcclient/tmpl/mc-account-manager.sgml | 31 --------
libmcclient/account-manager.xml | 1 -
libmcclient/mc-account-manager.c | 2 -
src/Makefile.am | 2 -
test/twisted/constants.py | 1 -
util/mc-tool.c | 2 +-
xml/Account_Manager_Interface_Creation.xml | 77 --------------------
xml/Makefile.am | 1 -
xml/nmc5.xml | 1 -
12 files changed, 49 insertions(+), 147 deletions(-)
delete mode 100644 xml/Account_Manager_Interface_Creation.xml
diff --git a/doc/reference/libmcclient/tmpl/interfaces-body.sgml b/doc/reference/libmcclient/tmpl/interfaces-body.sgml
index 0ba8335..9789d8f 100644
--- a/doc/reference/libmcclient/tmpl/interfaces-body.sgml
+++ b/doc/reference/libmcclient/tmpl/interfaces-body.sgml
@@ -65,11 +65,3 @@ interfaces-body
@Returns:
-<!-- ##### FUNCTION mc_iface_quark_account_manager_interface_creation ##### -->
-<para>
-
-</para>
-
- at Returns:
-
-
diff --git a/doc/reference/libmcclient/tmpl/interfaces.sgml b/doc/reference/libmcclient/tmpl/interfaces.sgml
index 4cfbe0b..1eef834 100644
--- a/doc/reference/libmcclient/tmpl/interfaces.sgml
+++ b/doc/reference/libmcclient/tmpl/interfaces.sgml
@@ -149,25 +149,3 @@ interfaces
@Returns:
-<!-- ##### MACRO MC_IFACE_ACCOUNT_MANAGER_INTERFACE_CREATION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO MC_IFACE_QUARK_ACCOUNT_MANAGER_INTERFACE_CREATION ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION mc_iface_quark_account_manager_interface_creation ##### -->
-<para>
-
-</para>
-
- at Returns:
-
-
diff --git a/doc/reference/libmcclient/tmpl/libmcclient-unused.sgml b/doc/reference/libmcclient/tmpl/libmcclient-unused.sgml
index a6bbcef..a0aa6e8 100644
--- a/doc/reference/libmcclient/tmpl/libmcclient-unused.sgml
+++ b/doc/reference/libmcclient/tmpl/libmcclient-unused.sgml
@@ -94,12 +94,24 @@ cli-account-manager
cli-account
+<!-- ##### MACRO MC_IFACE_ACCOUNT_MANAGER_INTERFACE_CREATION ##### -->
+<para>
+
+</para>
+
+
<!-- ##### MACRO MC_IFACE_NMC4 ##### -->
<para>
</para>
+<!-- ##### MACRO MC_IFACE_QUARK_ACCOUNT_MANAGER_INTERFACE_CREATION ##### -->
+<para>
+
+</para>
+
+
<!-- ##### MACRO MC_IFACE_QUARK_NMC4 ##### -->
<para>
@@ -218,6 +230,42 @@ cli-account
@user_data:
@weak_object:
+<!-- ##### FUNCTION mc_cli_account_manager_interface_creation_call_create_account ##### -->
+<para>
+
+</para>
+
+ at proxy:
+ at timeout_ms:
+ at in_Connection_Manager:
+ at in_Protocol:
+ at in_Display_Name:
+ at in_Parameters:
+ at in_Properties:
+ at callback:
+ at user_data:
+ at destroy:
+ at weak_object:
+ at Returns:
+
+<!-- ##### USER_FUNCTION mc_cli_account_manager_interface_creation_callback_for_create_account ##### -->
+<para>
+
+</para>
+
+ at proxy:
+ at out_Account:
+ at error:
+ at user_data:
+ at weak_object:
+
+<!-- ##### FUNCTION mc_iface_quark_account_manager_interface_creation ##### -->
+<para>
+
+</para>
+
+ at Returns:
+
<!-- ##### FUNCTION mc_iface_quark_nmc4 ##### -->
<para>
diff --git a/doc/reference/libmcclient/tmpl/mc-account-manager.sgml b/doc/reference/libmcclient/tmpl/mc-account-manager.sgml
index c7ddf12..c58e439 100644
--- a/doc/reference/libmcclient/tmpl/mc-account-manager.sgml
+++ b/doc/reference/libmcclient/tmpl/mc-account-manager.sgml
@@ -225,37 +225,6 @@ mc-account-manager
@Returns:
-<!-- ##### USER_FUNCTION mc_cli_account_manager_interface_creation_callback_for_create_account ##### -->
-<para>
-
-</para>
-
- at proxy:
- at out_Account:
- at error:
- at user_data:
- at weak_object:
-
-
-<!-- ##### FUNCTION mc_cli_account_manager_interface_creation_call_create_account ##### -->
-<para>
-
-</para>
-
- at proxy:
- at timeout_ms:
- at in_Connection_Manager:
- at in_Protocol:
- at in_Display_Name:
- at in_Parameters:
- at in_Properties:
- at callback:
- at user_data:
- at destroy:
- at weak_object:
- at Returns:
-
-
<!-- ##### USER_FUNCTION mc_cli_account_manager_interface_query_callback_for_find_accounts ##### -->
<para>
diff --git a/libmcclient/account-manager.xml b/libmcclient/account-manager.xml
index ef58038..1d07bf6 100644
--- a/libmcclient/account-manager.xml
+++ b/libmcclient/account-manager.xml
@@ -3,7 +3,6 @@
xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="../xml/Account_Manager.xml"/>
-<xi:include href="../xml/Account_Manager_Interface_Creation.xml"/>
<xi:include href="../xml/Account_Manager_Interface_Query.xml"/>
</tp:spec>
diff --git a/libmcclient/mc-account-manager.c b/libmcclient/mc-account-manager.c
index abe6d03..7ca0b1c 100644
--- a/libmcclient/mc-account-manager.c
+++ b/libmcclient/mc-account-manager.c
@@ -231,8 +231,6 @@ mc_account_manager_init (McAccountManager *self)
McAccountManagerPrivate);
tp_proxy_add_interface_by_id ((TpProxy *)self,
- MC_IFACE_QUARK_ACCOUNT_MANAGER_INTERFACE_CREATION);
- tp_proxy_add_interface_by_id ((TpProxy *)self,
MC_IFACE_QUARK_ACCOUNT_MANAGER_INTERFACE_QUERY);
}
diff --git a/src/Makefile.am b/src/Makefile.am
index 87c3690..4a2f832 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,7 +40,6 @@ mc_gen_headers = \
_gen/svc-Account_Interface_Compat.h \
_gen/svc-Account_Interface_Conditions.h \
_gen/svc-Account_Interface_Stats.h \
- _gen/svc-Account_Manager_Interface_Creation.h \
_gen/svc-Account_Manager_Interface_Query.h
nodist_libmissioncontrol_server_la_SOURCES = \
@@ -55,7 +54,6 @@ nodist_libmissioncontrol_server_la_SOURCES = \
_gen/svc-Account_Interface_Compat.c \
_gen/svc-Account_Interface_Conditions.c \
_gen/svc-Account_Interface_Stats.c \
- _gen/svc-Account_Manager_Interface_Creation.c \
_gen/svc-Account_Manager_Interface_Query.c \
$(mc_gen_headers)
diff --git a/test/twisted/constants.py b/test/twisted/constants.py
index 30d0c8b..aef27e7 100644
--- a/test/twisted/constants.py
+++ b/test/twisted/constants.py
@@ -137,7 +137,6 @@ ACCOUNT_IFACE_NOKIA_REQUESTS = 'com.nokia.Account.Interface.ChannelRequests'
ACCOUNT_IFACE_NOKIA_CONDITIONS = 'com.nokia.Account.Interface.Conditions'
AM = tp_name_prefix + '.AccountManager'
-AM_IFACE_CREATION_DRAFT = AM + '.Interface.Creation.DRAFT'
AM_IFACE_NOKIA_QUERY = 'com.nokia.AccountManager.Interface.Query'
AM_PATH = tp_path_prefix + '/AccountManager'
diff --git a/util/mc-tool.c b/util/mc-tool.c
index 294f090..4410718 100644
--- a/util/mc-tool.c
+++ b/util/mc-tool.c
@@ -507,7 +507,7 @@ command_add (McAccountManager *manager)
}
return NULL !=
- mc_cli_account_manager_interface_creation_call_create_account
+ mc_cli_account_manager_call_create_account
(manager, 25000,
command.add.manager,
command.add.protocol,
diff --git a/xml/Account_Manager_Interface_Creation.xml b/xml/Account_Manager_Interface_Creation.xml
deleted file mode 100644
index 7cd29b3..0000000
--- a/xml/Account_Manager_Interface_Creation.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" ?>
-<node name="/Account_Manager_Interface_Creation" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
- <tp:copyright>Copyright (C) 2008 Nokia Corporation</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.AccountManager.Interface.Creation.DRAFT">
- <tp:requires interface="org.freedesktop.Telepathy.AccountManager"/>
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>The Creation interface provides methods and properties that are not
- yet finalized in the specs and that therefore are subject to change.</p>
-
- </tp:docstring>
-
- <method name="CreateAccount"
- tp:name-for-bindings="Create_Account">
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>Request the creation of a new account, and sets the given properties on it.</p>
-
- <tp:rationale>
- <p>Besides for optimization reasons, it makes sense for some
- properties to be set as soon as the account is created (one being the
- "Profile" property in the Compat interface).</p>
- </tp:rationale>
- </tp:docstring>
-
- <arg name="Connection_Manager" direction="in" type="s"
- tp:type="Connection_Manager_Name">
- <tp:docstring>
- The name of the connection manager, e.g. "salut".
- </tp:docstring>
- </arg>
-
- <arg name="Protocol" direction="in" type="s"
- tp:type="Protocol">
- <tp:docstring>The protocol, e.g. "local-xmpp".</tp:docstring>
- </arg>
-
- <arg name="Display_Name" direction="in" type="s">
- <tp:docstring>The initial value of the new account's DisplayName
- property. The account manager MAY modify this to make it unique,
- for instance by appending a number or the 'account'
- parameter.</tp:docstring>
- </arg>
-
- <arg name="Parameters" direction="in" type="a{sv}">
- <tp:docstring>Initial parameter values, as would be passed to
- RequestConnection.</tp:docstring>
- </arg>
-
- <arg direction="in" name="Properties" type="a{sv}" tp:type="String_Variant_Map">
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>The properties to be set, whose key must be in the form
- <code>Interface.PropertyName</code>.</p>
- </tp:docstring>
- </arg>
-
- <arg name="Account" direction="out" type="o">
- <tp:docstring>The new account.</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 ef83840..a2a0c76 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.xml \
- Account_Manager_Interface_Creation.xml \
Account_Manager_Interface_Query.xml \
Account.xml \
Account_Interface_Avatar.xml \
diff --git a/xml/nmc5.xml b/xml/nmc5.xml
index 3c09ca7..5813c65 100644
--- a/xml/nmc5.xml
+++ b/xml/nmc5.xml
@@ -12,7 +12,6 @@
<xi:include href="Account_Interface_Stats.xml"/>
<xi:include href="Account_Manager.xml"/>
<xi:include href="Account_Manager_Interface_Query.xml"/>
-<xi:include href="Account_Manager_Interface_Creation.xml"/>
<xi:include href="Client.xml"/>
<xi:include href="Client_Approver.xml"/>
--
1.5.6.5
More information about the telepathy-commits
mailing list