diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-05-04 13:15:43 +0100 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-05-07 14:15:09 +0100 |
commit | 5f347b0b78c4e8730b5434372cee37c0a7cb3246 (patch) | |
tree | edf8e4f8606e31c66edd05d6cc1b9cc532e44928 | |
parent | 2d748f0e03ccf2117e46a4b31e9ad06a18f99fb4 (diff) |
Include nearly all headers in telepathy-glib.h
Exceptions:
* dbus-daemon.h is included via dbus.h
* debug-ansi.h is deprecated
* extra-gtkdoc.h is not really a header
* properties-mixin.h is deprecated
* proxy-subclass.h is sufficiently low-level that API users should
"opt in"
* svc-*.h wil be in telepathy-glib-dbus.h
* text-mixin.h is deprecated
* verify.h is included via util.h
Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49384
-rw-r--r-- | telepathy-glib/telepathy-glib.h | 79 |
1 files changed, 55 insertions, 24 deletions
diff --git a/telepathy-glib/telepathy-glib.h b/telepathy-glib/telepathy-glib.h index 2af1f72f9..84a404272 100644 --- a/telepathy-glib/telepathy-glib.h +++ b/telepathy-glib/telepathy-glib.h @@ -22,8 +22,6 @@ #define __TP_GLIB_H__ #define __TP_IN_GLIB_H__ -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/gtypes.h> #include <telepathy-glib/enums.h> #include <telepathy-glib/errors.h> #include <telepathy-glib/util.h> @@ -35,59 +33,92 @@ #include <telepathy-glib/account-channel-request.h> #include <telepathy-glib/account-manager.h> #include <telepathy-glib/account.h> -#include <telepathy-glib/automatic-proxy-factory.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/basic-proxy-factory.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-channel-factory.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/media-interfaces.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/simple-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> +/* deprecated, gone in 1.0 */ +#include <telepathy-glib/automatic-proxy-factory.h> +#include <telepathy-glib/basic-proxy-factory.h> +#include <telepathy-glib/channel-iface.h> +#include <telepathy-glib/client-channel-factory.h> + +/* D-Bus-API-dependent, moved to telepathy-glib-dbus.h in 1.0 */ +#include <telepathy-glib/gtypes.h> +#include <telepathy-glib/interfaces.h> #include <telepathy-glib/svc-generic.h> #include <telepathy-glib/svc-client.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__ */ |