From 6e71b391494a265ecfe80691d8acfd8340d3eab2 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 4 Jan 2013 15:45:01 +0000 Subject: Include config.h and our corresponding header first in every source file Putting the corresponding header first exposed a missing header inclusion in text-helper.h; fix that by using the meta-header. --- lib/gibber/gibber-bytestream-direct.c | 1 + lib/gibber/gibber-bytestream-iface.c | 1 + lib/gibber/gibber-bytestream-muc.c | 1 + lib/gibber/gibber-bytestream-oob.c | 1 + lib/gibber/gibber-debug.c | 4 ++-- lib/gibber/gibber-fd-transport.c | 4 ++-- lib/gibber/gibber-file-transfer.c | 3 ++- lib/gibber/gibber-linklocal-transport.c | 4 ++-- lib/gibber/gibber-listener.c | 4 ++-- lib/gibber/gibber-muc-connection.c | 4 ++-- lib/gibber/gibber-multicast-transport.c | 5 +++-- lib/gibber/gibber-oob-file-transfer.c | 3 ++- lib/gibber/gibber-r-multicast-causal-transport.c | 3 ++- lib/gibber/gibber-r-multicast-packet.c | 4 ++-- lib/gibber/gibber-r-multicast-sender.c | 3 ++- lib/gibber/gibber-r-multicast-transport.c | 3 ++- lib/gibber/gibber-tcp-transport.c | 2 +- lib/gibber/gibber-transport.c | 4 ++-- lib/gibber/gibber-unix-transport.c | 4 +++- lib/gibber/gibber-util.c | 3 +-- lib/gibber/tests/check-gibber-listener.c | 1 + lib/gibber/tests/check-gibber-r-multicast-causal-transport.c | 3 +++ lib/gibber/tests/check-gibber-r-multicast-packet.c | 2 ++ lib/gibber/tests/check-gibber-r-multicast-sender.c | 2 ++ lib/gibber/tests/check-gibber-unix-transport.c | 3 ++- lib/gibber/tests/test-r-multicast-transport-io.c | 2 ++ lib/gibber/tests/test-transport.c | 1 + src/avahi-contact-manager.c | 4 +++- src/avahi-contact.c | 5 +++-- src/avahi-discovery-client.c | 1 + src/avahi-muc-channel.c | 5 +++-- src/avahi-muc-manager.c | 5 +++-- src/avahi-olpc-activity-manager.c | 4 +++- src/avahi-olpc-activity.c | 5 +++-- src/avahi-roomlist-manager.c | 5 +++-- src/avahi-self.c | 5 +++-- src/bonjour-contact-manager.c | 4 +++- src/bonjour-contact.c | 7 ++++--- src/bonjour-discovery-client.c | 1 + src/bonjour-self.c | 5 +++-- src/caps-hash.c | 2 +- src/connection-contact-info.c | 1 + src/connection.c | 3 +-- src/contact-manager.c | 2 +- src/contact.c | 4 +++- src/debug.c | 4 ++-- src/discovery-client.c | 1 + src/dummy-discovery-client.c | 1 + src/file-transfer-channel.c | 5 +++-- src/ft-manager.c | 5 +++-- src/im-channel.c | 1 + src/im-manager.c | 4 +++- src/muc-channel.c | 5 +++-- src/muc-manager.c | 5 +++-- src/olpc-activity-manager.c | 5 +++-- src/olpc-activity.c | 4 +++- src/plugin-connection.c | 1 + src/plugin.c | 1 + src/protocol.c | 3 +-- src/roomlist-channel.c | 1 + src/roomlist-manager.c | 5 +++-- src/self.c | 5 +++-- src/si-bytestream-manager.c | 1 + src/sidecar.c | 1 + src/symbol-hacks.c | 1 + src/text-helper.c | 5 +++-- src/text-helper.h | 4 ++-- src/tube-dbus.c | 1 + src/tube-iface.c | 1 + src/tube-stream.c | 1 + src/tubes-manager.c | 1 + src/util.c | 1 + tests/check-node-properties.c | 1 + 73 files changed, 142 insertions(+), 75 deletions(-) diff --git a/lib/gibber/gibber-bytestream-direct.c b/lib/gibber/gibber-bytestream-direct.c index a336edda..12beab2a 100644 --- a/lib/gibber/gibber-bytestream-direct.c +++ b/lib/gibber/gibber-bytestream-direct.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "gibber-bytestream-direct.h" #include diff --git a/lib/gibber/gibber-bytestream-iface.c b/lib/gibber/gibber-bytestream-iface.c index fb7317a7..4bb5d96e 100644 --- a/lib/gibber/gibber-bytestream-iface.c +++ b/lib/gibber/gibber-bytestream-iface.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "gibber-bytestream-iface.h" #include diff --git a/lib/gibber/gibber-bytestream-muc.c b/lib/gibber/gibber-bytestream-muc.c index a947eb55..ff37089c 100644 --- a/lib/gibber/gibber-bytestream-muc.c +++ b/lib/gibber/gibber-bytestream-muc.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "gibber-bytestream-muc.h" #include diff --git a/lib/gibber/gibber-bytestream-oob.c b/lib/gibber/gibber-bytestream-oob.c index 43e6b5b6..ca9214cc 100644 --- a/lib/gibber/gibber-bytestream-oob.c +++ b/lib/gibber/gibber-bytestream-oob.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "gibber-bytestream-oob.h" #include diff --git a/lib/gibber/gibber-debug.c b/lib/gibber/gibber-debug.c index 47cc8742..69d24884 100644 --- a/lib/gibber/gibber-debug.c +++ b/lib/gibber/gibber-debug.c @@ -1,10 +1,10 @@ +#include "config.h" +#include "gibber-debug.h" #include #include -#include "gibber-debug.h" - #ifdef ENABLE_DEBUG static DebugFlags flags = 0; diff --git a/lib/gibber/gibber-fd-transport.c b/lib/gibber/gibber-fd-transport.c index e23f1bc4..abdadbb3 100644 --- a/lib/gibber/gibber-fd-transport.c +++ b/lib/gibber/gibber-fd-transport.c @@ -18,7 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "config.h" +#include "gibber-fd-transport.h" #include #include @@ -30,7 +31,6 @@ #endif #include "gibber-sockets.h" -#include "gibber-fd-transport.h" #define DEBUG_FLAG DEBUG_NET #include "gibber-debug.h" diff --git a/lib/gibber/gibber-file-transfer.c b/lib/gibber/gibber-file-transfer.c index dc42ff1c..a08e8096 100644 --- a/lib/gibber/gibber-file-transfer.c +++ b/lib/gibber/gibber-file-transfer.c @@ -17,12 +17,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "gibber-file-transfer.h" #include #include #include -#include "gibber-file-transfer.h" #include "gibber-oob-file-transfer.h" #define DEBUG_FLAG DEBUG_FILE_TRANSFER diff --git a/lib/gibber/gibber-linklocal-transport.c b/lib/gibber/gibber-linklocal-transport.c index 164af89c..456c6789 100644 --- a/lib/gibber/gibber-linklocal-transport.c +++ b/lib/gibber/gibber-linklocal-transport.c @@ -18,7 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "config.h" +#include "gibber-linklocal-transport.h" #include #include @@ -30,7 +31,6 @@ #endif #include "gibber-sockets.h" -#include "gibber-linklocal-transport.h" #include "gibber-util.h" #define DEBUG_FLAG DEBUG_NET diff --git a/lib/gibber/gibber-listener.c b/lib/gibber/gibber-listener.c index 67ea9563..3e3a5a5b 100644 --- a/lib/gibber/gibber-listener.c +++ b/lib/gibber/gibber-listener.c @@ -17,7 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "config.h" +#include "gibber-listener.h" #include #include @@ -34,7 +35,6 @@ #include -#include "gibber-listener.h" #include "gibber-fd-transport.h" #include "gibber-unix-transport.h" #include "gibber-util.h" diff --git a/lib/gibber/gibber-muc-connection.c b/lib/gibber/gibber-muc-connection.c index 31f006c6..4acd7e4d 100644 --- a/lib/gibber/gibber-muc-connection.c +++ b/lib/gibber/gibber-muc-connection.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "gibber-muc-connection.h" #include #include @@ -25,8 +27,6 @@ #include #include -#include "gibber-muc-connection.h" - #include "gibber-sockets.h" #include "gibber-multicast-transport.h" #include "gibber-r-multicast-transport.h" diff --git a/lib/gibber/gibber-multicast-transport.c b/lib/gibber/gibber-multicast-transport.c index fd146d40..2d9ed0c6 100644 --- a/lib/gibber/gibber-multicast-transport.c +++ b/lib/gibber/gibber-multicast-transport.c @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include + #include #include #include @@ -25,8 +28,6 @@ #include "gibber-sockets.h" -#include - #define DEBUG_FLAG DEBUG_NET #include diff --git a/lib/gibber/gibber-oob-file-transfer.c b/lib/gibber/gibber-oob-file-transfer.c index 60497020..23c2bff4 100644 --- a/lib/gibber/gibber-oob-file-transfer.c +++ b/lib/gibber/gibber-oob-file-transfer.c @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "gibber-oob-file-transfer.h" #include #include @@ -28,7 +30,6 @@ #include -#include "gibber-oob-file-transfer.h" #include "gibber-fd-transport.h" #include "gibber-util.h" diff --git a/lib/gibber/gibber-r-multicast-causal-transport.c b/lib/gibber/gibber-r-multicast-causal-transport.c index d4036286..1ec2f9f3 100644 --- a/lib/gibber/gibber-r-multicast-causal-transport.c +++ b/lib/gibber/gibber-r-multicast-causal-transport.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "gibber-r-multicast-causal-transport.h" #include #include @@ -28,7 +30,6 @@ #define DEBUG_FLAG DEBUG_RMULTICAST #include "gibber-debug.h" -#include "gibber-r-multicast-causal-transport.h" #include "gibber-r-multicast-packet.h" #include "gibber-r-multicast-sender.h" diff --git a/lib/gibber/gibber-r-multicast-packet.c b/lib/gibber/gibber-r-multicast-packet.c index 5710b6dd..88b072a9 100644 --- a/lib/gibber/gibber-r-multicast-packet.c +++ b/lib/gibber/gibber-r-multicast-packet.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "gibber-r-multicast-packet.h" #include #include @@ -25,8 +27,6 @@ #include "gibber-sockets.h" -#include "gibber-r-multicast-packet.h" - #define PACKET_VERSION 1 #define PACKET_PREFIX { 'C', 'l', 'i', 'q', 'u', 'e' } diff --git a/lib/gibber/gibber-r-multicast-sender.c b/lib/gibber/gibber-r-multicast-sender.c index 1090247b..66082465 100644 --- a/lib/gibber/gibber-r-multicast-sender.c +++ b/lib/gibber/gibber-r-multicast-sender.c @@ -18,12 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "gibber-r-multicast-sender.h" #include #include #include -#include "gibber-r-multicast-sender.h" #include "gibber-util.h" #define DEBUG_FLAG DEBUG_RMULTICAST_SENDER diff --git a/lib/gibber/gibber-r-multicast-transport.c b/lib/gibber/gibber-r-multicast-transport.c index 7c845ab9..122fcdd2 100644 --- a/lib/gibber/gibber-r-multicast-transport.c +++ b/lib/gibber/gibber-r-multicast-transport.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "gibber-r-multicast-transport.h" #include #include @@ -26,7 +28,6 @@ #define DEBUG_FLAG DEBUG_RMULTICAST #include "gibber-debug.h" -#include "gibber-r-multicast-transport.h" #include "gibber-r-multicast-packet.h" #include "gibber-r-multicast-sender.h" diff --git a/lib/gibber/gibber-tcp-transport.c b/lib/gibber/gibber-tcp-transport.c index efe2fc8a..58a74ae2 100644 --- a/lib/gibber/gibber-tcp-transport.c +++ b/lib/gibber/gibber-tcp-transport.c @@ -19,6 +19,7 @@ */ #include +#include "gibber-tcp-transport.h" #include #include @@ -31,7 +32,6 @@ #endif #include "gibber-sockets.h" -#include "gibber-tcp-transport.h" #define DEBUG_FLAG DEBUG_NET #include "gibber-debug.h" diff --git a/lib/gibber/gibber-transport.c b/lib/gibber/gibber-transport.c index 522f0fb1..ee77f930 100644 --- a/lib/gibber/gibber-transport.c +++ b/lib/gibber/gibber-transport.c @@ -18,12 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "gibber-transport.h" #include #include -#include "gibber-transport.h" - #define DEBUG_FLAG DEBUG_TRANSPORT #include "gibber-debug.h" diff --git a/lib/gibber/gibber-unix-transport.c b/lib/gibber/gibber-unix-transport.c index 884bac6d..cb18787c 100644 --- a/lib/gibber/gibber-unix-transport.c +++ b/lib/gibber/gibber-unix-transport.c @@ -22,6 +22,9 @@ /* needed for struct ucred */ #define _GNU_SOURCE +#include "config.h" +#include "gibber-unix-transport.h" + #include #ifdef G_OS_UNIX @@ -38,7 +41,6 @@ #include #include -#include "gibber-unix-transport.h" #include "gibber-util.h" #define DEBUG_FLAG DEBUG_NET diff --git a/lib/gibber/gibber-util.c b/lib/gibber/gibber-util.c index ff49ed10..cde25ba3 100644 --- a/lib/gibber/gibber-util.c +++ b/lib/gibber/gibber-util.c @@ -18,6 +18,7 @@ */ #include +#include "gibber-util.h" #include #include @@ -27,8 +28,6 @@ # include #endif -#include "gibber-util.h" - void gibber_normalize_address (struct sockaddr_storage *addr) { diff --git a/lib/gibber/tests/check-gibber-listener.c b/lib/gibber/tests/check-gibber-listener.c index 3ca01407..8f991ba6 100644 --- a/lib/gibber/tests/check-gibber-listener.c +++ b/lib/gibber/tests/check-gibber-listener.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include #include diff --git a/lib/gibber/tests/check-gibber-r-multicast-causal-transport.c b/lib/gibber/tests/check-gibber-r-multicast-causal-transport.c index 0d9f7427..5ffe8284 100644 --- a/lib/gibber/tests/check-gibber-r-multicast-causal-transport.c +++ b/lib/gibber/tests/check-gibber-r-multicast-causal-transport.c @@ -17,6 +17,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "config.h" + #include #include #include diff --git a/lib/gibber/tests/check-gibber-r-multicast-packet.c b/lib/gibber/tests/check-gibber-r-multicast-packet.c index 5d5fcfd8..1ec49b0b 100644 --- a/lib/gibber/tests/check-gibber-r-multicast-packet.c +++ b/lib/gibber/tests/check-gibber-r-multicast-packet.c @@ -1,3 +1,5 @@ +#include "config.h" + #include #include diff --git a/lib/gibber/tests/check-gibber-r-multicast-sender.c b/lib/gibber/tests/check-gibber-r-multicast-sender.c index 7eb41943..00e4f5b2 100644 --- a/lib/gibber/tests/check-gibber-r-multicast-sender.c +++ b/lib/gibber/tests/check-gibber-r-multicast-sender.c @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" + #include #include #include diff --git a/lib/gibber/tests/check-gibber-unix-transport.c b/lib/gibber/tests/check-gibber-unix-transport.c index c3cfbed8..d6907c64 100644 --- a/lib/gibber/tests/check-gibber-unix-transport.c +++ b/lib/gibber/tests/check-gibber-unix-transport.c @@ -18,9 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ - #define _GNU_SOURCE +#include "config.h" + #include #include #include diff --git a/lib/gibber/tests/test-r-multicast-transport-io.c b/lib/gibber/tests/test-r-multicast-transport-io.c index 62a4e96d..e2be1306 100644 --- a/lib/gibber/tests/test-r-multicast-transport-io.c +++ b/lib/gibber/tests/test-r-multicast-transport-io.c @@ -1,3 +1,5 @@ +#include "config.h" + #include #include #include diff --git a/lib/gibber/tests/test-transport.c b/lib/gibber/tests/test-transport.c index b035a534..541ffd0e 100644 --- a/lib/gibber/tests/test-transport.c +++ b/lib/gibber/tests/test-transport.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include #include diff --git a/src/avahi-contact-manager.c b/src/avahi-contact-manager.c index fd736da2..9fca4b90 100644 --- a/src/avahi-contact-manager.c +++ b/src/avahi-contact-manager.c @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "avahi-contact-manager.h" + #include #include #include @@ -30,7 +33,6 @@ #define DEBUG_FLAG DEBUG_MUC #include "debug.h" -#include "avahi-contact-manager.h" #include "avahi-contact.h" G_DEFINE_TYPE (SalutAvahiContactManager, salut_avahi_contact_manager, diff --git a/src/avahi-contact.c b/src/avahi-contact.c index b8e0769f..67f2ba48 100644 --- a/src/avahi-contact.c +++ b/src/avahi-contact.c @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "avahi-contact.h" + #include #include #include @@ -29,8 +32,6 @@ #include #include -#include "avahi-contact.h" - #include #include diff --git a/src/avahi-discovery-client.c b/src/avahi-discovery-client.c index 31ee6056..72cf9203 100644 --- a/src/avahi-discovery-client.c +++ b/src/avahi-discovery-client.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "avahi-discovery-client.h" #include diff --git a/src/avahi-muc-channel.c b/src/avahi-muc-channel.c index 738485f3..d5834c2c 100644 --- a/src/avahi-muc-channel.c +++ b/src/avahi-muc-channel.c @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "avahi-muc-channel.h" + #include #include #include @@ -27,8 +30,6 @@ #define DEBUG_FLAG DEBUG_MUC #include "debug.h" -#include "avahi-muc-channel.h" - #include G_DEFINE_TYPE (SalutAvahiMucChannel, salut_avahi_muc_channel, diff --git a/src/avahi-muc-manager.c b/src/avahi-muc-manager.c index 7418ab63..e3fe9fd1 100644 --- a/src/avahi-muc-manager.c +++ b/src/avahi-muc-manager.c @@ -17,14 +17,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "avahi-muc-manager.h" + #include #include #include #include #include -#include "avahi-muc-manager.h" - #include #include diff --git a/src/avahi-olpc-activity-manager.c b/src/avahi-olpc-activity-manager.c index 8d3691bc..304a73d2 100644 --- a/src/avahi-olpc-activity-manager.c +++ b/src/avahi-olpc-activity-manager.c @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "avahi-olpc-activity-manager.h" + #include #include #include @@ -25,7 +28,6 @@ #include -#include "avahi-olpc-activity-manager.h" #include "avahi-olpc-activity.h" #include "avahi-discovery-client.h" #include "olpc-activity.h" diff --git a/src/avahi-olpc-activity.c b/src/avahi-olpc-activity.c index 424da437..8dba37af 100644 --- a/src/avahi-olpc-activity.c +++ b/src/avahi-olpc-activity.c @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "avahi-olpc-activity.h" + #include #include #include @@ -25,8 +28,6 @@ #include #include -#include "avahi-olpc-activity.h" - #define DEBUG_FLAG DEBUG_OLPC_ACTIVITY #include "debug.h" diff --git a/src/avahi-roomlist-manager.c b/src/avahi-roomlist-manager.c index 625be31d..9ddd9dbf 100644 --- a/src/avahi-roomlist-manager.c +++ b/src/avahi-roomlist-manager.c @@ -17,14 +17,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "avahi-roomlist-manager.h" + #include #include #include #include #include -#include "avahi-roomlist-manager.h" - #include #include diff --git a/src/avahi-self.c b/src/avahi-self.c index 4b839500..0b752868 100644 --- a/src/avahi-self.c +++ b/src/avahi-self.c @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "avahi-self.h" + #include #include #include @@ -27,8 +30,6 @@ #define DEBUG_FLAG DEBUG_SELF #include "debug.h" -#include "avahi-self.h" - #include "sha1/sha1-util.h" #ifdef ENABLE_OLPC diff --git a/src/bonjour-contact-manager.c b/src/bonjour-contact-manager.c index a9b974a3..04b7a4fa 100644 --- a/src/bonjour-contact-manager.c +++ b/src/bonjour-contact-manager.c @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "bonjour-contact-manager.h" + #include #include #include @@ -29,7 +32,6 @@ #include "debug.h" #include "bonjour-contact.h" -#include "bonjour-contact-manager.h" #include "plugin-connection.h" #include "connection.h" diff --git a/src/bonjour-contact.c b/src/bonjour-contact.c index 96285a76..ba0ba7b0 100644 --- a/src/bonjour-contact.c +++ b/src/bonjour-contact.c @@ -17,14 +17,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#undef interface +#include "bonjour-contact.h" + #include #include #include #include -#undef interface -#include "bonjour-contact.h" - #include #include diff --git a/src/bonjour-discovery-client.c b/src/bonjour-discovery-client.c index b75ae110..66a69669 100644 --- a/src/bonjour-discovery-client.c +++ b/src/bonjour-discovery-client.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "bonjour-discovery-client.h" #include diff --git a/src/bonjour-self.c b/src/bonjour-self.c index d9a33908..330bcae4 100644 --- a/src/bonjour-self.c +++ b/src/bonjour-self.c @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "bonjour-self.h" + #include #include #include @@ -25,8 +28,6 @@ #define DEBUG_FLAG DEBUG_SELF #include "debug.h" -#include "bonjour-self.h" - #include "sha1/sha1-util.h" #ifdef ENABLE_OLPC diff --git a/src/caps-hash.c b/src/caps-hash.c index fc44bc29..48fc6065 100644 --- a/src/caps-hash.c +++ b/src/caps-hash.c @@ -26,6 +26,7 @@ */ #include "config.h" +#include "caps-hash.h" #include @@ -33,7 +34,6 @@ #include "debug.h" #include "capabilities.h" -#include "caps-hash.h" #include "self.h" static void diff --git a/src/connection-contact-info.c b/src/connection-contact-info.c index c95a1ba9..fb0edf9f 100644 --- a/src/connection-contact-info.c +++ b/src/connection-contact-info.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "connection-contact-info.h" #include diff --git a/src/connection.c b/src/connection.c index 03f745c9..c86261b4 100644 --- a/src/connection.c +++ b/src/connection.c @@ -17,10 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "connection.h" -#include - #include #include #include diff --git a/src/contact-manager.c b/src/contact-manager.c index 999b68a7..c6ec5460 100644 --- a/src/contact-manager.c +++ b/src/contact-manager.c @@ -18,6 +18,7 @@ */ #include "config.h" +#include "contact-manager.h" #include #include @@ -26,7 +27,6 @@ #include #include "connection.h" -#include "contact-manager.h" #include "contact.h" #include "enumtypes.h" diff --git a/src/contact.c b/src/contact.c index 9a306d45..197b2807 100644 --- a/src/contact.c +++ b/src/contact.c @@ -17,11 +17,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "contact.h" + #include #include #include -#include "contact.h" #include "presence.h" #include "presence-cache.h" #include "enumtypes.h" diff --git a/src/debug.c b/src/debug.c index ba9131d1..7c22b045 100644 --- a/src/debug.c +++ b/src/debug.c @@ -1,3 +1,5 @@ +#include "config.h" +#include "debug.h" #include #include @@ -12,8 +14,6 @@ #include #include -#include "debug.h" - #ifdef ENABLE_DEBUG static DebugFlags flags = 0; diff --git a/src/discovery-client.c b/src/discovery-client.c index 8ca3f01a..7add6fa8 100644 --- a/src/discovery-client.c +++ b/src/discovery-client.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "discovery-client.h" #include diff --git a/src/dummy-discovery-client.c b/src/dummy-discovery-client.c index 268d01c3..5399f260 100644 --- a/src/dummy-discovery-client.c +++ b/src/dummy-discovery-client.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "dummy-discovery-client.h" #define DEBUG_FLAG DEBUG_DISCOVERY diff --git a/src/file-transfer-channel.c b/src/file-transfer-channel.c index 25b77eaa..50e01d29 100644 --- a/src/file-transfer-channel.c +++ b/src/file-transfer-channel.c @@ -21,6 +21,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "file-transfer-channel.h" + #include #include #include @@ -41,8 +44,6 @@ #define DEBUG_FLAG DEBUG_FT #include "debug.h" -#include "file-transfer-channel.h" - #include "connection.h" #include "im-manager.h" #include "contact.h" diff --git a/src/ft-manager.c b/src/ft-manager.c index aafb194d..215fa2d6 100644 --- a/src/ft-manager.c +++ b/src/ft-manager.c @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "ft-manager.h" + #include #include #include @@ -28,8 +31,6 @@ #include -#include "ft-manager.h" - #include #include "file-transfer-channel.h" diff --git a/src/im-channel.c b/src/im-channel.c index f847c0ba..dab2b18b 100644 --- a/src/im-channel.c +++ b/src/im-channel.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "im-channel.h" #include diff --git a/src/im-manager.c b/src/im-manager.c index fe5c7bca..9fdb7801 100644 --- a/src/im-manager.c +++ b/src/im-manager.c @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "im-manager.h" + #include #include #include @@ -25,7 +28,6 @@ #include "extensions/extensions.h" #include "im-channel.h" -#include "im-manager.h" #include "contact.h" #include diff --git a/src/muc-channel.c b/src/muc-channel.c index c83ca1de..f0efbc1d 100644 --- a/src/muc-channel.c +++ b/src/muc-channel.c @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "muc-channel.h" + #include #include #include @@ -33,8 +36,6 @@ /* Maximum time to wait for others joining the group */ #define CONNECTED_TIMEOUT 60 * 1000 -#include "muc-channel.h" - #include #include diff --git a/src/muc-manager.c b/src/muc-manager.c index 7dabb17a..e1cfcd1d 100644 --- a/src/muc-manager.c +++ b/src/muc-manager.c @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "muc-manager.h" + #include #include #include @@ -26,8 +29,6 @@ #include #endif -#include "muc-manager.h" - #include #include diff --git a/src/olpc-activity-manager.c b/src/olpc-activity-manager.c index ca319f49..459d4c92 100644 --- a/src/olpc-activity-manager.c +++ b/src/olpc-activity-manager.c @@ -17,13 +17,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "olpc-activity-manager.h" + #include #include #include #include -#include "olpc-activity-manager.h" - #include "connection.h" #define DEBUG_FLAG DEBUG_OLPC_ACTIVITY diff --git a/src/olpc-activity.c b/src/olpc-activity.c index 47e88c26..b834d56f 100644 --- a/src/olpc-activity.c +++ b/src/olpc-activity.c @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "olpc-activity.h" + #include #include #include @@ -25,7 +28,6 @@ #include #include "contact-manager.h" -#include "olpc-activity.h" #include "muc-manager.h" #include "util.h" #include "namespaces.h" diff --git a/src/plugin-connection.c b/src/plugin-connection.c index 723c7642..fc36875c 100644 --- a/src/plugin-connection.c +++ b/src/plugin-connection.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "salut/plugin-connection.h" #include diff --git a/src/plugin.c b/src/plugin.c index 12104e55..5d8cd219 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "salut/plugin.h" #include diff --git a/src/protocol.c b/src/protocol.c index 3c86551c..2b7fd87b 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -17,10 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "protocol.h" -#include - #include #include #include diff --git a/src/roomlist-channel.c b/src/roomlist-channel.c index 2faa0f9f..3acf1ee1 100644 --- a/src/roomlist-channel.c +++ b/src/roomlist-channel.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "roomlist-channel.h" #include diff --git a/src/roomlist-manager.c b/src/roomlist-manager.c index dbde4310..9a63a240 100644 --- a/src/roomlist-manager.c +++ b/src/roomlist-manager.c @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "roomlist-manager.h" + #include #include #include @@ -25,8 +28,6 @@ #include #endif -#include "roomlist-manager.h" - #include #include diff --git a/src/self.c b/src/self.c index 8cf55112..2078808d 100644 --- a/src/self.c +++ b/src/self.c @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "self.h" + #include #include #include @@ -31,8 +34,6 @@ #include -#include "self.h" - #include #include diff --git a/src/si-bytestream-manager.c b/src/si-bytestream-manager.c index 37dd176b..e1e9c578 100644 --- a/src/si-bytestream-manager.c +++ b/src/si-bytestream-manager.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "si-bytestream-manager.h" #include diff --git a/src/sidecar.c b/src/sidecar.c index 481c68df..0c598d72 100644 --- a/src/sidecar.c +++ b/src/sidecar.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "salut/sidecar.h" G_DEFINE_INTERFACE (SalutSidecar, salut_sidecar, G_TYPE_OBJECT) diff --git a/src/symbol-hacks.c b/src/symbol-hacks.c index 294a1366..4f0b089b 100644 --- a/src/symbol-hacks.c +++ b/src/symbol-hacks.c @@ -10,6 +10,7 @@ * http://cgit.freedesktop.org/xorg/xserver/tree/hw/xfree86/loader/sdksyms.sh */ +#include "config.h" #include "symbol-hacks.h" /* First include all the public headers. */ diff --git a/src/text-helper.c b/src/text-helper.c index 58dd9b30..0da4ad1d 100644 --- a/src/text-helper.c +++ b/src/text-helper.c @@ -24,6 +24,9 @@ #define _GNU_SOURCE /* Needed for strptime (_XOPEN_SOURCE can also be used). */ +#include "config.h" +#include "text-helper.h" + #include #include #include @@ -37,8 +40,6 @@ #define DEBUG_FLAG DEBUG_IM #include "debug.h" -#include "text-helper.h" - #include "util.h" static void diff --git a/src/text-helper.h b/src/text-helper.h index 5bb0b266..d1ab7c6c 100644 --- a/src/text-helper.h +++ b/src/text-helper.h @@ -21,8 +21,8 @@ #ifndef __TEXT_HELPER_H__ #define __TEXT_HELPER_H__ -#include -#include +#include + #include #include "contact.h" diff --git a/src/tube-dbus.c b/src/tube-dbus.c index 39686d2f..ee98a455 100644 --- a/src/tube-dbus.c +++ b/src/tube-dbus.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "tube-dbus.h" #include diff --git a/src/tube-iface.c b/src/tube-iface.c index 56ad5e0c..e4bc27d3 100644 --- a/src/tube-iface.c +++ b/src/tube-iface.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "tube-iface.h" #include diff --git a/src/tube-stream.c b/src/tube-stream.c index e872ea32..58820c6c 100644 --- a/src/tube-stream.c +++ b/src/tube-stream.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "tube-stream.h" #include diff --git a/src/tubes-manager.c b/src/tubes-manager.c index a94d1623..04eb89fb 100644 --- a/src/tubes-manager.c +++ b/src/tubes-manager.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "tubes-manager.h" #include diff --git a/src/util.c b/src/util.c index 39a7e5e4..e9605ab9 100644 --- a/src/util.c +++ b/src/util.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "util.h" #include diff --git a/tests/check-node-properties.c b/tests/check-node-properties.c index 2575524e..0fc030cb 100644 --- a/tests/check-node-properties.c +++ b/tests/check-node-properties.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include #include -- cgit v1.2.1