diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-05-04 13:55:43 +0100 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-05-07 14:15:12 +0100 |
commit | 83a388b0cf10dbbb8cec9c17f4255188dcd7f65c (patch) | |
tree | e3ffcf12451d98db3c4af0f996f7a0bf6c99178b /examples | |
parent | 1c1b1f93953f85bf7c6cec326f8952368908b062 (diff) | |
download | telepathy-glib-83a388b0cf10dbbb8cec9c17f4255188dcd7f65c.tar.gz |
All examples: follow the meta-header policy
Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49384
Diffstat (limited to 'examples')
44 files changed, 42 insertions, 82 deletions
diff --git a/examples/client/approver.c b/examples/client/approver.c index cbe4801cb..d92ee3448 100644 --- a/examples/client/approver.c +++ b/examples/client/approver.c @@ -14,8 +14,6 @@ #include <stdio.h> #include <telepathy-glib/telepathy-glib.h> -#include <telepathy-glib/debug.h> -#include <telepathy-glib/simple-approver.h> GMainLoop *mainloop = NULL; diff --git a/examples/client/contact-list.c b/examples/client/contact-list.c index 724bf50c4..825d8c686 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 3c2ebe8cf..0d9a6940d 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 0d4a4464d..1ae680669 100644 --- a/examples/cm/call/call-channel.c +++ b/examples/cm/call/call-channel.c @@ -40,11 +40,8 @@ #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> #include "call-content.h" #include "call-stream.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-manager.c b/examples/cm/call/call-manager.c index 64c7992df..f637f2b41 100644 --- a/examples/cm/call/call-manager.c +++ b/examples/cm/call/call-manager.c @@ -28,11 +28,7 @@ #include <dbus/dbus-glib.h> -#include <telepathy-glib/base-connection.h> -#include <telepathy-glib/channel-manager.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/errors.h> -#include <telepathy-glib/interfaces.h> +#include <telepathy-glib/telepathy-glib.h> #include "call-channel.h" 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 34c561309..fbe885d75 100644 --- a/examples/cm/call/conn.c +++ b/examples/cm/call/conn.c @@ -26,8 +26,6 @@ #include <dbus/dbus-glib.h> #include <telepathy-glib/telepathy-glib.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 69da8179c..f7957cc46 100644 --- a/examples/cm/channelspecific/conn.c +++ b/examples/cm/channelspecific/conn.c @@ -16,7 +16,6 @@ #include <dbus/dbus-glib.h> #include <telepathy-glib/telepathy-glib.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 4d3f715e1..28dfc37ca 100644 --- a/examples/cm/channelspecific/room.c +++ b/examples/cm/channelspecific/room.c @@ -12,8 +12,7 @@ #include "room.h" #include <telepathy-glib/telepathy-glib.h> -#include <telepathy-glib/channel-iface.h> -#include <telepathy-glib/svc-channel.h> +#include <telepathy-glib/telepathy-glib-dbus.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 9f0a5f1c4..2317eda4c 100644 --- a/examples/cm/contactlist/conn.c +++ b/examples/cm/contactlist/conn.c @@ -16,8 +16,6 @@ #include <dbus/dbus-glib.h> #include <telepathy-glib/telepathy-glib.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 320f42868..73ddc8c00 100644 --- a/examples/cm/echo-message-parts/chan.c +++ b/examples/cm/echo-message-parts/chan.c @@ -16,9 +16,10 @@ #include <string.h> #include <telepathy-glib/telepathy-glib.h> -#include <telepathy-glib/channel-iface.h> +#include <telepathy-glib/telepathy-glib-dbus.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 84450254a..7e6e4c0ec 100644 --- a/examples/cm/echo-message-parts/conn.c +++ b/examples/cm/echo-message-parts/conn.c @@ -14,7 +14,6 @@ #include <dbus/dbus-glib.h> #include <telepathy-glib/telepathy-glib.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 0f8d51b65..69e99cc0b 100644 --- a/examples/cm/extended/conn.c +++ b/examples/cm/extended/conn.c @@ -16,7 +16,6 @@ #include <dbus/dbus-glib.h> #include <telepathy-glib/telepathy-glib.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" |