diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2009-09-16 17:04:59 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2009-09-16 17:04:59 +0100 |
| commit | 2db843b4978423837ad543c381f833548434d878 (patch) | |
| tree | 416d8d9340c95db0ee6414934589a075757e1d29 /doc | |
| parent | a858e02a7f53dce0011173786f80ed648f280943 (diff) | |
| parent | e452e606d720ad22a905c2ab482ef294a96609c2 (diff) | |
Merge branch 'no-creation'
Reviewed-by: Alberto Mardegan <alberto.mardegan@nokia.com>
Conflicts:
src/mcd-account-manager.c
test/twisted/Makefile.am
test/twisted/account-manager/old-create-with-properties.py
Diffstat (limited to 'doc')
4 files changed, 48 insertions, 61 deletions
diff --git a/doc/reference/libmcclient/tmpl/interfaces-body.sgml b/doc/reference/libmcclient/tmpl/interfaces-body.sgml index 0ba8335a..9789d8fd 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> - -@Returns: - - diff --git a/doc/reference/libmcclient/tmpl/interfaces.sgml b/doc/reference/libmcclient/tmpl/interfaces.sgml index 4cfbe0b8..1eef834a 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> - -@Returns: - - diff --git a/doc/reference/libmcclient/tmpl/libmcclient-unused.sgml b/doc/reference/libmcclient/tmpl/libmcclient-unused.sgml index a6bbcef0..a0aa6e86 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> + +@proxy: +@timeout_ms: +@in_Connection_Manager: +@in_Protocol: +@in_Display_Name: +@in_Parameters: +@in_Properties: +@callback: +@user_data: +@destroy: +@weak_object: +@Returns: + +<!-- ##### USER_FUNCTION mc_cli_account_manager_interface_creation_callback_for_create_account ##### --> +<para> + +</para> + +@proxy: +@out_Account: +@error: +@user_data: +@weak_object: + +<!-- ##### FUNCTION mc_iface_quark_account_manager_interface_creation ##### --> +<para> + +</para> + +@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 c7ddf12c..c58e4393 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> - -@proxy: -@out_Account: -@error: -@user_data: -@weak_object: - - -<!-- ##### FUNCTION mc_cli_account_manager_interface_creation_call_create_account ##### --> -<para> - -</para> - -@proxy: -@timeout_ms: -@in_Connection_Manager: -@in_Protocol: -@in_Display_Name: -@in_Parameters: -@in_Properties: -@callback: -@user_data: -@destroy: -@weak_object: -@Returns: - - <!-- ##### USER_FUNCTION mc_cli_account_manager_interface_query_callback_for_find_accounts ##### --> <para> |