[empathy] Reorder header inclusions accordingly to the Telepathy coding style
- From: Emanuele Aina <emaaa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] Reorder header inclusions accordingly to the Telepathy coding style
- Date: Tue, 2 Apr 2013 09:29:10 +0000 (UTC)
commit 0d137b74e57840bd85f090becd4144f62c89d6ab
Author: Emanuele Aina <emanuele aina collabora com>
Date: Mon Apr 1 17:04:08 2013 +0200
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
goa-mc-plugin/mcp-account-manager-goa.c | 6 +--
goa-mc-plugin/mission-control-plugin.c | 2 +
libempathy-gtk/empathy-account-chooser.c | 2 +-
libempathy-gtk/empathy-account-selector-dialog.c | 1 -
libempathy-gtk/empathy-account-widget-irc.c | 2 +-
libempathy-gtk/empathy-account-widget-sip.c | 2 +-
libempathy-gtk/empathy-account-widget.c | 8 ++--
libempathy-gtk/empathy-avatar-chooser.c | 13 +++---
libempathy-gtk/empathy-avatar-chooser.h | 1 +
libempathy-gtk/empathy-avatar-image.c | 4 +-
libempathy-gtk/empathy-avatar-image.h | 2 +
libempathy-gtk/empathy-bad-password-dialog.c | 1 -
libempathy-gtk/empathy-base-password-dialog.c | 4 +-
libempathy-gtk/empathy-calendar-button.c | 3 +-
libempathy-gtk/empathy-call-utils.c | 5 +--
libempathy-gtk/empathy-call-utils.h | 3 +
libempathy-gtk/empathy-cell-renderer-activatable.c | 3 +-
libempathy-gtk/empathy-cell-renderer-expander.c | 4 +-
libempathy-gtk/empathy-cell-renderer-text.c | 2 +-
libempathy-gtk/empathy-chat.c | 20 +++++-----
libempathy-gtk/empathy-contact-blocking-dialog.c | 7 +--
libempathy-gtk/empathy-contact-chooser.c | 4 +-
libempathy-gtk/empathy-contact-search-dialog.c | 11 +++--
libempathy-gtk/empathy-contact-widget.c | 9 ++--
libempathy-gtk/empathy-contactinfo-utils.c | 5 +-
libempathy-gtk/empathy-dialpad-button.c | 2 -
libempathy-gtk/empathy-dialpad-widget.c | 1 -
libempathy-gtk/empathy-geometry.c | 4 +-
libempathy-gtk/empathy-groups-widget.c | 3 +-
libempathy-gtk/empathy-individual-dialogs.c | 5 +-
libempathy-gtk/empathy-individual-edit-dialog.c | 5 +-
.../empathy-individual-information-dialog.c | 7 +--
libempathy-gtk/empathy-individual-menu.c | 22 +++++-----
libempathy-gtk/empathy-individual-store-channel.c | 3 +-
libempathy-gtk/empathy-individual-store-channel.h | 1 +
libempathy-gtk/empathy-individual-store-manager.c | 1 -
libempathy-gtk/empathy-individual-store.c | 6 +-
libempathy-gtk/empathy-individual-view.c | 18 ++++----
libempathy-gtk/empathy-individual-widget.c | 8 ++--
libempathy-gtk/empathy-input-text-view.c | 1 +
.../empathy-irc-network-chooser-dialog.c | 6 +-
libempathy-gtk/empathy-irc-network-chooser.c | 8 +--
libempathy-gtk/empathy-irc-network-dialog.c | 6 +--
libempathy-gtk/empathy-live-search.c | 3 +-
.../empathy-local-xmpp-assistant-widget.c | 3 +-
libempathy-gtk/empathy-location-manager.c | 3 +-
libempathy-gtk/empathy-log-window.c | 21 ++++------
libempathy-gtk/empathy-log-window.h | 1 +
libempathy-gtk/empathy-new-account-dialog.c | 6 +-
libempathy-gtk/empathy-new-call-dialog.c | 12 ++---
libempathy-gtk/empathy-new-message-dialog.c | 8 +--
libempathy-gtk/empathy-notify-manager.c | 6 +--
libempathy-gtk/empathy-password-dialog.c | 1 -
libempathy-gtk/empathy-plist.c | 3 +-
libempathy-gtk/empathy-presence-chooser.c | 3 +-
libempathy-gtk/empathy-protocol-chooser.c | 5 +-
libempathy-gtk/empathy-roster-contact.c | 6 +--
libempathy-gtk/empathy-roster-group.c | 1 -
libempathy-gtk/empathy-roster-model-aggregator.c | 3 +-
libempathy-gtk/empathy-roster-model-manager.c | 4 +-
libempathy-gtk/empathy-roster-model.c | 1 -
libempathy-gtk/empathy-roster-view.c | 2 -
libempathy-gtk/empathy-search-bar.c | 5 +-
libempathy-gtk/empathy-share-my-desktop.c | 3 +-
libempathy-gtk/empathy-smiley-manager.c | 4 +-
libempathy-gtk/empathy-sound-manager.c | 6 +-
libempathy-gtk/empathy-spell.c | 4 +-
libempathy-gtk/empathy-status-preset-dialog.c | 7 +--
libempathy-gtk/empathy-status-preset-dialog.h | 1 +
libempathy-gtk/empathy-string-parser.c | 2 +-
libempathy-gtk/empathy-subscription-dialog.c | 7 +--
libempathy-gtk/empathy-theme-adium.c | 11 ++---
libempathy-gtk/empathy-theme-manager.c | 4 +-
libempathy-gtk/empathy-tls-dialog.c | 4 +-
libempathy-gtk/empathy-ui-utils.c | 6 +-
libempathy-gtk/empathy-user-info.c | 10 ++--
libempathy-gtk/empathy-webkit-utils.c | 4 +-
libempathy/empathy-account-settings.c | 4 +-
libempathy/empathy-auth-factory.c | 6 +-
libempathy/empathy-camera-monitor.c | 2 +-
libempathy/empathy-chatroom-manager.c | 2 +-
libempathy/empathy-chatroom.c | 2 +-
libempathy/empathy-client-factory.c | 1 -
libempathy/empathy-connection-aggregator.c | 1 -
libempathy/empathy-connection-managers.c | 2 +-
libempathy/empathy-contact-groups.c | 2 +-
libempathy/empathy-contact-groups.h | 4 +-
libempathy/empathy-contact.c | 1 +
libempathy/empathy-debug.c | 1 -
libempathy/empathy-ft-factory.c | 2 +
libempathy/empathy-ft-handler.c | 2 +-
libempathy/empathy-goa-auth-handler.c | 5 +-
libempathy/empathy-individual-manager.c | 2 +-
libempathy/empathy-irc-network-manager.c | 2 +-
libempathy/empathy-irc-network.c | 2 +-
libempathy/empathy-irc-server.c | 2 +-
libempathy/empathy-keyring.c | 4 +-
libempathy/empathy-message.c | 2 +-
libempathy/empathy-pkg-kit.c | 1 -
libempathy/empathy-presence-manager.c | 1 -
libempathy/empathy-request-util.c | 1 -
libempathy/empathy-sasl-mechanisms.c | 2 +-
libempathy/empathy-server-sasl-handler.c | 5 +-
libempathy/empathy-server-tls-handler.c | 7 +--
libempathy/empathy-status-presets.c | 2 +-
libempathy/empathy-time.c | 3 +-
libempathy/empathy-tls-verifier.c | 4 +-
libempathy/empathy-tp-chat.c | 2 +-
libempathy/empathy-uoa-auth-handler.c | 7 ++-
libempathy/empathy-uoa-utils.c | 2 +-
libempathy/empathy-utils.c | 4 +-
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 +++++------
tests/empathy-chatroom-manager-test.c | 2 -
tests/empathy-chatroom-test.c | 1 -
tests/empathy-irc-network-manager-test.c | 5 +-
tests/empathy-irc-network-test.c | 5 +-
tests/empathy-irc-server-test.c | 5 +-
tests/empathy-live-search-test.c | 3 +-
tests/empathy-parser-test.c | 6 +--
tests/empathy-tls-test.c | 11 ++---
tests/interactive/empathy-logs.c | 5 +-
tests/interactive/test-empathy-account-chooser.c | 4 +-
.../test-empathy-contact-blocking-dialog.c | 5 +-
tests/interactive/test-empathy-dual-roster-view.c | 3 +-
tests/interactive/test-empathy-presence-chooser.c | 5 +-
tests/interactive/test-empathy-protocol-chooser.c | 4 +-
.../test-empathy-roster-model-aggregator.c | 5 +-
tests/interactive/test-empathy-roster-view.c | 3 +-
.../test-empathy-status-preset-dialog.c | 5 +-
tests/mock-pkcs11.c | 3 -
tests/test-helper.c | 5 +-
tests/test-irc-helper.c | 1 +
.../mc-plugin/empathy-webcredentials-monitor.c | 5 +--
.../mc-plugin/mcp-account-manager-uoa.c | 2 -
.../mc-plugin/mission-control-plugin.c | 2 +
183 files changed, 427 insertions(+), 542 deletions(-)
---
diff --git a/goa-mc-plugin/mcp-account-manager-goa.c b/goa-mc-plugin/mcp-account-manager-goa.c
index 41eb8f6..4af7828 100644
--- a/goa-mc-plugin/mcp-account-manager-goa.c
+++ b/goa-mc-plugin/mcp-account-manager-goa.c
@@ -24,13 +24,11 @@
*/
#include "config.h"
-
-#include <telepathy-glib/telepathy-glib.h>
+#include "mcp-account-manager-goa.h"
#define GOA_API_IS_SUBJECT_TO_CHANGE /* awesome! */
#include <goa/goa.h>
-
-#include "mcp-account-manager-goa.h"
+#include <telepathy-glib/telepathy-glib.h>
#define DEBUG g_debug
#define GET_PRIVATE(self) (((McpAccountManagerGoa *) self)->priv)
diff --git a/goa-mc-plugin/mission-control-plugin.c b/goa-mc-plugin/mission-control-plugin.c
index 4065305..3431d0e 100644
--- a/goa-mc-plugin/mission-control-plugin.c
+++ b/goa-mc-plugin/mission-control-plugin.c
@@ -23,6 +23,8 @@
* Danielle Madeley <danielle madeley collabora co uk>
*/
+#include "config.h"
+
#include <mission-control-plugins/mission-control-plugins.h>
#include "mcp-account-manager-goa.h"
diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c
index a272309..e6f4367 100644
--- a/libempathy-gtk/empathy-account-chooser.c
+++ b/libempathy-gtk/empathy-account-chooser.c
@@ -22,11 +22,11 @@
*/
#include "config.h"
+#include "empathy-account-chooser.h"
#include <glib/gi18n-lib.h>
#include "empathy-ui-utils.h"
-#include "empathy-account-chooser.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-account-selector-dialog.c
b/libempathy-gtk/empathy-account-selector-dialog.c
index 72a7b2f..0dd67ea 100644
--- a/libempathy-gtk/empathy-account-selector-dialog.c
+++ b/libempathy-gtk/empathy-account-selector-dialog.c
@@ -19,7 +19,6 @@
*/
#include "config.h"
-
#include "empathy-account-selector-dialog.h"
enum
diff --git a/libempathy-gtk/empathy-account-widget-irc.c b/libempathy-gtk/empathy-account-widget-irc.c
index e0647a9..e86cec4 100644
--- a/libempathy-gtk/empathy-account-widget-irc.c
+++ b/libempathy-gtk/empathy-account-widget-irc.c
@@ -19,9 +19,9 @@
*/
#include "config.h"
+#include "empathy-account-widget-irc.h"
#include "empathy-account-widget-private.h"
-#include "empathy-account-widget-irc.h"
#include "empathy-ui-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
diff --git a/libempathy-gtk/empathy-account-widget-sip.c b/libempathy-gtk/empathy-account-widget-sip.c
index 7545efb..b76078d 100644
--- a/libempathy-gtk/empathy-account-widget-sip.c
+++ b/libempathy-gtk/empathy-account-widget-sip.c
@@ -20,11 +20,11 @@
*/
#include "config.h"
+#include "empathy-account-widget-sip.h"
#include <glib/gi18n-lib.h>
#include "empathy-account-widget-private.h"
-#include "empathy-account-widget-sip.h"
#include "empathy-ui-utils.h"
typedef struct {
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index fb4ab8b..0751b24 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -25,17 +25,17 @@
*/
#include "config.h"
+#include "empathy-account-widget.h"
+#include "empathy-account-widget-private.h"
#include <glib/gi18n-lib.h>
-
-#include "empathy-utils.h"
-
#include <dbus/dbus-protocol.h>
+#include "empathy-account-widget-irc.h"
#include "empathy-account-widget-private.h"
#include "empathy-account-widget-sip.h"
-#include "empathy-account-widget-irc.h"
#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
#include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
index 30022c9..19314fe 100644
--- a/libempathy-gtk/empathy-avatar-chooser.c
+++ b/libempathy-gtk/empathy-avatar-chooser.c
@@ -21,20 +21,19 @@
*/
#include "config.h"
+#include "empathy-avatar-chooser.h"
#include <glib/gi18n-lib.h>
+#ifdef HAVE_CHEESE
+#include <cheese-avatar-chooser.h>
+#endif /* HAVE_CHEESE */
+
#include "empathy-camera-monitor.h"
#include "empathy-gsettings.h"
-#include "empathy-utils.h"
-
-#include "empathy-avatar-chooser.h"
#include "empathy-images.h"
#include "empathy-ui-utils.h"
-
-#ifdef HAVE_CHEESE
-#include <cheese-avatar-chooser.h>
-#endif /* HAVE_CHEESE */
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-avatar-chooser.h b/libempathy-gtk/empathy-avatar-chooser.h
index dc82c05..1636e28 100644
--- a/libempathy-gtk/empathy-avatar-chooser.h
+++ b/libempathy-gtk/empathy-avatar-chooser.h
@@ -26,6 +26,7 @@
#include <gio/gio.h>
#include <gtk/gtk.h>
+#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-avatar-image.c b/libempathy-gtk/empathy-avatar-image.c
index f66827f..f61c1b2 100644
--- a/libempathy-gtk/empathy-avatar-image.c
+++ b/libempathy-gtk/empathy-avatar-image.c
@@ -22,13 +22,13 @@
*/
#include "config.h"
+#include "empathy-avatar-image.h"
#include <glib/gi18n-lib.h>
#include <gdk/gdkx.h>
-#include "empathy-utils.h"
-#include "empathy-avatar-image.h"
#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
/**
* SECTION:empathy-avatar-image
diff --git a/libempathy-gtk/empathy-avatar-image.h b/libempathy-gtk/empathy-avatar-image.h
index 9429a28..65f088e 100644
--- a/libempathy-gtk/empathy-avatar-image.h
+++ b/libempathy-gtk/empathy-avatar-image.h
@@ -26,6 +26,8 @@
#include <gtk/gtk.h>
+#include "empathy-contact.h"
+
G_BEGIN_DECLS
#define EMPATHY_TYPE_AVATAR_IMAGE (empathy_avatar_image_get_type ())
diff --git a/libempathy-gtk/empathy-bad-password-dialog.c b/libempathy-gtk/empathy-bad-password-dialog.c
index 228a149..5cdb90d 100644
--- a/libempathy-gtk/empathy-bad-password-dialog.c
+++ b/libempathy-gtk/empathy-bad-password-dialog.c
@@ -18,7 +18,6 @@
*/
#include "config.h"
-
#include "empathy-bad-password-dialog.h"
#include <glib/gi18n-lib.h>
diff --git a/libempathy-gtk/empathy-base-password-dialog.c b/libempathy-gtk/empathy-base-password-dialog.c
index b47e5b5..9cbb178 100644
--- a/libempathy-gtk/empathy-base-password-dialog.c
+++ b/libempathy-gtk/empathy-base-password-dialog.c
@@ -18,14 +18,14 @@
*/
#include "config.h"
-
#include "empathy-base-password-dialog.h"
#include <glib/gi18n-lib.h>
+#include "empathy-utils.h"
+
#define DEBUG_FLAG EMPATHY_DEBUG_SASL
#include "empathy-debug.h"
-#include "empathy-utils.h"
G_DEFINE_TYPE (EmpathyBasePasswordDialog, empathy_base_password_dialog,
GTK_TYPE_MESSAGE_DIALOG)
diff --git a/libempathy-gtk/empathy-calendar-button.c b/libempathy-gtk/empathy-calendar-button.c
index 86cea89..ca96a42 100644
--- a/libempathy-gtk/empathy-calendar-button.c
+++ b/libempathy-gtk/empathy-calendar-button.c
@@ -18,11 +18,10 @@
*/
#include "config.h"
+#include "empathy-calendar-button.h"
#include <glib/gi18n-lib.h>
-#include "empathy-calendar-button.h"
-
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER_THING
#include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c
index 44fce09..cbcfdce 100644
--- a/libempathy-gtk/empathy-call-utils.c
+++ b/libempathy-gtk/empathy-call-utils.c
@@ -19,15 +19,12 @@
*/
#include "config.h"
+#include "empathy-call-utils.h"
#include <glib/gi18n-lib.h>
-
#include <gtk/gtk.h>
-
#include <telepathy-glib/telepathy-glib.h>
-#include "empathy-call-utils.h"
-
#include "empathy-request-util.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
diff --git a/libempathy-gtk/empathy-call-utils.h b/libempathy-gtk/empathy-call-utils.h
index 12fca68..7e342d8 100644
--- a/libempathy-gtk/empathy-call-utils.h
+++ b/libempathy-gtk/empathy-call-utils.h
@@ -21,6 +21,9 @@
#ifndef __EMPATHY_CALL_UTILS_H__
#define __EMPATHY_CALL_UTILS_H__
+#include <glib.h>
+#include <telepathy-glib/telepathy-glib.h>
+
G_BEGIN_DECLS
/* Calls */
diff --git a/libempathy-gtk/empathy-cell-renderer-activatable.c
b/libempathy-gtk/empathy-cell-renderer-activatable.c
index 6a8fe72..bdbf1cb 100644
--- a/libempathy-gtk/empathy-cell-renderer-activatable.c
+++ b/libempathy-gtk/empathy-cell-renderer-activatable.c
@@ -21,11 +21,10 @@
*/
#include "config.h"
+#include "empathy-cell-renderer-activatable.h"
#include "empathy-utils.h"
-#include "empathy-cell-renderer-activatable.h"
-
enum {
PATH_ACTIVATED,
LAST_SIGNAL
diff --git a/libempathy-gtk/empathy-cell-renderer-expander.c b/libempathy-gtk/empathy-cell-renderer-expander.c
index 9887b71..8653fae 100644
--- a/libempathy-gtk/empathy-cell-renderer-expander.c
+++ b/libempathy-gtk/empathy-cell-renderer-expander.c
@@ -21,9 +21,11 @@
* Authors: Kristian Rietveld <kris imendio com>
*/
-#include "empathy-utils.h"
+#include "config.h"
#include "empathy-cell-renderer-expander.h"
+#include "empathy-utils.h"
+
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCellRendererExpander)
typedef struct {
GtkExpanderStyle expander_style;
diff --git a/libempathy-gtk/empathy-cell-renderer-text.c b/libempathy-gtk/empathy-cell-renderer-text.c
index afefb2a..44bbd7e 100644
--- a/libempathy-gtk/empathy-cell-renderer-text.c
+++ b/libempathy-gtk/empathy-cell-renderer-text.c
@@ -22,9 +22,9 @@
*/
#include "config.h"
+#include "empathy-cell-renderer-text.h"
#include "empathy-utils.h"
-#include "empathy-cell-renderer-text.h"
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCellRendererText)
typedef struct {
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index f853fb3..ed0d27c 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -26,29 +26,29 @@
* Xavier Claessens <xclaesse gmail com>
*/
-#include "config.h"
/* for GCompletion */
#define GLIB_DISABLE_DEPRECATION_WARNINGS 1
+#include "config.h"
+#include "empathy-chat.h"
+
#include <glib/gi18n-lib.h>
-#include "empathy-gsettings.h"
-#include "empathy-keyring.h"
-#include "empathy-utils.h"
-#include "empathy-request-util.h"
#include "empathy-client-factory.h"
-
-#include "empathy-chat.h"
-#include "empathy-spell.h"
+#include "empathy-gsettings.h"
#include "empathy-individual-information-dialog.h"
#include "empathy-individual-store-channel.h"
#include "empathy-individual-view.h"
#include "empathy-input-text-view.h"
+#include "empathy-keyring.h"
+#include "empathy-request-util.h"
#include "empathy-search-bar.h"
-#include "empathy-theme-manager.h"
#include "empathy-smiley-manager.h"
-#include "empathy-ui-utils.h"
+#include "empathy-spell.h"
#include "empathy-string-parser.h"
+#include "empathy-theme-manager.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
#include "extensions.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CHAT
diff --git a/libempathy-gtk/empathy-contact-blocking-dialog.c
b/libempathy-gtk/empathy-contact-blocking-dialog.c
index 93f317f..ddcbcf3 100644
--- a/libempathy-gtk/empathy-contact-blocking-dialog.c
+++ b/libempathy-gtk/empathy-contact-blocking-dialog.c
@@ -21,16 +21,15 @@
*
* Authors: Danielle Madeley <danielle madeley collabora co uk>
*/
+
#include "config.h"
+#include "empathy-contact-blocking-dialog.h"
#include <glib/gi18n-lib.h>
-#include "empathy-utils.h"
-
#include "empathy-account-chooser.h"
#include "empathy-ui-utils.h"
-
-#include "empathy-contact-blocking-dialog.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-contact-chooser.c b/libempathy-gtk/empathy-contact-chooser.c
index d1368e9..dd81dde 100644
--- a/libempathy-gtk/empathy-contact-chooser.c
+++ b/libempathy-gtk/empathy-contact-chooser.c
@@ -10,15 +10,13 @@
*/
#include "config.h"
-
#include "empathy-contact-chooser.h"
-#include "empathy-utils.h"
#include "empathy-client-factory.h"
-
#include "empathy-individual-store-manager.h"
#include "empathy-individual-view.h"
#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
G_DEFINE_TYPE (EmpathyContactChooser,
empathy_contact_chooser, GTK_TYPE_BOX);
diff --git a/libempathy-gtk/empathy-contact-search-dialog.c b/libempathy-gtk/empathy-contact-search-dialog.c
index fd594e8..2696f5a 100644
--- a/libempathy-gtk/empathy-contact-search-dialog.c
+++ b/libempathy-gtk/empathy-contact-search-dialog.c
@@ -22,18 +22,19 @@
* Danielle Madeley <danielle madeley collabora co uk>
* Emilio Pozuelo Monfort <emilio pozuelo collabora co uk>
*/
+
#include "config.h"
+#include "empathy-contact-search-dialog.h"
#include <glib/gi18n-lib.h>
-#include "empathy-utils.h"
-#include "empathy-client-factory.h"
-
#include "empathy-account-chooser.h"
-#include "empathy-cell-renderer-text.h"
#include "empathy-cell-renderer-activatable.h"
-#include "empathy-individual-information-dialog.h"
+#include "empathy-cell-renderer-text.h"
+#include "empathy-client-factory.h"
#include "empathy-images.h"
+#include "empathy-individual-information-dialog.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index fd4d783..80a1aaf 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -20,17 +20,16 @@
*/
#include "config.h"
+#include "empathy-contact-widget.h"
#include <glib/gi18n-lib.h>
-#include "empathy-utils.h"
-#include "empathy-client-factory.h"
-
-#include "empathy-contact-widget.h"
#include "empathy-avatar-image.h"
+#include "empathy-client-factory.h"
#include "empathy-groups-widget.h"
-#include "empathy-ui-utils.h"
#include "empathy-string-parser.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
#include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-contactinfo-utils.c b/libempathy-gtk/empathy-contactinfo-utils.c
index 3dca374..38f6437 100644
--- a/libempathy-gtk/empathy-contactinfo-utils.c
+++ b/libempathy-gtk/empathy-contactinfo-utils.c
@@ -21,14 +21,13 @@
*/
#include "config.h"
+#include "empathy-contactinfo-utils.h"
#include <glib/gi18n-lib.h>
-#include "empathy-time.h"
#include "empathy-request-util.h"
-
-#include "empathy-contactinfo-utils.h"
#include "empathy-string-parser.h"
+#include "empathy-time.h"
#include "empathy-ui-utils.h"
static gchar *
diff --git a/libempathy-gtk/empathy-dialpad-button.c b/libempathy-gtk/empathy-dialpad-button.c
index bddf42b..792241f 100644
--- a/libempathy-gtk/empathy-dialpad-button.c
+++ b/libempathy-gtk/empathy-dialpad-button.c
@@ -20,9 +20,7 @@
* Guillaume Desmottes <guillaume desmottes collabora co uk>
*/
-
#include "config.h"
-
#include "empathy-dialpad-button.h"
G_DEFINE_TYPE (EmpathyDialpadButton, empathy_dialpad_button, GTK_TYPE_BUTTON)
diff --git a/libempathy-gtk/empathy-dialpad-widget.c b/libempathy-gtk/empathy-dialpad-widget.c
index 340d6fc..6c85c79 100644
--- a/libempathy-gtk/empathy-dialpad-widget.c
+++ b/libempathy-gtk/empathy-dialpad-widget.c
@@ -20,7 +20,6 @@
*/
#include "config.h"
-
#include "empathy-dialpad-widget.h"
#include "empathy-dialpad-button.h"
diff --git a/libempathy-gtk/empathy-geometry.c b/libempathy-gtk/empathy-geometry.c
index 1562001..452952b 100644
--- a/libempathy-gtk/empathy-geometry.c
+++ b/libempathy-gtk/empathy-geometry.c
@@ -22,12 +22,12 @@
*/
#include "config.h"
+#include "empathy-geometry.h"
#include <sys/stat.h>
-#include "empathy-utils.h"
-#include "empathy-geometry.h"
#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-groups-widget.c b/libempathy-gtk/empathy-groups-widget.c
index 8b66651..d1a6feb 100644
--- a/libempathy-gtk/empathy-groups-widget.c
+++ b/libempathy-gtk/empathy-groups-widget.c
@@ -20,14 +20,13 @@
*/
#include "config.h"
+#include "empathy-groups-widget.h"
#include <glib/gi18n-lib.h>
#include "empathy-utils.h"
#include "empathy-connection-aggregator.h"
-#include "empathy-groups-widget.h"
-
/**
* SECTION:empathy-groups-widget
* @title:EmpathyGroupsWidget
diff --git a/libempathy-gtk/empathy-individual-dialogs.c b/libempathy-gtk/empathy-individual-dialogs.c
index 9f01177..ce03d0a 100644
--- a/libempathy-gtk/empathy-individual-dialogs.c
+++ b/libempathy-gtk/empathy-individual-dialogs.c
@@ -20,15 +20,14 @@
*/
#include "config.h"
+#include "empathy-individual-dialogs.h"
#include <glib/gi18n-lib.h>
+#include "empathy-contact-widget.h"
#include "empathy-individual-manager.h"
#include "empathy-utils.h"
-#include "empathy-individual-dialogs.h"
-#include "empathy-contact-widget.h"
-
#define BULLET_POINT "\342\200\242"
static GtkWidget *new_individual_dialog = NULL;
diff --git a/libempathy-gtk/empathy-individual-edit-dialog.c b/libempathy-gtk/empathy-individual-edit-dialog.c
index 457dd95..dbd01c9 100644
--- a/libempathy-gtk/empathy-individual-edit-dialog.c
+++ b/libempathy-gtk/empathy-individual-edit-dialog.c
@@ -21,13 +21,12 @@
*/
#include "config.h"
+#include "empathy-individual-edit-dialog.h"
#include <glib/gi18n-lib.h>
-#include "empathy-utils.h"
-
-#include "empathy-individual-edit-dialog.h"
#include "empathy-individual-widget.h"
+#include "empathy-utils.h"
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualEditDialog)
diff --git a/libempathy-gtk/empathy-individual-information-dialog.c
b/libempathy-gtk/empathy-individual-information-dialog.c
index f4f8bda..2b8d64b 100644
--- a/libempathy-gtk/empathy-individual-information-dialog.c
+++ b/libempathy-gtk/empathy-individual-information-dialog.c
@@ -22,16 +22,15 @@
*/
#include "config.h"
+#include "empathy-individual-information-dialog.h"
#include <glib/gi18n-lib.h>
#include "empathy-individual-manager.h"
-#include "empathy-utils.h"
-#include "empathy-pkg-kit.h"
-
-#include "empathy-individual-information-dialog.h"
#include "empathy-individual-widget.h"
+#include "empathy-pkg-kit.h"
#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
#include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index 907c678..e70146b 100644
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -21,27 +21,27 @@
*/
#include "config.h"
+#include "empathy-individual-menu.h"
#include <glib/gi18n-lib.h>
+#include "empathy-account-selector-dialog.h"
+#include "empathy-call-utils.h"
#include "empathy-camera-monitor.h"
-#include "empathy-request-util.h"
-#include "empathy-individual-manager.h"
#include "empathy-chatroom-manager.h"
-#include "empathy-utils.h"
-
-#include "empathy-account-selector-dialog.h"
+#include "empathy-gtk-enum-types.h"
#include "empathy-images.h"
-#include "empathy-log-window.h"
#include "empathy-individual-dialogs.h"
-#include "empathy-gtk-enum-types.h"
#include "empathy-individual-dialogs.h"
#include "empathy-individual-edit-dialog.h"
-#include "empathy-ui-utils.h"
-#include "empathy-share-my-desktop.h"
-#include "empathy-call-utils.h"
-#include "empathy-individual-store-channel.h"
#include "empathy-individual-information-dialog.h"
+#include "empathy-individual-manager.h"
+#include "empathy-individual-store-channel.h"
+#include "empathy-log-window.h"
+#include "empathy-request-util.h"
+#include "empathy-share-my-desktop.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
#include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-individual-store-channel.c
b/libempathy-gtk/empathy-individual-store-channel.c
index 5db93d5..16134a6 100644
--- a/libempathy-gtk/empathy-individual-store-channel.c
+++ b/libempathy-gtk/empathy-individual-store-channel.c
@@ -24,11 +24,10 @@
*/
#include "config.h"
+#include "empathy-individual-store-channel.h"
#include "empathy-utils.h"
-#include "empathy-individual-store-channel.h"
-
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
#include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-individual-store-channel.h
b/libempathy-gtk/empathy-individual-store-channel.h
index 2cc6b5b..07cc096 100644
--- a/libempathy-gtk/empathy-individual-store-channel.h
+++ b/libempathy-gtk/empathy-individual-store-channel.h
@@ -27,6 +27,7 @@
#define __EMPATHY_INDIVIDUAL_STORE_CHANNEL_H__
#include <gtk/gtk.h>
+#include <telepathy-glib/telepathy-glib.h>
#include "empathy-individual-store.h"
diff --git a/libempathy-gtk/empathy-individual-store-manager.c
b/libempathy-gtk/empathy-individual-store-manager.c
index ca06287..d080242 100644
--- a/libempathy-gtk/empathy-individual-store-manager.c
+++ b/libempathy-gtk/empathy-individual-store-manager.c
@@ -24,7 +24,6 @@
*/
#include "config.h"
-
#include "empathy-individual-store-manager.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c
index 4055091..3ebe35a 100644
--- a/libempathy-gtk/empathy-individual-store.c
+++ b/libempathy-gtk/empathy-individual-store.c
@@ -25,13 +25,13 @@
*/
#include "config.h"
+#include "empathy-individual-store.h"
#include <glib/gi18n-lib.h>
-#include "empathy-utils.h"
-
-#include "empathy-ui-utils.h"
#include "empathy-gtk-enum-types.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
#include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index d02d3de..87fa3d9 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -25,22 +25,22 @@
*/
#include "config.h"
+#include "empathy-individual-view.h"
#include <glib/gi18n-lib.h>
+#include "empathy-cell-renderer-activatable.h"
+#include "empathy-cell-renderer-expander.h"
+#include "empathy-cell-renderer-text.h"
#include "empathy-connection-aggregator.h"
-#include "empathy-individual-manager.h"
#include "empathy-contact-groups.h"
-#include "empathy-request-util.h"
-#include "empathy-utils.h"
-
-#include "empathy-individual-edit-dialog.h"
+#include "empathy-gtk-enum-types.h"
#include "empathy-images.h"
-#include "empathy-cell-renderer-expander.h"
-#include "empathy-cell-renderer-text.h"
-#include "empathy-cell-renderer-activatable.h"
+#include "empathy-individual-edit-dialog.h"
+#include "empathy-individual-manager.h"
+#include "empathy-request-util.h"
#include "empathy-ui-utils.h"
-#include "empathy-gtk-enum-types.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
#include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index 371ddb1..a267a7d 100644
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -20,6 +20,7 @@
*/
#include "config.h"
+#include "empathy-individual-widget.h"
#include <glib/gi18n-lib.h>
@@ -28,15 +29,14 @@
#include <champlain-gtk/champlain-gtk.h>
#endif
-#include "empathy-utils.h"
-#include "empathy-location.h"
-#include "empathy-time.h"
-
#include "empathy-avatar-image.h"
#include "empathy-contactinfo-utils.h"
#include "empathy-groups-widget.h"
#include "empathy-gtk-enum-types.h"
+#include "empathy-location.h"
+#include "empathy-time.h"
#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
#include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-input-text-view.c b/libempathy-gtk/empathy-input-text-view.c
index 78502ef..d7c24a6 100644
--- a/libempathy-gtk/empathy-input-text-view.c
+++ b/libempathy-gtk/empathy-input-text-view.c
@@ -25,6 +25,7 @@
* Guillaume Desmottes <guillaume desmottes collabora co uk>
*/
+#include "config.h"
#include "empathy-input-text-view.h"
G_DEFINE_TYPE (EmpathyInputTextView, empathy_input_text_view,
diff --git a/libempathy-gtk/empathy-irc-network-chooser-dialog.c
b/libempathy-gtk/empathy-irc-network-chooser-dialog.c
index cb937da..60945ae 100644
--- a/libempathy-gtk/empathy-irc-network-chooser-dialog.c
+++ b/libempathy-gtk/empathy-irc-network-chooser-dialog.c
@@ -20,14 +20,14 @@
*/
#include "config.h"
+#include "empathy-irc-network-chooser-dialog.h"
#include <glib/gi18n-lib.h>
-#include "empathy-utils.h"
-#include "empathy-irc-network-manager.h"
-
#include "empathy-irc-network-dialog.h"
+#include "empathy-irc-network-manager.h"
#include "empathy-live-search.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
#include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-irc-network-chooser.c b/libempathy-gtk/empathy-irc-network-chooser.c
index 4945bb7..fab6a3a 100644
--- a/libempathy-gtk/empathy-irc-network-chooser.c
+++ b/libempathy-gtk/empathy-irc-network-chooser.c
@@ -20,18 +20,16 @@
*/
#include "config.h"
+#include "empathy-irc-network-chooser.h"
-#include "empathy-utils.h"
+#include "empathy-irc-network-chooser-dialog.h"
#include "empathy-irc-network-manager.h"
-
#include "empathy-ui-utils.h"
-#include "empathy-irc-network-chooser-dialog.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
#include "empathy-debug.h"
-#include "empathy-irc-network-chooser.h"
-
#define DEFAULT_IRC_NETWORK "irc.gimp.org"
#define DEFAULT_IRC_PORT 6667
#define DEFAULT_IRC_SSL FALSE
diff --git a/libempathy-gtk/empathy-irc-network-dialog.c b/libempathy-gtk/empathy-irc-network-dialog.c
index 8e4339c..fc3cc1f 100644
--- a/libempathy-gtk/empathy-irc-network-dialog.c
+++ b/libempathy-gtk/empathy-irc-network-dialog.c
@@ -19,16 +19,14 @@
*/
#include "config.h"
+#include "empathy-irc-network-dialog.h"
#include <glib/gi18n-lib.h>
-#include "empathy-utils.h"
-
#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
#include "totem-subtitle-encoding.h"
-#include "empathy-irc-network-dialog.h"
-
typedef struct {
EmpathyIrcNetwork *network;
diff --git a/libempathy-gtk/empathy-live-search.c b/libempathy-gtk/empathy-live-search.c
index 3047612..51f6a2e 100644
--- a/libempathy-gtk/empathy-live-search.c
+++ b/libempathy-gtk/empathy-live-search.c
@@ -22,11 +22,10 @@
*/
#include "config.h"
+#include "empathy-live-search.h"
#include "empathy-utils.h"
-#include "empathy-live-search.h"
-
G_DEFINE_TYPE (EmpathyLiveSearch, empathy_live_search, GTK_TYPE_HBOX)
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyLiveSearch)
diff --git a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
index dea2976..f0f6aef 100644
--- a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
+++ b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
@@ -23,10 +23,9 @@
#include <glib/gi18n-lib.h>
-#include "empathy-utils.h"
-
#include "empathy-account-widget.h"
#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
#include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c
index bb6dfa6..3a97c94 100644
--- a/libempathy-gtk/empathy-location-manager.c
+++ b/libempathy-gtk/empathy-location-manager.c
@@ -20,11 +20,10 @@
*/
#include "config.h"
+#include "empathy-location-manager.h"
#include <geoclue/geoclue-master.h>
-#include "empathy-location-manager.h"
-
#include "empathy-gsettings.h"
#include "empathy-location.h"
#include "empathy-time.h"
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index 1f091f6..3650a33 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -23,29 +23,26 @@
*/
#include "config.h"
+#include "empathy-log-window.h"
#include <glib/gi18n-lib.h>
-#include <webkit/webkit.h>
-
#include <telepathy-glib/proxy-subclass.h>
-
-#include "extensions.h"
+#include <webkit/webkit.h>
#include "action-chain-internal.h"
-#include "empathy-camera-monitor.h"
-#include "empathy-gsettings.h"
-#include "empathy-request-util.h"
-#include "empathy-utils.h"
-
-#include "empathy-log-window.h"
#include "empathy-account-chooser.h"
#include "empathy-call-utils.h"
-#include "empathy-individual-information-dialog.h"
+#include "empathy-camera-monitor.h"
+#include "empathy-geometry.h"
+#include "empathy-gsettings.h"
#include "empathy-images.h"
+#include "empathy-individual-information-dialog.h"
+#include "empathy-request-util.h"
#include "empathy-theme-manager.h"
#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
#include "empathy-webkit-utils.h"
-#include "empathy-geometry.h"
+#include "extensions.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-log-window.h b/libempathy-gtk/empathy-log-window.h
index f8f7690..48554fc 100644
--- a/libempathy-gtk/empathy-log-window.h
+++ b/libempathy-gtk/empathy-log-window.h
@@ -25,6 +25,7 @@
#ifndef __EMPATHY_LOG_WINDOW_H__
#define __EMPATHY_LOG_WINDOW_H__
+#include <gtk/gtk.h>
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-new-account-dialog.c b/libempathy-gtk/empathy-new-account-dialog.c
index 09f41a4..ed9242b 100644
--- a/libempathy-gtk/empathy-new-account-dialog.c
+++ b/libempathy-gtk/empathy-new-account-dialog.c
@@ -22,12 +22,12 @@
#include <glib/gi18n-lib.h>
-#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include "empathy-debug.h"
-
#include "empathy-account-widget.h"
#include "empathy-protocol-chooser.h"
+#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
+#include "empathy-debug.h"
+
G_DEFINE_TYPE (EmpathyNewAccountDialog, empathy_new_account_dialog, \
GTK_TYPE_DIALOG)
diff --git a/libempathy-gtk/empathy-new-call-dialog.c b/libempathy-gtk/empathy-new-call-dialog.c
index 61b3870..7dda2f9 100644
--- a/libempathy-gtk/empathy-new-call-dialog.c
+++ b/libempathy-gtk/empathy-new-call-dialog.c
@@ -19,22 +19,20 @@
*/
#include "config.h"
+#include "empathy-new-call-dialog.h"
#include <glib/gi18n-lib.h>
+#include "empathy-call-utils.h"
#include "empathy-camera-monitor.h"
+#include "empathy-contact-chooser.h"
+#include "empathy-images.h"
+#include "empathy-ui-utils.h"
#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
#include "empathy-debug.h"
-#include "empathy-contact-chooser.h"
-#include "empathy-ui-utils.h"
-#include "empathy-images.h"
-
-#include "empathy-new-call-dialog.h"
-#include "empathy-call-utils.h"
-
static EmpathyNewCallDialog *dialog_singleton = NULL;
G_DEFINE_TYPE(EmpathyNewCallDialog, empathy_new_call_dialog,
diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c
index 7308d14..3661472 100644
--- a/libempathy-gtk/empathy-new-message-dialog.c
+++ b/libempathy-gtk/empathy-new-message-dialog.c
@@ -19,19 +19,17 @@
*/
#include "config.h"
+#include "empathy-new-message-dialog.h"
#include <glib/gi18n-lib.h>
#include "empathy-request-util.h"
-
-#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include "empathy-debug.h"
-
#include "empathy-contact-chooser.h"
#include "empathy-ui-utils.h"
#include "empathy-images.h"
-#include "empathy-new-message-dialog.h"
+#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
+#include "empathy-debug.h"
static EmpathyNewMessageDialog *dialog_singleton = NULL;
diff --git a/libempathy-gtk/empathy-notify-manager.c b/libempathy-gtk/empathy-notify-manager.c
index b322ac7..033557e 100644
--- a/libempathy-gtk/empathy-notify-manager.c
+++ b/libempathy-gtk/empathy-notify-manager.c
@@ -18,19 +18,17 @@
*/
#include "config.h"
+#include "empathy-notify-manager.h"
#include <libnotify/notify.h>
#include "empathy-gsettings.h"
-#include "empathy-utils.h"
-
#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include "empathy-debug.h"
-#include "empathy-notify-manager.h"
-
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyNotifyManager)
typedef struct
diff --git a/libempathy-gtk/empathy-password-dialog.c b/libempathy-gtk/empathy-password-dialog.c
index e06a724..ef03061 100644
--- a/libempathy-gtk/empathy-password-dialog.c
+++ b/libempathy-gtk/empathy-password-dialog.c
@@ -18,7 +18,6 @@
*/
#include "config.h"
-
#include "empathy-password-dialog.h"
#include <glib/gi18n-lib.h>
diff --git a/libempathy-gtk/empathy-plist.c b/libempathy-gtk/empathy-plist.c
index ddaa97b..e1113a0 100644
--- a/libempathy-gtk/empathy-plist.c
+++ b/libempathy-gtk/empathy-plist.c
@@ -19,13 +19,12 @@
*/
#include "config.h"
+#include "empathy-plist.h"
#include <string.h>
#include <libxml/tree.h>
#include <telepathy-glib/telepathy-glib.h>
-#include "empathy-plist.h"
-
static GValue *empathy_plist_parse_node (xmlNode *a_node);
static GValue *
diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index cf2dbdf..445f79b 100644
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -25,12 +25,13 @@
*/
#include "config.h"
+#include "empathy-presence-chooser.h"
#include <glib/gi18n-lib.h>
#include "empathy-presence-manager.h"
-#include "empathy-utils.h"
#include "empathy-status-presets.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c
index 4722462..a060d9f 100644
--- a/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@ -21,14 +21,13 @@
*/
#include "config.h"
+#include "empathy-protocol-chooser.h"
#include <glib/gi18n-lib.h>
-#include "empathy-utils.h"
#include "empathy-connection-managers.h"
-
-#include "empathy-protocol-chooser.h"
#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
#include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-roster-contact.c b/libempathy-gtk/empathy-roster-contact.c
index a560f09..2db024a 100644
--- a/libempathy-gtk/empathy-roster-contact.c
+++ b/libempathy-gtk/empathy-roster-contact.c
@@ -1,13 +1,11 @@
#include "config.h"
-
-#include <glib/gi18n-lib.h>
-
#include "empathy-roster-contact.h"
-#include "empathy-utils.h"
+#include <glib/gi18n-lib.h>
#include "empathy-images.h"
#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
G_DEFINE_TYPE (EmpathyRosterContact, empathy_roster_contact, GTK_TYPE_ALIGNMENT)
diff --git a/libempathy-gtk/empathy-roster-group.c b/libempathy-gtk/empathy-roster-group.c
index 643fed5..9ca53a8 100644
--- a/libempathy-gtk/empathy-roster-group.c
+++ b/libempathy-gtk/empathy-roster-group.c
@@ -1,5 +1,4 @@
#include "config.h"
-
#include "empathy-roster-group.h"
#include <telepathy-glib/telepathy-glib.h>
diff --git a/libempathy-gtk/empathy-roster-model-aggregator.c
b/libempathy-gtk/empathy-roster-model-aggregator.c
index a81b2c2..b82fd16 100644
--- a/libempathy-gtk/empathy-roster-model-aggregator.c
+++ b/libempathy-gtk/empathy-roster-model-aggregator.c
@@ -22,11 +22,10 @@
*/
#include "config.h"
+#include "empathy-roster-model-aggregator.h"
#include <folks/folks-telepathy.h>
-#include "empathy-roster-model-aggregator.h"
-
/**
* SECTION: empathy-roster-model-aggregator
* @title: EmpathyRosterModelAggregator
diff --git a/libempathy-gtk/empathy-roster-model-manager.c b/libempathy-gtk/empathy-roster-model-manager.c
index 99c9290..e0fff03 100644
--- a/libempathy-gtk/empathy-roster-model-manager.c
+++ b/libempathy-gtk/empathy-roster-model-manager.c
@@ -22,13 +22,11 @@
*/
#include "config.h"
-
#include "empathy-roster-model-manager.h"
-#include "empathy-roster-model.h"
-
#include <glib/gi18n-lib.h>
+#include "empathy-roster-model.h"
#include "empathy-utils.h"
static void roster_model_iface_init (EmpathyRosterModelInterface *iface);
diff --git a/libempathy-gtk/empathy-roster-model.c b/libempathy-gtk/empathy-roster-model.c
index 3fd84b7..994ab98 100644
--- a/libempathy-gtk/empathy-roster-model.c
+++ b/libempathy-gtk/empathy-roster-model.c
@@ -18,7 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "config.h"
-
#include "empathy-roster-model.h"
G_DEFINE_INTERFACE (EmpathyRosterModel, empathy_roster_model, G_TYPE_OBJECT)
diff --git a/libempathy-gtk/empathy-roster-view.c b/libempathy-gtk/empathy-roster-view.c
index 336f629..657deaa 100644
--- a/libempathy-gtk/empathy-roster-view.c
+++ b/libempathy-gtk/empathy-roster-view.c
@@ -1,11 +1,9 @@
#include "config.h"
-
#include "empathy-roster-view.h"
#include <glib/gi18n-lib.h>
#include "empathy-contact-groups.h"
-
#include "empathy-roster-contact.h"
#include "empathy-roster-group.h"
#include "empathy-ui-utils.h"
diff --git a/libempathy-gtk/empathy-search-bar.c b/libempathy-gtk/empathy-search-bar.c
index cfb595c..dce1bdd 100644
--- a/libempathy-gtk/empathy-search-bar.c
+++ b/libempathy-gtk/empathy-search-bar.c
@@ -18,13 +18,12 @@
*/
#include "config.h"
+#include "empathy-search-bar.h"
#include <glib/gi18n-lib.h>
-#include "empathy-utils.h"
-
-#include "empathy-search-bar.h"
#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathySearchBar)
diff --git a/libempathy-gtk/empathy-share-my-desktop.c b/libempathy-gtk/empathy-share-my-desktop.c
index 78bf147..9c29533 100644
--- a/libempathy-gtk/empathy-share-my-desktop.c
+++ b/libempathy-gtk/empathy-share-my-desktop.c
@@ -19,12 +19,11 @@
*/
#include "config.h"
+#include "empathy-share-my-desktop.h"
#define DEBUG_FLAG EMPATHY_DEBUG_SHARE_DESKTOP
#include "empathy-debug.h"
-#include "empathy-share-my-desktop.h"
-
static void
create_tube_channel_cb (GObject *source,
GAsyncResult *result,
diff --git a/libempathy-gtk/empathy-smiley-manager.c b/libempathy-gtk/empathy-smiley-manager.c
index 77ea5b3..2e8ef3a 100644
--- a/libempathy-gtk/empathy-smiley-manager.c
+++ b/libempathy-gtk/empathy-smiley-manager.c
@@ -21,10 +21,10 @@
*/
#include "config.h"
-
-#include "empathy-utils.h"
#include "empathy-smiley-manager.h"
+
#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
typedef struct _SmileyManagerTree SmileyManagerTree;
diff --git a/libempathy-gtk/empathy-sound-manager.c b/libempathy-gtk/empathy-sound-manager.c
index a66e5f4..600816f 100644
--- a/libempathy-gtk/empathy-sound-manager.c
+++ b/libempathy-gtk/empathy-sound-manager.c
@@ -18,16 +18,16 @@
*/
#include "config.h"
-
#include "empathy-sound-manager.h"
#include <glib/gi18n-lib.h>
-#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "empathy-debug.h"
#include "empathy-gsettings.h"
#include "empathy-utils.h"
+#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
+#include "empathy-debug.h"
+
typedef struct {
EmpathySound sound_id;
const char * event_ca_id;
diff --git a/libempathy-gtk/empathy-spell.c b/libempathy-gtk/empathy-spell.c
index 409b41b..27f27f9 100644
--- a/libempathy-gtk/empathy-spell.c
+++ b/libempathy-gtk/empathy-spell.c
@@ -22,6 +22,7 @@
*/
#include "config.h"
+#include "empathy-spell.h"
#include <glib/gi18n-lib.h>
@@ -29,11 +30,10 @@
#include <enchant.h>
#endif
-#include "empathy-spell.h"
+#include "empathy-gsettings.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include "empathy-debug.h"
-#include "empathy-gsettings.h"
#ifdef HAVE_ENCHANT
diff --git a/libempathy-gtk/empathy-status-preset-dialog.c b/libempathy-gtk/empathy-status-preset-dialog.c
index 91c8160..b122f28 100644
--- a/libempathy-gtk/empathy-status-preset-dialog.c
+++ b/libempathy-gtk/empathy-status-preset-dialog.c
@@ -35,18 +35,17 @@
*/
#include "config.h"
+#include "empathy-status-preset-dialog.h"
#include <glib/gi18n-lib.h>
-#include "empathy-utils.h"
#include "empathy-status-presets.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include "empathy-debug.h"
-#include "empathy-ui-utils.h"
-#include "empathy-status-preset-dialog.h"
-
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyStatusPresetDialog)
G_DEFINE_TYPE (EmpathyStatusPresetDialog, empathy_status_preset_dialog, GTK_TYPE_DIALOG);
diff --git a/libempathy-gtk/empathy-status-preset-dialog.h b/libempathy-gtk/empathy-status-preset-dialog.h
index 5cf0e33..5de6071 100644
--- a/libempathy-gtk/empathy-status-preset-dialog.h
+++ b/libempathy-gtk/empathy-status-preset-dialog.h
@@ -29,6 +29,7 @@
#define __EMPATHY_STATUS_PRESET_DIALOG_H__
#include <glib.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-string-parser.c b/libempathy-gtk/empathy-string-parser.c
index cb7d3c3..7cbd290 100644
--- a/libempathy-gtk/empathy-string-parser.c
+++ b/libempathy-gtk/empathy-string-parser.c
@@ -19,8 +19,8 @@
*/
#include "config.h"
-
#include "empathy-string-parser.h"
+
#include "empathy-smiley-manager.h"
#include "empathy-ui-utils.h"
diff --git a/libempathy-gtk/empathy-subscription-dialog.c b/libempathy-gtk/empathy-subscription-dialog.c
index 9f8af52..8788326 100644
--- a/libempathy-gtk/empathy-subscription-dialog.c
+++ b/libempathy-gtk/empathy-subscription-dialog.c
@@ -19,14 +19,13 @@
*/
#include "config.h"
-
#include "empathy-subscription-dialog.h"
-#include "empathy-utils.h"
-#include "empathy-individual-widget.h"
-
#include <glib/gi18n-lib.h>
+#include "empathy-individual-widget.h"
+#include "empathy-utils.h"
+
G_DEFINE_TYPE (EmpathySubscriptionDialog, empathy_subscription_dialog, GTK_TYPE_MESSAGE_DIALOG)
enum
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 851d7ad..31715c3 100644
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -20,18 +20,17 @@
*/
#include "config.h"
+#include "empathy-theme-adium.h"
#include <glib/gi18n-lib.h>
#include "empathy-gsettings.h"
-#include "empathy-time.h"
-#include "empathy-utils.h"
-
-#include "empathy-theme-adium.h"
+#include "empathy-images.h"
+#include "empathy-plist.h"
#include "empathy-smiley-manager.h"
+#include "empathy-time.h"
#include "empathy-ui-utils.h"
-#include "empathy-plist.h"
-#include "empathy-images.h"
+#include "empathy-utils.h"
#include "empathy-webkit-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CHAT
diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c
index 461aca3..d921372 100644
--- a/libempathy-gtk/empathy-theme-manager.c
+++ b/libempathy-gtk/empathy-theme-manager.c
@@ -21,15 +21,13 @@
*/
#include "config.h"
+#include "empathy-theme-manager.h"
#include <string.h>
-
#include <gtk/gtk.h>
#include "empathy-gsettings.h"
-#include "empathy-theme-manager.h"
-
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include "empathy-debug.h"
diff --git a/libempathy-gtk/empathy-tls-dialog.c b/libempathy-gtk/empathy-tls-dialog.c
index ee4a943..def31d2 100644
--- a/libempathy-gtk/empathy-tls-dialog.c
+++ b/libempathy-gtk/empathy-tls-dialog.c
@@ -19,15 +19,15 @@
*/
#include "config.h"
-
#include "empathy-tls-dialog.h"
#include <glib/gi18n-lib.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 (EmpathyTLSDialog, empathy_tls_dialog,
GTK_TYPE_MESSAGE_DIALOG)
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 1cadaf4..86edb3b 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -30,20 +30,20 @@
*/
#include "config.h"
+#include "empathy-ui-utils.h"
#include <X11/Xatom.h>
#include <gdk/gdkx.h>
#include <glib/gi18n-lib.h>
#include <gio/gdesktopappinfo.h>
-#include "empathy-ui-utils.h"
+#include "empathy-ft-factory.h"
#include "empathy-images.h"
#include "empathy-live-search.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include "empathy-debug.h"
-#include "empathy-utils.h"
-#include "empathy-ft-factory.h"
void
empathy_gtk_init (void)
diff --git a/libempathy-gtk/empathy-user-info.c b/libempathy-gtk/empathy-user-info.c
index 0bbb576..e63f320 100644
--- a/libempathy-gtk/empathy-user-info.c
+++ b/libempathy-gtk/empathy-user-info.c
@@ -22,14 +22,14 @@
#include <glib/gi18n-lib.h>
-#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include "empathy-debug.h"
-#include "empathy-time.h"
-#include "empathy-utils.h"
-
#include "empathy-avatar-chooser.h"
#include "empathy-calendar-button.h"
#include "empathy-contactinfo-utils.h"
+#include "empathy-time.h"
+#include "empathy-utils.h"
+
+#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
+#include "empathy-debug.h"
G_DEFINE_TYPE (EmpathyUserInfo, empathy_user_info, GTK_TYPE_GRID)
diff --git a/libempathy-gtk/empathy-webkit-utils.c b/libempathy-gtk/empathy-webkit-utils.c
index d221e5f..0fc3190 100644
--- a/libempathy-gtk/empathy-webkit-utils.c
+++ b/libempathy-gtk/empathy-webkit-utils.c
@@ -19,13 +19,13 @@
*/
#include "config.h"
+#include "empathy-webkit-utils.h"
#include <glib/gi18n-lib.h>
-#include "empathy-webkit-utils.h"
#include "empathy-smiley-manager.h"
-#include "empathy-ui-utils.h"
#include "empathy-theme-adium.h"
+#include "empathy-ui-utils.h"
#define BORING_DPI_DEFAULT 96
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index 1a1391e..064d4d2 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 92a59da..cba4607 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 1e603e9..6e66911 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 7a6532f..3f18286 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 dcc72d5..32bb4ce 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 1c8fc58..3976099 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 83e15f1..763715f 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 6f2cd8c..b94ac12 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 7fb0249..81a1b31 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 181b287..0be1c81 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 3c91e63..3561044 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 09573c3..75900f4 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 9cf9001..855ddb9 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 30711c7..96c8e47 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 3659b37..3797300 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 f3c7565..71960b5 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 3c2a315..3f53a49 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 e0bc84f..e01116e 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 5457f23..75eb016 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 837b2d5..e7872f1 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 e19f69b..1115edd 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 c00ae52..21f703b 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 cdc45fb..1c288fb 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 d7b53c8..c5f693f 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 303bf9e..a6829c4 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 b9b908e..b18d1a7 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 78be2f0..34c3147 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 1de36d8..0e651f0 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 cbb6b3b..d14f2c4 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 00447cc..fcbc559 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 e15a8c4..4711aff 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 a57dd63..7e17b70 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 f63a151..6032d36 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 f62d1e5..962246f 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
diff --git a/src/empathy-about-dialog.c b/src/empathy-about-dialog.c
index 2480d75..bd6b2f8 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 <glib/gi18n.h>
-#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 f84f28d..ccbaab9 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 39d094d..e4a4a66 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 <glib.h>
+#include <telepathy-glib/telepathy-glib.h>
+
+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 421357c..27f41d3 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 <glib/gi18n-lib.h>
-#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 0cf4c95..8e9ce98 100644
--- a/src/empathy-accounts.c
+++ b/src/empathy-accounts.c
@@ -25,6 +25,7 @@
*/
#include "config.h"
+#include "empathy-accounts.h"
#include <glib/gi18n.h>
@@ -32,10 +33,9 @@
#include <cheese-gtk.h>
#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 0147b87..985a1fa 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 <gst/audio/streamvolume.h>
@@ -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 bdb25f8..bc3aa50 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 <gst/audio/streamvolume.h>
@@ -26,11 +27,9 @@
#include <gst/interfaces/streamvolume.h>
#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 e1f9ec5..f7a0037 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 <pulse/pulseaudio.h>
-#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 6da4656..be5b13a 100644
--- a/src/empathy-auth-client.c
+++ b/src/empathy-auth-client.c
@@ -22,21 +22,19 @@
#include "config.h"
#include <glib/gi18n.h>
+#include <gnutls/gnutls.h>
-#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 <gnutls/gnutls.h>
+#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 865aeac..60700ac 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 174fbf4..c400fc2 100644
--- a/src/empathy-call-factory.h
+++ b/src/empathy-call-factory.h
@@ -22,6 +22,7 @@
#define __EMPATHY_CALL_FACTORY_H__
#include <glib-object.h>
+#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
diff --git a/src/empathy-call-handler.c b/src/empathy-call-handler.c
index 28e8cda..1c4939a 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 <telepathy-farstream/telepathy-farstream.h>
-#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 2a60f6f..41e9bdf 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 <glib/gi18n-lib.h>
#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 6da478f..e6dca48 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 9b67bba..979d7e3 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 <glib/gi18n.h>
-
#include <telepathy-farstream/telepathy-farstream.h>
-
#include <farstream/fs-element-added-notifier.h>
#include <farstream/fs-utils.h>
+#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 9fccb56..8a55496 100644
--- a/src/empathy-call.c
+++ b/src/empathy-call.c
@@ -23,7 +23,6 @@
#include "config.h"
#include <glib/gi18n.h>
-
#include <clutter-gtk/clutter-gtk.h>
#include <clutter-gst/clutter-gst.h>
@@ -31,10 +30,9 @@
#include <X11/Xlib.h>
#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 0674e70..8dc037b 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 bc64cef..89f230d 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 <telepathy-glib/proxy-subclass.h>
#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 47f588f..9dafa5f 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 <gtk/gtk.h>
#include <glib/gi18n.h>
-#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 cfd82a1..8c59559 100644
--- a/src/empathy-chat-window.h
+++ b/src/empathy-chat-window.h
@@ -29,10 +29,10 @@
#include <glib-object.h>
#include <gtk/gtk.h>
-
#include <telepathy-glib/telepathy-glib.h>
#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 9919b6e..e6e8b1b 100644
--- a/src/empathy-chat.c
+++ b/src/empathy-chat.c
@@ -23,17 +23,14 @@
#include "config.h"
#include <glib/gi18n.h>
-
#include <libnotify/notify.h>
+#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 ff45bed..553c912 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 <glib/gi18n.h>
-#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 546e174..6cc6009 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 <glib/gi18n.h>
#include <libsoup/soup.h>
-#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 42bb43e..5269bcf 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 <glib-object.h>
#include <gtk/gtk.h>
+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 ca348f3..abb73ac 100644
--- a/src/empathy-debugger.c
+++ b/src/empathy-debugger.c
@@ -21,9 +21,8 @@
#include <glib/gi18n.h>
-#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 c0b802d..a017185 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 <glib/gi18n.h>
-#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 9098250..18e05dc 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 <glib/gi18n.h>
-#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 ea1ce18..5e6fa8d 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 <glib/gi18n-lib.h>
-#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 2211664..92adb86 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 <glib/gstdio.h>
#include <dbus/dbus-protocol.h>
#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 718c7d1..c382336 100644
--- a/src/empathy-import-utils.c
+++ b/src/empathy-import-utils.c
@@ -19,11 +19,12 @@
* Cosimo Cecchi <cosimo cecchi collabora co uk>
*/
-#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 68a71d5..a572ad0 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 <glib/gi18n-lib.h>
+#include "empathy-import-dialog.h"
#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
-#include <glib/gi18n-lib.h>
+#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 225350e..508706f 100644
--- a/src/empathy-import-widget.h
+++ b/src/empathy-import-widget.h
@@ -26,9 +26,9 @@
#define __EMPATHY_IMPORT_WIDGET_H__
#include <glib-object.h>
+#include <gtk/gtk.h>
#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 f78052f..e562dc5 100644
--- a/src/empathy-invite-participant-dialog.c
+++ b/src/empathy-invite-participant-dialog.c
@@ -10,14 +10,12 @@
*/
#include "config.h"
-
-#include <glib/gi18n.h>
-
#include "empathy-invite-participant-dialog.h"
-#include "empathy-utils.h"
+#include <glib/gi18n.h>
#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 0c6ed23..612ff34 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 afc526f..90d1088 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 <gtk/gtk.h>
#include <pulse/glib-mainloop.h>
-#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 4ad4a28..6d54548 100644
--- a/src/empathy-mic-monitor.h
+++ b/src/empathy-mic-monitor.h
@@ -20,7 +20,7 @@
#define __EMPATHY_MIC_MONITOR_H__
#include <glib-object.h>
-
+#include <gio/gio.h>
#include <pulse/pulseaudio.h>
G_BEGIN_DECLS
diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c
index cca729d..f0b6ec6 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 <glib/gi18n.h>
-#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 02bf3b2..9f7796d 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 <glib-object.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/src/empathy-notifications-approver.c b/src/empathy-notifications-approver.c
index 7e06da1..fb36f2a 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 <glib/gi18n.h>
-#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 735ba21..c2be935 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -24,18 +24,16 @@
*/
#include "config.h"
+#include "empathy-preferences.h"
#include <glib/gi18n.h>
#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 2f64d87..c09094e 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 <sys/stat.h>
#include <glib/gi18n.h>
-#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 038cb49..89e3144 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 67c0e27..810fa0d 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 <math.h>
-#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 7ac7d04..46c0b21 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 025c9b8..5af3ff4 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 <libaccounts-glib/ag-account-service.h>
#include <libaccounts-glib/ag-manager.h>
#include <libaccounts-glib/ag-service.h>
+
+#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 b40ebed..917fab3 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 ca21af8..44a0b12 100644
--- a/src/empathy-status-icon.h
+++ b/src/empathy-status-icon.h
@@ -23,6 +23,7 @@
#define __EMPATHY_STATUS_ICON_H__
#include <glib.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/src/empathy-video-src.c b/src/empathy-video-src.c
index b3b84d3..9856efe 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 <gst/video/colorbalance.h>
@@ -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 610150b..a8f23e8 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -23,31 +23,28 @@
#include <glib/gstdio.h>
#include <glib/gi18n.h>
+#include <libnotify/notify.h>
#ifdef HAVE_LIBCHAMPLAIN
#include <clutter-gtk/clutter-gtk.h>
#endif
-#include <libnotify/notify.h>
-
+#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"
diff --git a/tests/empathy-chatroom-manager-test.c b/tests/empathy-chatroom-manager-test.c
index e6e8258..323bbb9 100644
--- a/tests/empathy-chatroom-manager-test.c
+++ b/tests/empathy-chatroom-manager-test.c
@@ -2,11 +2,9 @@
#include <stdio.h>
#include <string.h>
#include <glib/gstdio.h>
-
#include <telepathy-glib/telepathy-glib.h>
#include "empathy-chatroom-manager.h"
-
#include "test-helper.h"
#define CHATROOM_SAMPLE "chatrooms-sample.xml"
diff --git a/tests/empathy-chatroom-test.c b/tests/empathy-chatroom-test.c
index 4a0f655..a64fd2c 100644
--- a/tests/empathy-chatroom-test.c
+++ b/tests/empathy-chatroom-test.c
@@ -3,7 +3,6 @@
#include <string.h>
#include "test-helper.h"
-
#include "empathy-chatroom.h"
#if 0
diff --git a/tests/empathy-irc-network-manager-test.c b/tests/empathy-irc-network-manager-test.c
index 9a3c46a..7fb195f 100644
--- a/tests/empathy-irc-network-manager-test.c
+++ b/tests/empathy-irc-network-manager-test.c
@@ -3,10 +3,9 @@
#include <string.h>
#include <glib/gstdio.h>
-#include "test-irc-helper.h"
-#include "test-helper.h"
-
#include "empathy-irc-network-manager.h"
+#include "test-helper.h"
+#include "test-irc-helper.h"
#define GLOBAL_SAMPLE "default-irc-networks-sample.xml"
#define USER_SAMPLE "user-irc-networks-sample.xml"
diff --git a/tests/empathy-irc-network-test.c b/tests/empathy-irc-network-test.c
index d22e04f..5ca4fba 100644
--- a/tests/empathy-irc-network-test.c
+++ b/tests/empathy-irc-network-test.c
@@ -2,10 +2,9 @@
#include <stdio.h>
#include <string.h>
-#include "test-irc-helper.h"
-#include "test-helper.h"
-
#include "empathy-irc-network.h"
+#include "test-helper.h"
+#include "test-irc-helper.h"
static void
test_empathy_irc_network_new (void)
diff --git a/tests/empathy-irc-server-test.c b/tests/empathy-irc-server-test.c
index 291a34d..225d57b 100644
--- a/tests/empathy-irc-server-test.c
+++ b/tests/empathy-irc-server-test.c
@@ -2,10 +2,9 @@
#include <stdio.h>
#include <string.h>
-#include "test-irc-helper.h"
-#include "test-helper.h"
-
#include "empathy-irc-server.h"
+#include "test-helper.h"
+#include "test-irc-helper.h"
static void
test_empathy_irc_server_new (void)
diff --git a/tests/empathy-live-search-test.c b/tests/empathy-live-search-test.c
index 0934fe4..10f0346 100644
--- a/tests/empathy-live-search-test.c
+++ b/tests/empathy-live-search-test.c
@@ -4,13 +4,12 @@
#include <stdio.h>
#include <string.h>
+#include "empathy-live-search.h"
#include "test-helper.h"
#define DEBUG_FLAG EMPATHY_DEBUG_TESTS
#include "empathy-debug.h"
-#include "empathy-live-search.h"
-
typedef struct
{
const gchar *string;
diff --git a/tests/empathy-parser-test.c b/tests/empathy-parser-test.c
index 24cd5d6..0cf0374 100644
--- a/tests/empathy-parser-test.c
+++ b/tests/empathy-parser-test.c
@@ -3,16 +3,14 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include "empathy-string-parser.h"
#include "test-helper.h"
-#include <telepathy-glib/telepathy-glib.h>
-
#define DEBUG_FLAG EMPATHY_DEBUG_TESTS
#include "empathy-debug.h"
-#include "empathy-string-parser.h"
-
static void
test_replace_match (const gchar *text,
gssize len,
diff --git a/tests/empathy-tls-test.c b/tests/empathy-tls-test.c
index 03cc9d7..3e5706c 100644
--- a/tests/empathy-tls-test.c
+++ b/tests/empathy-tls-test.c
@@ -1,19 +1,16 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-
-#include "empathy-tls-verifier.h"
-#include "test-helper.h"
-#include "mock-pkcs11.h"
-
#include <gcr/gcr.h>
-
#include <gnutls/gnutls.h>
-
#include <telepathy-glib/telepathy-glib.h>
#include <telepathy-glib/svc-tls.h>
#include <telepathy-glib/svc-generic.h>
+#include "empathy-tls-verifier.h"
+#include "mock-pkcs11.h"
+#include "test-helper.h"
+
#define MOCK_TLS_CERTIFICATE_PATH "/mock/certificate"
/* Forward decl */
diff --git a/tests/interactive/empathy-logs.c b/tests/interactive/empathy-logs.c
index 4a440f9..613bf75 100644
--- a/tests/interactive/empathy-logs.c
+++ b/tests/interactive/empathy-logs.c
@@ -19,15 +19,16 @@
* Authors: Xavier Claessens <xclaesse gmail com>
*/
-#include <config.h>
+#include "config.h"
+
#include <stdlib.h>
#include <glib.h>
#include <gtk/gtk.h>
#include "empathy-debug.h"
-#include "empathy-utils.h"
#include "empathy-log-window.h"
#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
static void
destroy_cb (GtkWidget *dialog,
diff --git a/tests/interactive/test-empathy-account-chooser.c
b/tests/interactive/test-empathy-account-chooser.c
index 8a4d08f..159f8fc 100644
--- a/tests/interactive/test-empathy-account-chooser.c
+++ b/tests/interactive/test-empathy-account-chooser.c
@@ -1,9 +1,9 @@
-#include <config.h>
+#include "config.h"
#include <gtk/gtk.h>
-#include "empathy-ui-utils.h"
#include "empathy-account-chooser.h"
+#include "empathy-ui-utils.h"
static void
filter_func (TpAccount *account,
diff --git a/tests/interactive/test-empathy-contact-blocking-dialog.c
b/tests/interactive/test-empathy-contact-blocking-dialog.c
index d4a7693..185f4e9 100644
--- a/tests/interactive/test-empathy-contact-blocking-dialog.c
+++ b/tests/interactive/test-empathy-contact-blocking-dialog.c
@@ -19,14 +19,13 @@
* Authors: Danielle Madeley <danielle madeley collabora co uk>
*/
-#include <config.h>
+#include "config.h"
#include <gtk/gtk.h>
#include "empathy-client-factory.h"
-
-#include "empathy-ui-utils.h"
#include "empathy-contact-blocking-dialog.h"
+#include "empathy-ui-utils.h"
static void
am_prepare_cb (GObject *source,
diff --git a/tests/interactive/test-empathy-dual-roster-view.c
b/tests/interactive/test-empathy-dual-roster-view.c
index d7c54a6..74bb59f 100644
--- a/tests/interactive/test-empathy-dual-roster-view.c
+++ b/tests/interactive/test-empathy-dual-roster-view.c
@@ -1,8 +1,7 @@
-#include <config.h>
+#include "config.h"
#include "empathy-roster-model.h"
#include "empathy-roster-model-manager.h"
-
#include "empathy-roster-view.h"
#include "empathy-ui-utils.h"
diff --git a/tests/interactive/test-empathy-presence-chooser.c
b/tests/interactive/test-empathy-presence-chooser.c
index 5710fb1..208c9a1 100644
--- a/tests/interactive/test-empathy-presence-chooser.c
+++ b/tests/interactive/test-empathy-presence-chooser.c
@@ -20,14 +20,13 @@
* Authors: Davyd Madeley <davyd madeley collabora co uk>
*/
-#include <config.h>
+#include "config.h"
#include <gtk/gtk.h>
+#include "empathy-presence-chooser.h"
#include "empathy-status-presets.h"
-
#include "empathy-ui-utils.h"
-#include "empathy-presence-chooser.h"
int
main (int argc, char **argv)
diff --git a/tests/interactive/test-empathy-protocol-chooser.c
b/tests/interactive/test-empathy-protocol-chooser.c
index f91cb12..ca548a8 100644
--- a/tests/interactive/test-empathy-protocol-chooser.c
+++ b/tests/interactive/test-empathy-protocol-chooser.c
@@ -1,9 +1,9 @@
-#include <config.h>
+#include "config.h"
#include <gtk/gtk.h>
-#include "empathy-ui-utils.h"
#include "empathy-protocol-chooser.h"
+#include "empathy-ui-utils.h"
int
main (int argc,
diff --git a/tests/interactive/test-empathy-roster-model-aggregator.c
b/tests/interactive/test-empathy-roster-model-aggregator.c
index bb31950..478b4e6 100644
--- a/tests/interactive/test-empathy-roster-model-aggregator.c
+++ b/tests/interactive/test-empathy-roster-model-aggregator.c
@@ -1,8 +1,7 @@
-#include <config.h>
+#include "config.h"
-#include "empathy-roster-model.h"
#include "empathy-roster-model-aggregator.h"
-
+#include "empathy-roster-model.h"
#include "empathy-roster-view.h"
#include "empathy-ui-utils.h"
diff --git a/tests/interactive/test-empathy-roster-view.c b/tests/interactive/test-empathy-roster-view.c
index ff5de0f..f814d96 100644
--- a/tests/interactive/test-empathy-roster-view.c
+++ b/tests/interactive/test-empathy-roster-view.c
@@ -1,8 +1,7 @@
-#include <config.h>
+#include "config.h"
#include "empathy-roster-model.h"
#include "empathy-roster-model-manager.h"
-
#include "empathy-roster-view.h"
#include "empathy-ui-utils.h"
diff --git a/tests/interactive/test-empathy-status-preset-dialog.c
b/tests/interactive/test-empathy-status-preset-dialog.c
index db9cd36..2494d78 100644
--- a/tests/interactive/test-empathy-status-preset-dialog.c
+++ b/tests/interactive/test-empathy-status-preset-dialog.c
@@ -22,14 +22,13 @@
* Will Thompson <will thompson collabora co uk>
*/
-#include <config.h>
+#include "config.h"
#include <gtk/gtk.h>
+#include "empathy-status-preset-dialog.h"
#include "empathy-status-presets.h"
-
#include "empathy-ui-utils.h"
-#include "empathy-status-preset-dialog.h"
int
main (int argc, char **argv)
diff --git a/tests/mock-pkcs11.c b/tests/mock-pkcs11.c
index 4b1219f..997b331 100644
--- a/tests/mock-pkcs11.c
+++ b/tests/mock-pkcs11.c
@@ -19,13 +19,10 @@
*/
#include "config.h"
-
#include "mock-pkcs11.h"
#include <gcr/gcr.h>
-
#include <glib.h>
-
#include <string.h>
/*
diff --git a/tests/test-helper.c b/tests/test-helper.c
index f6fc0ff..8d7be5f 100644
--- a/tests/test-helper.c
+++ b/tests/test-helper.c
@@ -17,6 +17,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
+#include "test-helper.h"
+
#include <stdlib.h>
#include <glib.h>
#include <glib-object.h>
@@ -24,8 +27,6 @@
#include "empathy-ui-utils.h"
-#include "test-helper.h"
-
void
test_init (int argc,
char **argv)
diff --git a/tests/test-irc-helper.c b/tests/test-irc-helper.c
index ade247f..6fafac8 100644
--- a/tests/test-irc-helper.c
+++ b/tests/test-irc-helper.c
@@ -1,3 +1,4 @@
+#include "config.h"
#include "test-irc-helper.h"
void
diff --git a/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.c
b/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.c
index 439bbda..761e221 100644
--- a/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.c
+++ b/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.c
@@ -1,13 +1,10 @@
#include "config.h"
+#include "empathy-webcredentials-monitor.h"
#include <gio/gio.h>
-
#include <telepathy-glib/telepathy-glib.h>
-
#include <libaccounts-glib/ag-account.h>
-#include "empathy-webcredentials-monitor.h"
-
G_DEFINE_TYPE (EmpathyWebcredentialsMonitor, empathy_webcredentials_monitor, G_TYPE_OBJECT)
#define WEBCRED_BUS_NAME "com.canonical.indicators.webcredentials"
diff --git a/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c
b/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c
index 8919065..0607b9e 100644
--- a/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c
+++ b/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c
@@ -20,12 +20,10 @@
#include "mcp-account-manager-uoa.h"
#include <telepathy-glib/telepathy-glib.h>
-
#include <libaccounts-glib/ag-account.h>
#include <libaccounts-glib/ag-account-service.h>
#include <libaccounts-glib/ag-manager.h>
#include <libaccounts-glib/ag-service.h>
-
#include <string.h>
#include <ctype.h>
diff --git a/ubuntu-online-accounts/mc-plugin/mission-control-plugin.c
b/ubuntu-online-accounts/mc-plugin/mission-control-plugin.c
index d7a33fd..3e61dc3 100644
--- a/ubuntu-online-accounts/mc-plugin/mission-control-plugin.c
+++ b/ubuntu-online-accounts/mc-plugin/mission-control-plugin.c
@@ -22,6 +22,8 @@
* Authors: Xavier Claessens <xavier claessens collabora co uk>
*/
+#include "config.h"
+
#include <mission-control-plugins/mission-control-plugins.h>
#include "mcp-account-manager-uoa.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
