Commit 0d137b74 authored by Emanuele Aina's avatar Emanuele Aina

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
parent 4d8ed19e
......@@ -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)
......
......@@ -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"
......
......@@ -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"
......
......@@ -19,7 +19,6 @@
*/
#include "config.h"
#include "empathy-account-selector-dialog.h"
enum
......
......@@ -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
......
......@@ -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 {
......
......@@ -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"
......
......@@ -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"
......
......@@ -26,6 +26,7 @@
#include <gio/gio.h>
#include <gtk/gtk.h>
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
......
......@@ -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
......
......@@ -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 ())
......
......@@ -18,7 +18,6 @@
*/
#include "config.h"
#include "empathy-bad-password-dialog.h"
#include <glib/gi18n-lib.h>
......
......@@ -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)
......
......@@ -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"
......
......@@ -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
......
......@@ -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 */
......
......@@ -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
......
......@@ -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;
......
......@@ -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 {
......
......@@ -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
......
......@@ -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"
......
......@@ -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);
......
......@@ -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"
......
......@@ -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"
......
......@@ -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 *
......
......@@ -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)
......
......@@ -20,7 +20,6 @@
*/
#include "config.h"
#include "empathy-dialpad-widget.h"
#include "empathy-dialpad-button.h"
......
......@@ -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"
......
......@@ -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
......
......@@ -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;
......
......@@ -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)
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -24,7 +24,6 @@
*/
#include "config.h"
#include "empathy-individual-store-manager.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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,
......