[Telepathy-commits] [telepathy-gabble/master] tidy up include style
Dafydd Harries
dafydd.harries at collabora.co.uk
Tue Aug 19 10:53:30 PDT 2008
20080721180337-c9803-09001e2492d16522e85e4d9514462a24cd34adff.gz
---
src/bytestream-factory.c | 12 +++++-------
src/bytestream-ibb.c | 7 ++-----
src/bytestream-muc.c | 7 ++-----
src/caps-hash.c | 14 +++++++-------
src/conn-aliasing.c | 7 +++----
src/conn-presence.c | 8 +++-----
src/connection-manager.c | 7 ++++---
src/connection.c | 3 +--
src/debug.c | 5 ++---
src/disco.c | 9 +++++----
src/gabble.c | 3 ++-
src/im-factory.c | 8 +++-----
src/media-channel.c | 20 +++++++++-----------
src/media-factory.c | 8 +++-----
src/media-session.c | 16 +++++++---------
src/media-stream.c | 19 +++++++++----------
src/muc-channel.c | 4 ++--
src/muc-factory.c | 5 +++--
src/presence-cache.c | 18 +++++++++---------
src/presence.c | 1 +
src/private-tubes-factory.c | 14 ++++++--------
src/pubsub.c | 3 ++-
src/register.c | 4 ++--
src/request-pipeline.c | 3 ++-
src/roomlist-channel.c | 5 +++--
src/roster-channel.c | 13 +++++++------
src/roster.c | 9 ++++-----
src/text-mixin.c | 6 +++---
src/tube-dbus.c | 16 +++++++---------
src/tube-iface.c | 1 +
src/tube-stream.c | 15 +++++++--------
src/tubes-channel.c | 13 ++++++-------
src/util.c | 13 ++++++-------
src/vcard-manager.c | 6 +++---
src/write-mgr-file.c | 2 +-
35 files changed, 142 insertions(+), 162 deletions(-)
diff --git a/src/bytestream-factory.c b/src/bytestream-factory.c
index bf7faa4..96b3a02 100644
--- a/src/bytestream-factory.c
+++ b/src/bytestream-factory.c
@@ -28,22 +28,20 @@
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
-
#include <loudmouth/loudmouth.h>
+#include <telepathy-glib/interfaces.h>
#define DEBUG_FLAG GABBLE_DEBUG_BYTESTREAM
-#include <telepathy-glib/interfaces.h>
-#include "debug.h"
-#include "connection.h"
-#include "bytestream-iface.h"
#include "bytestream-ibb.h"
+#include "bytestream-iface.h"
#include "bytestream-muc.h"
+#include "connection.h"
+#include "debug.h"
#include "namespaces.h"
-#include "util.h"
#include "presence-cache.h"
-
#include "private-tubes-factory.h"
+#include "util.h"
G_DEFINE_TYPE (GabbleBytestreamFactory, gabble_bytestream_factory,
G_TYPE_OBJECT);
diff --git a/src/bytestream-ibb.c b/src/bytestream-ibb.c
index 1434053..e4368b8 100644
--- a/src/bytestream-ibb.c
+++ b/src/bytestream-ibb.c
@@ -25,22 +25,19 @@
#include <time.h>
#include <glib.h>
-
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
-
#include <loudmouth/loudmouth.h>
-
#include <telepathy-glib/interfaces.h>
#define DEBUG_FLAG GABBLE_DEBUG_BYTESTREAM
-#include "bytestream-iface.h"
#include "base64.h"
#include "bytestream-factory.h"
+#include "bytestream-iface.h"
+#include "connection.h"
#include "debug.h"
#include "disco.h"
-#include "connection.h"
#include "gabble-signals-marshal.h"
#include "namespaces.h"
#include "util.h"
diff --git a/src/bytestream-muc.c b/src/bytestream-muc.c
index 3a29ac9..1739c73 100644
--- a/src/bytestream-muc.c
+++ b/src/bytestream-muc.c
@@ -25,22 +25,19 @@
#include <time.h>
#include <glib.h>
-
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
-
#include <loudmouth/loudmouth.h>
-
#include <telepathy-glib/interfaces.h>
#define DEBUG_FLAG GABBLE_DEBUG_BYTESTREAM
-#include "bytestream-iface.h"
#include "base64.h"
#include "bytestream-factory.h"
+#include "bytestream-iface.h"
+#include "connection.h"
#include "debug.h"
#include "disco.h"
-#include "connection.h"
#include "gabble-signals-marshal.h"
#include "namespaces.h"
#include "util.h"
diff --git a/src/caps-hash.c b/src/caps-hash.c
index fcc6994..2b585d8 100644
--- a/src/caps-hash.c
+++ b/src/caps-hash.c
@@ -28,21 +28,21 @@
#include "caps-hash.h"
#include <string.h>
-#include <glib.h>
#include <time.h>
+#include <glib.h>
+
+#define DEBUG_FLAG GABBLE_DEBUG_PRESENCE
+
#include "base64.h"
#include "capabilities.h"
-#include "presence.h"
-#include "presence-cache.h"
+#include "debug.h"
#include "namespaces.h"
+#include "presence-cache.h"
+#include "presence.h"
#include "sha1/sha1.h"
#include "util.h"
-#include "config.h"
-#define DEBUG_FLAG GABBLE_DEBUG_PRESENCE
-#include "debug.h"
-
typedef struct _DataFormField DataFormField;
struct _DataFormField {
diff --git a/src/conn-aliasing.c b/src/conn-aliasing.c
index 7a8f948..10b6315 100644
--- a/src/conn-aliasing.c
+++ b/src/conn-aliasing.c
@@ -23,7 +23,10 @@
#include <telepathy-glib/svc-connection.h>
+#define DEBUG_FLAG GABBLE_DEBUG_CONNECTION
+
#include "connection.h"
+#include "debug.h"
#include "namespaces.h"
#include "presence-cache.h"
#include "pubsub.h"
@@ -32,10 +35,6 @@
#include "util.h"
#include "vcard-manager.h"
-#define DEBUG_FLAG GABBLE_DEBUG_CONNECTION
-
-#include "debug.h"
-
#define GABBLE_TP_ALIAS_PAIR_TYPE (dbus_g_type_get_struct ("GValueArray", \
G_TYPE_UINT, G_TYPE_STRING, G_TYPE_INVALID))
diff --git a/src/conn-presence.c b/src/conn-presence.c
index 3f5434e..24f530b 100644
--- a/src/conn-presence.c
+++ b/src/conn-presence.c
@@ -27,14 +27,12 @@
#include <telepathy-glib/svc-connection.h>
#include <telepathy-glib/util.h>
-#include "connection.h"
-#include "presence.h"
-#include "presence-cache.h"
-
#define DEBUG_FLAG GABBLE_DEBUG_CONNECTION
+#include "connection.h"
#include "debug.h"
-
+#include "presence-cache.h"
+#include "presence.h"
static const TpPresenceStatusOptionalArgumentSpec gabble_status_arguments[] = {
{ "message", "s", NULL, NULL },
diff --git a/src/connection-manager.c b/src/connection-manager.c
index d0b1051..b731806 100644
--- a/src/connection-manager.c
+++ b/src/connection-manager.c
@@ -21,16 +21,17 @@
#include "config.h"
#include "connection-manager.h"
-#include <dbus/dbus-protocol.h>
-#include <dbus/dbus-glib.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "connection.h"
+#include <dbus/dbus-protocol.h>
+#include <dbus/dbus-glib.h>
#include <telepathy-glib/dbus.h>
#include <telepathy-glib/errors.h>
+#include "connection.h"
+
G_DEFINE_TYPE(GabbleConnectionManager,
gabble_connection_manager,
TP_TYPE_BASE_CONNECTION_MANAGER)
diff --git a/src/connection.c b/src/connection.c
index 8d821d8..817d9b5 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -19,7 +19,6 @@
*/
#include "config.h"
-
#include "connection.h"
#include <stdio.h>
@@ -27,11 +26,11 @@
#include <string.h>
#define DBUS_API_SUBJECT_TO_CHANGE
+
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
#include <glib-object.h>
#include <loudmouth/loudmouth.h>
-
#include <telepathy-glib/channel-iface.h>
#include <telepathy-glib/channel-factory-iface.h>
#include <telepathy-glib/dbus.h>
diff --git a/src/debug.c b/src/debug.c
index 97856d9..2a6583d 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -1,4 +1,6 @@
+
#include "config.h"
+#include "debug.h"
#include <stdarg.h>
#include <unistd.h>
@@ -9,11 +11,8 @@
#include <glib.h>
#include <glib/gstdio.h>
-
#include <telepathy-glib/debug.h>
-#include "debug.h"
-
void
gabble_debug_set_log_file_from_env (void)
{
diff --git a/src/disco.c b/src/disco.c
index a65cfcf..590480d 100644
--- a/src/disco.c
+++ b/src/disco.c
@@ -24,20 +24,21 @@
#include "config.h"
#include "disco.h"
+#include <stdlib.h>
+#include <string.h>
+
#define DBUS_API_SUBJECT_TO_CHANGE
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
-#include <stdlib.h>
-#include <string.h>
+#include <telepathy-glib/dbus.h>
#define DEBUG_FLAG GABBLE_DEBUG_DISCO
-#include "debug.h"
#include "connection.h"
+#include "debug.h"
#include "error.h"
#include "namespaces.h"
-#include <telepathy-glib/dbus.h>
#include "util.h"
#define DEFAULT_REQUEST_TIMEOUT 20000
diff --git a/src/gabble.c b/src/gabble.c
index 3780bdd..cc1ea27 100644
--- a/src/gabble.c
+++ b/src/gabble.c
@@ -19,15 +19,16 @@
*/
#include "config.h"
+#include "gabble.h"
#include <time.h>
#include <unistd.h>
#include <telepathy-glib/debug.h>
#include <telepathy-glib/run.h>
+
#include "debug.h"
#include "connection-manager.h"
-#include "gabble.h"
static TpBaseConnectionManager *
construct_cm (void)
diff --git a/src/im-factory.c b/src/im-factory.c
index f08b090..d5b0e07 100644
--- a/src/im-factory.c
+++ b/src/im-factory.c
@@ -27,21 +27,19 @@
#include <time.h>
#include <glib.h>
-
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
-
#include <loudmouth/loudmouth.h>
+#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/channel-factory-iface.h>
#define DEBUG_FLAG GABBLE_DEBUG_IM
+#include "connection.h"
#include "debug.h"
#include "disco.h"
-#include "connection.h"
#include "im-channel.h"
-#include <telepathy-glib/interfaces.h>
#include "text-mixin.h"
-#include <telepathy-glib/channel-factory-iface.h>
static void gabble_im_factory_iface_init (gpointer g_iface,
gpointer iface_data);
diff --git a/src/media-channel.c b/src/media-channel.c
index a921137..ee98d2a 100644
--- a/src/media-channel.c
+++ b/src/media-channel.c
@@ -22,18 +22,10 @@
#include "config.h"
#include "media-channel.h"
-#include <dbus/dbus-glib.h>
#include <stdio.h>
#include <stdlib.h>
-#define DEBUG_FLAG GABBLE_DEBUG_MEDIA
-
-#include "debug.h"
-#include "connection.h"
-#include "media-session.h"
-#include "presence.h"
-#include "presence-cache.h"
-
+#include <dbus/dbus-glib.h>
#include <telepathy-glib/dbus.h>
#include <telepathy-glib/errors.h>
#include <telepathy-glib/interfaces.h>
@@ -41,10 +33,16 @@
#include <telepathy-glib/svc-channel.h>
#include <telepathy-glib/svc-properties-interface.h>
-#include "media-session.h"
-#include "media-stream.h"
+#define DEBUG_FLAG GABBLE_DEBUG_MEDIA
+#include "connection.h"
+#include "debug.h"
#include "media-factory.h"
+#include "media-session.h"
+#include "media-session.h"
+#include "media-stream.h"
+#include "presence-cache.h"
+#include "presence.h"
#define GABBLE_TP_SESSION_HANDLER_SET_TYPE (dbus_g_type_get_struct ("GValueArray", \
DBUS_TYPE_G_OBJECT_PATH, \
diff --git a/src/media-factory.c b/src/media-factory.c
index 0b7c5be..affc44d 100644
--- a/src/media-factory.c
+++ b/src/media-factory.c
@@ -27,21 +27,19 @@
#include <time.h>
#include <glib.h>
-
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
-
#include <loudmouth/loudmouth.h>
+#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/channel-factory-iface.h>
#define DEBUG_FLAG GABBLE_DEBUG_MEDIA
-#include "debug.h"
#include "connection.h"
+#include "debug.h"
#include "media-channel.h"
#include "namespaces.h"
-#include <telepathy-glib/interfaces.h>
#include "text-mixin.h"
-#include <telepathy-glib/channel-factory-iface.h>
#include "util.h"
static void gabble_media_factory_iface_init (gpointer g_iface,
diff --git a/src/media-session.c b/src/media-session.c
index 1c06c67..16f20c1 100644
--- a/src/media-session.c
+++ b/src/media-session.c
@@ -22,30 +22,28 @@
#include "config.h"
#include "media-session.h"
-#include <dbus/dbus-glib.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
-#define DEBUG_FLAG GABBLE_DEBUG_MEDIA
-
+#include <dbus/dbus-glib.h>
#include <telepathy-glib/debug-ansi.h>
-#include "debug.h"
-#include "namespaces.h"
-#include "util.h"
-
#include <telepathy-glib/dbus.h>
#include <telepathy-glib/errors.h>
#include <telepathy-glib/svc-media-interfaces.h>
+#define DEBUG_FLAG GABBLE_DEBUG_MEDIA
+
#include "connection.h"
+#include "debug.h"
+#include "gabble-signals-marshal.h"
#include "media-channel.h"
#include "media-stream.h"
+#include "namespaces.h"
#include "presence-cache.h"
#include "presence.h"
-
-#include "gabble-signals-marshal.h"
+#include "util.h"
static void session_handler_iface_init (gpointer, gpointer);
diff --git a/src/media-stream.c b/src/media-stream.c
index cb005a4..15dd713 100644
--- a/src/media-stream.c
+++ b/src/media-stream.c
@@ -22,28 +22,27 @@
#include "config.h"
#include "media-stream.h"
-#include <dbus/dbus-glib.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#define DEBUG_FLAG GABBLE_DEBUG_MEDIA
-
+#include <dbus/dbus-glib.h>
#include <telepathy-glib/debug-ansi.h>
-#include "debug.h"
-#include "namespaces.h"
-
-#include "connection.h"
-#include "media-channel.h"
-#include "media-session.h"
-#include "media-session-enumtypes.h"
#include <telepathy-glib/dbus.h>
#include <telepathy-glib/enums.h>
#include <telepathy-glib/errors.h>
#include <telepathy-glib/svc-media-interfaces.h>
+#define DEBUG_FLAG GABBLE_DEBUG_MEDIA
+
+#include "connection.h"
+#include "debug.h"
#include "gabble-signals-marshal.h"
+#include "media-channel.h"
+#include "media-session-enumtypes.h"
+#include "media-session.h"
+#include "namespaces.h"
static void stream_handler_iface_init (gpointer, gpointer);
diff --git a/src/muc-channel.c b/src/muc-channel.c
index 98de8ef..3a6f77f 100644
--- a/src/muc-channel.c
+++ b/src/muc-channel.c
@@ -22,12 +22,12 @@
#include "config.h"
#include "muc-channel.h"
-#include <dbus/dbus-glib.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
+#include <dbus/dbus-glib.h>
#include <telepathy-glib/dbus.h>
#include <telepathy-glib/debug-ansi.h>
#include <telepathy-glib/errors.h>
@@ -36,9 +36,9 @@
#define DEBUG_FLAG GABBLE_DEBUG_MUC
+#include "connection.h"
#include "debug.h"
#include "disco.h"
-#include "connection.h"
#include "error.h"
#include "namespaces.h"
#include "util.h"
diff --git a/src/muc-factory.c b/src/muc-factory.c
index 1ecd18b..dc742a7 100644
--- a/src/muc-factory.c
+++ b/src/muc-factory.c
@@ -34,15 +34,16 @@
#include <telepathy-glib/interfaces.h>
#define DEBUG_FLAG GABBLE_DEBUG_MUC
+
+#include "connection.h"
#include "conn-olpc.h"
#include "debug.h"
#include "disco.h"
#include "extensions/extensions.h"
-#include "connection.h"
#include "muc-channel.h"
-#include "roomlist-channel.h"
#include "namespaces.h"
#include "presence-cache.h"
+#include "roomlist-channel.h"
#include "text-mixin.h"
#include "tubes-channel.h"
#include "util.h"
diff --git a/src/presence-cache.c b/src/presence-cache.c
index 6295b98..f325e2a 100644
--- a/src/presence-cache.c
+++ b/src/presence-cache.c
@@ -24,22 +24,22 @@
#include <stdlib.h>
#include <string.h>
-/* When five DIFFERENT guys report the same caps for a given bundle, it'll
- * be enough. But if only ONE guy use the verification string (XEP-0115 v1.5),
- * it'll be enough too.
- */
-#define CAPABILITY_BUNDLE_ENOUGH_TRUST 5
-#define DEBUG_FLAG GABBLE_DEBUG_PRESENCE
-
#include <telepathy-glib/intset.h>
+#define DEBUG_FLAG GABBLE_DEBUG_PRESENCE
+
#include "caps-hash.h"
#include "debug.h"
-#include "disco.h" /* \o\ \o/ /o/ */
+#include "disco.h"
+#include "gabble-signals-marshal.h"
#include "namespaces.h"
#include "util.h"
-#include "gabble-signals-marshal.h"
+/* When five DIFFERENT guys report the same caps for a given bundle, it'll
+ * be enough. But if only ONE guy use the verification string (XEP-0115 v1.5),
+ * it'll be enough too.
+ */
+#define CAPABILITY_BUNDLE_ENOUGH_TRUST 5
G_DEFINE_TYPE (GabblePresenceCache, gabble_presence_cache, G_TYPE_OBJECT);
diff --git a/src/presence.c b/src/presence.c
index ee68339..2d74e7a 100644
--- a/src/presence.c
+++ b/src/presence.c
@@ -30,6 +30,7 @@
#include "util.h"
#define DEBUG_FLAG GABBLE_DEBUG_PRESENCE
+
#include "debug.h"
G_DEFINE_TYPE (GabblePresence, gabble_presence, G_TYPE_OBJECT);
diff --git a/src/private-tubes-factory.c b/src/private-tubes-factory.c
index c0f636c..318799f 100644
--- a/src/private-tubes-factory.c
+++ b/src/private-tubes-factory.c
@@ -25,24 +25,22 @@
#include <time.h>
#include <glib.h>
-
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
-
#include <loudmouth/loudmouth.h>
+#include <telepathy-glib/channel-factory-iface.h>
+#include <telepathy-glib/interfaces.h>
#define DEBUG_FLAG GABBLE_DEBUG_TUBES
+#include "connection.h"
#include "debug.h"
#include "extensions/extensions.h"
-#include "connection.h"
-#include "tubes-channel.h"
+#include "muc-channel.h"
+#include "muc-factory.h"
#include "namespaces.h"
+#include "tubes-channel.h"
#include "util.h"
-#include "muc-factory.h"
-#include "muc-channel.h"
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/channel-factory-iface.h>
static GabbleTubesChannel *new_tubes_channel (GabblePrivateTubesFactory *fac,
TpHandle handle);
diff --git a/src/pubsub.c b/src/pubsub.c
index 2bb445e..3ecd8fd 100644
--- a/src/pubsub.c
+++ b/src/pubsub.c
@@ -18,13 +18,14 @@
*/
#include "config.h"
+#include "pubsub.h"
#include <string.h>
+
#include <loudmouth/loudmouth.h>
#include <telepathy-glib/enums.h>
#include "conn-aliasing.h"
-#include "pubsub.h"
#include "namespaces.h"
#include "util.h"
#include "conn-olpc.h"
diff --git a/src/register.c b/src/register.c
index 6a95ea1..4da43ad 100644
--- a/src/register.c
+++ b/src/register.c
@@ -25,13 +25,13 @@
#define DBUS_API_SUBJECT_TO_CHANGE
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-lowlevel.h>
#include <telepathy-glib/dbus.h>
#include <telepathy-glib/errors.h>
diff --git a/src/request-pipeline.c b/src/request-pipeline.c
index 0176b81..c5a348c 100644
--- a/src/request-pipeline.c
+++ b/src/request-pipeline.c
@@ -24,8 +24,9 @@
#include <telepathy-glib/dbus.h>
#define DEBUG_FLAG GABBLE_DEBUG_PIPELINE
-#include "debug.h"
+
#include "connection.h"
+#include "debug.h"
#define DEFAULT_REQUEST_TIMEOUT 20000
#define REQUEST_PIPELINE_SIZE 5
diff --git a/src/roomlist-channel.c b/src/roomlist-channel.c
index 902b976..abc2687 100644
--- a/src/roomlist-channel.c
+++ b/src/roomlist-channel.c
@@ -21,11 +21,11 @@
#include "config.h"
#include "roomlist-channel.h"
-#include <dbus/dbus-glib.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <dbus/dbus-glib.h>
#include <telepathy-glib/dbus.h>
#include <telepathy-glib/enums.h>
#include <telepathy-glib/interfaces.h>
@@ -34,9 +34,10 @@
#include <telepathy-glib/svc-generic.h>
#define DEBUG_FLAG GABBLE_DEBUG_ROOMLIST
+
+#include "connection.h"
#include "debug.h"
#include "disco.h"
-#include "connection.h"
#include "namespaces.h"
#include "util.h"
diff --git a/src/roster-channel.c b/src/roster-channel.c
index 256fa94..668cc67 100644
--- a/src/roster-channel.c
+++ b/src/roster-channel.c
@@ -21,22 +21,23 @@
#include "config.h"
#include "roster-channel.h"
-#include <dbus/dbus-glib.h>
#include <stdio.h>
#include <stdlib.h>
-#define DEBUG_FLAG GABBLE_DEBUG_ROSTER
-
-#include "debug.h"
-#include "connection.h"
+#include <dbus/dbus-glib.h>
#include <telepathy-glib/group-mixin.h>
-#include "roster.h"
#include <telepathy-glib/dbus.h>
#include <telepathy-glib/errors.h>
#include <telepathy-glib/interfaces.h>
#include <telepathy-glib/channel-iface.h>
#include <telepathy-glib/svc-generic.h>
#include <telepathy-glib/svc-channel.h>
+
+#define DEBUG_FLAG GABBLE_DEBUG_ROSTER
+
+#include "connection.h"
+#include "debug.h"
+#include "roster.h"
#include "util.h"
static void channel_iface_init (gpointer, gpointer);
diff --git a/src/roster.c b/src/roster.c
index c169837..904b91b 100644
--- a/src/roster.c
+++ b/src/roster.c
@@ -24,22 +24,21 @@
#define DBUS_API_SUBJECT_TO_CHANGE
-#include <dbus/dbus-glib.h>
#include <string.h>
+#include <dbus/dbus-glib.h>
#include <telepathy-glib/interfaces.h>
#include <telepathy-glib/channel-factory-iface.h>
#define DEBUG_FLAG GABBLE_DEBUG_ROSTER
#include "conn-aliasing.h"
-#include "debug.h"
#include "connection.h"
-#include "roster-channel.h"
+#include "debug.h"
#include "namespaces.h"
-#include "util.h"
-
#include "presence-cache.h"
+#include "roster-channel.h"
+#include "util.h"
#define GOOGLE_ROSTER_VERSION "2"
diff --git a/src/text-mixin.c b/src/text-mixin.c
index 32828d3..bbe6a31 100644
--- a/src/text-mixin.c
+++ b/src/text-mixin.c
@@ -26,19 +26,19 @@
#include "config.h"
#include "text-mixin.h"
-#include <loudmouth/loudmouth.h>
-#include <dbus/dbus-glib.h>
#include <string.h>
#include <time.h>
+#include <dbus/dbus-glib.h>
+#include <loudmouth/loudmouth.h>
#include <telepathy-glib/text-mixin.h>
#include <telepathy-glib/enums.h>
#include <telepathy-glib/errors.h>
#define DEBUG_FLAG GABBLE_DEBUG_IM
-#include "debug.h"
#include "connection.h"
+#include "debug.h"
#include "namespaces.h"
#include "roster.h"
#include "util.h"
diff --git a/src/tube-dbus.c b/src/tube-dbus.c
index bf13abc..d1c1532 100644
--- a/src/tube-dbus.c
+++ b/src/tube-dbus.c
@@ -27,26 +27,24 @@
#include <glib.h>
#include <glib/gstdio.h>
-
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
-
#include <loudmouth/loudmouth.h>
#define DEBUG_FLAG GABBLE_DEBUG_TUBES
+#include "base64.h"
+#include "bytestream-factory.h"
+#include "bytestream-ibb.h"
+#include "bytestream-iface.h"
+#include "connection.h"
#include "debug.h"
#include "disco.h"
#include "extensions/extensions.h"
-#include "connection.h"
+#include "gabble-signals-marshal.h"
#include "namespaces.h"
-#include "util.h"
-#include "base64.h"
#include "tube-iface.h"
-#include "bytestream-iface.h"
-#include "bytestream-ibb.h"
-#include "bytestream-factory.h"
-#include "gabble-signals-marshal.h"
+#include "util.h"
/* When we receive D-Bus messages to be delivered to the application and the
* application is not yet connected to the D-Bus tube, theses D-Bus messages
diff --git a/src/tube-iface.c b/src/tube-iface.c
index 2d5b806..9c2eee4 100644
--- a/src/tube-iface.c
+++ b/src/tube-iface.c
@@ -19,6 +19,7 @@
#include "config.h"
#include "tube-iface.h"
+
#include "connection.h"
#include "extensions/extensions.h"
diff --git a/src/tube-stream.c b/src/tube-stream.c
index de30e7f..8d08604 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -33,23 +33,22 @@
#include <glib.h>
#include <glib/gstdio.h>
-
#include <loudmouth/loudmouth.h>
#define DEBUG_FLAG GABBLE_DEBUG_TUBES
+#include "bytestream-factory.h"
+#include "bytestream-iface.h"
+#include "connection.h"
#include "debug.h"
#include "disco.h"
#include "extensions/extensions.h"
-#include "connection.h"
-#include "presence.h"
-#include "presence-cache.h"
+#include "gabble-signals-marshal.h"
#include "namespaces.h"
-#include "util.h"
+#include "presence-cache.h"
+#include "presence.h"
#include "tube-iface.h"
-#include "bytestream-factory.h"
-#include "bytestream-iface.h"
-#include "gabble-signals-marshal.h"
+#include "util.h"
static void
tube_iface_init (gpointer g_iface, gpointer iface_data);
diff --git a/src/tubes-channel.c b/src/tubes-channel.c
index 040a2ef..f09b2f9 100644
--- a/src/tubes-channel.c
+++ b/src/tubes-channel.c
@@ -20,7 +20,6 @@
#include "config.h"
#include "tubes-channel.h"
-#include <dbus/dbus-glib.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -31,7 +30,7 @@
#include <glib.h>
#include <glib/gstdio.h>
-
+#include <dbus/dbus-glib.h>
#include <telepathy-glib/channel-iface.h>
#include <telepathy-glib/dbus.h>
#include <telepathy-glib/enums.h>
@@ -43,15 +42,15 @@
#define DEBUG_FLAG GABBLE_DEBUG_TUBES
-#include "debug.h"
+#include "bytestream-factory.h"
#include "connection.h"
-#include "presence.h"
-#include "presence-cache.h"
+#include "debug.h"
#include "namespaces.h"
-#include "util.h"
+#include "presence-cache.h"
+#include "presence.h"
#include "tube-iface.h"
#include "tube-stream.h"
-#include "bytestream-factory.h"
+#include "util.h"
#ifdef HAVE_DBUS_TUBE
#include "tube-dbus.h"
diff --git a/src/util.c b/src/util.c
index 5f86d2a..5ce5fbd 100644
--- a/src/util.c
+++ b/src/util.c
@@ -21,24 +21,23 @@
*/
#include "config.h"
-
#include "util.h"
-#include <glib.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
+#include <glib.h>
#include <telepathy-glib/handle-repo-dynamic.h>
+#define DEBUG_FLAG GABBLE_DEBUG_JID
+
+#include "base64.h"
#include "conn-aliasing.h"
-#include "sha1/sha1.h"
-#include "namespaces.h"
#include "connection.h"
-#include "base64.h"
-
-#define DEBUG_FLAG GABBLE_DEBUG_JID
#include "debug.h"
+#include "namespaces.h"
+#include "sha1/sha1.h"
gchar *
sha1_hex (const gchar *bytes, guint len)
diff --git a/src/vcard-manager.c b/src/vcard-manager.c
index 16e5ff7..e057750 100644
--- a/src/vcard-manager.c
+++ b/src/vcard-manager.c
@@ -28,16 +28,16 @@
#include <telepathy-glib/dbus.h>
#include <telepathy-glib/heap.h>
+#define DEBUG_FLAG GABBLE_DEBUG_VCARD
+
#include "base64.h"
#include "conn-aliasing.h"
#include "connection.h"
+#include "debug.h"
#include "namespaces.h"
#include "request-pipeline.h"
#include "util.h"
-#define DEBUG_FLAG GABBLE_DEBUG_VCARD
-#include "debug.h"
-
#define DEFAULT_REQUEST_TIMEOUT 60000
#define VCARD_CACHE_ENTRY_TTL 60
diff --git a/src/write-mgr-file.c b/src/write-mgr-file.c
index e992ac8..50db5ed 100644
--- a/src/write-mgr-file.c
+++ b/src/write-mgr-file.c
@@ -24,8 +24,8 @@
#include <dbus/dbus-glib.h>
#include <dbus/dbus-protocol.h>
-
#include <telepathy-glib/enums.h>
+
#include "connection-manager.h"
static gchar *
--
1.5.6.3
More information about the Telepathy-commits
mailing list