Reorder header inclusions accordingly to the Telepathy coding style

Sort by:
• "config.h"
• API declarations, if any
• public libraries
• internal headers, alphabetically sorted (mostly)

http://telepathy.freedesktop.org/wiki/Style#A.23includes

https://bugzilla.gnome.org/show_bug.cgi?id=697076

34 files changed, 42 insertions, 50 deletions

diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index 1a1391e16..064d4d215 100644
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -19,12 +19,12 @@
  */
 
 #include "config.h"
-
 #include "empathy-account-settings.h"
+
 #include "empathy-connection-managers.h"
 #include "empathy-keyring.h"
-#include "empathy-utils.h"
 #include "empathy-presence-manager.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include "empathy-debug.h"
diff --git a/libempathy/empathy-auth-factory.c b/libempathy/empathy-auth-factory.c
index 92a59dab2..cba4607a3 100644
--- a/libempathy/empathy-auth-factory.c
+++ b/libempathy/empathy-auth-factory.c
@@ -19,11 +19,8 @@
  */
 
 #include "config.h"
-
 #include "empathy-auth-factory.h"
 
-#define DEBUG_FLAG EMPATHY_DEBUG_TLS
-#include "empathy-debug.h"
 #include "empathy-keyring.h"
 #include "empathy-sasl-mechanisms.h"
 #include "empathy-server-sasl-handler.h"
@@ -40,6 +37,9 @@
 
 #include "extensions.h"
 
