From a9988251a1f71a85a029f5ebc9221666dc273270 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 6 Mar 2012 18:29:47 +0000 Subject: [PATCH 05/10] cli-channel: new header for TpChannel's auto-generated client code --- docs/reference/telepathy-glib-docs.sgml | 1 + docs/reference/telepathy-glib-sections.txt | 30 ++++++++++++++++----------- examples/client/approver.c | 1 + examples/client/stream-tubes/offerer.c | 1 + telepathy-glib/Makefile.am | 1 + telepathy-glib/call-channel.c | 1 + telepathy-glib/channel-group.c | 1 + telepathy-glib/channel.c | 1 + telepathy-glib/channel.h | 2 - telepathy-glib/cli-channel.h | 30 ++++++++++++++++++++++++++++ telepathy-glib/contact-search.c | 1 + telepathy-glib/file-transfer-channel.c | 1 + telepathy-glib/stream-tube-channel.c | 1 + telepathy-glib/text-channel.c | 1 + tests/dbus/account-channel-request.c | 1 + tests/dbus/base-client.c | 1 + tests/dbus/channel.c | 1 + tests/dbus/cli-group.c | 1 + tests/dbus/group-mixin.c | 1 + tests/dbus/message-mixin.c | 1 + tests/dbus/simple-handler.c | 1 + tests/dbus/text-channel.c | 1 + tests/dbus/text-respawn.c | 1 + 23 files changed, 68 insertions(+), 14 deletions(-) create mode 100644 telepathy-glib/cli-channel.h diff --git a/docs/reference/telepathy-glib-docs.sgml b/docs/reference/telepathy-glib-docs.sgml index fa19106..3527752 100644 --- a/docs/reference/telepathy-glib-docs.sgml +++ b/docs/reference/telepathy-glib-docs.sgml @@ -56,6 +56,7 @@ + diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt index fc33975..e39b828 100644 --- a/docs/reference/telepathy-glib-sections.txt +++ b/docs/reference/telepathy-glib-sections.txt @@ -3034,6 +3034,12 @@ TP_CHANNEL_CLASS TP_CHANNEL_GET_CLASS TP_IS_CHANNEL TP_IS_CHANNEL_CLASS + + +
+cli-channel +cli-channel +telepathy-glib/cli-channel.h tp_cli_channel_call_close tp_cli_channel_callback_for_close @@ -3047,7 +3053,7 @@ tp_cli_channel_interface_destroyable_callback_for_destroy
channel-group channel-group -telepathy-glib/channel.h +telepathy-glib/cli-channel.h tp_cli_channel_interface_group_call_add_members tp_cli_channel_interface_group_call_remove_members tp_cli_channel_interface_group_callback_for_add_members @@ -3072,7 +3078,7 @@ tp_cli_channel_interface_conference_signal_callback_channel_removed
channel-text channel-text -telepathy-glib/channel.h +telepathy-glib/cli-channel.h tp_cli_channel_type_text_call_acknowledge_pending_messages tp_cli_channel_type_text_call_send_message tp_cli_channel_type_text_callback_for_acknowledge_pending_messages @@ -3103,7 +3109,7 @@ tp_cli_channel_interface_sms_callback_for_get_sms_length
channel-room channel-room -telepathy-glib/channel.h +telepathy-glib/cli-channel.h tp_cli_channel_interface_room_config_call_update_configuration tp_cli_channel_interface_room_config_callback_for_update_configuration @@ -3115,7 +3121,7 @@ tp_cli_channel_interface_subject_callback_for_set_subject
channel-file-transfer channel-file-transfer -telepathy-glib/channel.h +telepathy-glib/cli-channel.h tp_cli_channel_type_file_transfer_call_accept_file tp_cli_channel_type_file_transfer_call_provide_file tp_cli_channel_type_file_transfer_callback_for_accept_file @@ -3133,7 +3139,7 @@ tp_cli_channel_type_file_transfer_signal_callback_uri_defined
channel-media channel-media -telepathy-glib/channel.h +telepathy-glib/cli-channel.h tp_cli_channel_interface_dtmf_call_start_tone tp_cli_channel_interface_dtmf_call_stop_tone tp_cli_channel_interface_dtmf_callback_for_start_tone @@ -3158,7 +3164,7 @@ tp_cli_channel_interface_hold_connect_to_hold_state_changed
channel-tube channel-tube -telepathy-glib/channel.h +telepathy-glib/cli-channel.h tp_cli_channel_interface_tube_connect_to_tube_channel_state_changed tp_cli_channel_interface_tube_signal_callback_tube_channel_state_changed tp_cli_channel_type_stream_tube_call_offer @@ -3182,7 +3188,7 @@ tp_cli_channel_type_dbus_tube_signal_callback_dbus_names_changed
channel-roomlist channel-roomlist -telepathy-glib/channel.h +telepathy-glib/cli-channel.h tp_cli_channel_type_room_list_call_get_listing_rooms tp_cli_channel_type_room_list_call_list_rooms tp_cli_channel_type_room_list_call_stop_listing @@ -3198,7 +3204,7 @@ tp_cli_channel_type_room_list_signal_callback_listing_rooms
cli-anonymity cli-anonymity -telepathy-glib/telepathy-glib.h +telepathy-glib/telepathy-glib.h,telepathy-glib/cli-channel.h tp_cli_connection_interface_anonymity_connect_to_anonymity_modes_changed tp_cli_connection_interface_anonymity_signal_callback_anonymity_modes_changed
@@ -3206,7 +3212,7 @@ tp_cli_connection_interface_anonymity_signal_callback_anonymity_modes_changed
cli-service-point cli-service-point -telepathy-glib/telepathy-glib.h +telepathy-glib/telepathy-glib.h,telepathy-glib/cli-channel.h tp_cli_channel_interface_service_point_connect_to_service_point_changed tp_cli_channel_interface_service_point_signal_callback_service_point_changed tp_cli_connection_interface_service_point_connect_to_service_points_changed @@ -4747,7 +4753,7 @@ TpProtocolClassPrivate
channel-contactsearch channel-contactsearch -telepathy-glib/channel.h +telepathy-glib/cli-channel.h tp_cli_channel_type_contact_search_call_more tp_cli_channel_type_contact_search_call_search tp_cli_channel_type_contact_search_call_stop @@ -5192,7 +5198,7 @@ tp_svc_channel_interface_captcha_authentication_return_from_get_captchas
channel-auth channel-auth -telepathy-glib/channel.h +telepathy-glib/cli-channel.h tp_cli_channel_interface_sasl_authentication_call_abort_sasl tp_cli_channel_interface_sasl_authentication_call_accept_sasl tp_cli_channel_interface_sasl_authentication_call_respond @@ -5335,7 +5341,7 @@ tp_file_transfer_channel_get_feature_quark_core
cli-call-channel cli-call-channel -telepathy-glib/channel.h +telepathy-glib/cli-channel.h tp_cli_channel_type_call_call_accept tp_cli_channel_type_call_call_add_content diff --git a/examples/client/approver.c b/examples/client/approver.c index afc6594..1ff876a 100644 --- a/examples/client/approver.c +++ b/examples/client/approver.c @@ -14,6 +14,7 @@ #include #include +#include #include #include diff --git a/examples/client/stream-tubes/offerer.c b/examples/client/stream-tubes/offerer.c index 3b6535a..4ddd3f5 100644 --- a/examples/client/stream-tubes/offerer.c +++ b/examples/client/stream-tubes/offerer.c @@ -1,4 +1,5 @@ #include +#include static GMainLoop *loop = NULL; diff --git a/telepathy-glib/Makefile.am b/telepathy-glib/Makefile.am index 0747cbc..f89a712 100644 --- a/telepathy-glib/Makefile.am +++ b/telepathy-glib/Makefile.am @@ -70,6 +70,7 @@ our_headers = \ channel-dispatch-operation.h \ channel-manager.h \ channel-request.h \ + cli-channel.h \ cli-misc.h \ client.h \ client-channel-factory.h \ diff --git a/telepathy-glib/call-channel.c b/telepathy-glib/call-channel.c index 1df0c7c..9092d23 100644 --- a/telepathy-glib/call-channel.c +++ b/telepathy-glib/call-channel.c @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include diff --git a/telepathy-glib/channel-group.c b/telepathy-glib/channel-group.c index 71b13db..e1d5d65 100644 --- a/telepathy-glib/channel-group.c +++ b/telepathy-glib/channel-group.c @@ -23,6 +23,7 @@ #include "telepathy-glib/channel-internal.h" +#include #include #include #include diff --git a/telepathy-glib/channel.c b/telepathy-glib/channel.c index 1c10145..afde2d0 100644 --- a/telepathy-glib/channel.c +++ b/telepathy-glib/channel.c @@ -24,6 +24,7 @@ #include "telepathy-glib/channel-internal.h" #include +#include #include #include #include diff --git a/telepathy-glib/channel.h b/telepathy-glib/channel.h index b868b3d..9229530 100644 --- a/telepathy-glib/channel.h +++ b/telepathy-glib/channel.h @@ -191,6 +191,4 @@ gboolean tp_channel_provide_password_finish (TpChannel *self, G_END_DECLS -#include - #endif diff --git a/telepathy-glib/cli-channel.h b/telepathy-glib/cli-channel.h new file mode 100644 index 0000000..c664845 --- /dev/null +++ b/telepathy-glib/cli-channel.h @@ -0,0 +1,30 @@ +/* + * cli-channel.h - auto-generated client API for a Telepathy channel + * + * Copyright © 2007-2012 Collabora Ltd. + * Copyright © 2007 Nokia Corporation + * + * 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. + * + * 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. + * + * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef TELEPATHY_GLIB_CLI_CHANNEL_H +#define TELEPATHY_GLIB_CLI_CHANNEL_H + +#include + +#include + +#endif + diff --git a/telepathy-glib/contact-search.c b/telepathy-glib/contact-search.c index dacea81..5ebbec2 100644 --- a/telepathy-glib/contact-search.c +++ b/telepathy-glib/contact-search.c @@ -22,6 +22,7 @@ #include "telepathy-glib/contact-search.h" +#include #include #include #include diff --git a/telepathy-glib/file-transfer-channel.c b/telepathy-glib/file-transfer-channel.c index 34cc49b..b8e0f98 100644 --- a/telepathy-glib/file-transfer-channel.c +++ b/telepathy-glib/file-transfer-channel.c @@ -98,6 +98,7 @@ #include "telepathy-glib/file-transfer-channel.h" +#include #include #include #include diff --git a/telepathy-glib/stream-tube-channel.c b/telepathy-glib/stream-tube-channel.c index 94bb23d..e36cea3 100644 --- a/telepathy-glib/stream-tube-channel.c +++ b/telepathy-glib/stream-tube-channel.c @@ -49,6 +49,7 @@ #include "telepathy-glib/stream-tube-channel.h" +#include #include #include #include diff --git a/telepathy-glib/text-channel.c b/telepathy-glib/text-channel.c index 9f36fbb..7d61daa 100644 --- a/telepathy-glib/text-channel.c +++ b/telepathy-glib/text-channel.c @@ -47,6 +47,7 @@ #include "telepathy-glib/text-channel.h" +#include #include #include #include diff --git a/tests/dbus/account-channel-request.c b/tests/dbus/account-channel-request.c index e4abd1a..a71a7d3 100644 --- a/tests/dbus/account-channel-request.c +++ b/tests/dbus/account-channel-request.c @@ -12,6 +12,7 @@ #include #include +#include #include #include diff --git a/tests/dbus/base-client.c b/tests/dbus/base-client.c index fa90db9..5a1cf85 100644 --- a/tests/dbus/base-client.c +++ b/tests/dbus/base-client.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include diff --git a/tests/dbus/channel.c b/tests/dbus/channel.c index 1c7dc9a..0ad56db 100644 --- a/tests/dbus/channel.c +++ b/tests/dbus/channel.c @@ -13,6 +13,7 @@ #include +#include #include #include "tests/lib/util.h" diff --git a/tests/dbus/cli-group.c b/tests/dbus/cli-group.c index 4d1870a..4065752 100644 --- a/tests/dbus/cli-group.c +++ b/tests/dbus/cli-group.c @@ -13,6 +13,7 @@ #include #include +#include #include #include #include diff --git a/tests/dbus/group-mixin.c b/tests/dbus/group-mixin.c index ec209ec..d305dd7 100644 --- a/tests/dbus/group-mixin.c +++ b/tests/dbus/group-mixin.c @@ -11,6 +11,7 @@ #include "config.h" #include +#include #include #include #include diff --git a/tests/dbus/message-mixin.c b/tests/dbus/message-mixin.c index d918d3c..66c8429 100644 --- a/tests/dbus/message-mixin.c +++ b/tests/dbus/message-mixin.c @@ -11,6 +11,7 @@ #include "config.h" #include +#include #include #include #include diff --git a/tests/dbus/simple-handler.c b/tests/dbus/simple-handler.c index b44a119..d076a57 100644 --- a/tests/dbus/simple-handler.c +++ b/tests/dbus/simple-handler.c @@ -10,6 +10,7 @@ #include "config.h" #include +#include #include #include #include diff --git a/tests/dbus/text-channel.c b/tests/dbus/text-channel.c index 1fd5144..fbc1300 100644 --- a/tests/dbus/text-channel.c +++ b/tests/dbus/text-channel.c @@ -11,6 +11,7 @@ #include +#include #include #include diff --git a/tests/dbus/text-respawn.c b/tests/dbus/text-respawn.c index 28aef2a..2faf1bd 100644 --- a/tests/dbus/text-respawn.c +++ b/tests/dbus/text-respawn.c @@ -11,6 +11,7 @@ #include "config.h" #include +#include #include #include #include -- 1.7.9.1