From b25bcd6653db5ae5f771256aad95c5a93875ecda Mon Sep 17 00:00:00 2001 From: Emanuele Aina Date: Mon, 1 Apr 2013 18:10:01 +0200 Subject: [PATCH] Clean up #include directives in headers Reorder some inclusions and remove a few blank lines. https://bugzilla.gnome.org/show_bug.cgi?id=697076 --- libempathy-gtk/empathy-account-chooser.h | 1 - libempathy-gtk/empathy-account-widget-irc.h | 1 + libempathy-gtk/empathy-account-widget-private.h | 3 ++- libempathy-gtk/empathy-account-widget-sip.h | 1 + libempathy-gtk/empathy-chat.h | 3 +-- libempathy-gtk/empathy-contact-widget.h | 2 +- libempathy-gtk/empathy-contactinfo-utils.h | 1 - libempathy-gtk/empathy-dialpad-button.h | 1 - libempathy-gtk/empathy-groups-widget.h | 1 - libempathy-gtk/empathy-individual-dialogs.h | 1 - libempathy-gtk/empathy-individual-edit-dialog.h | 1 - libempathy-gtk/empathy-individual-information-dialog.h | 1 - libempathy-gtk/empathy-individual-store-manager.h | 1 - libempathy-gtk/empathy-individual-view.h | 3 +-- libempathy-gtk/empathy-individual-widget.h | 1 - libempathy-gtk/empathy-local-xmpp-assistant-widget.h | 1 - libempathy-gtk/empathy-location-manager.h | 1 - libempathy-gtk/empathy-notify-manager.h | 3 +-- libempathy-gtk/empathy-password-dialog.h | 3 +-- libempathy-gtk/empathy-protocol-chooser.h | 1 - libempathy-gtk/empathy-roster-model-aggregator.h | 1 - libempathy-gtk/empathy-roster-model.h | 1 - libempathy-gtk/empathy-roster-view.h | 1 - libempathy-gtk/empathy-sound-manager.h | 1 - libempathy-gtk/empathy-tls-dialog.h | 1 - libempathy-gtk/empathy-ui-utils.h | 1 - libempathy-gtk/empathy-user-info.h | 1 - libempathy/empathy-account-settings.h | 1 - libempathy/empathy-auth-factory.h | 1 - libempathy/empathy-chatroom-manager.h | 1 - libempathy/empathy-chatroom.h | 1 - libempathy/empathy-connection-aggregator.h | 1 - libempathy/empathy-connection-managers.h | 1 - libempathy/empathy-contact.h | 1 - libempathy/empathy-debug.h | 3 --- libempathy/empathy-ft-handler.h | 1 - libempathy/empathy-keyring.h | 1 - libempathy/empathy-presence-manager.h | 1 - libempathy/empathy-request-util.h | 1 - libempathy/empathy-server-sasl-handler.h | 1 - libempathy/empathy-server-tls-handler.h | 1 - libempathy/empathy-time.h | 1 - libempathy/empathy-tls-verifier.h | 1 - libempathy/empathy-tp-chat.h | 1 - libempathy/empathy-utils.h | 1 - src/empathy-accounts-dialog.h | 1 - src/empathy-call-handler.h | 2 -- src/empathy-call-window.h | 2 +- src/empathy-invite-participant-dialog.h | 1 - src/empathy-sanity-cleaning.h | 4 ++++ tests/mock-pkcs11.h | 4 +--- tests/test-irc-helper.h | 2 +- .../account-plugins/empathy-accounts-plugin-widget.h | 2 -- .../cc-plugins/app-plugin/empathy-app-plugin-widget.h | 2 -- .../cc-plugins/app-plugin/empathy-app-plugin.h | 1 - .../mc-plugin/empathy-webcredentials-monitor.h | 1 - 56 files changed, 16 insertions(+), 64 deletions(-) diff --git a/libempathy-gtk/empathy-account-chooser.h b/libempathy-gtk/empathy-account-chooser.h index d58fcf12..5302ad70 100644 --- a/libempathy-gtk/empathy-account-chooser.h +++ b/libempathy-gtk/empathy-account-chooser.h @@ -25,7 +25,6 @@ #define __EMPATHY_ACCOUNT_CHOOSER_H__ #include - #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-account-widget-irc.h b/libempathy-gtk/empathy-account-widget-irc.h index eba469e8..4be6d61a 100644 --- 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 + #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 8da22bda..4fc9a319 100644 --- 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 #include +#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 438ee837..807d57df 100644 --- 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 + #include "empathy-account-widget.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-chat.h b/libempathy-gtk/empathy-chat.h index cbd69a34..2a983622 100644 --- a/libempathy-gtk/empathy-chat.h +++ b/libempathy-gtk/empathy-chat.h @@ -31,9 +31,8 @@ #include #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 9f1f1a70..5f44adb6 100644 --- a/libempathy-gtk/empathy-contact-widget.h +++ b/libempathy-gtk/empathy-contact-widget.h @@ -24,8 +24,8 @@ #include -#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 80c18ffa..c102c5dd 100644 --- a/libempathy-gtk/empathy-contactinfo-utils.h +++ b/libempathy-gtk/empathy-contactinfo-utils.h @@ -23,7 +23,6 @@ #include #include - #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-dialpad-button.h b/libempathy-gtk/empathy-dialpad-button.h index cca96f3b..cd312bda 100644 --- a/libempathy-gtk/empathy-dialpad-button.h +++ b/libempathy-gtk/empathy-dialpad-button.h @@ -25,7 +25,6 @@ #define __EMPATHY_DIALPAD_BUTTON_H__ #include - #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-groups-widget.h b/libempathy-gtk/empathy-groups-widget.h index 1085fac4..2b59db62 100644 --- a/libempathy-gtk/empathy-groups-widget.h +++ b/libempathy-gtk/empathy-groups-widget.h @@ -23,7 +23,6 @@ #define __EMPATHY_GROUPS_WIDGET_H__ #include - #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-individual-dialogs.h b/libempathy-gtk/empathy-individual-dialogs.h index e0710567..b603c576 100644 --- a/libempathy-gtk/empathy-individual-dialogs.h +++ b/libempathy-gtk/empathy-individual-dialogs.h @@ -24,7 +24,6 @@ #define __EMPATHY_INDIVIDUAL_DIALOGS_H__ #include - #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-individual-edit-dialog.h b/libempathy-gtk/empathy-individual-edit-dialog.h index 4f580fb0..747e6824 100644 --- 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 - #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-individual-information-dialog.h b/libempathy-gtk/empathy-individual-information-dialog.h index cdba07a6..58c22957 100644 --- 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 - #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-individual-store-manager.h b/libempathy-gtk/empathy-individual-store-manager.h index fac0f31d..8726c1fd 100644 --- a/libempathy-gtk/empathy-individual-store-manager.h +++ b/libempathy-gtk/empathy-individual-store-manager.h @@ -29,7 +29,6 @@ #include #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 baac701e..e942a42b 100644 --- a/libempathy-gtk/empathy-individual-view.h +++ b/libempathy-gtk/empathy-individual-view.h @@ -28,12 +28,11 @@ #define __EMPATHY_INDIVIDUAL_VIEW_H__ #include - #include -#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 b8156c48..fd63377f 100644 --- a/libempathy-gtk/empathy-individual-widget.h +++ b/libempathy-gtk/empathy-individual-widget.h @@ -22,7 +22,6 @@ #define __EMPATHY_INDIVIDUAL_WIDGET_H__ #include - #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-local-xmpp-assistant-widget.h b/libempathy-gtk/empathy-local-xmpp-assistant-widget.h index dafd7fb2..efea64d2 100644 --- 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 - #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-location-manager.h b/libempathy-gtk/empathy-location-manager.h index 525e490b..6ea8b7bf 100644 --- a/libempathy-gtk/empathy-location-manager.h +++ b/libempathy-gtk/empathy-location-manager.h @@ -25,7 +25,6 @@ #include - 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 ca8996f7..ee01e7ab 100644 --- a/libempathy-gtk/empathy-notify-manager.h +++ b/libempathy-gtk/empathy-notify-manager.h @@ -22,11 +22,10 @@ #define __EMPATHY_NOTIFY_MANAGER_H__ #include +#include #include "empathy-contact.h" -#include - 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 9ae16b28..fe84019f 100644 --- a/libempathy-gtk/empathy-password-dialog.h +++ b/libempathy-gtk/empathy-password-dialog.h @@ -23,9 +23,8 @@ #include #include -#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 47e4592e..efa3089e 100644 --- a/libempathy-gtk/empathy-protocol-chooser.h +++ b/libempathy-gtk/empathy-protocol-chooser.h @@ -25,7 +25,6 @@ #include #include - #include #include "empathy-account-settings.h" diff --git a/libempathy-gtk/empathy-roster-model-aggregator.h b/libempathy-gtk/empathy-roster-model-aggregator.h index e29e36eb..3b9c0202 100644 --- 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 - #include #include "empathy-roster-model.h" diff --git a/libempathy-gtk/empathy-roster-model.h b/libempathy-gtk/empathy-roster-model.h index 27c5482f..9a211946 100644 --- a/libempathy-gtk/empathy-roster-model.h +++ b/libempathy-gtk/empathy-roster-model.h @@ -21,7 +21,6 @@ #define __EMPATHY_ROSTER_MODEL_H__ #include - #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-roster-view.h b/libempathy-gtk/empathy-roster-view.h index 45e24084..c09d09c3 100644 --- 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 99e96c57..5e592186 100644 --- a/libempathy-gtk/empathy-sound-manager.h +++ b/libempathy-gtk/empathy-sound-manager.h @@ -22,7 +22,6 @@ #define __EMPATHY_SOUND_MANAGER_H__ #include - #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-tls-dialog.h b/libempathy-gtk/empathy-tls-dialog.h index a9c37ad5..6b08ee39 100644 --- a/libempathy-gtk/empathy-tls-dialog.h +++ b/libempathy-gtk/empathy-tls-dialog.h @@ -23,7 +23,6 @@ #include #include - #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h index a7d86e0b..baf250e3 100644 --- a/libempathy-gtk/empathy-ui-utils.h +++ b/libempathy-gtk/empathy-ui-utils.h @@ -33,7 +33,6 @@ #define __EMPATHY_UI_UTILS_H__ #include - #include #include "empathy-contact.h" diff --git a/libempathy-gtk/empathy-user-info.h b/libempathy-gtk/empathy-user-info.h index 117bfd32..a06c7291 100644 --- a/libempathy-gtk/empathy-user-info.h +++ b/libempathy-gtk/empathy-user-info.h @@ -21,7 +21,6 @@ #define __EMPATHY_USER_INFO_H__ #include - #include G_BEGIN_DECLS diff --git a/libempathy/empathy-account-settings.h b/libempathy/empathy-account-settings.h index 162def48..6e4713c4 100644 --- a/libempathy/empathy-account-settings.h +++ b/libempathy/empathy-account-settings.h @@ -23,7 +23,6 @@ #include #include - #include G_BEGIN_DECLS diff --git a/libempathy/empathy-auth-factory.h b/libempathy/empathy-auth-factory.h index 16d6ad34..73e90578 100644 --- a/libempathy/empathy-auth-factory.h +++ b/libempathy/empathy-auth-factory.h @@ -22,7 +22,6 @@ #define __EMPATHY_AUTH_FACTORY_H__ #include - #include G_BEGIN_DECLS diff --git a/libempathy/empathy-chatroom-manager.h b/libempathy/empathy-chatroom-manager.h index b8232dc6..498d225a 100644 --- a/libempathy/empathy-chatroom-manager.h +++ b/libempathy/empathy-chatroom-manager.h @@ -25,7 +25,6 @@ #define __EMPATHY_CHATROOM_MANAGER_H__ #include - #include #include "empathy-chatroom.h" diff --git a/libempathy/empathy-chatroom.h b/libempathy/empathy-chatroom.h index 6701e568..98ed04b9 100644 --- a/libempathy/empathy-chatroom.h +++ b/libempathy/empathy-chatroom.h @@ -23,7 +23,6 @@ #define __EMPATHY_CHATROOM_H__ #include - #include #include "empathy-tp-chat.h" diff --git a/libempathy/empathy-connection-aggregator.h b/libempathy/empathy-connection-aggregator.h index 71e6e439..267b2093 100644 --- a/libempathy/empathy-connection-aggregator.h +++ b/libempathy/empathy-connection-aggregator.h @@ -22,7 +22,6 @@ #define __EMPATHY_CONNECTION_AGGREGATOR_H__ #include - #include G_BEGIN_DECLS diff --git a/libempathy/empathy-connection-managers.h b/libempathy/empathy-connection-managers.h index d8bcb390..0ed20c93 100644 --- a/libempathy/empathy-connection-managers.h +++ b/libempathy/empathy-connection-managers.h @@ -23,7 +23,6 @@ #include #include - #include G_BEGIN_DECLS diff --git a/libempathy/empathy-contact.h b/libempathy/empathy-contact.h index 14c3f644..e7ce10e4 100644 --- a/libempathy/empathy-contact.h +++ b/libempathy/empathy-contact.h @@ -23,7 +23,6 @@ #define __EMPATHY_CONTACT_H__ #include - #include #include #include diff --git a/libempathy/empathy-debug.h b/libempathy/empathy-debug.h index e6b93cc7..5a600602 100644 --- 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 #include diff --git a/libempathy/empathy-ft-handler.h b/libempathy/empathy-ft-handler.h index a120f241..2fc1b609 100644 --- a/libempathy/empathy-ft-handler.h +++ b/libempathy/empathy-ft-handler.h @@ -26,7 +26,6 @@ #include #include - #include #include "empathy-contact.h" diff --git a/libempathy/empathy-keyring.h b/libempathy/empathy-keyring.h index 7e945dc0..6471099f 100644 --- a/libempathy/empathy-keyring.h +++ b/libempathy/empathy-keyring.h @@ -20,7 +20,6 @@ #define __EMPATHY_KEYRING_H__ #include - #include G_BEGIN_DECLS diff --git a/libempathy/empathy-presence-manager.h b/libempathy/empathy-presence-manager.h index 6357aeec..f616647a 100644 --- a/libempathy/empathy-presence-manager.h +++ b/libempathy/empathy-presence-manager.h @@ -22,7 +22,6 @@ #define __EMPATHY_PRESENCE_MANAGER_H__ #include - #include G_BEGIN_DECLS diff --git a/libempathy/empathy-request-util.h b/libempathy/empathy-request-util.h index 497c65ee..9c168d7a 100644 --- a/libempathy/empathy-request-util.h +++ b/libempathy/empathy-request-util.h @@ -23,7 +23,6 @@ #include #include - #include #include "empathy-contact.h" diff --git a/libempathy/empathy-server-sasl-handler.h b/libempathy/empathy-server-sasl-handler.h index d25d90ab..8bf7e3b7 100644 --- a/libempathy/empathy-server-sasl-handler.h +++ b/libempathy/empathy-server-sasl-handler.h @@ -22,7 +22,6 @@ #include #include - #include G_BEGIN_DECLS diff --git a/libempathy/empathy-server-tls-handler.h b/libempathy/empathy-server-tls-handler.h index f4caf353..ed19c72f 100644 --- a/libempathy/empathy-server-tls-handler.h +++ b/libempathy/empathy-server-tls-handler.h @@ -23,7 +23,6 @@ #include #include - #include G_BEGIN_DECLS diff --git a/libempathy/empathy-time.h b/libempathy/empathy-time.h index 59bd9269..fc7af28e 100644 --- a/libempathy/empathy-time.h +++ b/libempathy/empathy-time.h @@ -24,7 +24,6 @@ #define __USE_XOPEN #endif #include - #include G_BEGIN_DECLS diff --git a/libempathy/empathy-tls-verifier.h b/libempathy/empathy-tls-verifier.h index 2f66acb9..c25d9756 100644 --- a/libempathy/empathy-tls-verifier.h +++ b/libempathy/empathy-tls-verifier.h @@ -23,7 +23,6 @@ #include #include - #include G_BEGIN_DECLS diff --git a/libempathy/empathy-tp-chat.h b/libempathy/empathy-tp-chat.h index d8d4ac31..20fb4e1e 100644 --- a/libempathy/empathy-tp-chat.h +++ b/libempathy/empathy-tp-chat.h @@ -22,7 +22,6 @@ #define __EMPATHY_TP_CHAT_H__ #include - #include #include "empathy-message.h" diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h index 935b501a..440fe835 100644 --- a/libempathy/empathy-utils.h +++ b/libempathy/empathy-utils.h @@ -27,7 +27,6 @@ #include #include - #include #include #include diff --git a/src/empathy-accounts-dialog.h b/src/empathy-accounts-dialog.h index d436fed0..070cd02e 100644 --- a/src/empathy-accounts-dialog.h +++ b/src/empathy-accounts-dialog.h @@ -25,7 +25,6 @@ #define __EMPATHY_ACCOUNTS_DIALOG_H__ #include - #include G_BEGIN_DECLS diff --git a/src/empathy-call-handler.h b/src/empathy-call-handler.h index 0f42209c..face0088 100644 --- a/src/empathy-call-handler.h +++ b/src/empathy-call-handler.h @@ -22,10 +22,8 @@ #define __EMPATHY_CALL_HANDLER_H__ #include - #include #include - #include #include "empathy-contact.h" diff --git a/src/empathy-call-window.h b/src/empathy-call-window.h index a5df2dac..d4d1b7cb 100644 --- a/src/empathy-call-window.h +++ b/src/empathy-call-window.h @@ -24,8 +24,8 @@ #include #include -#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 da121a49..daa3448d 100644 --- 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 - #include #include "empathy-tp-chat.h" diff --git a/src/empathy-sanity-cleaning.h b/src/empathy-sanity-cleaning.h index 32000163..f7299325 100644 --- a/src/empathy-sanity-cleaning.h +++ b/src/empathy-sanity-cleaning.h @@ -24,10 +24,14 @@ #include +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 67d94bef..11b219d4 100644 --- a/tests/mock-pkcs11.h +++ b/tests/mock-pkcs11.h @@ -19,11 +19,9 @@ */ #include - +#include #include - #include -#include #ifndef MOCK_MODULE_H #define MOCK_MODULE_H diff --git a/tests/test-irc-helper.h b/tests/test-irc-helper.h index 04271715..ed7a6924 100644 --- a/tests/test-irc-helper.h +++ b/tests/test-irc-helper.h @@ -1,9 +1,9 @@ #include #include -#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 17963e65..27d114c0 100644 --- 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 - #include 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 b1bfb28c..aa9d3a20 100644 --- 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 - #include 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 0167c851..67963967 100644 --- 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 - #include 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 cf373a2d..1c96f336 100644 --- 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 - #include G_BEGIN_DECLS -- 2.39.2