Clean up #include directives in headers

Reorder some inclusions and remove a few blank lines.

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

diff --git a/libempathy-gtk/empathy-account-chooser.h b/libempathy-gtk/empathy-account-chooser.h
index d58fcf12fbfa0743ee983ba1a63b31ae49a4a3ea..5302ad70246d5d141e3bf505b7ce8612521f03e1 100644 (file)
--- a/libempathy-gtk/empathy-account-chooser.h
+++ b/libempathy-gtk/empathy-account-chooser.h
@@ -25,7 +25,6 @@
 #define __EMPATHY_ACCOUNT_CHOOSER_H__
 
 #include <gtk/gtk.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-account-widget-irc.h b/libempathy-gtk/empathy-account-widget-irc.h
index eba469e8267090c56c9b0e45e313c4d18ff22d68..4be6d61a9b2f9246981b1f5b32a93cd45584371f 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-irc.h
+++ b/libempathy-gtk/empathy-account-widget-irc.h
@@ -22,6 +22,7 @@
 #define __EMPATHY_ACCOUNT_WIDGET_IRC_H__
 
 #include <gtk/gtk.h>
+
 #include "empathy-account-widget.h"
 #include "empathy-irc-network-chooser.h"
 

diff --git a/libempathy-gtk/empathy-account-widget-private.h b/libempathy-gtk/empathy-account-widget-private.h
index 8da22bdadac6d43628bad58fd957f745dde93582..4fc9a319716a59d2f3ff79dfb4fdd94aac355d58 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-private.h
+++ b/libempathy-gtk/empathy-account-widget-private.h
@@ -22,10 +22,11 @@
 #ifndef __EMPATHY_ACCOUNT_WIDGET_PRIVATE_H__
 #define __EMPATHY_ACCOUNT_WIDGET_PRIVATE_H__
 
-#include "empathy-account-widget.h"
 #include <glib.h>
 #include <gtk/gtk.h>
 
