From e62dee8ee022027eb157e36ce8130b21d5d3f726 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 4 May 2012 13:55:43 +0100 Subject: [PATCH 6/7] All examples: follow the meta-header policy --- examples/client/approver.c | 2 -- examples/client/contact-list.c | 1 - examples/client/media-observer.c | 2 -- examples/cm/call/call-channel.c | 5 +---- examples/cm/call/call-content.c | 3 +-- examples/cm/call/call-manager.c | 6 +----- examples/cm/call/call-stream.c | 5 ++--- examples/cm/call/cm.c | 3 +-- examples/cm/call/cm.h | 2 +- examples/cm/call/conn.c | 2 -- examples/cm/call/conn.h | 4 +--- examples/cm/call/main.c | 3 +-- examples/cm/call/protocol.h | 3 ++- examples/cm/channelspecific/conn.c | 1 - examples/cm/channelspecific/conn.h | 3 +-- examples/cm/channelspecific/connection-manager.h | 2 +- examples/cm/channelspecific/main.c | 3 +-- examples/cm/channelspecific/protocol.h | 2 +- examples/cm/channelspecific/room-manager.h | 2 +- examples/cm/channelspecific/room.c | 3 +-- examples/cm/channelspecific/room.h | 5 +---- examples/cm/contactlist/conn.c | 2 -- examples/cm/contactlist/conn.h | 4 +--- examples/cm/contactlist/connection-manager.h | 2 +- examples/cm/contactlist/contact-list.c | 1 - examples/cm/contactlist/contact-list.h | 5 +---- examples/cm/contactlist/main.c | 3 +-- examples/cm/contactlist/protocol.h | 2 +- examples/cm/echo-message-parts/chan.c | 5 +++-- examples/cm/echo-message-parts/chan.h | 4 +--- examples/cm/echo-message-parts/conn.c | 1 - examples/cm/echo-message-parts/conn.h | 3 +-- examples/cm/echo-message-parts/connection-manager.h | 2 +- examples/cm/echo-message-parts/main.c | 3 +-- examples/cm/echo-message-parts/protocol.h | 2 +- examples/cm/extended/conn.c | 1 - examples/cm/extended/conn.h | 3 +-- examples/cm/extended/connection-manager.h | 2 +- examples/cm/extended/main.c | 3 +-- examples/cm/extended/protocol.h | 2 +- examples/cm/no-protocols/connection-manager.h | 2 +- examples/cm/no-protocols/main.c | 3 +-- examples/extensions/extensions-cli.c | 4 +++- examples/extensions/extensions.h | 3 ++- 44 files changed, 42 insertions(+), 82 deletions(-) diff --git a/examples/client/approver.c b/examples/client/approver.c index cbe4801..d92ee34 100644 --- a/examples/client/approver.c +++ b/examples/client/approver.c @@ -14,8 +14,6 @@ #include #include -#include -#include GMainLoop *mainloop = NULL; diff --git a/examples/client/contact-list.c b/examples/client/contact-list.c index 724bf50..825d8c6 100644 --- a/examples/client/contact-list.c +++ b/examples/client/contact-list.c @@ -11,7 +11,6 @@ #include "config.h" #include -#include static void account_manager_prepared_cb (GObject *object, diff --git a/examples/client/media-observer.c b/examples/client/media-observer.c index 3c2ebe8..0d9a694 100644 --- a/examples/client/media-observer.c +++ b/examples/client/media-observer.c @@ -13,8 +13,6 @@ #include #include -#include -#include static void chan_invalidated_cb (TpProxy *proxy, diff --git a/examples/cm/call/call-channel.c b/examples/cm/call/call-channel.c index 0d4a446..1ae6806 100644 --- a/examples/cm/call/call-channel.c +++ b/examples/cm/call/call-channel.c @@ -40,11 +40,8 @@ #include -#include -#include -#include -#include #include +#include #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 2f81835..b72b5f2 100644 --- a/examples/cm/call/call-content.c +++ b/examples/cm/call/call-content.c @@ -21,9 +21,8 @@ #include "call-content.h" -#include #include -#include +#include G_DEFINE_TYPE (ExampleCallContent, example_call_content, diff --git a/examples/cm/call/call-manager.c b/examples/cm/call/call-manager.c index 64c7992..f637f2b 100644 --- a/examples/cm/call/call-manager.c +++ b/examples/cm/call/call-manager.c @@ -28,11 +28,7 @@ #include -#include -#include -#include -#include -#include +#include #include "call-channel.h" diff --git a/examples/cm/call/call-stream.c b/examples/cm/call/call-stream.c index c8fe4f2..cc63d54 100644 --- a/examples/cm/call/call-stream.c +++ b/examples/cm/call/call-stream.c @@ -21,9 +21,8 @@ #include "call-stream.h" -#include -#include -#include +#include +#include G_DEFINE_TYPE (ExampleCallStream, example_call_stream, diff --git a/examples/cm/call/cm.c b/examples/cm/call/cm.c index 5e42d97..4f67f57 100644 --- a/examples/cm/call/cm.c +++ b/examples/cm/call/cm.c @@ -25,8 +25,7 @@ #include -#include -#include +#include #include "conn.h" #include "protocol.h" diff --git a/examples/cm/call/cm.h b/examples/cm/call/cm.h index 275abb2..ed53e23 100644 --- a/examples/cm/call/cm.h +++ b/examples/cm/call/cm.h @@ -23,7 +23,7 @@ #define EXAMPLE_CALL_CM_H #include -#include +#include G_BEGIN_DECLS diff --git a/examples/cm/call/conn.c b/examples/cm/call/conn.c index 34c5613..fbe885d 100644 --- a/examples/cm/call/conn.c +++ b/examples/cm/call/conn.c @@ -26,8 +26,6 @@ #include #include -#include -#include #include "call-manager.h" #include "protocol.h" diff --git a/examples/cm/call/conn.h b/examples/cm/call/conn.h index 1ad22ae..b9e98ad 100644 --- a/examples/cm/call/conn.h +++ b/examples/cm/call/conn.h @@ -13,9 +13,7 @@ #define EXAMPLE_CALL_CONN_H #include -#include -#include -#include +#include G_BEGIN_DECLS diff --git a/examples/cm/call/main.c b/examples/cm/call/main.c index a25936e..aee9f17 100644 --- a/examples/cm/call/main.c +++ b/examples/cm/call/main.c @@ -23,8 +23,7 @@ #include "config.h" -#include -#include +#include #include "cm.h" diff --git a/examples/cm/call/protocol.h b/examples/cm/call/protocol.h index 68d2acd..adfe8a6 100644 --- a/examples/cm/call/protocol.h +++ b/examples/cm/call/protocol.h @@ -11,7 +11,8 @@ #define EXAMPLE_CALL_PROTOCOL_H #include -#include + +#include G_BEGIN_DECLS diff --git a/examples/cm/channelspecific/conn.c b/examples/cm/channelspecific/conn.c index 69da817..f7957cc 100644 --- a/examples/cm/channelspecific/conn.c +++ b/examples/cm/channelspecific/conn.c @@ -16,7 +16,6 @@ #include #include -#include #include "protocol.h" #include "room-manager.h" diff --git a/examples/cm/channelspecific/conn.h b/examples/cm/channelspecific/conn.h index 63e1e31..dc056e5 100644 --- a/examples/cm/channelspecific/conn.h +++ b/examples/cm/channelspecific/conn.h @@ -13,8 +13,7 @@ #define __EXAMPLE_CSH_CONN_H__ #include -#include -#include +#include G_BEGIN_DECLS diff --git a/examples/cm/channelspecific/connection-manager.h b/examples/cm/channelspecific/connection-manager.h index b30105c..10185d1 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 -#include +#include G_BEGIN_DECLS diff --git a/examples/cm/channelspecific/main.c b/examples/cm/channelspecific/main.c index 843d5a7..5ba4ac3 100644 --- a/examples/cm/channelspecific/main.c +++ b/examples/cm/channelspecific/main.c @@ -11,8 +11,7 @@ #include "config.h" -#include -#include +#include #include "examples/cm/channelspecific/connection-manager.h" diff --git a/examples/cm/channelspecific/protocol.h b/examples/cm/channelspecific/protocol.h index f823a43..507c02d 100644 --- a/examples/cm/channelspecific/protocol.h +++ b/examples/cm/channelspecific/protocol.h @@ -11,7 +11,7 @@ #define EXAMPLE_CHANNELSPECIFIC_PROTOCOL_H #include -#include +#include G_BEGIN_DECLS diff --git a/examples/cm/channelspecific/room-manager.h b/examples/cm/channelspecific/room-manager.h index 6e9eb27..a296923 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 -#include +#include G_BEGIN_DECLS diff --git a/examples/cm/channelspecific/room.c b/examples/cm/channelspecific/room.c index 4d3f715..28dfc37 100644 --- a/examples/cm/channelspecific/room.c +++ b/examples/cm/channelspecific/room.c @@ -12,8 +12,7 @@ #include "room.h" #include -#include -#include +#include 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 32f60ab..7265e74 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 -#include -#include -#include +#include G_BEGIN_DECLS diff --git a/examples/cm/contactlist/conn.c b/examples/cm/contactlist/conn.c index 9f0a5f1..2317eda 100644 --- a/examples/cm/contactlist/conn.c +++ b/examples/cm/contactlist/conn.c @@ -16,8 +16,6 @@ #include #include -#include -#include #include "contact-list.h" #include "protocol.h" diff --git a/examples/cm/contactlist/conn.h b/examples/cm/contactlist/conn.h index 73311d3..cb9b52c 100644 --- a/examples/cm/contactlist/conn.h +++ b/examples/cm/contactlist/conn.h @@ -13,9 +13,7 @@ #define __EXAMPLE_CONTACT_LIST_CONN_H__ #include -#include -#include -#include +#include G_BEGIN_DECLS diff --git a/examples/cm/contactlist/connection-manager.h b/examples/cm/contactlist/connection-manager.h index b99d159..d7f460a 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 -#include +#include G_BEGIN_DECLS diff --git a/examples/cm/contactlist/contact-list.c b/examples/cm/contactlist/contact-list.c index 5c21564..410ba45 100644 --- a/examples/cm/contactlist/contact-list.c +++ b/examples/cm/contactlist/contact-list.c @@ -17,7 +17,6 @@ #include -#include #include /* 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 06f83bd..fdd1175 100644 --- a/examples/cm/contactlist/contact-list.h +++ b/examples/cm/contactlist/contact-list.h @@ -14,10 +14,7 @@ #include -#include -#include -#include -#include +#include G_BEGIN_DECLS diff --git a/examples/cm/contactlist/main.c b/examples/cm/contactlist/main.c index c49622e..222c7bb 100644 --- a/examples/cm/contactlist/main.c +++ b/examples/cm/contactlist/main.c @@ -11,8 +11,7 @@ #include "config.h" -#include -#include +#include #include "connection-manager.h" diff --git a/examples/cm/contactlist/protocol.h b/examples/cm/contactlist/protocol.h index cfa07f7..897f6e0 100644 --- a/examples/cm/contactlist/protocol.h +++ b/examples/cm/contactlist/protocol.h @@ -11,7 +11,7 @@ #define EXAMPLE_CONTACT_LIST_PROTOCOL_H #include -#include +#include G_BEGIN_DECLS diff --git a/examples/cm/echo-message-parts/chan.c b/examples/cm/echo-message-parts/chan.c index 320f428..73ddc8c 100644 --- a/examples/cm/echo-message-parts/chan.c +++ b/examples/cm/echo-message-parts/chan.c @@ -16,9 +16,10 @@ #include #include -#include +#include + +/* FIXME: example code should not be doing this! */ #include -#include 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 8a420ca..bb2a530 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 -#include -#include +#include G_BEGIN_DECLS diff --git a/examples/cm/echo-message-parts/conn.c b/examples/cm/echo-message-parts/conn.c index 8445025..7e6e4c0 100644 --- a/examples/cm/echo-message-parts/conn.c +++ b/examples/cm/echo-message-parts/conn.c @@ -14,7 +14,6 @@ #include #include -#include #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 f43a825..12f0036 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 -#include -#include +#include G_BEGIN_DECLS diff --git a/examples/cm/echo-message-parts/connection-manager.h b/examples/cm/echo-message-parts/connection-manager.h index 645ac95..6c4c54b 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 -#include +#include G_BEGIN_DECLS diff --git a/examples/cm/echo-message-parts/main.c b/examples/cm/echo-message-parts/main.c index 7a927cd..e3941cc 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 -#include +#include #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 ce0377e..50f922f 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 -#include +#include G_BEGIN_DECLS diff --git a/examples/cm/extended/conn.c b/examples/cm/extended/conn.c index 0f8d51b..69e99cc 100644 --- a/examples/cm/extended/conn.c +++ b/examples/cm/extended/conn.c @@ -16,7 +16,6 @@ #include #include -#include /* 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 ccc9c91..ba0888c 100644 --- a/examples/cm/extended/conn.h +++ b/examples/cm/extended/conn.h @@ -13,8 +13,7 @@ #define __EXAMPLE_EXTENDED_CONN_H__ #include -#include -#include +#include G_BEGIN_DECLS diff --git a/examples/cm/extended/connection-manager.h b/examples/cm/extended/connection-manager.h index b3345f4..7f29d82 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 -#include +#include G_BEGIN_DECLS diff --git a/examples/cm/extended/main.c b/examples/cm/extended/main.c index b0aba71..a265ca3 100644 --- a/examples/cm/extended/main.c +++ b/examples/cm/extended/main.c @@ -11,8 +11,7 @@ #include "config.h" -#include -#include +#include #include "connection-manager.h" diff --git a/examples/cm/extended/protocol.h b/examples/cm/extended/protocol.h index 5feb4d3..80a3cfb 100644 --- a/examples/cm/extended/protocol.h +++ b/examples/cm/extended/protocol.h @@ -11,7 +11,7 @@ #define EXAMPLE_EXTENDED_PROTOCOL_H #include -#include +#include G_BEGIN_DECLS diff --git a/examples/cm/no-protocols/connection-manager.h b/examples/cm/no-protocols/connection-manager.h index cf5716f..f1a277d 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 -#include +#include G_BEGIN_DECLS diff --git a/examples/cm/no-protocols/main.c b/examples/cm/no-protocols/main.c index 3cf974c..a88ac7d 100644 --- a/examples/cm/no-protocols/main.c +++ b/examples/cm/no-protocols/main.c @@ -11,8 +11,7 @@ #include "config.h" -#include -#include +#include #include "connection-manager.h" diff --git a/examples/extensions/extensions-cli.c b/examples/extensions/extensions-cli.c index 4302e3b..aba1680 100644 --- a/examples/extensions/extensions-cli.c +++ b/examples/extensions/extensions-cli.c @@ -2,7 +2,9 @@ #include "extensions.h" -#include +#include +#include + #include static void _example_ext_register_dbus_glib_marshallers (void); diff --git a/examples/extensions/extensions.h b/examples/extensions/extensions.h index 26c53dc..40c1e75 100644 --- a/examples/extensions/extensions.h +++ b/examples/extensions/extensions.h @@ -2,7 +2,8 @@ #define __EXAMPLE_EXTENSIONS_H__ #include -#include + +#include #include "examples/extensions/_gen/enums.h" #include "examples/extensions/_gen/cli-connection.h" -- 1.7.10