diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-05-07 15:34:13 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-05-07 15:34:13 +0100 |
| commit | 23203206ccdb31717624a930f0f94d79b2b28819 (patch) | |
| tree | cce13e8e351bda149e9f3687dcaddc2299a23bd5 | |
| parent | c3d3f29a61886f87f16e1c335aabc506b2b6beb3 (diff) | |
| parent | a95806d419ba88a57a1f5793e86bfe99a0d4dc02 (diff) | |
Merge branch 'master' into next
Conflicts:
docs/reference/telepathy-glib-sections.txt
examples/client/approver.c
examples/cm/call/call-manager.c
examples/cm/call/conn.c
examples/cm/channelspecific/conn.c
examples/cm/channelspecific/room.c
examples/cm/contactlist/conn.c
examples/cm/echo-message-parts/chan.c
examples/cm/echo-message-parts/conn.c
examples/cm/extended/conn.c
telepathy-glib/Makefile.am
telepathy-glib/base-contact-list-internal.h
telepathy-glib/contact.h
telepathy-glib/dbus-properties-mixin-internal.h
telepathy-glib/telepathy-glib-dbus.h
telepathy-glib/telepathy-glib.h
tools/glib-client-gen.py
59 files changed, 281 insertions, 288 deletions
@@ -7,6 +7,10 @@ Dependencies: Deprecations: +• Deprecations are now versioned. telepathy-glib users can define + TP_VERSION_MIN_REQUIRED and/or TP_VERSION_MAX_ALLOWED, which work like the + corresponding macros in GLib 2.32. + • All TpChannel APIs using contact TpHandle have been deprecated in favor of their TpContact variants. Note that replacement APIs are only guaranteed to work with Connection Managers implementing spec >= 0.23.4. Any CMs using @@ -15,8 +19,24 @@ Deprecations: • TpTextMixin is (officially) deprecated, use TpMessageMixin. +• TpIntsetIter is deprecated, use TpIntsetFastIter. The typedefs + TpIntSetIter and TpIntSetFastIter are also deprecated. + +• TP_ERRORS has officially been deprecated since 0.11; it now produces + deprecation warnings too. + Enhancements: +• <telepathy-glib/telepathy-glib.h> now includes all non-generated code + except proxy-subclass.h. Please use it instead of individual headers - + direct inclusion of most individual headers will become an error in + future versions, as was done for GLib. (Simon) + +• A new meta-header, <telepathy-glib/telepathy-glib-dbus.h>, now includes + all generated code. Please include it in any file that uses tp_svc_*, + tp_cli_*, TP_IFACE_*, TP_HASH_TYPE_*, TP_STRUCT_TYPE_* or TP_ARRAY_TYPE_*. + In telepathy-glib 1.0, it will become a separate pkg-config module. + • Replace --disable-coding-style-checks and --disable-doc-checks with --disable-fatal-warnings. In addition to what the removed options did, it changes the default for --disable-Werror and turns off @@ -36,8 +56,9 @@ Enhancements: • Add tp_connection_dup_detailed_error_vardict(), tp_base_connection_disconnect_with_dbus_error_vardict(), - tp_connection_manager_param_dup_default_variant() which use/return GVariants - instead of dbus-glib parameterized types (Simon) + tp_connection_manager_param_dup_default_variant(), + tp_capabilities_dup_channel_classes_variant() which use/return GVariants + instead of dbus-glib parameterized types (Simon, Guillaume) • Add a simple PyGtk3 dialler to the examples, and optionally install the Python examples as well as the C ones (fd.o #48504, Simon) diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt index bd9a22ad1..0aebf9cc4 100644 --- a/docs/reference/telepathy-glib-sections.txt +++ b/docs/reference/telepathy-glib-sections.txt @@ -1,5 +1,5 @@ <SECTION> -<INCLUDE>telepathy-glib/channel-iface.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <FILE>channel-iface</FILE> TpChannelFunc <TITLE>TpChannelIface</TITLE> @@ -101,7 +101,7 @@ TpBaseConnectionManagerPrivate </SECTION> <SECTION> -<INCLUDE>telepathy-glib/channel-manager.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <FILE>channel-manager</FILE> TpChannelManagerChannelClassFunc TpChannelManagerForeachChannelClassFunc @@ -135,7 +135,7 @@ TP_CHANNEL_MANAGER_GET_INTERFACE </SECTION> <SECTION> -<INCLUDE>telepathy-glib/exportable-channel.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <FILE>exportable-channel</FILE> TpExportableChannelFunc <TITLE>TpExportableChannel</TITLE> @@ -185,7 +185,7 @@ TpBaseChannelPrivate <SECTION> <FILE>handle-repo</FILE> -<INCLUDE>telepathy-glib/handle-repo.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <TITLE>handle-repo</TITLE> TpHandleRepoIface TpHandleRepoIfaceClass @@ -238,7 +238,7 @@ tp_handle_set_dump </SECTION> <SECTION> -<INCLUDE>telepathy-glib/handle-repo-dynamic.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <FILE>handle-repo-dynamic</FILE> <TITLE>TpDynamicHandleRepo</TITLE> TpDynamicHandleRepo @@ -258,7 +258,7 @@ TP_DYNAMIC_HANDLE_REPO_GET_CLASS <SECTION> <FILE>handle-repo-static</FILE> -<INCLUDE>telepathy-glib/handle-repo-static.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <TITLE>TpStaticHandleRepo</TITLE> tp_static_handle_repo_new TpStaticHandleRepo @@ -275,7 +275,7 @@ TP_STATIC_HANDLE_REPO_GET_CLASS <SECTION> <FILE>svc-generic</FILE> -<INCLUDE>telepathy-glib/svc-generic.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> <TITLE>svc-generic</TITLE> TpSvcDBusIntrospectable TpSvcDBusIntrospectableClass @@ -313,7 +313,7 @@ TP_TYPE_SVC_DBUS_PROPERTIES </SECTION> <SECTION> -<INCLUDE>telepathy-glib/svc-channel.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> <TITLE>svc-channel</TITLE> <FILE>svc-channel</FILE> TpSvcChannel @@ -342,7 +342,7 @@ TP_TYPE_SVC_CHANNEL_INTERFACE_DESTROYABLE </SECTION> <SECTION> -<INCLUDE>telepathy-glib/svc-channel.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> <TITLE>svc-channel-text</TITLE> <FILE>svc-channel-text</FILE> TpSvcChannelTypeText @@ -407,7 +407,7 @@ TP_IS_SVC_CHANNEL_INTERFACE_SMS </SECTION> <SECTION> -<INCLUDE>telepathy-glib/svc-channel.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> <TITLE>svc-channel-room</TITLE> <FILE>svc-channel-room</FILE> <SUBSECTION> @@ -446,7 +446,7 @@ TP_IS_SVC_CHANNEL_INTERFACE_SUBJECT </SECTION> <SECTION> -<INCLUDE>telepathy-glib/svc-channel.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> <TITLE>svc-channel-file-transfer</TITLE> <FILE>svc-channel-file-transfer</FILE> TpSvcChannelTypeFileTransfer @@ -470,7 +470,7 @@ TP_SVC_CHANNEL_TYPE_FILE_TRANSFER_GET_CLASS </SECTION> <SECTION> -<INCLUDE>telepathy-glib/svc-channel.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> <TITLE>svc-channel-tube</TITLE> <FILE>svc-channel-tube</FILE> TpSvcChannelInterfaceTube @@ -517,7 +517,7 @@ TP_SVC_CHANNEL_TYPE_DBUS_TUBE_GET_CLASS <SECTION> <FILE>svc-channel-roomlist</FILE> <TITLE>svc-channel-roomlist</TITLE> -<INCLUDE>telepathy-glib/svc-channel.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> TpSvcChannelTypeRoomList TpSvcChannelTypeRoomListClass tp_svc_channel_type_room_list_get_listing_rooms_impl @@ -542,7 +542,7 @@ TP_SVC_CHANNEL_TYPE_ROOM_LIST_GET_CLASS <SECTION> <FILE>svc-channel-group</FILE> <TITLE>svc-channel-group</TITLE> -<INCLUDE>telepathy-glib/svc-channel.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> TpSvcChannelInterfaceGroup TpSvcChannelInterfaceGroupClass tp_svc_channel_interface_group_add_members_impl @@ -576,7 +576,7 @@ tp_svc_channel_interface_conference_get_type <SECTION> <FILE>svc-channel-call</FILE> <TITLE>svc-channel-call</TITLE> -<INCLUDE>telepathy-glib/svc-call.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> TpSvcChannelTypeCall TpSvcChannelTypeCallClass tp_svc_channel_type_call_accept_impl @@ -864,7 +864,7 @@ TP_TYPE_SVC_CALL_STREAM_ENDPOINT <SECTION> <FILE>svc-anonymity</FILE> <TITLE>svc-anonymity</TITLE> -<INCLUDE>telepathy-glib/svc-channel.h,telepathy-glib/svc-connection.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> TpSvcConnectionInterfaceAnonymity TpSvcConnectionInterfaceAnonymityClass tp_svc_connection_interface_anonymity_emit_anonymity_modes_changed @@ -887,7 +887,7 @@ tp_svc_connection_interface_anonymity_get_type <SECTION> <FILE>svc-service-point</FILE> <TITLE>svc-service-point</TITLE> -<INCLUDE>telepathy-glib/svc-channel.h,telepathy-glib/svc-connection.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> TpSvcConnectionInterfaceServicePoint TpSvcConnectionInterfaceServicePointClass tp_svc_connection_interface_service_point_emit_service_points_changed @@ -910,7 +910,7 @@ tp_svc_connection_interface_service_point_get_type <SECTION> <FILE>svc-connection</FILE> -<INCLUDE>telepathy-glib/svc-connection.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> <TITLE>svc-connection</TITLE> TpSvcConnection TpSvcConnectionClass @@ -1258,7 +1258,7 @@ tp_svc_connection_interface_addressing_get_type <SECTION> <FILE>svc-connection-manager</FILE> -<INCLUDE>telepathy-glib/svc-connection-manager.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> <TITLE>svc-connection-manager</TITLE> TpSvcConnectionManager TpSvcConnectionManagerClass @@ -1277,7 +1277,7 @@ TP_SVC_CONNECTION_MANAGER_GET_CLASS <SECTION> <FILE>util</FILE> <TITLE>util</TITLE> -<INCLUDE>telepathy-glib/util.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> tp_g_hash_table_update tp_g_ptr_array_contains tp_g_ptr_array_extend @@ -1326,7 +1326,7 @@ tp_utf8_make_valid <SECTION> <FILE>gnio-util</FILE> <TITLE>gnio-util</TITLE> -<INCLUDE>telepathy-glib/gnio-util.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> tp_g_socket_address_from_variant tp_address_variant_from_g_socket_address tp_unix_connection_receive_credentials_with_byte @@ -1340,7 +1340,7 @@ tp_unix_connection_send_credentials_with_byte_finish <SECTION> <FILE>gtypes</FILE> <TITLE>gtypes</TITLE> -<INCLUDE>telepathy-glib/gtypes.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> <SUBSECTION> # Generic tp_dbus_specialized_value_slice_new @@ -1631,14 +1631,14 @@ tp_type_dbus_struct_ussuas <SECTION> <TITLE>run</TITLE> -<INCLUDE>telepathy-glib/run.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <FILE>run</FILE> tp_run_connection_manager </SECTION> <SECTION> <FILE>base-room-config</FILE> -<INCLUDE>telepathy-glib/base-room-config.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <TITLE>TpBaseRoomConfig</TITLE> TpBaseRoomConfig TpBaseRoomConfigClass @@ -1669,7 +1669,7 @@ TpBaseRoomConfigPrivate </SECTION> <SECTION> -<INCLUDE>telepathy-glib/contacts-mixin.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <FILE>contacts-mixin</FILE> <TITLE>TpContactsMixin</TITLE> @@ -1698,7 +1698,7 @@ TP_CONTACTS_MIXIN </SECTION> <SECTION> -<INCLUDE>telepathy-glib/presence-mixin.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <FILE>presence-mixin</FILE> TpPresenceStatusOptionalArgumentSpec TpPresenceStatusSpec @@ -1737,7 +1737,7 @@ TP_PRESENCE_MIXIN <SECTION> <FILE>debug</FILE> <TITLE>debug</TITLE> -<INCLUDE>telepathy-glib/debug.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> tp_debug_set_flags tp_debug_set_persistent tp_debug_divert_messages @@ -1746,7 +1746,7 @@ tp_debug_timestamped_log_handler <SECTION> <FILE>handle</FILE> -<INCLUDE>telepathy-glib/handle.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <TITLE>handle</TITLE> TpHandle TP_TYPE_HANDLE @@ -1757,7 +1757,7 @@ tp_handle_type_to_string <SECTION> <FILE>group-mixin</FILE> -<INCLUDE>telepathy-glib/group-mixin.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <TITLE>TpGroupMixin</TITLE> TP_HAS_GROUP_MIXIN TP_HAS_GROUP_MIXIN_CLASS @@ -1810,7 +1810,7 @@ TP_GROUP_MIXIN <SECTION> <FILE>intset</FILE> -<INCLUDE>telepathy-glib/intset.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <TITLE>TpIntset</TITLE> TpIntset TP_TYPE_INTSET @@ -1851,7 +1851,7 @@ TpIntSetFastIter <SECTION> <FILE>asv</FILE> <TITLE>asv</TITLE> -<INCLUDE>telepathy-glib/dbus.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> tp_asv_size tp_asv_new tp_asv_get_boolean @@ -1890,7 +1890,7 @@ tp_asv_dump <SECTION> <FILE>dbus</FILE> <TITLE>dbus</TITLE> -<INCLUDE>telepathy-glib/dbus.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> tp_dbus_g_method_return_not_implemented TpDBusNameType TP_TYPE_DBUS_NAME_TYPE @@ -1933,7 +1933,7 @@ TpDBusDaemonPrivate </SECTION> <SECTION> -<INCLUDE>telepathy-glib/dbus-properties-mixin.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <FILE>dbus-properties-mixin</FILE> <TITLE>dbus-properties-mixin</TITLE> TpDBusPropertiesMixinFlags @@ -1965,7 +1965,7 @@ tp_dbus_properties_mixin_flags_get_type <SECTION> <TITLE>errors</TITLE> -<INCLUDE>telepathy-glib/errors.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <FILE>errors</FILE> TP_ERROR_PREFIX TP_ERROR @@ -2035,7 +2035,7 @@ tp_error_quark <SECTION> <TITLE>TpHeap</TITLE> -<INCLUDE>telepathy-glib/heap.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <FILE>heap</FILE> TpHeap tp_heap_new @@ -2050,7 +2050,7 @@ tp_heap_size <SECTION> <FILE>message-mixin</FILE> -<INCLUDE>telepathy-glib/message-mixin.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <TITLE>TpMessageMixin</TITLE> TpMessageMixin TpMessageMixinSendImpl @@ -2071,7 +2071,7 @@ TpMessageMixinPrivate <SECTION> <FILE>message</FILE> -<INCLUDE>telepathy-glib/message.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <TITLE>TpMessage</TITLE> TpMessage tp_message_count_parts @@ -2115,7 +2115,7 @@ tp_message_get_type <SECTION> <FILE>cm-message</FILE> -<INCLUDE>telepathy-glib/cm-message.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <TITLE>TpCMMessage</TITLE> TpCMMessage tp_cm_message_new @@ -2254,7 +2254,7 @@ TP_NUM_MEDIA_STREAM_TYPES <SECTION> <FILE>interfaces</FILE> <TITLE>interfaces</TITLE> -<INCLUDE>telepathy-glib/interfaces.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> TP_CM_BUS_NAME_BASE TP_CM_OBJECT_PATH_BASE TP_CONN_BUS_NAME_BASE @@ -2856,7 +2856,7 @@ tp_iface_quark_channel_type_call <SECTION> <FILE>proxy</FILE> <TITLE>proxy</TITLE> -<INCLUDE>telepathy-glib/proxy.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> TpProxy TpProxyPrepareAsync TpProxyFeature @@ -2899,7 +2899,7 @@ TpProxyFeaturePrivate <SECTION> <FILE>proxy-dbus-core</FILE> <TITLE>proxy-dbus-core</TITLE> -<INCLUDE>telepathy-glib/cli-misc.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> <SUBSECTION> tp_cli_dbus_introspectable_call_introspect tp_cli_dbus_introspectable_callback_for_introspect @@ -3071,7 +3071,7 @@ tp_cli_channel_add_signals <SECTION> <FILE>channel-group</FILE> <TITLE>channel-group</TITLE> -<INCLUDE>telepathy-glib/cli-channel.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> 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 @@ -3096,7 +3096,7 @@ tp_cli_channel_interface_conference_signal_callback_channel_removed <SECTION> <FILE>channel-text</FILE> <TITLE>channel-text</TITLE> -<INCLUDE>telepathy-glib/cli-channel.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> 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 @@ -3129,7 +3129,7 @@ tp_cli_channel_interface_sms_callback_for_get_sms_length <SECTION> <FILE>channel-room</FILE> <TITLE>channel-room</TITLE> -<INCLUDE>telepathy-glib/cli-channel.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> <SUBSECTION> tp_cli_channel_interface_room_config_call_update_configuration tp_cli_channel_interface_room_config_callback_for_update_configuration @@ -3141,7 +3141,7 @@ tp_cli_channel_interface_subject_callback_for_set_subject <SECTION> <FILE>channel-file-transfer</FILE> <TITLE>channel-file-transfer</TITLE> -<INCLUDE>telepathy-glib/cli-channel.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> 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 @@ -3159,7 +3159,7 @@ tp_cli_channel_type_file_transfer_signal_callback_uri_defined <SECTION> <FILE>channel-media</FILE> <TITLE>channel-media</TITLE> -<INCLUDE>telepathy-glib/cli-channel.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> 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 @@ -3184,7 +3184,7 @@ tp_cli_channel_interface_hold_connect_to_hold_state_changed <SECTION> <FILE>channel-tube</FILE> <TITLE>channel-tube</TITLE> -<INCLUDE>telepathy-glib/cli-channel.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> 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 @@ -3208,7 +3208,7 @@ tp_cli_channel_type_dbus_tube_signal_callback_dbus_names_changed <SECTION> <FILE>channel-roomlist</FILE> <TITLE>channel-roomlist</TITLE> -<INCLUDE>telepathy-glib/cli-channel.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> 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 @@ -3224,7 +3224,7 @@ tp_cli_channel_type_room_list_signal_callback_listing_rooms <SECTION> <FILE>cli-anonymity</FILE> <TITLE>cli-anonymity</TITLE> -<INCLUDE>telepathy-glib/cli-connection.h,telepathy-glib/cli-channel.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> tp_cli_connection_interface_anonymity_connect_to_anonymity_modes_changed tp_cli_connection_interface_anonymity_signal_callback_anonymity_modes_changed </SECTION> @@ -3232,7 +3232,7 @@ tp_cli_connection_interface_anonymity_signal_callback_anonymity_modes_changed <SECTION> <FILE>cli-service-point</FILE> <TITLE>cli-service-point</TITLE> -<INCLUDE>telepathy-glib/cli-connection.h,telepathy-glib/cli-channel.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> 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 @@ -3409,7 +3409,7 @@ tp_cli_connection_add_signals <SECTION> <FILE>connection-aliasing</FILE> <TITLE>connection-aliasing</TITLE> -<INCLUDE>telepathy-glib/cli-connection.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> tp_cli_connection_interface_aliasing_call_get_alias_flags tp_cli_connection_interface_aliasing_call_request_aliases tp_cli_connection_interface_aliasing_call_get_aliases @@ -3425,7 +3425,7 @@ tp_cli_connection_interface_aliasing_signal_callback_aliases_changed <SECTION> <FILE>connection-avatars</FILE> <TITLE>connection-avatars</TITLE> -<INCLUDE>telepathy-glib/cli-connection.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> tp_cli_connection_interface_avatars_call_clear_avatar tp_cli_connection_interface_avatars_call_get_known_avatar_tokens tp_cli_connection_interface_avatars_call_request_avatars @@ -3443,7 +3443,7 @@ tp_cli_connection_interface_avatars_signal_callback_avatar_updated <SECTION> <FILE>connection-balance</FILE> <TITLE>connection-balance</TITLE> -<INCLUDE>telepathy-glib/cli-connection.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> tp_cli_connection_interface_balance_connect_to_balance_changed tp_cli_connection_interface_balance_signal_callback_balance_changed </SECTION> @@ -3451,7 +3451,7 @@ tp_cli_connection_interface_balance_signal_callback_balance_changed <SECTION> <FILE>connection-caps</FILE> <TITLE>connection-caps</TITLE> -<INCLUDE>telepathy-glib/cli-connection.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> tp_cli_connection_interface_contact_capabilities_callback_for_get_contact_capabilities tp_cli_connection_interface_contact_capabilities_call_get_contact_capabilities tp_cli_connection_interface_contact_capabilities_callback_for_update_capabilities @@ -3463,7 +3463,7 @@ tp_cli_connection_interface_contact_capabilities_connect_to_contact_capabilities <SECTION> <FILE>connection-contact-list</FILE> <TITLE>connection-contact-list</TITLE> -<INCLUDE>telepathy-glib/cli-connection.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> tp_cli_connection_interface_contact_blocking_call_block_contacts tp_cli_connection_interface_contact_blocking_call_request_blocked_contacts tp_cli_connection_interface_contact_blocking_call_unblock_contacts @@ -3518,7 +3518,7 @@ tp_cli_connection_interface_contact_list_callback_for_get_contact_list_attribute <SECTION> <FILE>connection-cellular</FILE> <TITLE>connection-cellular</TITLE> -<INCLUDE>telepathy-glib/cli-connection.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> tp_cli_connection_interface_cellular_connect_to_imsi_changed tp_cli_connection_interface_cellular_signal_callback_imsi_changed </SECTION> @@ -3526,7 +3526,7 @@ tp_cli_connection_interface_cellular_signal_callback_imsi_changed <SECTION> <FILE>connection-contacts</FILE> <TITLE>connection-contacts</TITLE> -<INCLUDE>telepathy-glib/cli-connection.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> tp_cli_connection_interface_contacts_call_get_contact_attributes tp_cli_connection_interface_contacts_callback_for_get_contact_attributes </SECTION> @@ -3534,7 +3534,7 @@ tp_cli_connection_interface_contacts_callback_for_get_contact_attributes <SECTION> <FILE>connection-contact-info</FILE> <TITLE>connection-contact-info</TITLE> -<INCLUDE>telepathy-glib/cli-connection.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> tp_cli_connection_interface_contact_info_call_get_contact_info tp_cli_connection_interface_contact_info_call_refresh_contact_info tp_cli_connection_interface_contact_info_call_request_contact_info @@ -3550,7 +3550,7 @@ tp_cli_connection_interface_contact_info_signal_callback_contact_info_changed <SECTION> <FILE>connection-requests</FILE> <TITLE>connection-requests</TITLE> -<INCLUDE>telepathy-glib/cli-connection.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> tp_cli_connection_interface_requests_call_create_channel tp_cli_connection_interface_requests_call_ensure_channel tp_cli_connection_interface_requests_callback_for_create_channel @@ -3564,7 +3564,7 @@ tp_cli_connection_interface_requests_signal_callback_new_channels <SECTION> <FILE>connection-presence</FILE> <TITLE>connection-presence</TITLE> -<INCLUDE>telepathy-glib/cli-connection.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> tp_cli_connection_interface_presence_call_get_presences tp_cli_connection_interface_presence_call_set_presence tp_cli_connection_interface_presence_callback_for_get_presences @@ -3576,7 +3576,7 @@ tp_cli_connection_interface_presence_signal_callback_presences_changed <SECTION> <FILE>connection-location</FILE> <TITLE>connection-location</TITLE> -<INCLUDE>telepathy-glib/cli-connection.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> tp_cli_connection_interface_location_connect_to_location_updated tp_cli_connection_interface_location_signal_callback_location_updated tp_cli_connection_interface_location_call_get_locations @@ -3587,12 +3587,10 @@ tp_cli_connection_interface_location_call_set_location tp_cli_connection_interface_location_callback_for_set_location </SECTION> -</SECTION> - <SECTION> <FILE>connection-powersaving</FILE> <TITLE>connection-powersaving</TITLE> -<INCLUDE>telepathy-glib/cli-connection.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> tp_cli_connection_interface_power_saving_call_set_power_saving tp_cli_connection_interface_power_saving_callback_for_set_power_saving tp_cli_connection_interface_power_saving_connect_to_power_saving_changed @@ -3602,7 +3600,7 @@ tp_cli_connection_interface_power_saving_signal_callback_power_saving_changed <SECTION> <FILE>connection-client-types</FILE> <TITLE>connection-client-types</TITLE> -<INCLUDE>telepathy-glib/cli-connection.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> tp_cli_connection_interface_client_types_call_get_client_types tp_cli_connection_interface_client_types_call_request_client_types tp_cli_connection_interface_client_types_callback_for_get_client_types @@ -3614,7 +3612,7 @@ tp_cli_connection_interface_client_types_signal_callback_client_types_updated <SECTION> <FILE>connection-mail</FILE> <TITLE>connection-mail</TITLE> -<INCLUDE>telepathy-glib/cli-connection.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> tp_cli_connection_interface_mail_notification_call_request_inbox_url tp_cli_connection_interface_mail_notification_call_request_mail_url tp_cli_connection_interface_mail_notification_callback_for_request_inbox_url @@ -3628,7 +3626,7 @@ tp_cli_connection_interface_mail_notification_signal_callback_unread_mails_chang <SECTION> <FILE>connection-addressing</FILE> <TITLE>connection-addressing</TITLE> -<INCLUDE>telepathy-glib/cli-connection.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> tp_cli_connection_interface_addressing_call_get_contacts_by_uri tp_cli_connection_interface_addressing_call_get_contacts_by_vcard_field tp_cli_connection_interface_addressing_callback_for_get_contacts_by_uri @@ -3638,7 +3636,7 @@ tp_cli_connection_interface_addressing_callback_for_get_contacts_by_vcard_field <SECTION> <FILE>connection-manager</FILE> <TITLE>connection-manager</TITLE> -<INCLUDE>telepathy-glib/connection-manager.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> TpConnectionManagerListCb tp_list_connection_managers_async tp_list_connection_managers_finish @@ -3782,7 +3780,6 @@ tp_contact_get_connection tp_contact_get_handle tp_contact_get_identifier tp_contact_has_feature -tp_contact_is_self <SUBSECTION> TP_CONTACT_FEATURE_ALIAS tp_contact_get_alias @@ -3868,7 +3865,7 @@ TpContactPrivate </SECTION> <SECTION> -<INCLUDE>telepathy-glib/capabilities.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <FILE>capabilities</FILE> <TITLE>capabilities</TITLE> TpCapabilities @@ -3903,7 +3900,7 @@ TpCapabilitiesPrivate <SECTION> <FILE>svc-account</FILE> -<INCLUDE>telepathy-glib/svc-account.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> <TITLE>svc-account</TITLE> TpSvcAccount TpSvcAccountClass @@ -3959,7 +3956,7 @@ tp_svc_account_interface_addressing_get_type <SECTION> <FILE>svc-account-manager</FILE> -<INCLUDE>telepathy-glib/svc-account-manager.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> <TITLE>svc-account-manager</TITLE> TpSvcAccountManager TpSvcAccountManagerClass @@ -3978,7 +3975,7 @@ TP_SVC_ACCOUNT_MANAGER_GET_CLASS <SECTION> <FILE>account</FILE> -<INCLUDE>telepathy-glib/account.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <TITLE>account</TITLE> TpAccount TpAccountClass @@ -4076,7 +4073,7 @@ TpAccountClassPrivate <SECTION> <FILE>account-manager</FILE> -<INCLUDE>telepathy-glib/account-manager.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <TITLE>account-manager</TITLE> TpAccountManager TpAccountManagerClass @@ -4141,7 +4138,7 @@ tp_cli_account_manager_add_signals <SECTION> <FILE>channel-dispatcher</FILE> -<INCLUDE>telepathy-glib/channel-dispatcher.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <TITLE>channel-dispatcher</TITLE> TpChannelDispatcher TpChannelDispatcherClass @@ -4204,7 +4201,7 @@ tp_cli_channel_request_add_signals <SECTION> <FILE>svc-channel-dispatcher</FILE> -<INCLUDE>telepathy-glib/svc-channel-dispatcher.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> <TITLE>svc-channel-dispatcher</TITLE> TpSvcChannelDispatcher TpSvcChannelDispatcherClass @@ -4240,7 +4237,7 @@ TP_SVC_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST_GET_CLASS <SECTION> <FILE>channel-dispatch-operation</FILE> -<INCLUDE>telepathy-glib/channel-dispatch-operation.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <TITLE>channel-dispatch-operation</TITLE> TpChannelDispatchOperation TpChannelDispatchOperationClass @@ -4279,7 +4276,7 @@ tp_channel_dispatch_operation_get_feature_quark_core <SECTION> <FILE>channel-request</FILE> -<INCLUDE>telepathy-glib/channel-request.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <TITLE>channel-request</TITLE> TpChannelRequest TpChannelRequestClass @@ -4304,7 +4301,7 @@ tp_channel_request_get_type <SECTION> <FILE>svc-channel-dispatch-operation</FILE> -<INCLUDE>telepathy-glib/svc-channel-dispatch-operation.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> <TITLE>svc-channel-dispatch-operation</TITLE> TpSvcChannelDispatchOperation TpSvcChannelDispatchOperationClass @@ -4329,7 +4326,7 @@ TP_TYPE_SVC_CHANNEL_DISPATCH_OPERATION <SECTION> <FILE>svc-channel-request</FILE> -<INCLUDE>telepathy-glib/svc-channel-request.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> <TITLE>svc-channel-request</TITLE> TpSvcChannelRequest TpSvcChannelRequestClass @@ -4351,7 +4348,7 @@ TP_TYPE_SVC_CHANNEL_REQUEST <SECTION> <FILE>client</FILE> -<INCLUDE>telepathy-glib/client.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <TITLE>client</TITLE> TpClient TpClientClass @@ -4390,7 +4387,7 @@ tp_cli_client_add_signals <SECTION> <FILE>svc-client</FILE> -<INCLUDE>telepathy-glib/svc-client.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> <TITLE>svc-client</TITLE> TpSvcClient TpSvcClientClass @@ -4449,7 +4446,7 @@ TP_TYPE_SVC_CLIENT_OBSERVER </SECTION> <SECTION> -<INCLUDE>telepathy-glib/svc-debug.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> <TITLE>svc-debug</TITLE> <FILE>svc-debug</FILE> TpSvcDebug @@ -4467,8 +4464,7 @@ tp_svc_debug_get_type </SECTION> <SECTION> -<INCLUDE>telepathy-glib/debug-sender.h</INCLUDE> -<INCLUDE>telepathy-glib/debug-sender.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <FILE>debug-sender</FILE> <TITLE>debug-sender</TITLE> TpDebugSender @@ -4546,7 +4542,7 @@ TpBaseClientClassPrivate </SECTION> <SECTION> -<INCLUDE>telepathy-glib/observe-channels-context.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <FILE>observe-channels-context</FILE> <TITLE>observe-channels-context</TITLE> TpObserveChannelsContext @@ -4567,7 +4563,7 @@ TpObserveChannelsContextPrivate </SECTION> <SECTION> -<INCLUDE>telepathy-glib/simple-observer.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <FILE>simple-observer</FILE> <TITLE>simple-observer</TITLE> TpSimpleObserver @@ -4587,7 +4583,7 @@ TpSimpleObserverPrivate </SECTION> <SECTION> -<INCLUDE>telepathy-glib/add-dispatch-operation-context.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <FILE>add-dispatch-operation-context</FILE> <TITLE>add-dispatch-operation-context</TITLE> TpAddDispatchOperationContext @@ -4607,7 +4603,7 @@ TP_TYPE_ADD_DISPATCH_OPERATION_CONTEXT </SECTION> <SECTION> -<INCLUDE>telepathy-glib/simple-approver.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <FILE>simple-approver</FILE> <TITLE>simple-approver</TITLE> TpSimpleApprover @@ -4627,7 +4623,7 @@ TpSimpleApproverPrivate </SECTION> <SECTION> -<INCLUDE>telepathy-glib/handle-channels-context.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <FILE>handle-channels-context</FILE> <TITLE>handle-channels-context</TITLE> TpHandleChannelsContext @@ -4649,7 +4645,7 @@ TP_TYPE_HANDLE_CHANNELS_CONTEXT </SECTION> <SECTION> -<INCLUDE>telepathy-glib/simple-handler.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <FILE>simple-handler</FILE> <TITLE>simple-handler</TITLE> TpSimpleHandler @@ -4669,7 +4665,7 @@ TpSimpleHandlerPrivate </SECTION> <SECTION> -<INCLUDE>telepathy-glib/simple-password-manager.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <FILE>simple-password-manager</FILE> <TITLE>simple-password-manager</TITLE> TpSimplePasswordManager @@ -4693,7 +4689,7 @@ TpSimplePasswordManagerPrivate </SECTION> <SECTION> -<INCLUDE>telepathy-glib/base-password-channel.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <FILE>base-password-channel</FILE> <TITLE>base-password-channel</TITLE> TpBasePasswordChannel @@ -4753,7 +4749,7 @@ TpBaseProtocolClassPrivate </SECTION> <SECTION> -<INCLUDE>telepathy-glib/svc-protocol.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> <FILE>svc-protocol</FILE> <TITLE>svc-protocol</TITLE> TpSvcProtocol @@ -4807,7 +4803,7 @@ TP_TYPE_SVC_PROTOCOL_INTERFACE_AVATARS </SECTION> <SECTION> -<INCLUDE>telepathy-glib/protocol.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <FILE>protocol</FILE> <TITLE>protocol</TITLE> TpProtocol @@ -4850,7 +4846,7 @@ TpProtocolClassPrivate <SECTION> <FILE>channel-contactsearch</FILE> <TITLE>channel-contactsearch</TITLE> -<INCLUDE>telepathy-glib/cli-channel.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> tp_cli_channel_type_contact_search_call_more tp_cli_channel_type_contact_search_call_search tp_cli_channel_type_contact_search_call_stop @@ -4866,7 +4862,7 @@ tp_cli_channel_type_contact_search_signal_callback_search_state_changed <SECTION> <FILE>svc-channel-contactsearch</FILE> <TITLE>svc-channel-contactsearch</TITLE> -<INCLUDE>telepathy-glib/svc-channel.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> TpSvcChannelTypeContactSearch TpSvcChannelTypeContactSearchClass tp_svc_channel_type_contact_search_emit_search_result_received @@ -4891,7 +4887,7 @@ tp_svc_channel_type_contact_search_get_type <SECTION> <FILE>account-channel-request</FILE> <TITLE>account-channel-request</TITLE> -<INCLUDE>telepathy-glib/account-channel-request.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> TpAccountChannelRequest tp_account_channel_request_new tp_account_channel_request_get_request @@ -4938,7 +4934,7 @@ TP_TYPE_ACCOUNT_CHANNEL_REQUEST <SECTION> <FILE>svc-tls</FILE> <TITLE>svc-tls</TITLE> -<INCLUDE>telepathy-glib/svc-channel.h,telepathy-glib/svc-tls.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> <SUBSECTION> TpSvcChannelTypeServerTLSConnection TpSvcChannelTypeServerTLSConnectionClass @@ -5095,7 +5091,7 @@ tp_mutable_contact_group_list_get_type <SECTION> <FILE>stream-tube-channel</FILE> <TITLE>stream-tube-channel</TITLE> -<INCLUDE>telepathy-glib/stream-tube-channel.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <SUBSECTION> TpStreamTubeChannel TpStreamTubeChannelClass @@ -5120,7 +5116,7 @@ TpStreamTubeChannelPrivate <SECTION> <FILE>stream-tube-connection</FILE> <TITLE>stream-tube-connection</TITLE> -<INCLUDE>telepathy-glib/stream-tube-connection.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <SUBSECTION> TpStreamTubeConnection TpStreamTubeConnectionClass @@ -5141,7 +5137,7 @@ TpStreamTubeConnectionPrivate <SECTION> <FILE>dbus-tube-channel</FILE> <TITLE>dbus-tube-channel</TITLE> -<INCLUDE>telepathy-glib/dbus-tube-channel.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <SUBSECTION> TpDBusTubeChannel TpDBusTubeChannelClass @@ -5188,7 +5184,7 @@ tp_dtmf_player_get_type <SECTION> <FILE>svc-channel-securable</FILE> <TITLE>svc-channel-securable</TITLE> -<INCLUDE>telepathy-glib/svc-channel.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> TpSvcChannelInterfaceSecurable TpSvcChannelInterfaceSecurableClass <SUBSECTION Standard> @@ -5202,7 +5198,7 @@ TP_SVC_CHANNEL_INTERFACE_SECURABLE_GET_CLASS <SECTION> <FILE>svc-channel-auth</FILE> <TITLE>svc-channel-auth</TITLE> -<INCLUDE>telepathy-glib/svc-channel.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> TpSvcChannelTypeServerAuthentication TpSvcChannelTypeServerAuthenticationClass <SUBSECTION> @@ -5263,7 +5259,7 @@ tp_svc_channel_interface_captcha_authentication_return_from_get_captchas <SECTION> <FILE>channel-auth</FILE> <TITLE>channel-auth</TITLE> -<INCLUDE>telepathy-glib/cli-channel.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> 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 @@ -5292,7 +5288,7 @@ tp_cli_channel_interface_captcha_authentication_callback_for_get_captchas <SECTION> <FILE>client-message</FILE> -<INCLUDE>telepathy-glib/client-message.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <TITLE>TpClientMessage</TITLE> TpClientMessage tp_client_message_new @@ -5309,7 +5305,7 @@ tp_client_message_get_type <SECTION> <FILE>signalled-message</FILE> -<INCLUDE>telepathy-glib/signalled-message.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <TITLE>TpSignalledMessage</TITLE> TpSignalledMessage tp_signalled_message_get_sender @@ -5406,7 +5402,7 @@ tp_file_transfer_channel_get_feature_quark_core <SECTION> <FILE>cli-call-channel</FILE> <TITLE>cli-call-channel</TITLE> -<INCLUDE>telepathy-glib/cli-channel.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> <SUBSECTION> tp_cli_channel_type_call_call_accept tp_cli_channel_type_call_call_add_content @@ -5481,7 +5477,7 @@ tp_call_channel_get_feature_quark_core <SECTION> <FILE>cli-call-content</FILE> <TITLE>cli-call-content</TITLE> -<INCLUDE>telepathy-glib/cli-call.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> <SUBSECTION> tp_cli_call_content_call_remove tp_cli_call_content_callback_for_remove @@ -5576,7 +5572,7 @@ tp_call_content_get_feature_quark_core <SECTION> <FILE>cli-call-stream</FILE> <TITLE>cli-call-stream</TITLE> -<INCLUDE>telepathy-glib/cli-call.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> <SUBSECTION> tp_cli_call_stream_call_request_receiving tp_cli_call_stream_call_set_sending @@ -5658,7 +5654,7 @@ tp_call_stream_get_feature_quark_core <SECTION> <FILE>cli-call-misc</FILE> <TITLE>cli-call-misc</TITLE> -<INCLUDE>telepathy-glib/cli-call.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> tp_cli_call_content_media_description_call_accept tp_cli_call_content_media_description_call_reject tp_cli_call_content_media_description_callback_for_accept @@ -5757,7 +5753,7 @@ tp_automatic_client_factory_get_type <SECTION> <FILE>svc-channel-ft-metadata</FILE> <TITLE>svc-channel-ft-metadata</TITLE> -<INCLUDE>telepathy-glib/svc-channel.h</INCLUDE> +<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE> TpSvcChannelInterfaceFileTransferMetadata TpSvcChannelInterfaceFileTransferMetadataClass <SUBSECTION Standard> diff --git a/examples/client/contact-list.c b/examples/client/contact-list.c index a82e5a0ed..ab34c4f32 100644 --- a/examples/client/contact-list.c +++ b/examples/client/contact-list.c @@ -11,7 +11,6 @@ #include "config.h" #include <telepathy-glib/telepathy-glib.h> -#include <telepathy-glib/debug.h> static void account_manager_prepared_cb (GObject *object, diff --git a/examples/client/media-observer.c b/examples/client/media-observer.c index 07065f3d4..464965887 100644 --- a/examples/client/media-observer.c +++ b/examples/client/media-observer.c @@ -13,8 +13,6 @@ #include <glib.h> #include <telepathy-glib/telepathy-glib.h> -#include <telepathy-glib/debug.h> -#include <telepathy-glib/simple-observer.h> static void chan_invalidated_cb (TpProxy *proxy, diff --git a/examples/cm/call/call-channel.c b/examples/cm/call/call-channel.c index 580d7249f..1ae680669 100644 --- a/examples/cm/call/call-channel.c +++ b/examples/cm/call/call-channel.c @@ -40,10 +40,6 @@ #include <gobject/gvaluecollector.h> -#include <telepathy-glib/base-connection.h> -#include <telepathy-glib/channel-iface.h> -#include <telepathy-glib/svc-channel.h> -#include <telepathy-glib/svc-call.h> #include <telepathy-glib/telepathy-glib.h> #include <telepathy-glib/telepathy-glib-dbus.h> diff --git a/examples/cm/call/call-content.c b/examples/cm/call/call-content.c index 2f81835bb..b72b5f25e 100644 --- a/examples/cm/call/call-content.c +++ b/examples/cm/call/call-content.c @@ -21,9 +21,8 @@ #include "call-content.h" -#include <telepathy-glib/base-connection.h> #include <telepathy-glib/telepathy-glib.h> -#include <telepathy-glib/svc-call.h> +#include <telepathy-glib/telepathy-glib-dbus.h> G_DEFINE_TYPE (ExampleCallContent, example_call_content, diff --git a/examples/cm/call/call-stream.c b/examples/cm/call/call-stream.c index c8fe4f28d..cc63d5469 100644 --- a/examples/cm/call/call-stream.c +++ b/examples/cm/call/call-stream.c @@ -21,9 +21,8 @@ #include "call-stream.h" -#include <telepathy-glib/base-connection.h> -#include <telepathy-glib/gtypes.h> -#include <telepathy-glib/svc-call.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> G_DEFINE_TYPE (ExampleCallStream, example_call_stream, diff --git a/examples/cm/call/cm.c b/examples/cm/call/cm.c index 5e42d97d3..4f67f57f1 100644 --- a/examples/cm/call/cm.c +++ b/examples/cm/call/cm.c @@ -25,8 +25,7 @@ #include <dbus/dbus-glib.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/errors.h> +#include <telepathy-glib/telepathy-glib.h> #include "conn.h" #include "protocol.h" diff --git a/examples/cm/call/cm.h b/examples/cm/call/cm.h index 275abb229..ed53e23cf 100644 --- a/examples/cm/call/cm.h +++ b/examples/cm/call/cm.h @@ -23,7 +23,7 @@ #define EXAMPLE_CALL_CM_H #include <glib-object.h> -#include <telepathy-glib/base-connection-manager.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/examples/cm/call/conn.c b/examples/cm/call/conn.c index e6b114ba5..c72b98a4e 100644 --- a/examples/cm/call/conn.c +++ b/examples/cm/call/conn.c @@ -27,8 +27,6 @@ #include <telepathy-glib/telepathy-glib.h> #include <telepathy-glib/telepathy-glib-dbus.h> -#include <telepathy-glib/handle-repo-dynamic.h> -#include <telepathy-glib/handle-repo-static.h> #include "call-manager.h" #include "protocol.h" diff --git a/examples/cm/call/conn.h b/examples/cm/call/conn.h index 1ad22ae3a..b9e98ad2e 100644 --- a/examples/cm/call/conn.h +++ b/examples/cm/call/conn.h @@ -13,9 +13,7 @@ #define EXAMPLE_CALL_CONN_H #include <glib-object.h> -#include <telepathy-glib/base-connection.h> -#include <telepathy-glib/contacts-mixin.h> -#include <telepathy-glib/presence-mixin.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/examples/cm/call/main.c b/examples/cm/call/main.c index a25936e1b..aee9f17bc 100644 --- a/examples/cm/call/main.c +++ b/examples/cm/call/main.c @@ -23,8 +23,7 @@ #include "config.h" -#include <telepathy-glib/debug.h> -#include <telepathy-glib/run.h> +#include <telepathy-glib/telepathy-glib.h> #include "cm.h" diff --git a/examples/cm/call/protocol.h b/examples/cm/call/protocol.h index 68d2acd7c..adfe8a6ed 100644 --- a/examples/cm/call/protocol.h +++ b/examples/cm/call/protocol.h @@ -11,7 +11,8 @@ #define EXAMPLE_CALL_PROTOCOL_H #include <glib-object.h> -#include <telepathy-glib/base-protocol.h> + +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/examples/cm/channelspecific/conn.c b/examples/cm/channelspecific/conn.c index 1b7ae2a6d..3e516d62d 100644 --- a/examples/cm/channelspecific/conn.c +++ b/examples/cm/channelspecific/conn.c @@ -17,7 +17,6 @@ #include <telepathy-glib/telepathy-glib.h> #include <telepathy-glib/telepathy-glib-dbus.h> -#include <telepathy-glib/handle-repo-dynamic.h> #include "protocol.h" #include "room-manager.h" diff --git a/examples/cm/channelspecific/conn.h b/examples/cm/channelspecific/conn.h index 63e1e31d3..dc056e586 100644 --- a/examples/cm/channelspecific/conn.h +++ b/examples/cm/channelspecific/conn.h @@ -13,8 +13,7 @@ #define __EXAMPLE_CSH_CONN_H__ #include <glib-object.h> -#include <telepathy-glib/base-connection.h> -#include <telepathy-glib/contacts-mixin.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/examples/cm/channelspecific/connection-manager.h b/examples/cm/channelspecific/connection-manager.h index b30105cd8..10185d172 100644 --- a/examples/cm/channelspecific/connection-manager.h +++ b/examples/cm/channelspecific/connection-manager.h @@ -13,7 +13,7 @@ #define __EXAMPLE_CSH_CONNECTION_MANAGER_H__ #include <glib-object.h> -#include <telepathy-glib/base-connection-manager.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/examples/cm/channelspecific/main.c b/examples/cm/channelspecific/main.c index 843d5a72b..5ba4ac36a 100644 --- a/examples/cm/channelspecific/main.c +++ b/examples/cm/channelspecific/main.c @@ -11,8 +11,7 @@ #include "config.h" -#include <telepathy-glib/debug.h> -#include <telepathy-glib/run.h> +#include <telepathy-glib/telepathy-glib.h> #include "examples/cm/channelspecific/connection-manager.h" diff --git a/examples/cm/channelspecific/protocol.h b/examples/cm/channelspecific/protocol.h index f823a435c..507c02d59 100644 --- a/examples/cm/channelspecific/protocol.h +++ b/examples/cm/channelspecific/protocol.h @@ -11,7 +11,7 @@ #define EXAMPLE_CHANNELSPECIFIC_PROTOCOL_H #include <glib-object.h> -#include <telepathy-glib/base-protocol.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/examples/cm/channelspecific/room-manager.h b/examples/cm/channelspecific/room-manager.h index 6e9eb27b7..a29692392 100644 --- a/examples/cm/channelspecific/room-manager.h +++ b/examples/cm/channelspecific/room-manager.h @@ -13,7 +13,7 @@ #define __EXAMPLE_CSH_ROOM_MANAGER_H__ #include <glib-object.h> -#include <telepathy-glib/channel-manager.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/examples/cm/channelspecific/room.c b/examples/cm/channelspecific/room.c index 5dea6e0e6..fd5dc4eae 100644 --- a/examples/cm/channelspecific/room.c +++ b/examples/cm/channelspecific/room.c @@ -13,8 +13,6 @@ #include <telepathy-glib/telepathy-glib.h> #include <telepathy-glib/telepathy-glib-dbus.h> -#include <telepathy-glib/channel-iface.h> -#include <telepathy-glib/svc-channel.h> G_DEFINE_TYPE_WITH_CODE (ExampleCSHRoomChannel, example_csh_room_channel, diff --git a/examples/cm/channelspecific/room.h b/examples/cm/channelspecific/room.h index 32f60ab62..7265e7442 100644 --- a/examples/cm/channelspecific/room.h +++ b/examples/cm/channelspecific/room.h @@ -12,10 +12,7 @@ #ifndef EXAMPLE_CSH_ROOM_H #define EXAMPLE_CSH_ROOM_H -#include <telepathy-glib/base-channel.h> -#include <telepathy-glib/base-connection.h> -#include <telepathy-glib/group-mixin.h> -#include <telepathy-glib/message-mixin.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/examples/cm/contactlist/conn.c b/examples/cm/contactlist/conn.c index 867e5f75a..c033d420c 100644 --- a/examples/cm/contactlist/conn.c +++ b/examples/cm/contactlist/conn.c @@ -17,8 +17,6 @@ #include <telepathy-glib/telepathy-glib.h> #include <telepathy-glib/telepathy-glib-dbus.h> -#include <telepathy-glib/handle-repo-dynamic.h> -#include <telepathy-glib/handle-repo-static.h> #include "contact-list.h" #include "protocol.h" diff --git a/examples/cm/contactlist/conn.h b/examples/cm/contactlist/conn.h index 73311d3c5..cb9b52cca 100644 --- a/examples/cm/contactlist/conn.h +++ b/examples/cm/contactlist/conn.h @@ -13,9 +13,7 @@ #define __EXAMPLE_CONTACT_LIST_CONN_H__ #include <glib-object.h> -#include <telepathy-glib/base-connection.h> -#include <telepathy-glib/contacts-mixin.h> -#include <telepathy-glib/presence-mixin.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/examples/cm/contactlist/connection-manager.h b/examples/cm/contactlist/connection-manager.h index b99d15963..d7f460aba 100644 --- a/examples/cm/contactlist/connection-manager.h +++ b/examples/cm/contactlist/connection-manager.h @@ -13,7 +13,7 @@ #define __EXAMPLE_CONTACT_LIST_CONNECTION_MANAGER_H__ #include <glib-object.h> -#include <telepathy-glib/base-connection-manager.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/examples/cm/contactlist/contact-list.c b/examples/cm/contactlist/contact-list.c index 5c21564b9..410ba45eb 100644 --- a/examples/cm/contactlist/contact-list.c +++ b/examples/cm/contactlist/contact-list.c @@ -17,7 +17,6 @@ #include <dbus/dbus-glib.h> -#include <telepathy-glib/base-connection.h> #include <telepathy-glib/telepathy-glib.h> /* this array must be kept in sync with the enum diff --git a/examples/cm/contactlist/contact-list.h b/examples/cm/contactlist/contact-list.h index 06f83bd84..fdd1175fd 100644 --- a/examples/cm/contactlist/contact-list.h +++ b/examples/cm/contactlist/contact-list.h @@ -14,10 +14,7 @@ #include <glib-object.h> -#include <telepathy-glib/base-contact-list.h> -#include <telepathy-glib/channel-manager.h> -#include <telepathy-glib/handle.h> -#include <telepathy-glib/presence-mixin.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/examples/cm/contactlist/main.c b/examples/cm/contactlist/main.c index c49622e84..222c7bb42 100644 --- a/examples/cm/contactlist/main.c +++ b/examples/cm/contactlist/main.c @@ -11,8 +11,7 @@ #include "config.h" -#include <telepathy-glib/debug.h> -#include <telepathy-glib/run.h> +#include <telepathy-glib/telepathy-glib.h> #include "connection-manager.h" diff --git a/examples/cm/contactlist/protocol.h b/examples/cm/contactlist/protocol.h index cfa07f79e..897f6e050 100644 --- a/examples/cm/contactlist/protocol.h +++ b/examples/cm/contactlist/protocol.h @@ -11,7 +11,7 @@ #define EXAMPLE_CONTACT_LIST_PROTOCOL_H #include <glib-object.h> -#include <telepathy-glib/base-protocol.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/examples/cm/echo-message-parts/chan.c b/examples/cm/echo-message-parts/chan.c index 9c8baa900..7c1d8d450 100644 --- a/examples/cm/echo-message-parts/chan.c +++ b/examples/cm/echo-message-parts/chan.c @@ -17,9 +17,9 @@ #include <telepathy-glib/telepathy-glib.h> #include <telepathy-glib/telepathy-glib-dbus.h> -#include <telepathy-glib/channel-iface.h> + +/* FIXME: example code should not be doing this! */ #include <telepathy-glib/message-internal.h> -#include <telepathy-glib/svc-channel.h> static void destroyable_iface_init (gpointer iface, gpointer data); static void sms_iface_init (gpointer iface, gpointer data); diff --git a/examples/cm/echo-message-parts/chan.h b/examples/cm/echo-message-parts/chan.h index 8a420cac7..bb2a53051 100644 --- a/examples/cm/echo-message-parts/chan.h +++ b/examples/cm/echo-message-parts/chan.h @@ -12,9 +12,7 @@ #ifndef EXAMPLE_ECHO_MESSAGE_PARTS_CHAN_H #define EXAMPLE_ECHO_MESSAGE_PARTS_CHAN_H -#include <telepathy-glib/base-channel.h> -#include <telepathy-glib/base-connection.h> -#include <telepathy-glib/message-mixin.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/examples/cm/echo-message-parts/conn.c b/examples/cm/echo-message-parts/conn.c index f7301cdc1..ac2793ac4 100644 --- a/examples/cm/echo-message-parts/conn.c +++ b/examples/cm/echo-message-parts/conn.c @@ -15,7 +15,6 @@ #include <telepathy-glib/telepathy-glib.h> #include <telepathy-glib/telepathy-glib-dbus.h> -#include <telepathy-glib/handle-repo-dynamic.h> #include "im-manager.h" #include "protocol.h" diff --git a/examples/cm/echo-message-parts/conn.h b/examples/cm/echo-message-parts/conn.h index f43a82597..12f003663 100644 --- a/examples/cm/echo-message-parts/conn.h +++ b/examples/cm/echo-message-parts/conn.h @@ -13,8 +13,7 @@ #define EXAMPLE_ECHO_MESSAGE_PARTS_CONN_H #include <glib-object.h> -#include <telepathy-glib/base-connection.h> -#include <telepathy-glib/contacts-mixin.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/examples/cm/echo-message-parts/connection-manager.h b/examples/cm/echo-message-parts/connection-manager.h index 645ac9524..6c4c54b0f 100644 --- a/examples/cm/echo-message-parts/connection-manager.h +++ b/examples/cm/echo-message-parts/connection-manager.h @@ -11,7 +11,7 @@ #define EXAMPLE_ECHO_MESSAGE_PARTS_MANAGER_H #include <glib-object.h> -#include <telepathy-glib/base-connection-manager.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/examples/cm/echo-message-parts/main.c b/examples/cm/echo-message-parts/main.c index 7a927cd86..e3941ccc7 100644 --- a/examples/cm/echo-message-parts/main.c +++ b/examples/cm/echo-message-parts/main.c @@ -11,8 +11,7 @@ #include "config.h" -#include <telepathy-glib/debug.h> -#include <telepathy-glib/run.h> +#include <telepathy-glib/telepathy-glib.h> #include "connection-manager.h" static TpBaseConnectionManager * diff --git a/examples/cm/echo-message-parts/protocol.h b/examples/cm/echo-message-parts/protocol.h index ce0377e0f..50f922f06 100644 --- a/examples/cm/echo-message-parts/protocol.h +++ b/examples/cm/echo-message-parts/protocol.h @@ -11,7 +11,7 @@ #define EXAMPLE_ECHO_MESSAGE_PARTS_PROTOCOL_H #include <glib-object.h> -#include <telepathy-glib/base-protocol.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/examples/cm/extended/conn.c b/examples/cm/extended/conn.c index c6747af2e..2cd95465f 100644 --- a/examples/cm/extended/conn.c +++ b/examples/cm/extended/conn.c @@ -17,7 +17,6 @@ #include <telepathy-glib/telepathy-glib.h> #include <telepathy-glib/telepathy-glib-dbus.h> -#include <telepathy-glib/handle-repo-dynamic.h> /* This would conventionally be extensions/extensions.h */ #include "examples/extensions/extensions.h" diff --git a/examples/cm/extended/conn.h b/examples/cm/extended/conn.h index ccc9c915b..ba0888cd7 100644 --- a/examples/cm/extended/conn.h +++ b/examples/cm/extended/conn.h @@ -13,8 +13,7 @@ #define __EXAMPLE_EXTENDED_CONN_H__ #include <glib-object.h> -#include <telepathy-glib/base-connection.h> -#include <telepathy-glib/contacts-mixin.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/examples/cm/extended/connection-manager.h b/examples/cm/extended/connection-manager.h index b3345f430..7f29d8203 100644 --- a/examples/cm/extended/connection-manager.h +++ b/examples/cm/extended/connection-manager.h @@ -11,7 +11,7 @@ #define __EXAMPLE_EXTENDED_CONNECTION_MANAGER_H__ #include <glib-object.h> -#include <telepathy-glib/base-connection-manager.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/examples/cm/extended/main.c b/examples/cm/extended/main.c index b0aba7101..a265ca3c8 100644 --- a/examples/cm/extended/main.c +++ b/examples/cm/extended/main.c @@ -11,8 +11,7 @@ #include "config.h" -#include <telepathy-glib/debug.h> -#include <telepathy-glib/run.h> +#include <telepathy-glib/telepathy-glib.h> #include "connection-manager.h" diff --git a/examples/cm/extended/protocol.h b/examples/cm/extended/protocol.h index 5feb4d31d..80a3cfb6e 100644 --- a/examples/cm/extended/protocol.h +++ b/examples/cm/extended/protocol.h @@ -11,7 +11,7 @@ #define EXAMPLE_EXTENDED_PROTOCOL_H #include <glib-object.h> -#include <telepathy-glib/base-protocol.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/examples/cm/no-protocols/connection-manager.h b/examples/cm/no-protocols/connection-manager.h index cf5716fa6..f1a277d2e 100644 --- a/examples/cm/no-protocols/connection-manager.h +++ b/examples/cm/no-protocols/connection-manager.h @@ -13,7 +13,7 @@ #define __EXAMPLE_NO_PROTOCOLS_CONNECTION_MANAGER_H__ #include <glib-object.h> -#include <telepathy-glib/base-connection-manager.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/examples/cm/no-protocols/main.c b/examples/cm/no-protocols/main.c index 3cf974c7c..a88ac7d71 100644 --- a/examples/cm/no-protocols/main.c +++ b/examples/cm/no-protocols/main.c @@ -11,8 +11,7 @@ #include "config.h" -#include <telepathy-glib/debug.h> -#include <telepathy-glib/run.h> +#include <telepathy-glib/telepathy-glib.h> #include "connection-manager.h" diff --git a/examples/extensions/extensions-cli.c b/examples/extensions/extensions-cli.c index 4302e3b3e..aba168013 100644 --- a/examples/extensions/extensions-cli.c +++ b/examples/extensions/extensions-cli.c @@ -2,7 +2,9 @@ #include "extensions.h" -#include <telepathy-glib/connection.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> + #include <telepathy-glib/proxy-subclass.h> static void _example_ext_register_dbus_glib_marshallers (void); diff --git a/examples/extensions/extensions.h b/examples/extensions/extensions.h index 26c53dcd9..40c1e7510 100644 --- a/examples/extensions/extensions.h +++ b/examples/extensions/extensions.h @@ -2,7 +2,8 @@ #define __EXAMPLE_EXTENSIONS_H__ #include <glib-object.h> -#include <telepathy-glib/connection.h> + +#include <telepathy-glib/telepathy-glib.h> #include "examples/extensions/_gen/enums.h" #include "examples/extensions/_gen/cli-connection.h" diff --git a/telepathy-glib/Makefile.am b/telepathy-glib/Makefile.am index 02e1e3321..eb447c863 100644 --- a/telepathy-glib/Makefile.am +++ b/telepathy-glib/Makefile.am @@ -335,8 +335,12 @@ libtelepathy_glib_reentrants_la_SOURCES = \ reentrants.c \ reentrants.h -AM_CFLAGS = \ +AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"tp-glib\" \ + -D_TP_COMPILATION \ + $(NULL) + +AM_CFLAGS = \ $(ERROR_CFLAGS) \ @DBUS_CFLAGS@ \ @GLIB_CFLAGS@ \ diff --git a/telepathy-glib/channel-contacts.c b/telepathy-glib/channel-contacts.c index cc8562bee..1c79237e8 100644 --- a/telepathy-glib/channel-contacts.c +++ b/telepathy-glib/channel-contacts.c @@ -29,7 +29,6 @@ #define DEBUG_FLAG TP_DEBUG_GROUPS #include "telepathy-glib/connection-internal.h" -#include "telepathy-glib/contact-internal.h" #include "telepathy-glib/debug-internal.h" #include "telepathy-glib/util-internal.h" @@ -171,7 +170,6 @@ _tp_channel_contacts_group_init (TpChannel *self, self->priv->group_self_contact = dup_contact (self, self->priv->group_self_handle, identifiers); - _tp_contact_set_is_self (self->priv->group_self_contact, TRUE); self->priv->group_members_contacts = dup_contacts_table (self, self->priv->group_members, identifiers); @@ -706,10 +704,6 @@ self_contact_changed_prepared_cb (GObject *object, _tp_channel_contacts_queue_prepare_finish (self, result, NULL, NULL); - if (self->priv->group_self_contact != NULL) - _tp_contact_set_is_self (self->priv->group_self_contact, FALSE); - _tp_contact_set_is_self (contact, TRUE); - g_clear_object (&self->priv->group_self_contact); self->priv->group_self_contact = contact; diff --git a/telepathy-glib/codegen.am b/telepathy-glib/codegen.am index 9ccf927c0..a7668b8ad 100644 --- a/telepathy-glib/codegen.am +++ b/telepathy-glib/codegen.am @@ -323,6 +323,7 @@ _gen/tp-cli-%-body.h: _gen/tp-spec-%.xml \ $(PYTHON) $(tools_dir)/glib-client-gen.py \ $$subclass $$subclass_assert \ --group `echo $* | tr - _` \ + --guard "TP_GEN_TP_CLI_`echo $* | tr a-z- A-Z_`_H_INCLUDED" \ --iface-quark-prefix=TP_IFACE_QUARK \ --tp-proxy-api=0.7.6 \ --deprecation-attribute=_TP_GNUC_DEPRECATED \ diff --git a/telepathy-glib/connection.c b/telepathy-glib/connection.c index 73beab8ab..59e1470f5 100644 --- a/telepathy-glib/connection.c +++ b/telepathy-glib/connection.c @@ -44,7 +44,6 @@ #include "telepathy-glib/capabilities-internal.h" #include "telepathy-glib/connection-internal.h" #include "telepathy-glib/connection-contact-list.h" -#include "telepathy-glib/contact-internal.h" #include "telepathy-glib/dbus-internal.h" #include "telepathy-glib/debug-internal.h" #include "telepathy-glib/proxy-internal.h" @@ -776,10 +775,6 @@ tp_connection_set_self_contact (TpConnection *self, { TpContact *tmp = self->priv->self_contact; - if (self->priv->self_contact != NULL) - _tp_contact_set_is_self (self->priv->self_contact, FALSE); - _tp_contact_set_is_self (contact, TRUE); - self->priv->self_contact = g_object_ref (contact); tp_clear_object (&tmp); g_object_notify ((GObject *) self, "self-contact"); diff --git a/telepathy-glib/contact-internal.h b/telepathy-glib/contact-internal.h index 57a350631..e77b52cfb 100644 --- a/telepathy-glib/contact-internal.h +++ b/telepathy-glib/contact-internal.h @@ -43,9 +43,6 @@ void _tp_contact_set_subscription_states (TpContact *self, void _tp_contact_set_is_blocked (TpContact *self, gboolean is_blocked); -void _tp_contact_set_is_self (TpContact *self, - gboolean is_self); - G_END_DECLS #endif diff --git a/telepathy-glib/contact.c b/telepathy-glib/contact.c index ba7ab66d2..2352dfaee 100644 --- a/telepathy-glib/contact.c +++ b/telepathy-glib/contact.c @@ -332,7 +332,6 @@ enum { PROP_PUBLISH_REQUEST, PROP_CONTACT_GROUPS, PROP_IS_BLOCKED, - PROP_IS_SELF, N_PROPS }; @@ -369,7 +368,6 @@ struct _TpContactPrivate { TpHandle handle; gchar *identifier; ContactFeatureFlags has_features; - gboolean is_self; /* aliasing */ gchar *alias; @@ -556,33 +554,6 @@ tp_contact_has_feature (TpContact *self, return ((self->priv->has_features & mask) != 0); } -/** - * tp_contact_is_self: - * @self: a contact - * - * <!-- --> - * - * Returns: the value of #TpContact:is-self property - * Since: 0.UNRELEASED - */ -gboolean -tp_contact_is_self (TpContact *self) -{ - g_return_val_if_fail (TP_IS_CONTACT (self), FALSE); - - return self->priv->is_self; -} - -void -_tp_contact_set_is_self (TpContact *self, - gboolean is_self) -{ - g_return_if_fail (TP_IS_CONTACT (self)); - - self->priv->is_self = is_self; - g_object_notify ((GObject *) self, "is-self"); -} - /** * tp_contact_get_alias: @@ -1170,10 +1141,6 @@ tp_contact_get_property (GObject *object, g_value_set_boolean (value, tp_contact_is_blocked (self)); break; - case PROP_IS_SELF: - g_value_set_boolean (value, tp_contact_is_self (self)); - break; - default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; @@ -1549,7 +1516,7 @@ tp_contact_class_init (TpContactClass *klass) g_object_class_install_property (object_class, PROP_CONTACT_GROUPS, param_spec); - /** +/** * TpContact:is-blocked: * * %TRUE if the contact has been blocked. @@ -1568,22 +1535,6 @@ tp_contact_class_init (TpContactClass *klass) g_object_class_install_property (object_class, PROP_IS_BLOCKED, param_spec); /** - * TpContact:is-self: - * - * This is %TRUE if the contact is set as - * #TpConnection's #TpConnection:self-contact or - * #TpChannel's #TpChannel:group-self-contact, %FALSE otherwise. - * - * Since: 0.UNRELEASED - */ - param_spec = g_param_spec_boolean ("is-self", - "is local user", - "TRUE if contact is local user", - FALSE, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); - g_object_class_install_property (object_class, PROP_IS_SELF, param_spec); - - /** * TpContact::contact-groups-changed: * @contact: A #TpContact * @added: A #GStrv with added contact groups diff --git a/telepathy-glib/contact.h b/telepathy-glib/contact.h index 07e605a89..2910f1dc3 100644 --- a/telepathy-glib/contact.h +++ b/telepathy-glib/contact.h @@ -106,8 +106,6 @@ TpConnection *tp_contact_get_connection (TpContact *self); TpHandle tp_contact_get_handle (TpContact *self); const gchar *tp_contact_get_identifier (TpContact *self); gboolean tp_contact_has_feature (TpContact *self, GQuark feature); -_TP_AVAILABLE_IN_0_20 -gboolean tp_contact_is_self (TpContact *self); /* TP_CONTACT_FEATURE_ALIAS */ const gchar *tp_contact_get_alias (TpContact *self); diff --git a/telepathy-glib/telepathy-glib-dbus.h b/telepathy-glib/telepathy-glib-dbus.h index e6e13017a..ea644674c 100644 --- a/telepathy-glib/telepathy-glib-dbus.h +++ b/telepathy-glib/telepathy-glib-dbus.h @@ -1,5 +1,5 @@ /* - * telepathy-glib-dbus.h - meta-header for parts of the D-Bus API + * telepathy-glib-dbus.h - meta-header for all generated code * * Copyright © 2009-2012 Collabora Ltd. <http://www.collabora.co.uk/> * @@ -18,19 +18,51 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TP_TELEPATHY_GLIB_DBUS_H -#define _TP_TELEPATHY_GLIB_DBUS_H +#ifndef TELEPATHY_GLIB_DBUS_H_INCLUDED +#define TELEPATHY_GLIB_DBUS_H_INCLUDED #define _TP_IN_META_HEADER -#include <telepathy-glib/interfaces.h> +#include <telepathy-glib/telepathy-glib.h> + +/* common */ #include <telepathy-glib/gtypes.h> +#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/cli-channel.h> -#include <telepathy-glib/cli-connection.h> -#include <telepathy-glib/cli-misc.h> +/* client-side */ +#include <telepathy-glib/_gen/tp-cli-account.h> +#include <telepathy-glib/_gen/tp-cli-account-manager.h> +#include <telepathy-glib/_gen/tp-cli-call-content.h> +#include <telepathy-glib/_gen/tp-cli-call-content-media-description.h> +#include <telepathy-glib/_gen/tp-cli-call-stream-endpoint.h> +#include <telepathy-glib/_gen/tp-cli-call-stream.h> +#include <telepathy-glib/_gen/tp-cli-channel-dispatcher.h> +#include <telepathy-glib/_gen/tp-cli-channel-dispatch-operation.h> +#include <telepathy-glib/_gen/tp-cli-channel.h> +#include <telepathy-glib/_gen/tp-cli-channel-request.h> +#include <telepathy-glib/_gen/tp-cli-client.h> +#include <telepathy-glib/_gen/tp-cli-connection.h> +#include <telepathy-glib/_gen/tp-cli-connection-manager.h> +#include <telepathy-glib/_gen/tp-cli-dbus-daemon.h> +#include <telepathy-glib/_gen/tp-cli-debug.h> +#include <telepathy-glib/_gen/tp-cli-generic.h> +#include <telepathy-glib/_gen/tp-cli-protocol.h> -#include <telepathy-glib/svc-generic.h> +/* service-side */ +#include <telepathy-glib/svc-account.h> +#include <telepathy-glib/svc-account-manager.h> +#include <telepathy-glib/svc-call.h> +#include <telepathy-glib/svc-channel-dispatcher.h> +#include <telepathy-glib/svc-channel-dispatch-operation.h> +#include <telepathy-glib/svc-channel.h> +#include <telepathy-glib/svc-channel-request.h> #include <telepathy-glib/svc-client.h> +#include <telepathy-glib/svc-connection.h> +#include <telepathy-glib/svc-connection-manager.h> +#include <telepathy-glib/svc-debug.h> +#include <telepathy-glib/svc-generic.h> +#include <telepathy-glib/svc-properties-interface.h> +#include <telepathy-glib/svc-protocol.h> +#include <telepathy-glib/svc-tls.h> -#undef _TP_IN_META_HEADER -#endif /* multiple-inclusion */ +#undef _TP_IN_META_HEADER +#endif diff --git a/telepathy-glib/telepathy-glib.h b/telepathy-glib/telepathy-glib.h index 900ec29d3..17d16dc0e 100644 --- a/telepathy-glib/telepathy-glib.h +++ b/telepathy-glib/telepathy-glib.h @@ -33,53 +33,79 @@ #include <telepathy-glib/account-channel-request.h> #include <telepathy-glib/account-manager.h> #include <telepathy-glib/account.h> +#include <telepathy-glib/add-dispatch-operation-context.h> #include <telepathy-glib/automatic-client-factory.h> +#include <telepathy-glib/base-call-channel.h> +#include <telepathy-glib/base-call-content.h> +#include <telepathy-glib/base-call-stream.h> +#include <telepathy-glib/base-channel.h> #include <telepathy-glib/base-client.h> +#include <telepathy-glib/base-connection-manager.h> +#include <telepathy-glib/base-connection.h> +#include <telepathy-glib/base-contact-list.h> +#include <telepathy-glib/base-media-call-channel.h> +#include <telepathy-glib/base-media-call-content.h> +#include <telepathy-glib/base-media-call-stream.h> +#include <telepathy-glib/base-password-channel.h> +#include <telepathy-glib/base-protocol.h> +#include <telepathy-glib/base-room-config.h> #include <telepathy-glib/call-channel.h> +#include <telepathy-glib/call-content-media-description.h> #include <telepathy-glib/call-content.h> #include <telepathy-glib/call-misc.h> +#include <telepathy-glib/call-stream-endpoint.h> #include <telepathy-glib/call-stream.h> +#include <telepathy-glib/capabilities.h> #include <telepathy-glib/channel-dispatch-operation.h> #include <telepathy-glib/channel-dispatcher.h> +#include <telepathy-glib/channel-manager.h> #include <telepathy-glib/channel-request.h> #include <telepathy-glib/channel.h> +#include <telepathy-glib/client.h> +#include <telepathy-glib/client-message.h> +#include <telepathy-glib/cm-message.h> #include <telepathy-glib/connection-contact-list.h> #include <telepathy-glib/connection-manager.h> #include <telepathy-glib/connection.h> -#include <telepathy-glib/contact.h> #include <telepathy-glib/contact-operations.h> -#include <telepathy-glib/contact-search.h> #include <telepathy-glib/contact-search-result.h> +#include <telepathy-glib/contact-search.h> +#include <telepathy-glib/contact.h> +#include <telepathy-glib/contacts-mixin.h> #include <telepathy-glib/dbus.h> -#include <telepathy-glib/dtmf.h> -#include <telepathy-glib/debug.h> +#include <telepathy-glib/dbus-properties-mixin.h> +#include <telepathy-glib/dbus-tube-channel.h> #include <telepathy-glib/debug-client.h> +#include <telepathy-glib/debug-message.h> +#include <telepathy-glib/debug-sender.h> +#include <telepathy-glib/debug.h> +#include <telepathy-glib/dtmf.h> +#include <telepathy-glib/exportable-channel.h> #include <telepathy-glib/file-transfer-channel.h> +#include <telepathy-glib/group-mixin.h> +#include <telepathy-glib/handle-channels-context.h> +#include <telepathy-glib/handle-repo.h> +#include <telepathy-glib/handle-repo-dynamic.h> +#include <telepathy-glib/handle-repo-static.h> #include <telepathy-glib/handle.h> +#include <telepathy-glib/message.h> +#include <telepathy-glib/message-mixin.h> +#include <telepathy-glib/observe-channels-context.h> +#include <telepathy-glib/presence-mixin.h> +#include <telepathy-glib/protocol.h> #include <telepathy-glib/proxy.h> +#include <telepathy-glib/room-info.h> +#include <telepathy-glib/room-list.h> +#include <telepathy-glib/run.h> #include <telepathy-glib/signalled-message.h> #include <telepathy-glib/simple-approver.h> #include <telepathy-glib/client-factory.h> #include <telepathy-glib/simple-handler.h> +#include <telepathy-glib/simple-password-manager.h> #include <telepathy-glib/simple-observer.h> #include <telepathy-glib/stream-tube-channel.h> #include <telepathy-glib/stream-tube-connection.h> #include <telepathy-glib/text-channel.h> -#include <telepathy-glib/room-list.h> - -#include <telepathy-glib/base-call-channel.h> -#include <telepathy-glib/base-call-content.h> -#include <telepathy-glib/base-call-stream.h> -#include <telepathy-glib/base-channel.h> -#include <telepathy-glib/base-media-call-channel.h> -#include <telepathy-glib/base-media-call-content.h> -#include <telepathy-glib/base-media-call-stream.h> -#include <telepathy-glib/base-connection.h> -#include <telepathy-glib/base-connection-manager.h> -#include <telepathy-glib/base-contact-list.h> -#include <telepathy-glib/base-protocol.h> -#include <telepathy-glib/call-content-media-description.h> -#include <telepathy-glib/call-stream-endpoint.h> #undef __TP_IN_GLIB_H__ #endif /* __TP_GLIB_H__ */ diff --git a/tests/Makefile.am b/tests/Makefile.am index ed1fd8090..15339f9a4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -154,6 +154,7 @@ LDADD = \ AM_CPPFLAGS = \ -I${top_srcdir} -I${top_builddir} \ + -D_TP_COMPILATION \ -D_TP_IGNORE_DEPRECATIONS \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ diff --git a/tests/dbus/Makefile.am b/tests/dbus/Makefile.am index c3463b34c..c111112a3 100644 --- a/tests/dbus/Makefile.am +++ b/tests/dbus/Makefile.am @@ -254,6 +254,7 @@ check-local: check-coding-style AM_CPPFLAGS = \ -I${top_srcdir} -I${top_builddir} \ + -D_TP_COMPILATION \ -D_TP_IGNORE_DEPRECATIONS \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ diff --git a/tests/dbus/channel.c b/tests/dbus/channel.c index 086db7a0c..6137e40a3 100644 --- a/tests/dbus/channel.c +++ b/tests/dbus/channel.c @@ -634,7 +634,6 @@ test_contacts (Test *test, contact = tp_channel_group_get_self_contact (test->channel_room); g_assert_cmpstr (tp_contact_get_identifier (contact), ==, "me@test.com"); - g_assert (tp_contact_is_self (contact)); /* Add a member in the room, assert that the member fetched its alias before * being signaled. */ diff --git a/tests/dbus/contacts.c b/tests/dbus/contacts.c index beb8a1e19..f987cb438 100644 --- a/tests/dbus/contacts.c +++ b/tests/dbus/contacts.c @@ -2563,7 +2563,6 @@ test_self_contact (Fixture *f, contact = tp_connection_get_self_contact (f->client_conn); g_assert (contact != NULL); g_assert (tp_contact_has_feature (contact, TP_CONTACT_FEATURE_ALIAS)); - g_assert (tp_contact_is_self (contact)); } static void diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am index a78dc9f08..c63d2e332 100644 --- a/tests/lib/Makefile.am +++ b/tests/lib/Makefile.am @@ -77,6 +77,10 @@ check_c_sources = *.c include $(top_srcdir)/tools/check-coding-style.mk check-local: check-coding-style +AM_CPPFLAGS = \ + -D_TP_COMPILATION \ + $(NULL) + AM_CFLAGS = \ $(ERROR_CFLAGS) \ $(DBUS_CFLAGS) \ diff --git a/tools/glib-client-gen.py b/tools/glib-client-gen.py index a09a1e4e3..5e44db5cf 100644 --- a/tools/glib-client-gen.py +++ b/tools/glib-client-gen.py @@ -75,6 +75,8 @@ class Generator(object): self.split_reentrants = opts.get('--split-reentrants', False) + self.guard = opts.get('--guard', None) + def h(self, s): if isinstance(s, unicode): s = s.encode('utf-8') @@ -1249,6 +1251,11 @@ class Generator(object): def __call__(self): + if self.guard is not None: + self.h('#ifndef %s' % self.guard) + self.h('#define %s' % self.guard) + self.h('') + self.h('G_BEGIN_DECLS') self.h('') @@ -1320,6 +1327,10 @@ class Generator(object): self.h('G_END_DECLS') self.h('') + if self.guard is not None: + self.h('#endif /* defined (%s) */' % self.guard) + self.h('') + if self.split_reentrants: file_set_contents(self.basename + '-reentrant-body.h', '\n'.join(self.__reentrant_body)) file_set_contents(self.basename + '-reentrant.h', '\n'.join(self.__reentrant_header)) @@ -1337,7 +1348,7 @@ if __name__ == '__main__': ['group=', 'subclass=', 'subclass-assert=', 'iface-quark-prefix=', 'tp-proxy-api=', 'generate-reentrant=', 'deprecate-reentrant=', - 'deprecation-attribute=', + 'deprecation-attribute=', 'guard=', 'split-reentrants=']) opts = {} |