diff options
Diffstat (limited to 'libempathy-gtk')
75 files changed, 175 insertions, 218 deletions
diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c index a272309e5..e6f4367c9 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 72a7b2ffd..0dd67ea7c 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 e0647a9b8..e86cec417 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 7545efb11..b76078d5c 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 fb4ab8bf4..0751b24a4 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 30022c9df..19314fe59 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 dc82c0571..1636e2896 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 f66827f64..f61c1b236 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 9429a2874..65f088ecd 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 228a1497a..5cdb90d1e 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 b47e5b59d..9cbb178f0 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 86cea89d7..ca96a423a 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 44fce09e5..cbcfdce89 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 12fca684e..7e342d819 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 6a8fe72ee..bdbf1cb09 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 9887b7128..8653fae80 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 afefb2af5..44bbd7eab 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 f853fb3be..ed0d27cc8 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 93f317f2a..ddcbcf315 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 d1368e956..dd81dde41 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 fd594e8c3..2696f5abb 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 fd4d783be..80a1aafb4 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 3dca3740d..38f64375a 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 bddf42bf2..792241fd8 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 340d6fc07..6c85c7971 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 1562001fb..452952bb8 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 8b6665167..d1a6febfa 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 9f0117753..ce03d0a28 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 457dd9575..dbd01c970 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 f4f8bda92..2b8d64bd3 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 907c678b3..e70146bf7 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 5db93d5f1..16134a61c 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 2cc6b5be4..07cc096ee 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 ca0628717..d080242ea 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 4055091f1..3ebe35a6b 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 d02d3dea2..87fa3d966 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 371ddb1b0..a267a7d79 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 78502ef83..d7c24a68d 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 cb937daa5..60945aed6 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 4945bb7c1..fab6a3a3f 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 8e4339cf9..fc3cc1fb3 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 3047612b0..51f6a2e07 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 dea29762d..f0f6aefec 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 bb6dfa6da..3a97c94cf 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 1f091f62d..3650a33c3 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 f8f76905a..48554fc3e 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 09f41a4e8..ed9242b58 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 61b3870de..7dda2f9e8 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 7308d1472..366147259 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 b322ac7f9..033557e81 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 e06a72495..ef03061a6 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 ddaa97b7f..e1113a073 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 cf2dbdf77..445f79b63 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 4722462fe..a060d9f7e 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 a560f0953..2db024a3d 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 643fed526..9ca53a8e9 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 a81b2c254..b82fd1620 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 99c929006..e0fff03e9 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 3fd84b7fc..994ab9896 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 336f629c7..657deaa96 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 cfb595c27..dce1bdd1b 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 78bf1472d..9c29533c7 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 77ea5b33d..2e8ef3aa5 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 a66e5f4cf..600816f67 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 409b41bd5..27f27f902 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 91c816076..b122f287e 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 5cf0e3397..5de6071e3 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 cb7d3c3e1..7cbd290f3 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 9f8af521d..878832657 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 851d7ad40..31715c305 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 461aca35b..d921372ab 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 ee4a943db..def31d224 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 1cadaf417..86edb3b0a 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 0bbb57652..e63f320fe 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 d221e5f98..0fc319088 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 |