From 0d137b74e57840bd85f090becd4144f62c89d6ab Mon Sep 17 00:00:00 2001 From: Emanuele Aina Date: Mon, 1 Apr 2013 17:04:08 +0200 Subject: Reorder header inclusions accordingly to the Telepathy coding style MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/empathy-about-dialog.c | 3 +-- src/empathy-accounts-common.c | 5 ++-- src/empathy-accounts-common.h | 7 ++++++ src/empathy-accounts-dialog.c | 18 +++++++------- src/empathy-accounts.c | 6 ++--- src/empathy-audio-sink.c | 2 +- src/empathy-audio-src.c | 5 ++-- src/empathy-audio-utils.c | 3 +-- src/empathy-auth-client.c | 14 +++++------ src/empathy-call-factory.c | 3 +-- src/empathy-call-factory.h | 1 + src/empathy-call-handler.c | 6 ++--- src/empathy-call-observer.c | 3 +-- src/empathy-call-window-fullscreen.c | 3 ++- src/empathy-call-window.c | 31 +++++++++++------------- src/empathy-call.c | 6 ++--- src/empathy-camera-menu.c | 3 +-- src/empathy-chat-manager.c | 12 ++++------ src/empathy-chat-window.c | 22 ++++++++--------- src/empathy-chat-window.h | 2 +- src/empathy-chat.c | 7 ++---- src/empathy-chatrooms-window.c | 8 +++---- src/empathy-debug-window.c | 9 ++++--- src/empathy-debug-window.h | 4 ++-- src/empathy-debugger.c | 3 +-- src/empathy-event-manager.c | 16 ++++++------- src/empathy-ft-manager.c | 11 ++++----- src/empathy-import-dialog.c | 4 ++-- src/empathy-import-pidgin.c | 4 ++-- src/empathy-import-utils.c | 7 +++--- src/empathy-import-widget.c | 11 ++++----- src/empathy-import-widget.h | 2 +- src/empathy-invite-participant-dialog.c | 6 ++--- src/empathy-mic-menu.c | 2 +- src/empathy-mic-monitor.c | 3 +-- src/empathy-mic-monitor.h | 2 +- src/empathy-new-chatroom-dialog.c | 10 ++++---- src/empathy-new-chatroom-dialog.h | 1 + src/empathy-notifications-approver.c | 6 ++--- src/empathy-preferences.c | 10 ++++---- src/empathy-roster-window.c | 42 ++++++++++++++++----------------- src/empathy-rounded-actor.c | 1 - src/empathy-rounded-rectangle.c | 3 +-- src/empathy-rounded-texture.c | 1 + src/empathy-sanity-cleaning.c | 14 +++++------ src/empathy-status-icon.c | 12 ++++------ src/empathy-status-icon.h | 1 + src/empathy-video-src.c | 3 +-- src/empathy.c | 23 ++++++++---------- 49 files changed, 169 insertions(+), 212 deletions(-) (limited to 'src') diff --git a/src/empathy-about-dialog.c b/src/empathy-about-dialog.c index 2480d7569..bd6b2f866 100644 --- a/src/empathy-about-dialog.c +++ b/src/empathy-about-dialog.c @@ -23,11 +23,10 @@ */ #include "config.h" +#include "empathy-about-dialog.h" #include -#include "empathy-about-dialog.h" - #define WEB_SITE "http://live.gnome.org/Empathy" static const char *authors[] = { diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c index f84f28dba..ccbaab9d8 100644 --- a/src/empathy-accounts-common.c +++ b/src/empathy-accounts-common.c @@ -25,11 +25,10 @@ */ #include "config.h" - -#include "empathy-ui-utils.h" - #include "empathy-accounts-common.h" + #include "empathy-accounts-dialog.h" +#include "empathy-ui-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT #include "empathy-debug.h" diff --git a/src/empathy-accounts-common.h b/src/empathy-accounts-common.h index 39d094d22..e4a4a6626 100644 --- a/src/empathy-accounts-common.h +++ b/src/empathy-accounts-common.h @@ -22,6 +22,11 @@ #ifndef __EMPATHY_ACCOUNTS_COMMON_H__ #define __EMPATHY_ACCOUNTS_COMMON_H__ +#include +#include + +G_BEGIN_DECLS + gboolean empathy_accounts_has_non_salut_accounts (TpAccountManager *manager); gboolean empathy_accounts_has_accounts (TpAccountManager *manager); @@ -30,4 +35,6 @@ void empathy_accounts_show_accounts_ui (TpAccountManager *manager, TpAccount *account, GApplication *app); +G_END_DECLS + #endif /* __EMPATHY_ACCOUNTS_COMMON_H__ */ diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c index 421357c84..27f41d37b 100644 --- a/src/empathy-accounts-dialog.c +++ b/src/empathy-accounts-dialog.c @@ -25,22 +25,20 @@ */ #include "config.h" +#include "empathy-accounts-dialog.h" #include -#include "empathy-utils.h" -#include "empathy-pkg-kit.h" - -#include "empathy-ui-utils.h" -#include "empathy-account-widget-sip.h" -#include "empathy-user-info.h" -#include "empathy-local-xmpp-assistant-widget.h" -#include "empathy-new-account-dialog.h" - #include "empathy-accounts-common.h" -#include "empathy-accounts-dialog.h" +#include "empathy-account-widget-sip.h" #include "empathy-import-dialog.h" #include "empathy-import-utils.h" +#include "empathy-local-xmpp-assistant-widget.h" +#include "empathy-new-account-dialog.h" +#include "empathy-pkg-kit.h" +#include "empathy-ui-utils.h" +#include "empathy-user-info.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT #include "empathy-debug.h" diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c index 0cf4c9572..8e9ce9894 100644 --- a/src/empathy-accounts.c +++ b/src/empathy-accounts.c @@ -25,6 +25,7 @@ */ #include "config.h" +#include "empathy-accounts.h" #include @@ -32,10 +33,9 @@ #include #endif -#include "empathy-utils.h" -#include "empathy-ui-utils.h" - #include "empathy-accounts-common.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT #include "empathy-debug.h" diff --git a/src/empathy-audio-sink.c b/src/empathy-audio-sink.c index 0147b8706..985a1fa36 100644 --- a/src/empathy-audio-sink.c +++ b/src/empathy-audio-sink.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "empathy-audio-sink.h" #ifdef HAVE_GST1 #include @@ -27,7 +28,6 @@ #endif #include "empathy-audio-utils.h" -#include "empathy-audio-sink.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP #include "empathy-debug.h" diff --git a/src/empathy-audio-src.c b/src/empathy-audio-src.c index bdb25f80c..bc3aa50cd 100644 --- a/src/empathy-audio-src.c +++ b/src/empathy-audio-src.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "empathy-audio-src.h" #ifdef HAVE_GST1 #include @@ -26,11 +27,9 @@ #include #endif -#include "empathy-utils.h" #include "empathy-audio-utils.h" - -#include "empathy-audio-src.h" #include "empathy-mic-monitor.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP #include "empathy-debug.h" diff --git a/src/empathy-audio-utils.c b/src/empathy-audio-utils.c index e1f9ec56f..f7a00378f 100644 --- a/src/empathy-audio-utils.c +++ b/src/empathy-audio-utils.c @@ -19,11 +19,10 @@ */ #include "config.h" +#include "empathy-audio-utils.h" #include -#include "empathy-audio-utils.h" - #include "empathy-gsettings.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER diff --git a/src/empathy-auth-client.c b/src/empathy-auth-client.c index 6da465665..be5b13a0b 100644 --- a/src/empathy-auth-client.c +++ b/src/empathy-auth-client.c @@ -22,21 +22,19 @@ #include "config.h" #include +#include -#define DEBUG_FLAG EMPATHY_DEBUG_TLS -#include "empathy-debug.h" #include "empathy-auth-factory.h" -#include "empathy-server-tls-handler.h" -#include "empathy-tls-verifier.h" - #include "empathy-bad-password-dialog.h" #include "empathy-password-dialog.h" +#include "empathy-sanity-cleaning.h" +#include "empathy-server-tls-handler.h" #include "empathy-tls-dialog.h" +#include "empathy-tls-verifier.h" #include "empathy-ui-utils.h" -#include "empathy-sanity-cleaning.h" - -#include +#define DEBUG_FLAG EMPATHY_DEBUG_TLS +#include "empathy-debug.h" #define TIMEOUT 60 diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c index 865aeace2..60700ac0f 100644 --- a/src/empathy-call-factory.c +++ b/src/empathy-call-factory.c @@ -19,12 +19,11 @@ */ #include "config.h" - #include "empathy-client-factory.h" -#include "empathy-request-util.h" #include "empathy-call-factory.h" #include "empathy-call-handler.h" +#include "empathy-request-util.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP #include "empathy-debug.h" diff --git a/src/empathy-call-factory.h b/src/empathy-call-factory.h index 174fbf4bd..c400fc2fa 100644 --- a/src/empathy-call-factory.h +++ b/src/empathy-call-factory.h @@ -22,6 +22,7 @@ #define __EMPATHY_CALL_FACTORY_H__ #include +#include G_BEGIN_DECLS diff --git a/src/empathy-call-handler.c b/src/empathy-call-handler.c index 28e8cda83..1c4939af1 100644 --- a/src/empathy-call-handler.c +++ b/src/empathy-call-handler.c @@ -19,14 +19,12 @@ */ #include "config.h" +#include "empathy-call-handler.h" #include -#include "empathy-utils.h" - #include "empathy-call-utils.h" - -#include "empathy-call-handler.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP #include "empathy-debug.h" diff --git a/src/empathy-call-observer.c b/src/empathy-call-observer.c index 2a60f6fe2..41e9bdfc1 100644 --- a/src/empathy-call-observer.c +++ b/src/empathy-call-observer.c @@ -19,14 +19,13 @@ */ #include "config.h" +#include "empathy-call-observer.h" #include #include "empathy-images.h" #include "empathy-notify-manager.h" -#include "empathy-call-observer.h" - #define DEBUG_FLAG EMPATHY_DEBUG_VOIP #include "empathy-debug.h" diff --git a/src/empathy-call-window-fullscreen.c b/src/empathy-call-window-fullscreen.c index 6da478fbd..e6dca4868 100644 --- a/src/empathy-call-window-fullscreen.c +++ b/src/empathy-call-window-fullscreen.c @@ -22,10 +22,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "empathy-call-window-fullscreen.h" -#include "empathy-utils.h" #include "empathy-ui-utils.h" +#include "empathy-utils.h" /* The number of seconds for which the "leave fullscreen" popup should be shown */ diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 9b67bba4a..979d7e3bb 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -19,38 +19,35 @@ */ #include "config.h" +#include "empathy-call-window.h" #include - #include - #include #include +#include "empathy-about-dialog.h" +#include "empathy-audio-sink.h" +#include "empathy-call-utils.h" +#include "empathy-call-window-fullscreen.h" +#include "empathy-camera-menu.h" #include "empathy-camera-monitor.h" -#include "empathy-gsettings.h" -#include "empathy-request-util.h" -#include "empathy-utils.h" - #include "empathy-dialpad-widget.h" -#include "empathy-ui-utils.h" -#include "empathy-sound-manager.h" #include "empathy-geometry.h" +#include "empathy-gsettings.h" #include "empathy-images.h" -#include "empathy-call-utils.h" - -#define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include "empathy-debug.h" - -#include "empathy-call-window-fullscreen.h" -#include "empathy-about-dialog.h" -#include "empathy-audio-sink.h" #include "empathy-mic-menu.h" #include "empathy-preferences.h" +#include "empathy-request-util.h" #include "empathy-rounded-actor.h" #include "empathy-rounded-rectangle.h" #include "empathy-rounded-texture.h" -#include "empathy-camera-menu.h" +#include "empathy-sound-manager.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" + +#define DEBUG_FLAG EMPATHY_DEBUG_VOIP +#include "empathy-debug.h" #define CONTENT_HBOX_SPACING 3 #define CONTENT_HBOX_CHILDREN_PACKING_PADDING 0 diff --git a/src/empathy-call.c b/src/empathy-call.c index 9fccb5650..8a5549694 100644 --- a/src/empathy-call.c +++ b/src/empathy-call.c @@ -23,7 +23,6 @@ #include "config.h" #include - #include #include @@ -31,10 +30,9 @@ #include #endif -#include "empathy-ui-utils.h" - -#include "empathy-call-window.h" #include "empathy-call-factory.h" +#include "empathy-call-window.h" +#include "empathy-ui-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP #include "empathy-debug.h" diff --git a/src/empathy-camera-menu.c b/src/empathy-camera-menu.c index 0674e7076..8dc037bdb 100644 --- a/src/empathy-camera-menu.c +++ b/src/empathy-camera-menu.c @@ -20,12 +20,11 @@ */ #include "config.h" +#include "empathy-camera-menu.h" #include "empathy-camera-monitor.h" #include "empathy-gsettings.h" -#include "empathy-camera-menu.h" - #define DEBUG_FLAG EMPATHY_DEBUG_VOIP #include "empathy-debug.h" diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c index bc64cefc8..89f230dc3 100644 --- a/src/empathy-chat-manager.c +++ b/src/empathy-chat-manager.c @@ -18,24 +18,20 @@ */ #include "config.h" +#include "empathy-chat-manager.h" #include #include "empathy-chatroom-manager.h" -#include "empathy-request-util.h" +#include "empathy-chat-window.h" #include "empathy-individual-manager.h" - +#include "empathy-request-util.h" #include "empathy-ui-utils.h" - -#include "empathy-chat-window.h" +#include "extensions.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER #include "empathy-debug.h" -#include "empathy-chat-manager.h" - -#include "extensions.h" - enum { CLOSED_CHATS_CHANGED, DISPLAYED_CHATS_CHANGED, diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 47f588f08..9dafa5fe2 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -26,28 +26,26 @@ */ #include "config.h" +#include "empathy-chat-window.h" #include #include -#include "empathy-client-factory.h" +#include "empathy-about-dialog.h" +#include "empathy-chat-manager.h" #include "empathy-chatroom-manager.h" +#include "empathy-client-factory.h" +#include "empathy-geometry.h" #include "empathy-gsettings.h" -#include "empathy-utils.h" -#include "empathy-request-util.h" -#include "empathy-individual-manager.h" - #include "empathy-images.h" -#include "empathy-geometry.h" +#include "empathy-individual-manager.h" +#include "empathy-invite-participant-dialog.h" +#include "empathy-notify-manager.h" +#include "empathy-request-util.h" #include "empathy-smiley-manager.h" #include "empathy-sound-manager.h" #include "empathy-ui-utils.h" -#include "empathy-notify-manager.h" - -#include "empathy-chat-manager.h" -#include "empathy-chat-window.h" -#include "empathy-about-dialog.h" -#include "empathy-invite-participant-dialog.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_CHAT #include "empathy-debug.h" diff --git a/src/empathy-chat-window.h b/src/empathy-chat-window.h index cfd82a128..8c5955972 100644 --- a/src/empathy-chat-window.h +++ b/src/empathy-chat-window.h @@ -29,10 +29,10 @@ #include #include - #include #include "empathy-chat.h" +#include "empathy-individual-manager.h" G_BEGIN_DECLS diff --git a/src/empathy-chat.c b/src/empathy-chat.c index 9919b6edd..e6e8b1b3b 100644 --- a/src/empathy-chat.c +++ b/src/empathy-chat.c @@ -23,17 +23,14 @@ #include "config.h" #include - #include +#include "empathy-chat-manager.h" +#include "empathy-chat-resources.h" #include "empathy-presence-manager.h" - #include "empathy-theme-manager.h" #include "empathy-ui-utils.h" -#include "empathy-chat-manager.h" -#include "empathy-chat-resources.h" - #define DEBUG_FLAG EMPATHY_DEBUG_CHAT #include "empathy-debug.h" diff --git a/src/empathy-chatrooms-window.c b/src/empathy-chatrooms-window.c index ff45bed9c..553c91290 100644 --- a/src/empathy-chatrooms-window.c +++ b/src/empathy-chatrooms-window.c @@ -24,16 +24,14 @@ */ #include "config.h" +#include "empathy-chatrooms-window.h" #include -#include "empathy-chatroom-manager.h" -#include "empathy-utils.h" - #include "empathy-account-chooser.h" +#include "empathy-chatroom-manager.h" #include "empathy-ui-utils.h" - -#include "empathy-chatrooms-window.h" +#include "empathy-utils.h" typedef struct { EmpathyChatroomManager *manager; diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c index 546e17406..6cc60098f 100644 --- a/src/empathy-debug-window.c +++ b/src/empathy-debug-window.c @@ -20,18 +20,17 @@ */ #include "config.h" +#include "empathy-debug-window.h" #include #include -#define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include "empathy-debug.h" -#include "empathy-utils.h" - #include "empathy-geometry.h" #include "empathy-ui-utils.h" +#include "empathy-utils.h" -#include "empathy-debug-window.h" +#define DEBUG_FLAG EMPATHY_DEBUG_OTHER +#include "empathy-debug.h" G_DEFINE_TYPE (EmpathyDebugWindow, empathy_debug_window, GTK_TYPE_WINDOW) diff --git a/src/empathy-debug-window.h b/src/empathy-debug-window.h index 42bb43ef7..5269bcfc5 100644 --- a/src/empathy-debug-window.h +++ b/src/empathy-debug-window.h @@ -21,11 +21,11 @@ #ifndef __EMPATHY_DEBUG_WINDOW_H__ #define __EMPATHY_DEBUG_WINDOW_H__ -G_BEGIN_DECLS - #include #include +G_BEGIN_DECLS + #define EMPATHY_TYPE_DEBUG_WINDOW (empathy_debug_window_get_type ()) #define EMPATHY_DEBUG_WINDOW(object) (G_TYPE_CHECK_INSTANCE_CAST \ ((object), EMPATHY_TYPE_DEBUG_WINDOW, EmpathyDebugWindow)) diff --git a/src/empathy-debugger.c b/src/empathy-debugger.c index ca348f3cd..abb73ac44 100644 --- a/src/empathy-debugger.c +++ b/src/empathy-debugger.c @@ -21,9 +21,8 @@ #include -#include "empathy-ui-utils.h" - #include "empathy-debug-window.h" +#include "empathy-ui-utils.h" #define EMPATHY_DEBUGGER_DBUS_NAME "org.gnome.Empathy.Debugger" diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index c0b802d3b..a0171858a 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -20,23 +20,21 @@ */ #include "config.h" +#include "empathy-event-manager.h" #include -#include "empathy-presence-manager.h" +#include "empathy-call-utils.h" #include "empathy-connection-aggregator.h" -#include "empathy-tp-chat.h" -#include "empathy-utils.h" #include "empathy-gsettings.h" -#include "empathy-sasl-mechanisms.h" - #include "empathy-images.h" +#include "empathy-presence-manager.h" +#include "empathy-sasl-mechanisms.h" #include "empathy-sound-manager.h" -#include "empathy-ui-utils.h" -#include "empathy-call-utils.h" #include "empathy-subscription-dialog.h" - -#include "empathy-event-manager.h" +#include "empathy-tp-chat.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER #include "empathy-debug.h" diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c index 9098250bf..18e05dc19 100644 --- a/src/empathy-ft-manager.c +++ b/src/empathy-ft-manager.c @@ -28,17 +28,16 @@ /* The original file transfer manager code was copied from Epiphany */ #include "config.h" +#include "empathy-ft-manager.h" #include -#define DEBUG_FLAG EMPATHY_DEBUG_FT -#include "empathy-debug.h" -#include "empathy-utils.h" - -#include "empathy-ui-utils.h" #include "empathy-geometry.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" -#include "empathy-ft-manager.h" +#define DEBUG_FLAG EMPATHY_DEBUG_FT +#include "empathy-debug.h" enum { diff --git a/src/empathy-import-dialog.c b/src/empathy-import-dialog.c index ea1ce1841..5e6fa8d55 100644 --- a/src/empathy-import-dialog.c +++ b/src/empathy-import-dialog.c @@ -21,15 +21,15 @@ */ #include "config.h" +#include "empathy-import-dialog.h" #include -#include "empathy-import-dialog.h" #include "empathy-import-widget.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER #include "empathy-debug.h" -#include "empathy-utils.h" enum { PROP_PARENT = 1, diff --git a/src/empathy-import-pidgin.c b/src/empathy-import-pidgin.c index 22116648d..92adb861e 100644 --- a/src/empathy-import-pidgin.c +++ b/src/empathy-import-pidgin.c @@ -20,16 +20,16 @@ * */ #include "config.h" +#include "empathy-import-pidgin.h" #include #include #include "empathy-import-utils.h" -#include "empathy-import-pidgin.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER #include "empathy-debug.h" -#include "empathy-utils.h" /* Pidgin to CM map */ typedef struct diff --git a/src/empathy-import-utils.c b/src/empathy-import-utils.c index 718c7d1e1..c38233647 100644 --- a/src/empathy-import-utils.c +++ b/src/empathy-import-utils.c @@ -19,11 +19,12 @@ * Cosimo Cecchi */ -#include "empathy-connection-managers.h" -#include "empathy-utils.h" - +#include "config.h" #include "empathy-import-utils.h" + +#include "empathy-connection-managers.h" #include "empathy-import-pidgin.h" +#include "empathy-utils.h" EmpathyImportAccountData * empathy_import_account_data_new (const gchar *source) diff --git a/src/empathy-import-widget.c b/src/empathy-import-widget.c index 68a71d5ff..a572ad0c6 100644 --- a/src/empathy-import-widget.c +++ b/src/empathy-import-widget.c @@ -23,17 +23,16 @@ /* empathy-import-widget.c */ #include "config.h" - -#include "empathy-import-dialog.h" #include "empathy-import-widget.h" -#define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include "empathy-debug.h" -#include "empathy-utils.h" +#include +#include "empathy-import-dialog.h" #include "empathy-ui-utils.h" +#include "empathy-utils.h" -#include +#define DEBUG_FLAG EMPATHY_DEBUG_OTHER +#include "empathy-debug.h" G_DEFINE_TYPE (EmpathyImportWidget, empathy_import_widget, G_TYPE_OBJECT) diff --git a/src/empathy-import-widget.h b/src/empathy-import-widget.h index 225350e6e..508706fb8 100644 --- a/src/empathy-import-widget.h +++ b/src/empathy-import-widget.h @@ -26,9 +26,9 @@ #define __EMPATHY_IMPORT_WIDGET_H__ #include +#include #include "empathy-connection-managers.h" - #include "empathy-import-utils.h" G_BEGIN_DECLS diff --git a/src/empathy-invite-participant-dialog.c b/src/empathy-invite-participant-dialog.c index f78052f8c..e562dc564 100644 --- a/src/empathy-invite-participant-dialog.c +++ b/src/empathy-invite-participant-dialog.c @@ -10,14 +10,12 @@ */ #include "config.h" - -#include - #include "empathy-invite-participant-dialog.h" -#include "empathy-utils.h" +#include #include "empathy-contact-chooser.h" +#include "empathy-utils.h" G_DEFINE_TYPE (EmpathyInviteParticipantDialog, empathy_invite_participant_dialog, GTK_TYPE_DIALOG); diff --git a/src/empathy-mic-menu.c b/src/empathy-mic-menu.c index 0c6ed23a9..612ff34be 100644 --- a/src/empathy-mic-menu.c +++ b/src/empathy-mic-menu.c @@ -20,8 +20,8 @@ */ #include "config.h" - #include "empathy-mic-menu.h" + #include "empathy-mic-monitor.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP diff --git a/src/empathy-mic-monitor.c b/src/empathy-mic-monitor.c index afc526ffa..90d1088ff 100644 --- a/src/empathy-mic-monitor.c +++ b/src/empathy-mic-monitor.c @@ -18,12 +18,11 @@ */ #include "config.h" +#include "empathy-mic-monitor.h" #include #include -#include "empathy-mic-monitor.h" - #include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP diff --git a/src/empathy-mic-monitor.h b/src/empathy-mic-monitor.h index 4ad4a28fa..6d545483e 100644 --- a/src/empathy-mic-monitor.h +++ b/src/empathy-mic-monitor.h @@ -20,7 +20,7 @@ #define __EMPATHY_MIC_MONITOR_H__ #include - +#include #include G_BEGIN_DECLS diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c index cca729df9..f0b6ec641 100644 --- a/src/empathy-new-chatroom-dialog.c +++ b/src/empathy-new-chatroom-dialog.c @@ -22,17 +22,15 @@ */ #include "config.h" +#include "empathy-new-chatroom-dialog.h" #include -#include "empathy-utils.h" -#include "empathy-request-util.h" -#include "empathy-gsettings.h" - #include "empathy-account-chooser.h" +#include "empathy-gsettings.h" +#include "empathy-request-util.h" #include "empathy-ui-utils.h" - -#include "empathy-new-chatroom-dialog.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER #include "empathy-debug.h" diff --git a/src/empathy-new-chatroom-dialog.h b/src/empathy-new-chatroom-dialog.h index 02bf3b2a0..9f7796dbe 100644 --- a/src/empathy-new-chatroom-dialog.h +++ b/src/empathy-new-chatroom-dialog.h @@ -25,6 +25,7 @@ #define __EMPATHY_NEW_CHATROOM_DIALOG_H__ #include +#include G_BEGIN_DECLS diff --git a/src/empathy-notifications-approver.c b/src/empathy-notifications-approver.c index 7e06da1b7..fb36f2ac3 100644 --- a/src/empathy-notifications-approver.c +++ b/src/empathy-notifications-approver.c @@ -18,19 +18,17 @@ */ #include "config.h" +#include "empathy-notifications-approver.h" #include -#include "empathy-notify-manager.h" #include "empathy-call-utils.h" - #include "empathy-event-manager.h" +#include "empathy-notify-manager.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER #include "empathy-debug.h" -#include "empathy-notifications-approver.h" - struct _EmpathyNotificationsApproverPrivate { EmpathyEventManager *event_mgr; diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c index 735ba2175..c2be935b0 100644 --- a/src/empathy-preferences.c +++ b/src/empathy-preferences.c @@ -24,18 +24,16 @@ */ #include "config.h" +#include "empathy-preferences.h" #include #include "empathy-client-factory.h" #include "empathy-gsettings.h" -#include "empathy-utils.h" - -#include "empathy-ui-utils.h" -#include "empathy-theme-manager.h" #include "empathy-spell.h" - -#include "empathy-preferences.h" +#include "empathy-theme-manager.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER #include "empathy-debug.h" diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c index 2f64d877c..c09094eb0 100644 --- a/src/empathy-roster-window.c +++ b/src/empathy-roster-window.c @@ -22,41 +22,39 @@ */ #include "config.h" +#include "empathy-roster-window.h" #include #include -#include "empathy-utils.h" -#include "empathy-request-util.h" +#include "empathy-about-dialog.h" +#include "empathy-accounts-dialog.h" +#include "empathy-call-observer.h" +#include "empathy-chat-manager.h" #include "empathy-chatroom-manager.h" -#include "empathy-gsettings.h" -#include "empathy-gsettings.h" -#include "empathy-status-presets.h" -#include "empathy-presence-manager.h" - +#include "empathy-chatrooms-window.h" #include "empathy-contact-blocking-dialog.h" #include "empathy-contact-search-dialog.h" +#include "empathy-event-manager.h" +#include "empathy-ft-manager.h" #include "empathy-geometry.h" +#include "empathy-gsettings.h" +#include "empathy-gsettings.h" #include "empathy-gtk-enum-types.h" #include "empathy-individual-dialogs.h" -#include "empathy-roster-model-manager.h" -#include "empathy-roster-view.h" -#include "empathy-new-message-dialog.h" -#include "empathy-new-call-dialog.h" #include "empathy-log-window.h" +#include "empathy-new-call-dialog.h" +#include "empathy-new-chatroom-dialog.h" +#include "empathy-new-message-dialog.h" +#include "empathy-preferences.h" #include "empathy-presence-chooser.h" +#include "empathy-presence-manager.h" +#include "empathy-request-util.h" +#include "empathy-roster-model-manager.h" +#include "empathy-roster-view.h" +#include "empathy-status-presets.h" #include "empathy-ui-utils.h" - -#include "empathy-accounts-dialog.h" -#include "empathy-call-observer.h" -#include "empathy-chat-manager.h" -#include "empathy-roster-window.h" -#include "empathy-preferences.h" -#include "empathy-about-dialog.h" -#include "empathy-new-chatroom-dialog.h" -#include "empathy-chatrooms-window.h" -#include "empathy-event-manager.h" -#include "empathy-ft-manager.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER #include "empathy-debug.h" diff --git a/src/empathy-rounded-actor.c b/src/empathy-rounded-actor.c index 038cb4955..89e3144cc 100644 --- a/src/empathy-rounded-actor.c +++ b/src/empathy-rounded-actor.c @@ -19,7 +19,6 @@ */ #include "config.h" - #include "empathy-rounded-actor.h" G_DEFINE_TYPE(EmpathyRoundedActor, empathy_rounded_actor, GTK_CLUTTER_TYPE_ACTOR) diff --git a/src/empathy-rounded-rectangle.c b/src/empathy-rounded-rectangle.c index 67c0e27c0..810fa0df7 100644 --- a/src/empathy-rounded-rectangle.c +++ b/src/empathy-rounded-rectangle.c @@ -19,11 +19,10 @@ */ #include "config.h" +#include "empathy-rounded-rectangle.h" #include -#include "empathy-rounded-rectangle.h" - G_DEFINE_TYPE (EmpathyRoundedRectangle, empathy_rounded_rectangle, CLUTTER_TYPE_CAIRO_TEXTURE) diff --git a/src/empathy-rounded-texture.c b/src/empathy-rounded-texture.c index 7ac7d040d..46c0b2135 100644 --- a/src/empathy-rounded-texture.c +++ b/src/empathy-rounded-texture.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "empathy-rounded-texture.h" G_DEFINE_TYPE (EmpathyRoundedTexture, diff --git a/src/empathy-sanity-cleaning.c b/src/empathy-sanity-cleaning.c index 025c9b841..5af3ff45f 100644 --- a/src/empathy-sanity-cleaning.c +++ b/src/empathy-sanity-cleaning.c @@ -22,22 +22,20 @@ */ #include "config.h" - #include "empathy-sanity-cleaning.h" -#include "empathy-gsettings.h" - -#include "empathy-theme-manager.h" - #ifdef HAVE_UOA -#include "empathy-pkg-kit.h" -#include "empathy-uoa-utils.h" - #include #include #include + +#include "empathy-pkg-kit.h" +#include "empathy-uoa-utils.h" #endif +#include "empathy-gsettings.h" +#include "empathy-theme-manager.h" + #define DEBUG_FLAG EMPATHY_DEBUG_OTHER #include "empathy-debug.h" diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c index b40ebed7b..917fab383 100644 --- a/src/empathy-status-icon.c +++ b/src/empathy-status-icon.c @@ -20,17 +20,15 @@ */ #include "config.h" +#include "empathy-status-icon.h" +#include "empathy-event-manager.h" #include "empathy-gsettings.h" -#include "empathy-utils.h" - +#include "empathy-new-call-dialog.h" +#include "empathy-new-message-dialog.h" #include "empathy-presence-chooser.h" #include "empathy-ui-utils.h" -#include "empathy-new-message-dialog.h" -#include "empathy-new-call-dialog.h" - -#include "empathy-status-icon.h" -#include "empathy-event-manager.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER #include "empathy-debug.h" diff --git a/src/empathy-status-icon.h b/src/empathy-status-icon.h index ca21af833..44a0b1253 100644 --- a/src/empathy-status-icon.h +++ b/src/empathy-status-icon.h @@ -23,6 +23,7 @@ #define __EMPATHY_STATUS_ICON_H__ #include +#include G_BEGIN_DECLS diff --git a/src/empathy-video-src.c b/src/empathy-video-src.c index b3b84d3e7..9856efed9 100644 --- a/src/empathy-video-src.c +++ b/src/empathy-video-src.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "empathy-video-src.h" #ifdef HAVE_GST1 #include @@ -29,8 +30,6 @@ #define DEBUG_FLAG EMPATHY_DEBUG_VOIP #include "empathy-debug.h" -#include "empathy-video-src.h" - G_DEFINE_TYPE(EmpathyGstVideoSrc, empathy_video_src, GST_TYPE_BIN) /* Keep in sync with EmpathyGstVideoSrcChannel */ diff --git a/src/empathy.c b/src/empathy.c index 610150bbd..a8f23e82c 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -23,31 +23,28 @@ #include #include +#include #ifdef HAVE_LIBCHAMPLAIN #include #endif -#include - +#include "empathy-accounts-common.h" +#include "empathy-accounts-dialog.h" +#include "empathy-chatroom-manager.h" #include "empathy-client-factory.h" #include "empathy-connection-aggregator.h" -#include "empathy-presence-manager.h" -#include "empathy-utils.h" -#include "empathy-chatroom-manager.h" -#include "empathy-request-util.h" #include "empathy-ft-factory.h" +#include "empathy-ft-manager.h" #include "empathy-gsettings.h" - -#include "empathy-ui-utils.h" #include "empathy-location-manager.h" - +#include "empathy-notifications-approver.h" +#include "empathy-presence-manager.h" +#include "empathy-request-util.h" #include "empathy-roster-window.h" -#include "empathy-accounts-common.h" -#include "empathy-accounts-dialog.h" #include "empathy-status-icon.h" -#include "empathy-ft-manager.h" -#include "empathy-notifications-approver.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER #include "empathy-debug.h" -- cgit v1.2.3