+#include "empathy-account-widget.h"
+
 G_BEGIN_DECLS
 
 struct _EmpathyAccountWidgetUIDetails {

diff --git a/libempathy-gtk/empathy-account-widget-sip.h b/libempathy-gtk/empathy-account-widget-sip.h
index 438ee8372f1242c4f75657057a521520ca8ede87..807d57dffe540e630701eded74180e16861a5e32 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-sip.h
+++ b/libempathy-gtk/empathy-account-widget-sip.h
@@ -22,6 +22,7 @@
 #define __EMPATHY_ACCOUNT_WIDGET_SIP_H__
 
 #include <gtk/gtk.h>
+
 #include "empathy-account-widget.h"
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-chat.h b/libempathy-gtk/empathy-chat.h
index cbd69a343720e5bbebfdf41fff4c1d793e38aa46..2a983622b9e17902b1d758ebc9f67daaf8d889fa 100644 (file)
--- a/libempathy-gtk/empathy-chat.h
+++ b/libempathy-gtk/empathy-chat.h
@@ -31,9 +31,8 @@
 #include <gtk/gtk.h>
 
 #include "empathy-contact.h"
-#include "empathy-tp-chat.h"
-
 #include "empathy-theme-adium.h"
+#include "empathy-tp-chat.h"
 
 G_BEGIN_DECLS
 

diff --git a/libempathy-gtk/empathy-contact-widget.h b/libempathy-gtk/empathy-contact-widget.h
index 9f1f1a70faf83936fe992a2b156bfc206a131206..5f44adb6bff949198d14860ee3be424a276fcbda 100644 (file)
--- a/libempathy-gtk/empathy-contact-widget.h
+++ b/libempathy-gtk/empathy-contact-widget.h
@@ -24,8 +24,8 @@
 
 #include <gtk/gtk.h>
 
-#include "empathy-contact.h"
 #include "empathy-account-chooser.h"
+#include "empathy-contact.h"
 
 G_BEGIN_DECLS
 

diff --git a/libempathy-gtk/empathy-contactinfo-utils.h b/libempathy-gtk/empathy-contactinfo-utils.h
index 80c18ffae22e574cc20b86cb68389f9776540ac6..c102c5dd0b3520e820da2bddd2085dacc24fcbbc 100644 (file)
--- a/libempathy-gtk/empathy-contactinfo-utils.h
+++ b/libempathy-gtk/empathy-contactinfo-utils.h
@@ -23,7 +23,6 @@
 
 #include <glib.h>
 #include <gtk/gtk.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-dialpad-button.h b/libempathy-gtk/empathy-dialpad-button.h
index cca96f3b2e03806f315af149de99644892eef10c..cd312bda1821194802279ad770e4b5b0ed1e348b 100644 (file)
--- a/libempathy-gtk/empathy-dialpad-button.h
+++ b/libempathy-gtk/empathy-dialpad-button.h
@@ -25,7 +25,6 @@
 #define __EMPATHY_DIALPAD_BUTTON_H__
 
 #include <gtk/gtk.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-groups-widget.h b/libempathy-gtk/empathy-groups-widget.h
index 1085fac4f5d61cddf4eb3d754917adb8ae5e8944..2b59db62cca8e2a2bd90bbadbdc3fd79e0d9cee6 100644 (file)
--- a/libempathy-gtk/empathy-groups-widget.h
+++ b/libempathy-gtk/empathy-groups-widget.h
@@ -23,7 +23,6 @@
 #define __EMPATHY_GROUPS_WIDGET_H__
 
 #include <gtk/gtk.h>
-
 #include <folks/folks.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-individual-dialogs.h b/libempathy-gtk/empathy-individual-dialogs.h
index e071056768c9c7375736393e22b3e418b4a2f735..b603c576505b80861efa58b6bf182b3f17db2f5b 100644 (file)
--- a/libempathy-gtk/empathy-individual-dialogs.h
+++ b/libempathy-gtk/empathy-individual-dialogs.h
@@ -24,7 +24,6 @@
 #define __EMPATHY_INDIVIDUAL_DIALOGS_H__
 
 #include <gtk/gtk.h>
-
 #include <folks/folks.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-individual-edit-dialog.h b/libempathy-gtk/empathy-individual-edit-dialog.h
index 4f580fb03181f320537d8c79135b7313f1c74bf9..747e6824fc98dbe02e89ec5717e3e6b79a0a9a75 100644 (file)
--- a/libempathy-gtk/empathy-individual-edit-dialog.h
+++ b/libempathy-gtk/empathy-individual-edit-dialog.h
@@ -23,7 +23,6 @@
 #define __EMPATHY_INDIVIDUAL_EDIT_DIALOG_H__
 
 #include <gtk/gtk.h>
-
 #include <folks/folks.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-individual-information-dialog.h b/libempathy-gtk/empathy-individual-information-dialog.h
index cdba07a61a5c55aaf746021f120545d26ca312fe..58c229577c8e1de05b38bc32f1489064ac341d90 100644 (file)
--- a/libempathy-gtk/empathy-individual-information-dialog.h
+++ b/libempathy-gtk/empathy-individual-information-dialog.h
@@ -24,7 +24,6 @@
 #define __EMPATHY_INDIVIDUAL_INFORMATION_DIALOG_H__
 
 #include <gtk/gtk.h>
-
 #include <folks/folks.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-individual-store-manager.h b/libempathy-gtk/empathy-individual-store-manager.h
index fac0f31d69b9803df13149d853b2b7207eaf329e..8726c1fd19c60448df2cea8c654030d385d4882e 100644 (file)
--- a/libempathy-gtk/empathy-individual-store-manager.h
+++ b/libempathy-gtk/empathy-individual-store-manager.h
@@ -29,7 +29,6 @@
 #include <gtk/gtk.h>
 
 #include "empathy-individual-manager.h"
-
 #include "empathy-individual-store.h"
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-individual-view.h b/libempathy-gtk/empathy-individual-view.h
index baac701edfd3ee03430d36aee7b914106c90b27f..e942a42b50dbb176a7c852acf258e2399f957cfd 100644 (file)
--- a/libempathy-gtk/empathy-individual-view.h
+++ b/libempathy-gtk/empathy-individual-view.h
@@ -28,12 +28,11 @@
 #define __EMPATHY_INDIVIDUAL_VIEW_H__
 
 #include <gtk/gtk.h>
-
 #include <folks/folks.h>
 
-#include "empathy-live-search.h"
 #include "empathy-individual-menu.h"
 #include "empathy-individual-store.h"
+#include "empathy-live-search.h"
 
 G_BEGIN_DECLS
 #define EMPATHY_TYPE_INDIVIDUAL_VIEW         (empathy_individual_view_get_type ())

diff --git a/libempathy-gtk/empathy-individual-widget.h b/libempathy-gtk/empathy-individual-widget.h
index b8156c48ad834d8268d5d49c3f81349ec18ba855..fd63377f2dbde3e8a3aa2a29fb679ba264a298e0 100644 (file)
--- a/libempathy-gtk/empathy-individual-widget.h
+++ b/libempathy-gtk/empathy-individual-widget.h
@@ -22,7 +22,6 @@
 #define __EMPATHY_INDIVIDUAL_WIDGET_H__
 
 #include <gtk/gtk.h>
-
 #include <folks/folks.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-local-xmpp-assistant-widget.h b/libempathy-gtk/empathy-local-xmpp-assistant-widget.h
index dafd7fb2a960f311847ddbf85f51ca7169bd09fc..efea64d295f0e994cb31c4b7d305fec23afe375b 100644 (file)
--- a/libempathy-gtk/empathy-local-xmpp-assistant-widget.h
+++ b/libempathy-gtk/empathy-local-xmpp-assistant-widget.h
@@ -22,7 +22,6 @@
 #define __EMPATHY_LOCAL_XMPP_ASSISTANT_WIDGET_H__
 
 #include <gtk/gtk.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-location-manager.h b/libempathy-gtk/empathy-location-manager.h
index 525e490bb96284c187c62bb3ee33f048ef6668ca..6ea8b7bf937e6259cdb30fd53f2b6965d5af953b 100644 (file)
--- a/libempathy-gtk/empathy-location-manager.h
+++ b/libempathy-gtk/empathy-location-manager.h
@@ -25,7 +25,6 @@
 
 #include <glib-object.h>
 
-
 G_BEGIN_DECLS
 
 #define EMPATHY_TYPE_LOCATION_MANAGER         (empathy_location_manager_get_type ())

diff --git a/libempathy-gtk/empathy-notify-manager.h b/libempathy-gtk/empathy-notify-manager.h
index ca8996f7d76e943a919690a7f4ec1886cd8cb2fb..ee01e7ab98c21f22cc2175b1acc3e8247df6fc46 100644 (file)
--- a/libempathy-gtk/empathy-notify-manager.h
+++ b/libempathy-gtk/empathy-notify-manager.h
@@ -22,11 +22,10 @@
 #define __EMPATHY_NOTIFY_MANAGER_H__
 
 #include <glib-object.h>
+#include <libnotify/notification.h>
 
 #include "empathy-contact.h"
 
-#include <libnotify/notification.h>
-
 G_BEGIN_DECLS
 
 #define EMPATHY_NOTIFY_MANAGER_CAP_ACTIONS             "actions"

diff --git a/libempathy-gtk/empathy-password-dialog.h b/libempathy-gtk/empathy-password-dialog.h
index 9ae16b2812f9764385bf2d5265d7181544f6a78f..fe84019f3c84869cb194487f1edf9bb773e2bc29 100644 (file)
--- a/libempathy-gtk/empathy-password-dialog.h
+++ b/libempathy-gtk/empathy-password-dialog.h
@@ -23,9 +23,8 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
-#include "empathy-server-sasl-handler.h"
-
 #include "empathy-base-password-dialog.h"
+#include "empathy-server-sasl-handler.h"
 
 G_BEGIN_DECLS
 

diff --git a/libempathy-gtk/empathy-protocol-chooser.h b/libempathy-gtk/empathy-protocol-chooser.h
index 47e4592edfa149fcba00c48843c2c18225f803e4..efa3089e5ee44185010aa17bd78b01076617ef8d 100644 (file)
--- a/libempathy-gtk/empathy-protocol-chooser.h
+++ b/libempathy-gtk/empathy-protocol-chooser.h
@@ -25,7 +25,6 @@
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-account-settings.h"

diff --git a/libempathy-gtk/empathy-roster-model-aggregator.h b/libempathy-gtk/empathy-roster-model-aggregator.h
index e29e36eb0de1149f7ac3385d90aea0a57dfd6b11..3b9c0202bef6c3cde4053fe2af9f2671e192e13b 100644 (file)
--- a/libempathy-gtk/empathy-roster-model-aggregator.h
+++ b/libempathy-gtk/empathy-roster-model-aggregator.h
@@ -23,7 +23,6 @@
 #define __EMPATHY_ROSTER_MODEL_AGGREGATOR_H__
 
 #include <glib-object.h>
-
 #include <folks/folks.h>
 
 #include "empathy-roster-model.h"

diff --git a/libempathy-gtk/empathy-roster-model.h b/libempathy-gtk/empathy-roster-model.h
index 27c5482f3ba39d2891268d51b4843e04ee8eed6d..9a211946dd35dce85c89650a2f876bba0e0c257b 100644 (file)
--- a/libempathy-gtk/empathy-roster-model.h
+++ b/libempathy-gtk/empathy-roster-model.h
@@ -21,7 +21,6 @@
 #define __EMPATHY_ROSTER_MODEL_H__
 
 #include <glib-object.h>
-
 #include <folks/folks.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-roster-view.h b/libempathy-gtk/empathy-roster-view.h
index 45e240844838e3cc6a38f457d76b5fe88ba17132..c09d09c3a7c770e103e9efda53925e8cea644851 100644 (file)
--- a/libempathy-gtk/empathy-roster-view.h
+++ b/libempathy-gtk/empathy-roster-view.h
@@ -4,7 +4,6 @@
 
 #include "egg-list-box/egg-list-box.h"
 #include "empathy-live-search.h"
-
 #include "empathy-roster-model.h"
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-sound-manager.h b/libempathy-gtk/empathy-sound-manager.h
index 99e96c5715d2ec223fc70b907f75618bc647de25..5e592186ba62453c529dca1d7677a1c1ecb22998 100644 (file)
--- a/libempathy-gtk/empathy-sound-manager.h
+++ b/libempathy-gtk/empathy-sound-manager.h
@@ -22,7 +22,6 @@
 #define __EMPATHY_SOUND_MANAGER_H__
 
 #include <gtk/gtk.h>
-
 #include <canberra-gtk.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-tls-dialog.h b/libempathy-gtk/empathy-tls-dialog.h
index a9c37ad5ef04dd2903c51440c1147b1c3f618e8a..6b08ee399a0e75c6efbbd1d24944b48b91acef8a 100644 (file)
--- a/libempathy-gtk/empathy-tls-dialog.h
+++ b/libempathy-gtk/empathy-tls-dialog.h
@@ -23,7 +23,6 @@
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h
index a7d86e0bb30a5b96cf6d8637a5cc25f78d9adeb1..baf250e32d848cd8a86f57d115cc17387fae6fdb 100644 (file)
--- a/libempathy-gtk/empathy-ui-utils.h
+++ b/libempathy-gtk/empathy-ui-utils.h
@@ -33,7 +33,6 @@
 #define __EMPATHY_UI_UTILS_H__
 
 #include <gtk/gtk.h>
-
 #include <folks/folks.h>
 
 #include "empathy-contact.h"

diff --git a/libempathy-gtk/empathy-user-info.h b/libempathy-gtk/empathy-user-info.h
index 117bfd325e4be788ee9a4e634338dfda91e427a0..a06c72911d0af323783e317f1b502d3736c6634d 100644 (file)
--- a/libempathy-gtk/empathy-user-info.h
+++ b/libempathy-gtk/empathy-user-info.h
@@ -21,7 +21,6 @@
 #define __EMPATHY_USER_INFO_H__
 
 #include <gtk/gtk.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy/empathy-account-settings.h b/libempathy/empathy-account-settings.h
index 162def48c6a0fe2efbc48727baec1dd09d1c9f20..6e4713c4ca2e4cb5feba6b568e0c1ddf753aedcd 100644 (file)
--- a/libempathy/empathy-account-settings.h
+++ b/libempathy/empathy-account-settings.h
@@ -23,7 +23,6 @@
 
 #include <glib-object.h>
 #include <gio/gio.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy/empathy-auth-factory.h b/libempathy/empathy-auth-factory.h
index 16d6ad34f0928e906ef8116d965486931eb21675..73e90578202505fc14ca0bfacdf916b4101485f2 100644 (file)
--- a/libempathy/empathy-auth-factory.h
+++ b/libempathy/empathy-auth-factory.h
@@ -22,7 +22,6 @@
 #define __EMPATHY_AUTH_FACTORY_H__
 
 #include <glib-object.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy/empathy-chatroom-manager.h b/libempathy/empathy-chatroom-manager.h
index b8232dc647cff42dcad591acd1fe41b40172923c..498d225ad9395421ca43139010b15ce89d3a8920 100644 (file)
--- a/libempathy/empathy-chatroom-manager.h
+++ b/libempathy/empathy-chatroom-manager.h
@@ -25,7 +25,6 @@
 #define __EMPATHY_CHATROOM_MANAGER_H__
 
 #include <glib-object.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-chatroom.h"

diff --git a/libempathy/empathy-chatroom.h b/libempathy/empathy-chatroom.h
index 6701e568f997a43965c74e6cf4764ab97a418fc0..98ed04b96bb94cd6f30b0958566ebf8d6e8d1ef3 100644 (file)
--- a/libempathy/empathy-chatroom.h
+++ b/libempathy/empathy-chatroom.h
@@ -23,7 +23,6 @@
 #define __EMPATHY_CHATROOM_H__
 
 #include <glib-object.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-tp-chat.h"

diff --git a/libempathy/empathy-connection-aggregator.h b/libempathy/empathy-connection-aggregator.h
index 71e6e4392596ded66e99e7453b0f7954ff153225..267b20937236ae04f27b329ce315677bf0e9c330 100644 (file)
--- a/libempathy/empathy-connection-aggregator.h
+++ b/libempathy/empathy-connection-aggregator.h
@@ -22,7 +22,6 @@
 #define __EMPATHY_CONNECTION_AGGREGATOR_H__
 
 #include <glib-object.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy/empathy-connection-managers.h b/libempathy/empathy-connection-managers.h
index d8bcb390a382a2340b6bb8ec1f1c343fa6f12aab..0ed20c934a7c1a18f857c977f1c1c7e0eb9e3b9c 100644 (file)
--- a/libempathy/empathy-connection-managers.h
+++ b/libempathy/empathy-connection-managers.h
@@ -23,7 +23,6 @@
 
 #include <glib-object.h>
 #include <gio/gio.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy/empathy-contact.h b/libempathy/empathy-contact.h
index 14c3f64404c875faf11ac25bf3d737bc9d04dbc7..e7ce10e4bf0de313edc5c0d8020b51fd8a53acdc 100644 (file)
--- a/libempathy/empathy-contact.h
+++ b/libempathy/empathy-contact.h
@@ -23,7 +23,6 @@
 #define __EMPATHY_CONTACT_H__
 
 #include <glib-object.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 #include <telepathy-logger/telepathy-logger.h>
 #include <folks/folks.h>

diff --git a/libempathy/empathy-debug.h b/libempathy/empathy-debug.h
index e6b93cc7af215bfba7bec32d775d144ad72df2a4..5a600602bbb8190b349613832801f1dd9191288a 100644 (file)
--- a/libempathy/empathy-debug.h
+++ b/libempathy/empathy-debug.h
@@ -21,9 +21,6 @@
 #ifndef __EMPATHY_DEBUG_H__
 #define __EMPATHY_DEBUG_H__
 
-#include "config.h"
-
-
 #include <glib.h>
 #include <telepathy-glib/telepathy-glib.h>
 

diff --git a/libempathy/empathy-ft-handler.h b/libempathy/empathy-ft-handler.h
index a120f241bb7181dcbedaf0461e89e548df6e30ec..2fc1b609f78a62aa032a1840488039200a5c4339 100644 (file)
--- a/libempathy/empathy-ft-handler.h
+++ b/libempathy/empathy-ft-handler.h
@@ -26,7 +26,6 @@
 
 #include <glib-object.h>
 #include <gio/gio.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-contact.h"

diff --git a/libempathy/empathy-keyring.h b/libempathy/empathy-keyring.h
index 7e945dc0269de18af346794290929cf166cbfc53..6471099f9292cae7fb298468ff845472ea7a64ab 100644 (file)
--- a/libempathy/empathy-keyring.h
+++ b/libempathy/empathy-keyring.h
@@ -20,7 +20,6 @@
 #define __EMPATHY_KEYRING_H__
 
 #include <gio/gio.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy/empathy-presence-manager.h b/libempathy/empathy-presence-manager.h
index 6357aeecd82319e9a56a55c7a916364e081c0b10..f616647ad2d1a62c251ad06e4f9783851f0dc670 100644 (file)
--- a/libempathy/empathy-presence-manager.h
+++ b/libempathy/empathy-presence-manager.h
@@ -22,7 +22,6 @@
 #define __EMPATHY_PRESENCE_MANAGER_H__
 
 #include <glib.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy/empathy-request-util.h b/libempathy/empathy-request-util.h
index 497c65ee5b02d365972a225cfaff9466b695c5fc..9c168d7a37422106542530fd0b2db1d9816b0532 100644 (file)
--- a/libempathy/empathy-request-util.h
+++ b/libempathy/empathy-request-util.h
@@ -23,7 +23,6 @@
 
 #include <glib.h>
 #include <gio/gio.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-contact.h"

diff --git a/libempathy/empathy-server-sasl-handler.h b/libempathy/empathy-server-sasl-handler.h
index d25d90ab788a7e39486c385e7564c3d02049f317..8bf7e3b7f7c15611b1d524ee1810e280f8d0ed03 100644 (file)
--- a/libempathy/empathy-server-sasl-handler.h
+++ b/libempathy/empathy-server-sasl-handler.h
@@ -22,7 +22,6 @@
 
 #include <glib-object.h>
 #include <gio/gio.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy/empathy-server-tls-handler.h b/libempathy/empathy-server-tls-handler.h
index f4caf353981ecaf993fe468dece6f0075f3ae365..ed19c72ffb7a2ea8d7124baa3ae77af2d47e96d3 100644 (file)
--- a/libempathy/empathy-server-tls-handler.h
+++ b/libempathy/empathy-server-tls-handler.h
@@ -23,7 +23,6 @@
 
 #include <glib-object.h>
 #include <gio/gio.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy/empathy-time.h b/libempathy/empathy-time.h
index 59bd9269bd36b37a097896213692cfcf7876f31b..fc7af28e34df5e0d3de858d57fe93b3e7de780a3 100644 (file)
--- a/libempathy/empathy-time.h
+++ b/libempathy/empathy-time.h
@@ -24,7 +24,6 @@
 #define __USE_XOPEN
 #endif
 #include <time.h>
-
 #include <glib.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy/empathy-tls-verifier.h b/libempathy/empathy-tls-verifier.h
index 2f66acb9c97f861cb3c91f0b7371e30e8c457a1b..c25d9756cb02a2a611e0ac0c7673d252210142a7 100644 (file)
--- a/libempathy/empathy-tls-verifier.h
+++ b/libempathy/empathy-tls-verifier.h
@@ -23,7 +23,6 @@
 
 #include <glib-object.h>
 #include <gio/gio.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy/empathy-tp-chat.h b/libempathy/empathy-tp-chat.h
index d8d4ac31dea483c1ad2be7e4ee72772bf1b50be1..20fb4e1e06b0dcb3579b7665ff67e62fe3447fca 100644 (file)
--- a/libempathy/empathy-tp-chat.h
+++ b/libempathy/empathy-tp-chat.h
@@ -22,7 +22,6 @@
 #define __EMPATHY_TP_CHAT_H__
 
 #include <glib.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-message.h"

diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h
index 935b501a49aae974ec17ef0487d1d340b9624478..440fe83504c406e7000a8a3d95cde3b572fd7cfb 100644 (file)
--- a/libempathy/empathy-utils.h
+++ b/libempathy/empathy-utils.h
@@ -27,7 +27,6 @@
 
 #include <glib.h>
 #include <glib-object.h>
-
 #include <gnutls/x509.h>
 #include <libxml/tree.h>
 #include <folks/folks.h>

diff --git a/src/empathy-accounts-dialog.h b/src/empathy-accounts-dialog.h
index d436fed045b70eec219a3fb3b01c3427b91a40ab..070cd02e90f2360027441f02bb9bfb903beda985 100644 (file)
--- a/src/empathy-accounts-dialog.h
+++ b/src/empathy-accounts-dialog.h
@@ -25,7 +25,6 @@
 #define __EMPATHY_ACCOUNTS_DIALOG_H__
 
 #include <gtk/gtk.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS

diff --git a/src/empathy-call-handler.h b/src/empathy-call-handler.h
index 0f42209c2486408c2f660387736f442047f6c546..face008875d0717c2f55fd55ec5bf3c1eb3d7f81 100644 (file)
--- a/src/empathy-call-handler.h
+++ b/src/empathy-call-handler.h
@@ -22,10 +22,8 @@
 #define __EMPATHY_CALL_HANDLER_H__
 
 #include <glib-object.h>
-
 #include <gst/gst.h>
 #include <farstream/fs-conference.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-contact.h"

diff --git a/src/empathy-call-window.h b/src/empathy-call-window.h
index a5df2dac4ffc5d55f76feb7a1b3fd7f3cf106225..d4d1b7cb3c8bccd9b83742fde15a93d6d5d26ca9 100644 (file)
--- a/src/empathy-call-window.h
+++ b/src/empathy-call-window.h
@@ -24,8 +24,8 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
-#include "empathy-call-handler.h"
 #include "empathy-audio-src.h"
+#include "empathy-call-handler.h"
 #include "empathy-video-src.h"
 
 G_BEGIN_DECLS

diff --git a/src/empathy-invite-participant-dialog.h b/src/empathy-invite-participant-dialog.h
index da121a49e3f28ccec0c508d7a801446af970859b..daa3448d2755b48c32c3aa610581f58ca7998c1a 100644 (file)
--- a/src/empathy-invite-participant-dialog.h
+++ b/src/empathy-invite-participant-dialog.h
@@ -13,7 +13,6 @@
 #define __EMPATHY_INVITE_PARTICIPANT_DIALOG_H__
 
 #include <gtk/gtk.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-tp-chat.h"

diff --git a/src/empathy-sanity-cleaning.h b/src/empathy-sanity-cleaning.h
index 32000163fd26e38d16f9a30c7ba45ce14d5d5496..f7299325740e3f11d31ef671ad23fbc4b642bc6a 100644 (file)
--- a/src/empathy-sanity-cleaning.h
+++ b/src/empathy-sanity-cleaning.h
@@ -24,10 +24,14 @@
 
 #include <gio/gio.h>
 
+G_BEGIN_DECLS
+
 void empathy_sanity_checking_run_async (GAsyncReadyCallback callback,
     gpointer user_data);
 
 gboolean empathy_sanity_checking_run_finish (GAsyncResult *result,
     GError **error);
 
+G_END_DECLS
+
 #endif

diff --git a/tests/mock-pkcs11.h b/tests/mock-pkcs11.h
index 67d94bef34dea49215ae3f7c64a582c370376faa..11b219d48953f160886421ff021bd459c81678f4 100644 (file)
--- a/tests/mock-pkcs11.h
+++ b/tests/mock-pkcs11.h
@@ -19,11 +19,9 @@
  */
 
 #include <glib.h>
-
+#include <gck/pkcs11x.h>
 #include <gcr/gcr.h>
-
 #include <p11-kit/pkcs11.h>
-#include <gck/pkcs11x.h>
 
 #ifndef MOCK_MODULE_H
 #define MOCK_MODULE_H

diff --git a/tests/test-irc-helper.h b/tests/test-irc-helper.h
index 04271715b679f277c105e515e0c947da1ab2a1fd..ed7a6924e9de7f88f4c052ef16f4691a46893f7d 100644 (file)
--- a/tests/test-irc-helper.h
+++ b/tests/test-irc-helper.h
@@ -1,9 +1,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "empathy-irc-server.h"
 #include "empathy-irc-network.h"
 #include "empathy-irc-network-manager.h"
+#include "empathy-irc-server.h"
 
 #ifndef __CHECK_IRC_HELPER_H__
 #define __CHECK_IRC_HELPER_H__

diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.h
index 17963e656724503749f1ad129a17f06b35e5ca85..27d114c0e468c6be455be929144e5221edc8467d 100644 (file)
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.h
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.h
@@ -18,12 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-
 #ifndef __EMPATHY_ACCOUNTS_PLUGIN_WIDGET_H__
 #define __EMPATHY_ACCOUNTS_PLUGIN_WIDGET_H__
 
 #include <gtk/gtk.h>
-
 #include <libaccounts-glib/ag-account.h>
 
 G_BEGIN_DECLS

diff --git a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.h b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.h
index b1bfb28cd8c2fb71ad7d496b6e9cb7e3f67bb1ff..aa9d3a2045165fc7c55858223ce7e536064fe4e7 100644 (file)
--- a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.h
+++ b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.h
@@ -18,12 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-
 #ifndef __EMPATHY_APP_PLUGIN_WIDGET_H__
 #define __EMPATHY_APP_PLUGIN_WIDGET_H__
 
 #include <gtk/gtk.h>
-
 #include <libaccounts-glib/ag-account.h>
 
 G_BEGIN_DECLS

diff --git a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.h b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.h
index 0167c851e9d1e7939dd7f4ca047063e47765992a..6796396706474d363ef0c4dc59064ecf854e49e6 100644 (file)
--- a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.h
+++ b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.h
@@ -22,7 +22,6 @@
 #define __EMPATHY_APP_PLUGIN_H__
 
 #include <glib-object.h>
-
 #include <libaccount-plugin/application-plugin.h>
 
 G_BEGIN_DECLS

diff --git a/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.h b/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.h
index cf373a2d4ab1632f1e9b8a3c44ac4c2812bbd245..1c96f3368d8761ad78d1290e38026752e650eee2 100644 (file)
--- a/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.h
+++ b/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.h
@@ -2,7 +2,6 @@
 #define __EMPATHY_WEBCREDENTIALS_MONITOR_H__
 
 #include <glib-object.h>
-
 #include <libaccounts-glib/ag-manager.h>
 
 G_BEGIN_DECLS