From 9877388599d1f58e9333ceed8ff277e001f46b6e Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 6 Mar 2012 19:07:08 +0000 Subject: [PATCH 09/10] Move Account, AccountManager, Client generated client code to cli-misc.h --- docs/reference/telepathy-glib-docs.sgml | 2 + docs/reference/telepathy-glib-sections.txt | 79 +++++++++++++++------------ telepathy-glib/account-manager.h | 2 - telepathy-glib/account.h | 2 - telepathy-glib/cli-misc.h | 6 ++ telepathy-glib/client.c | 1 + telepathy-glib/client.h | 2 - tests/dbus/account-channel-request.c | 1 + tests/lib/simple-channel-request.c | 1 + 9 files changed, 55 insertions(+), 41 deletions(-) diff --git a/docs/reference/telepathy-glib-docs.sgml b/docs/reference/telepathy-glib-docs.sgml index cfcfc85..622b0b3 100644 --- a/docs/reference/telepathy-glib-docs.sgml +++ b/docs/reference/telepathy-glib-docs.sgml @@ -75,12 +75,14 @@ + + diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt index f7d3d30..be9df8f 100644 --- a/docs/reference/telepathy-glib-sections.txt +++ b/docs/reference/telepathy-glib-sections.txt @@ -3987,23 +3987,6 @@ tp_account_get_feature_quark_core tp_account_get_feature_quark_connection tp_account_get_feature_quark_addressing tp_account_get_feature_quark_storage - -tp_cli_account_callback_for_reconnect -tp_cli_account_call_reconnect -tp_cli_account_callback_for_remove -tp_cli_account_call_remove -tp_cli_account_callback_for_update_parameters -tp_cli_account_call_update_parameters -tp_cli_account_signal_callback_account_property_changed -tp_cli_account_connect_to_account_property_changed -tp_cli_account_signal_callback_removed -tp_cli_account_connect_to_removed - -tp_cli_account_interface_avatar_signal_callback_avatar_changed -tp_cli_account_interface_avatar_connect_to_avatar_changed - -tp_cli_account_interface_addressing_callback_for_set_uri_scheme_association -tp_cli_account_interface_addressing_call_set_uri_scheme_association TP_ACCOUNT TP_IS_ACCOUNT @@ -4038,13 +4021,6 @@ tp_account_manager_enable_restart TP_ACCOUNT_MANAGER_FEATURE_CORE tp_account_manager_get_feature_quark_core - -tp_cli_account_manager_callback_for_create_account -tp_cli_account_manager_call_create_account -tp_cli_account_manager_signal_callback_account_removed -tp_cli_account_manager_connect_to_account_removed -tp_cli_account_manager_signal_callback_account_usability_changed -tp_cli_account_manager_connect_to_account_usability_changed TP_ACCOUNT_MANAGER TP_IS_ACCOUNT_MANAGER @@ -4058,6 +4034,34 @@ TpAccountManagerClassPrivate
+cli-account-manager +telepathy-glib/cli-misc.h +cli-account-manager +tp_cli_account_manager_callback_for_create_account +tp_cli_account_manager_call_create_account +tp_cli_account_manager_signal_callback_account_removed +tp_cli_account_manager_connect_to_account_removed +tp_cli_account_manager_signal_callback_account_usability_changed +tp_cli_account_manager_connect_to_account_usability_changed + +tp_cli_account_callback_for_reconnect +tp_cli_account_call_reconnect +tp_cli_account_callback_for_remove +tp_cli_account_call_remove +tp_cli_account_callback_for_update_parameters +tp_cli_account_call_update_parameters +tp_cli_account_signal_callback_account_property_changed +tp_cli_account_connect_to_account_property_changed +tp_cli_account_signal_callback_removed +tp_cli_account_connect_to_removed + +tp_cli_account_interface_avatar_signal_callback_avatar_changed +tp_cli_account_interface_avatar_connect_to_avatar_changed + +tp_cli_account_interface_addressing_callback_for_set_uri_scheme_association +tp_cli_account_interface_addressing_call_set_uri_scheme_association + +
channel-dispatcher telepathy-glib/channel-dispatcher.h channel-dispatcher @@ -4273,7 +4277,22 @@ TP_TYPE_SVC_CHANNEL_REQUEST TpClient TpClientClass tp_client_init_known_interfaces - + +tp_client_get_type +TP_CLIENT +TP_CLIENT_CLASS +TP_CLIENT_GET_CLASS +TP_IS_CLIENT +TP_IS_CLIENT_CLASS +TP_TYPE_CLIENT +TpClientClassPrivate +TpClientPrivate +
+ +
+cli-client +telepathy-glib/cli-misc.h +cli-client tp_cli_client_observer_callback_for_observe_channels tp_cli_client_observer_call_observe_channels @@ -4286,16 +4305,6 @@ tp_cli_client_interface_requests_call_remove_request tp_cli_client_approver_callback_for_add_dispatch_operation tp_cli_client_approver_call_add_dispatch_operation - -tp_client_get_type -TP_CLIENT -TP_CLIENT_CLASS -TP_CLIENT_GET_CLASS -TP_IS_CLIENT -TP_IS_CLIENT_CLASS -TP_TYPE_CLIENT -TpClientClassPrivate -TpClientPrivate
diff --git a/telepathy-glib/account-manager.h b/telepathy-glib/account-manager.h index 9d92e6a..6926335 100644 --- a/telepathy-glib/account-manager.h +++ b/telepathy-glib/account-manager.h @@ -107,6 +107,4 @@ void tp_account_manager_enable_restart (TpAccountManager *manager); G_END_DECLS -#include - #endif diff --git a/telepathy-glib/account.h b/telepathy-glib/account.h index 5a2fb2f..361cb52 100644 --- a/telepathy-glib/account.h +++ b/telepathy-glib/account.h @@ -253,6 +253,4 @@ GBinding *tp_account_bind_connection_status_to_property (TpAccount *self, G_END_DECLS -#include - #endif diff --git a/telepathy-glib/cli-misc.h b/telepathy-glib/cli-misc.h index 56b87f0..9efc661 100644 --- a/telepathy-glib/cli-misc.h +++ b/telepathy-glib/cli-misc.h @@ -22,16 +22,22 @@ #ifndef TELEPATHY_GLIB_CLI_MISC_H #define TELEPATHY_GLIB_CLI_MISC_H +#include +#include #include #include #include +#include #include #include #include +#include +#include #include #include #include +#include #include #include #include diff --git a/telepathy-glib/client.c b/telepathy-glib/client.c index 782fb94..3b66e62 100644 --- a/telepathy-glib/client.c +++ b/telepathy-glib/client.c @@ -23,6 +23,7 @@ #include "telepathy-glib/client.h" +#include #include #include #include diff --git a/telepathy-glib/client.h b/telepathy-glib/client.h index fce1220..55143bf 100644 --- a/telepathy-glib/client.h +++ b/telepathy-glib/client.h @@ -68,6 +68,4 @@ void tp_client_init_known_interfaces (void); G_END_DECLS -#include - #endif diff --git a/tests/dbus/account-channel-request.c b/tests/dbus/account-channel-request.c index a71a7d3..7570082 100644 --- a/tests/dbus/account-channel-request.c +++ b/tests/dbus/account-channel-request.c @@ -13,6 +13,7 @@ #include #include +#include #include #include diff --git a/tests/lib/simple-channel-request.c b/tests/lib/simple-channel-request.c index 1c9ca99..c19dbca 100644 --- a/tests/lib/simple-channel-request.c +++ b/tests/lib/simple-channel-request.c @@ -13,6 +13,7 @@ #include "simple-channel-request.h" #include +#include #include #include #include -- 1.7.9.1