+#define DEBUG_FLAG EMPATHY_DEBUG_TLS
+#include "empathy-debug.h"
+
 G_DEFINE_TYPE (EmpathyAuthFactory, empathy_auth_factory, TP_TYPE_BASE_CLIENT);
 
 struct _EmpathyAuthFactoryPriv {
diff --git a/libempathy/empathy-camera-monitor.c b/libempathy/empathy-camera-monitor.c
index 1e603e989..6e6691120 100644
--- a/libempathy/empathy-camera-monitor.c
+++ b/libempathy/empathy-camera-monitor.c
@@ -19,8 +19,8 @@
  */
 
 #include "config.h"
-
 #include "empathy-camera-monitor.h"
+
 #include "cheese-camera-device-monitor.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c
index 7a6532f3e..3f1828612 100644
--- a/libempathy/empathy-chatroom-manager.c
+++ b/libempathy/empathy-chatroom-manager.c
@@ -22,11 +22,11 @@
  */
 
 #include "config.h"
+#include "empathy-chatroom-manager.h"
 
 #include <sys/stat.h>
 
 #include "empathy-client-factory.h"
-#include "empathy-chatroom-manager.h"
 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
diff --git a/libempathy/empathy-chatroom.c b/libempathy/empathy-chatroom.c
index dcc72d5f7..32bb4ce30 100644
--- a/libempathy/empathy-chatroom.c
+++ b/libempathy/empathy-chatroom.c
@@ -20,8 +20,8 @@
  */
 
 #include "config.h"
-
 #include "empathy-chatroom.h"
+
 #include "empathy-utils.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyChatroom)
diff --git a/libempathy/empathy-client-factory.c b/libempathy/empathy-client-factory.c
index 1c8fc58cf..39760998c 100644
--- a/libempathy/empathy-client-factory.c
+++ b/libempathy/empathy-client-factory.c
@@ -20,7 +20,6 @@
  */
 
 #include "config.h"
-
 #include "empathy-client-factory.h"
 
 #include "empathy-tp-chat.h"
diff --git a/libempathy/empathy-connection-aggregator.c b/libempathy/empathy-connection-aggregator.c
index 83e15f15d..763715f9e 100644
--- a/libempathy/empathy-connection-aggregator.c
+++ b/libempathy/empathy-connection-aggregator.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-
 #include "empathy-connection-aggregator.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
diff --git a/libempathy/empathy-connection-managers.c b/libempathy/empathy-connection-managers.c
index 6f2cd8c53..b94ac1253 100644
--- a/libempathy/empathy-connection-managers.c
+++ b/libempathy/empathy-connection-managers.c
@@ -19,8 +19,8 @@
  */
 
 #include "config.h"
-
 #include "empathy-connection-managers.h"
+
 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
diff --git a/libempathy/empathy-contact-groups.c b/libempathy/empathy-contact-groups.c
index 7fb02499f..81a1b3133 100644
--- a/libempathy/empathy-contact-groups.c
+++ b/libempathy/empathy-contact-groups.c
@@ -21,11 +21,11 @@
  */
 
 #include "config.h"
+#include "empathy-contact-groups.h"
 
 #include <sys/stat.h>
 
 #include "empathy-utils.h"
-#include "empathy-contact-groups.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include "empathy-debug.h"
diff --git a/libempathy/empathy-contact-groups.h b/libempathy/empathy-contact-groups.h
index 181b28753..0be1c81b3 100644
--- a/libempathy/empathy-contact-groups.h
+++ b/libempathy/empathy-contact-groups.h
@@ -23,10 +23,10 @@
 #ifndef __EMPATHY_CONTACT_GROUPS_H__
 #define __EMPATHY_CONTACT_GROUPS_H__
 
-G_BEGIN_DECLS
-
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 void     empathy_contact_groups_get_all     (void);
 
 gboolean empathy_contact_group_get_expanded (const gchar *group);
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index 3c91e6319..356104434 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -20,6 +20,7 @@
  */
 
 #include "config.h"
+#include "empathy-contact.h"
 
 #ifdef HAVE_GEOCODE
 #include <geocode-glib/geocode-glib.h>
diff --git a/libempathy/empathy-debug.c b/libempathy/empathy-debug.c
index 09573c39a..75900f4ad 100644
--- a/libempathy/empathy-debug.c
+++ b/libempathy/empathy-debug.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-
 #include "empathy-debug.h"
 
 #ifdef ENABLE_DEBUG
diff --git a/libempathy/empathy-ft-factory.c b/libempathy/empathy-ft-factory.c
index 9cf90014b..855ddb98f 100644
--- a/libempathy/empathy-ft-factory.c
+++ b/libempathy/empathy-ft-factory.c
@@ -21,7 +21,9 @@
 
 /* empathy-ft-factory.c */
 
+#include "config.h"
 #include "empathy-ft-factory.h"
+
 #include "empathy-request-util.h"
 #include "empathy-utils.h"
 
diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c
index 30711c7d1..96c8e47f5 100644
--- a/libempathy/empathy-ft-handler.c
+++ b/libempathy/empathy-ft-handler.c
@@ -22,10 +22,10 @@
 /* empathy-ft-handler.c */
 
 #include "config.h"
+#include "empathy-ft-handler.h"
 
 #include <glib/gi18n-lib.h>
 
-#include "empathy-ft-handler.h"
 #include "empathy-time.h"
 #include "empathy-utils.h"
 
diff --git a/libempathy/empathy-goa-auth-handler.c b/libempathy/empathy-goa-auth-handler.c
index 3659b3728..379730004 100644
--- a/libempathy/empathy-goa-auth-handler.c
+++ b/libempathy/empathy-goa-auth-handler.c
@@ -19,14 +19,15 @@
  */
 
 #include "config.h"
+#include "empathy-goa-auth-handler.h"
 
 #define GOA_API_IS_SUBJECT_TO_CHANGE /* awesome! */
 #include <goa/goa.h>
 
+#include "empathy-sasl-mechanisms.h"
+
 #define DEBUG_FLAG EMPATHY_DEBUG_SASL
 #include "empathy-debug.h"
-#include "empathy-goa-auth-handler.h"
-#include "empathy-sasl-mechanisms.h"
 
 struct _EmpathyGoaAuthHandlerPriv
 {
diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c
index f3c7565a1..71960b5d2 100644
--- a/libempathy/empathy-individual-manager.c
+++ b/libempathy/empathy-individual-manager.c
@@ -21,8 +21,8 @@
  */
 
 #include "config.h"
-
 #include "empathy-individual-manager.h"
+
 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
diff --git a/libempathy/empathy-irc-network-manager.c b/libempathy/empathy-irc-network-manager.c
index 3c2a31544..3f53a49ad 100644
--- a/libempathy/empathy-irc-network-manager.c
+++ b/libempathy/empathy-irc-network-manager.c
@@ -19,11 +19,11 @@
  */
 
 #include "config.h"
+#include "empathy-irc-network-manager.h"
 
 #include <sys/stat.h>
 
 #include "empathy-utils.h"
-#include "empathy-irc-network-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_IRC
 #include "empathy-debug.h"
diff --git a/libempathy/empathy-irc-network.c b/libempathy/empathy-irc-network.c
index e0bc84f7d..e01116e96 100644
--- a/libempathy/empathy-irc-network.c
+++ b/libempathy/empathy-irc-network.c
@@ -20,8 +20,8 @@
  */
 
 #include "config.h"
-
 #include "empathy-irc-network.h"
+
 #include "empathy-utils.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIrcNetwork)
diff --git a/libempathy/empathy-irc-server.c b/libempathy/empathy-irc-server.c
index 5457f23a1..75eb016dd 100644
--- a/libempathy/empathy-irc-server.c
+++ b/libempathy/empathy-irc-server.c
@@ -19,8 +19,8 @@
  */
 
 #include "config.h"
-
 #include "empathy-irc-server.h"
+
 #include "empathy-utils.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIrcServer)
diff --git a/libempathy/empathy-keyring.c b/libempathy/empathy-keyring.c
index 837b2d519..e7872f1b0 100644
--- a/libempathy/empathy-keyring.c
+++ b/libempathy/empathy-keyring.c
@@ -17,11 +17,9 @@
  */
 
 #include "config.h"
-
-#include <glib/gi18n-lib.h>
-
 #include "empathy-keyring.h"
 
+#include <glib/gi18n-lib.h>
 #include <libsecret/secret.h>
 
 #ifdef HAVE_UOA
diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c
index e19f69b09..1115eddda 100644
--- a/libempathy/empathy-message.c
+++ b/libempathy/empathy-message.c
@@ -23,11 +23,11 @@
  */
 
 #include "config.h"
+#include "empathy-message.h"
 
 #include <glib/gi18n-lib.h>
 
 #include "empathy-client-factory.h"
-#include "empathy-message.h"
 #include "empathy-time.h"
 #include "empathy-utils.h"
 #include "empathy-enum-types.h"
diff --git a/libempathy/empathy-pkg-kit.c b/libempathy/empathy-pkg-kit.c
index c00ae52a8..21f703b68 100644
--- a/libempathy/empathy-pkg-kit.c
+++ b/libempathy/empathy-pkg-kit.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-
 #include "empathy-pkg-kit.h"
 
 typedef struct
diff --git a/libempathy/empathy-presence-manager.c b/libempathy/empathy-presence-manager.c
index cdc45fbe9..1c288fb98 100644
--- a/libempathy/empathy-presence-manager.c
+++ b/libempathy/empathy-presence-manager.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-
 #include "empathy-presence-manager.h"
 
 #include "empathy-utils.h"
diff --git a/libempathy/empathy-request-util.c b/libempathy/empathy-request-util.c
index d7b53c82c..c5f693f04 100644
--- a/libempathy/empathy-request-util.c
+++ b/libempathy/empathy-request-util.c
@@ -20,7 +20,6 @@
  */
 
 #include "config.h"
-
 #include "empathy-request-util.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
diff --git a/libempathy/empathy-sasl-mechanisms.c b/libempathy/empathy-sasl-mechanisms.c
index 303bf9e3e..a6829c450 100644
--- a/libempathy/empathy-sasl-mechanisms.c
+++ b/libempathy/empathy-sasl-mechanisms.c
@@ -19,13 +19,13 @@
  */
 
 #include "config.h"
+#include "empathy-sasl-mechanisms.h"
 
 #include <libsoup/soup.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_SASL
 #include "empathy-debug.h"
 #include "empathy-utils.h"
-#include "empathy-sasl-mechanisms.h"
 
 #define MECH_FACEBOOK "X-FACEBOOK-PLATFORM"
 #define MECH_WLM "X-MESSENGER-OAUTH2"
diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c
index b9b908ed7..b18d1a735 100644
--- a/libempathy/empathy-server-sasl-handler.c
+++ b/libempathy/empathy-server-sasl-handler.c
@@ -18,15 +18,14 @@
  */
 
 #include "config.h"
-
 #include "empathy-server-sasl-handler.h"
 
+#include "empathy-keyring.h"
+#include "empathy-sasl-mechanisms.h"
 #include "extensions.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_SASL
 #include "empathy-debug.h"
-#include "empathy-keyring.h"
-#include "empathy-sasl-mechanisms.h"
 
 enum {
   PROP_CHANNEL = 1,
diff --git a/libempathy/empathy-server-tls-handler.c b/libempathy/empathy-server-tls-handler.c
index 78be2f0a7..34c3147a3 100644
--- a/libempathy/empathy-server-tls-handler.c
+++ b/libempathy/empathy-server-tls-handler.c
@@ -19,15 +19,14 @@
  */
 
 #include "config.h"
-
 #include "empathy-server-tls-handler.h"
 
-#define DEBUG_FLAG EMPATHY_DEBUG_TLS
-#include "empathy-debug.h"
 #include "empathy-utils.h"
-
 #include "extensions.h"
 
+#define DEBUG_FLAG EMPATHY_DEBUG_TLS
+#include "empathy-debug.h"
+
 static void async_initable_iface_init (GAsyncInitableIface *iface);
 
 enum {
diff --git a/libempathy/empathy-status-presets.c b/libempathy/empathy-status-presets.c
index 1de36d81b..0e651f074 100644
--- a/libempathy/empathy-status-presets.c
+++ b/libempathy/empathy-status-presets.c
@@ -21,11 +21,11 @@
  */
 
 #include "config.h"
+#include "empathy-status-presets.h"
 
 #include <sys/stat.h>
 
 #include "empathy-utils.h"
-#include "empathy-status-presets.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
diff --git a/libempathy/empathy-time.c b/libempathy/empathy-time.c
index cbb6b3bdb..d14f2c4cc 100644
--- a/libempathy/empathy-time.c
+++ b/libempathy/empathy-time.c
@@ -20,11 +20,10 @@
  */
 
 #include "config.h"
+#include "empathy-time.h"
 
 #include <glib/gi18n-lib.h>
 
-#include "empathy-time.h"
-
 /* Note: EmpathyTime is always in UTC. */
 
 gint64
diff --git a/libempathy/empathy-tls-verifier.c b/libempathy/empathy-tls-verifier.c
index 00447cc40..fcbc559b3 100644
--- a/libempathy/empathy-tls-verifier.c
+++ b/libempathy/empathy-tls-verifier.c
@@ -20,14 +20,14 @@
  */
 
 #include "config.h"
-
 #include "empathy-tls-verifier.h"
 
 #include <gcr/gcr.h>
 
+#include "empathy-utils.h"
+
 #define DEBUG_FLAG EMPATHY_DEBUG_TLS
 #include "empathy-debug.h"
-#include "empathy-utils.h"
 
 G_DEFINE_TYPE (EmpathyTLSVerifier, empathy_tls_verifier,
     G_TYPE_OBJECT)
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index e15a8c41b..4711affcb 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -19,8 +19,8 @@
  */
 
 #include "config.h"
-
 #include "empathy-tp-chat.h"
+
 #include "empathy-request-util.h"
 #include "empathy-utils.h"
 
diff --git a/libempathy/empathy-uoa-auth-handler.c b/libempathy/empathy-uoa-auth-handler.c
index a57dd6335..7e17b7089 100644
--- a/libempathy/empathy-uoa-auth-handler.c
+++ b/libempathy/empathy-uoa-auth-handler.c
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include "empathy-uoa-auth-handler.h"
 
 #include <libaccounts-glib/ag-account.h>
 #include <libaccounts-glib/ag-account-service.h>
@@ -29,14 +30,14 @@
 #include <libsignon-glib/signon-identity.h>
 #include <libsignon-glib/signon-auth-session.h>
 
-#define DEBUG_FLAG EMPATHY_DEBUG_SASL
-#include "empathy-debug.h"
 #include "empathy-keyring.h"
 #include "empathy-utils.h"
-#include "empathy-uoa-auth-handler.h"
 #include "empathy-uoa-utils.h"
 #include "empathy-sasl-mechanisms.h"
 
+#define DEBUG_FLAG EMPATHY_DEBUG_SASL
+#include "empathy-debug.h"
+
 struct _EmpathyUoaAuthHandlerPriv
 {
   AgManager *manager;
diff --git a/libempathy/empathy-uoa-utils.c b/libempathy/empathy-uoa-utils.c
index f63a15193..6032d36bd 100644
--- a/libempathy/empathy-uoa-utils.c
+++ b/libempathy/empathy-uoa-utils.c
@@ -19,10 +19,10 @@
  */
 
 #include "config.h"
+#include "empathy-uoa-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include "empathy-debug.h"
-#include "empathy-uoa-utils.h"
 
 static AgManager *singleton = NULL;
 
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index f62d1e5f0..962246f52 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -27,16 +27,14 @@
  */
 
 #include "config.h"
+#include "empathy-utils.h"
 
 #include <glib/gi18n-lib.h>
-
 #include <libxml/uri.h>
 #include <dbus/dbus-protocol.h>
 
 #include "empathy-client-factory.h"
-#include "empathy-utils.h"
 #include "empathy-presence-manager.h"
-
 #include "extensions.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER