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

diff --git a/goa-mc-plugin/mcp-account-manager-goa.c b/goa-mc-plugin/mcp-account-manager-goa.c
index 41eb8f6ebc9e6c469132b040944bc402e4303be1..4af7828a347ed265042681a881fa376cf4fc6272 100644 (file)
--- 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 "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>
 
 #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)
 
 #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 4065305605280d0230e1a5c8cdc03690182023cb..3431d0ec86c899eaa4db063d2ee9a622025c755e 100644 (file)
--- 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>
  */
 
  *    Danielle Madeley <danielle.madeley@collabora.co.uk>
  */
 

+#include "config.h"
+

 #include <mission-control-plugins/mission-control-plugins.h>
 
 #include "mcp-account-manager-goa.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 a272309e589f222fdcaf9832b568d2eba9d03722..e6f4367c9eda828ccc8a37eecfd1fb50de3ef6ae 100644 (file)
--- a/libempathy-gtk/empathy-account-chooser.c
+++ b/libempathy-gtk/empathy-account-chooser.c
@@ -22,11 +22,11 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-account-chooser.h"

 
 #include <glib/gi18n-lib.h>
 
 #include "empathy-ui-utils.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"
 
 #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 72a7b2ffd84f86a81d6decd467861d2ee3bb99f3..0dd67ea7cf84d4391d5a2deff18fd6b2700b3f43 100644 (file)
--- a/libempathy-gtk/empathy-account-selector-dialog.c
+++ b/libempathy-gtk/empathy-account-selector-dialog.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-account-selector-dialog.h"
 
 enum
 #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 e0647a9b850a43f7ec0d65116f9b3134c49ec135..e86cec41721ba9a5487bb6b6ab7606446cd1dbd1 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-irc.c
+++ b/libempathy-gtk/empathy-account-widget-irc.c
@@ -19,9 +19,9 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-account-widget-irc.h"

 
 #include "empathy-account-widget-private.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
 #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 7545efb11e9ab4e4a7649ba3bf9c84da55aa0e18..b76078d5cb4b3b42073bb9b160e70dad70450f57 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-sip.c
+++ b/libempathy-gtk/empathy-account-widget-sip.c
@@ -20,11 +20,11 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-account-widget-sip.h"

 
 #include <glib/gi18n-lib.h>
 
 #include "empathy-account-widget-private.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 {
 #include "empathy-ui-utils.h"
 
 typedef struct {

diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index fb4ab8bf4b0a4a619ee5331977576e57cc394942..0751b24a499a67d686c875306179af9b2929bf82 100644 (file)
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -25,17 +25,17 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-account-widget.h"
+#include "empathy-account-widget-private.h"

 
 #include <glib/gi18n-lib.h>
 
 #include <glib/gi18n-lib.h>

-
-#include "empathy-utils.h"
-

 #include <dbus/dbus-protocol.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-private.h"
 #include "empathy-account-widget-sip.h"

-#include "empathy-account-widget-irc.h"

 #include "empathy-ui-utils.h"
 #include "empathy-ui-utils.h"

+#include "empathy-utils.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include "empathy-debug.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 30022c9df7505123b043527396774535c8c6a871..19314fe5952c6963408599ef408125acce25fb4a 100644 (file)
--- a/libempathy-gtk/empathy-avatar-chooser.c
+++ b/libempathy-gtk/empathy-avatar-chooser.c
@@ -21,20 +21,19 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-avatar-chooser.h"

 
 #include <glib/gi18n-lib.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-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"
 #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"
 
 #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 dc82c0571c4718b33da86aa99c83e9b652e63ce5..1636e289648ac721d8180a02b6e38511bb112442 100644 (file)
--- 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 <gio/gio.h>
 #include <gtk/gtk.h>

+#include <telepathy-glib/telepathy-glib.h>

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

diff --git a/libempathy-gtk/empathy-avatar-image.c b/libempathy-gtk/empathy-avatar-image.c
index f66827f641906f969e6b80eb17a0e715105d2c6a..f61c1b236892eec98018fe8a38dbc8a022a07638 100644 (file)
--- a/libempathy-gtk/empathy-avatar-image.c
+++ b/libempathy-gtk/empathy-avatar-image.c
@@ -22,13 +22,13 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-avatar-image.h"

 
 #include <glib/gi18n-lib.h>
 #include <gdk/gdkx.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-ui-utils.h"

+#include "empathy-utils.h"

 
 /**
  * SECTION:empathy-avatar-image
 
 /**
  * SECTION:empathy-avatar-image

diff --git a/libempathy-gtk/empathy-avatar-image.h b/libempathy-gtk/empathy-avatar-image.h
index 9429a28748f7144c46b22ae9849589de449eac13..65f088ecddbcbce6ddf3aab214096b8fe2138c1d 100644 (file)
--- a/libempathy-gtk/empathy-avatar-image.h
+++ b/libempathy-gtk/empathy-avatar-image.h
@@ -26,6 +26,8 @@
 
 #include <gtk/gtk.h>
 
 
 #include <gtk/gtk.h>
 

+#include "empathy-contact.h"
+

 G_BEGIN_DECLS
 
 #define EMPATHY_TYPE_AVATAR_IMAGE         (empathy_avatar_image_get_type ())
 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 228a1497a0d04d183fba17c9e87df19348963ed8..5cdb90d1eeadbfcb7e671c6d280abcb26627fadb 100644 (file)
--- a/libempathy-gtk/empathy-bad-password-dialog.c
+++ b/libempathy-gtk/empathy-bad-password-dialog.c
@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-bad-password-dialog.h"
 
 #include <glib/gi18n-lib.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 b47e5b59d3afdcc796bf4da49c3e07a0658a84e8..9cbb178f0cf877f40b535b8720846da94c2541ad 100644 (file)
--- a/libempathy-gtk/empathy-base-password-dialog.c
+++ b/libempathy-gtk/empathy-base-password-dialog.c
@@ -18,14 +18,14 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-base-password-dialog.h"
 
 #include <glib/gi18n-lib.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"
 #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)
 
 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 86cea89d76790b1f0b77bed7284dd6487a3e63de..ca96a423a3e664a3b0361125c8340d995be19e22 100644 (file)
--- a/libempathy-gtk/empathy-calendar-button.c
+++ b/libempathy-gtk/empathy-calendar-button.c
@@ -18,11 +18,10 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-calendar-button.h"

 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

-#include "empathy-calendar-button.h"
-

 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER_THING
 #include "empathy-debug.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 44fce09e5855882977d1a3d89a03c39a93d79627..cbcfdce8949c1cf9576fdbd57d606ef2ddf4f126 100644 (file)
--- a/libempathy-gtk/empathy-call-utils.c
+++ b/libempathy-gtk/empathy-call-utils.c
@@ -19,15 +19,12 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-call-utils.h"

 
 #include <glib/gi18n-lib.h>
 
 #include <glib/gi18n-lib.h>

-

 #include <gtk/gtk.h>
 #include <gtk/gtk.h>

-

 #include <telepathy-glib/telepathy-glib.h>
 
 #include <telepathy-glib/telepathy-glib.h>
 

-#include "empathy-call-utils.h"
-

 #include "empathy-request-util.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #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 12fca684e132323e1f31d7e63814b1626fdd9d34..7e342d819f70d8e12dcb3e07c55c758e1be2ef90 100644 (file)
--- 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__
 
 #ifndef __EMPATHY_CALL_UTILS_H__
 #define __EMPATHY_CALL_UTILS_H__
 

+#include <glib.h>
+#include <telepathy-glib/telepathy-glib.h>
+

 G_BEGIN_DECLS
 
 /* Calls */
 G_BEGIN_DECLS
 
 /* Calls */

diff --git a/libempathy-gtk/empathy-cell-renderer-activatable.c b/libempathy-gtk/empathy-cell-renderer-activatable.c
index 6a8fe72eeed55e3d72a0b03b8f9a20bb605372f3..bdbf1cb095ed0a67149aa4bd20946b059c312cd0 100644 (file)
--- a/libempathy-gtk/empathy-cell-renderer-activatable.c
+++ b/libempathy-gtk/empathy-cell-renderer-activatable.c
@@ -21,11 +21,10 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-cell-renderer-activatable.h"

 
 #include "empathy-utils.h"
 
 
 #include "empathy-utils.h"
 

-#include "empathy-cell-renderer-activatable.h"
-

 enum {
   PATH_ACTIVATED,
   LAST_SIGNAL
 enum {
   PATH_ACTIVATED,
   LAST_SIGNAL

diff --git a/libempathy-gtk/empathy-cell-renderer-expander.c b/libempathy-gtk/empathy-cell-renderer-expander.c
index 9887b7128bf3a626cb9467c372e63dbf85519c24..8653fae80551a0fb5ec969ebf74effb052f0d11e 100644 (file)
--- 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>
  */
 
  * Authors: Kristian Rietveld <kris@imendio.com>
  */
 

-#include "empathy-utils.h"
+#include "config.h"

 #include "empathy-cell-renderer-expander.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;
 #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 afefb2af566e22803c957d4653d4e3f5f722cd12..44bbd7eabd9ec9d48212c96930159194674a1a55 100644 (file)
--- a/libempathy-gtk/empathy-cell-renderer-text.c
+++ b/libempathy-gtk/empathy-cell-renderer-text.c
@@ -22,9 +22,9 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-cell-renderer-text.h"

 
 #include "empathy-utils.h"
 
 #include "empathy-utils.h"

-#include "empathy-cell-renderer-text.h"

 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCellRendererText)
 typedef struct {
 
 #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 f853fb3be468bc8fd4bcb4e332beaeeeac2a166c..ed0d27cc877dbbf6bcb706e1cc878822add7fc02 100644 (file)
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -26,29 +26,29 @@
  *          Xavier Claessens <xclaesse@gmail.com>
  */
 
  *          Xavier Claessens <xclaesse@gmail.com>
  */
 

-#include "config.h"

 /* for GCompletion */
 #define GLIB_DISABLE_DEPRECATION_WARNINGS 1
 
 /* for GCompletion */
 #define GLIB_DISABLE_DEPRECATION_WARNINGS 1
 

+#include "config.h"
+#include "empathy-chat.h"
+

 #include <glib/gi18n-lib.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-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-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-search-bar.h"

-#include "empathy-theme-manager.h"

 #include "empathy-smiley-manager.h"
 #include "empathy-smiley-manager.h"

-#include "empathy-ui-utils.h"
+#include "empathy-spell.h"

 #include "empathy-string-parser.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
 #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 93f317f2a063ccc8647b1d6f49def1d4e5b64a48..ddcbcf315391d6aad98276435fe1480a9aa8596b 100644 (file)
--- 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>
  */
  *
  * Authors: Danielle Madeley <danielle.madeley@collabora.co.uk>
  */

+

 #include "config.h"
 #include "config.h"

+#include "empathy-contact-blocking-dialog.h"

 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

-#include "empathy-utils.h"
-

 #include "empathy-account-chooser.h"
 #include "empathy-ui-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"
 
 #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 d1368e95612dfababb12972387825fcf45140959..dd81dde419c38e5c11ad9b8a1c11f8a4abeed3a1 100644 (file)
--- a/libempathy-gtk/empathy-contact-chooser.c
+++ b/libempathy-gtk/empathy-contact-chooser.c
@@ -10,15 +10,13 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-contact-chooser.h"
 
 #include "empathy-contact-chooser.h"
 

-#include "empathy-utils.h"

 #include "empathy-client-factory.h"
 #include "empathy-client-factory.h"

-

 #include "empathy-individual-store-manager.h"
 #include "empathy-individual-view.h"
 #include "empathy-ui-utils.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);
 
 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 fd594e8c3c4c67fae164efe6863bc66040595e7e..2696f5abbeb2fdb9a8af808e434745175bbeae2d 100644 (file)
--- 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>
  */
  *     Danielle Madeley <danielle.madeley@collabora.co.uk>
  *     Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
  */

+

 #include "config.h"
 #include "config.h"

+#include "empathy-contact-search-dialog.h"

 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

-#include "empathy-utils.h"
-#include "empathy-client-factory.h"
-

 #include "empathy-account-chooser.h"
 #include "empathy-account-chooser.h"

-#include "empathy-cell-renderer-text.h"

 #include "empathy-cell-renderer-activatable.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-images.h"

+#include "empathy-individual-information-dialog.h"
+#include "empathy-utils.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.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 fd4d783be182e4f722ca07b32f08d727bbefa291..80a1aafb4e699a4119eaca36dff2cb8c2595e337 100644 (file)
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -20,17 +20,16 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-contact-widget.h"

 
 #include <glib/gi18n-lib.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-avatar-image.h"

+#include "empathy-client-factory.h"

 #include "empathy-groups-widget.h"
 #include "empathy-groups-widget.h"

-#include "empathy-ui-utils.h"

 #include "empathy-string-parser.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"
 
 #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 3dca3740ddd46f063788c3d7f81069917c3f150c..38f64375aa6efd14293582bdf0c3bbf56e6276f1 100644 (file)
--- a/libempathy-gtk/empathy-contactinfo-utils.c
+++ b/libempathy-gtk/empathy-contactinfo-utils.c
@@ -21,14 +21,13 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-contactinfo-utils.h"

 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

-#include "empathy-time.h"

 #include "empathy-request-util.h"
 #include "empathy-request-util.h"

-
-#include "empathy-contactinfo-utils.h"

 #include "empathy-string-parser.h"
 #include "empathy-string-parser.h"

+#include "empathy-time.h"

 #include "empathy-ui-utils.h"
 
 static gchar *
 #include "empathy-ui-utils.h"
 
 static gchar *

diff --git a/libempathy-gtk/empathy-dialpad-button.c b/libempathy-gtk/empathy-dialpad-button.c
index bddf42bf290c9bce6ed3fdd8a083b01566b53f9a..792241fd8739d743a633228de303294ffd4107fb 100644 (file)
--- 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>
  */
 
  *          Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
  */
 

-

 #include "config.h"
 #include "config.h"

-

 #include "empathy-dialpad-button.h"
 
 G_DEFINE_TYPE (EmpathyDialpadButton, empathy_dialpad_button, GTK_TYPE_BUTTON)
 #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 340d6fc07b07f9dd263f104a35ef658d03ea92a6..6c85c7971e6eb58016185afec364a6a844921864 100644 (file)
--- a/libempathy-gtk/empathy-dialpad-widget.c
+++ b/libempathy-gtk/empathy-dialpad-widget.c
@@ -20,7 +20,6 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-dialpad-widget.h"
 
 #include "empathy-dialpad-button.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 1562001fb0c9e19a3e6920585399a2d003fc60ee..452952bb8fe119e5dc8b5cbfbe14e330da5c226a 100644 (file)
--- a/libempathy-gtk/empathy-geometry.c
+++ b/libempathy-gtk/empathy-geometry.c
@@ -22,12 +22,12 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-geometry.h"

 
 #include <sys/stat.h>
 
 
 #include <sys/stat.h>
 

-#include "empathy-utils.h"
-#include "empathy-geometry.h"

 #include "empathy-ui-utils.h"
 #include "empathy-ui-utils.h"

+#include "empathy-utils.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.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 8b66651678fba857f85a5c21ae00ca13000612bd..d1a6febfade8829a1539ee2a1431781567e7e817 100644 (file)
--- a/libempathy-gtk/empathy-groups-widget.c
+++ b/libempathy-gtk/empathy-groups-widget.c
@@ -20,14 +20,13 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-groups-widget.h"

 
 #include <glib/gi18n-lib.h>
 
 #include "empathy-utils.h"
 #include "empathy-connection-aggregator.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
 /**
  * SECTION:empathy-groups-widget
  * @title:EmpathyGroupsWidget

diff --git a/libempathy-gtk/empathy-individual-dialogs.c b/libempathy-gtk/empathy-individual-dialogs.c
index 9f0117753712a3da74abad42e249b943707e732a..ce03d0a284fe85ebeb04e26446102874608b6daf 100644 (file)
--- a/libempathy-gtk/empathy-individual-dialogs.c
+++ b/libempathy-gtk/empathy-individual-dialogs.c
@@ -20,15 +20,14 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-individual-dialogs.h"

 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

+#include "empathy-contact-widget.h"

 #include "empathy-individual-manager.h"
 #include "empathy-utils.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;
 #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 457dd95752f0288b26bbc5e48f77e5217e43407b..dbd01c970d24d8205f97636c41992623cab3fe7a 100644 (file)
--- a/libempathy-gtk/empathy-individual-edit-dialog.c
+++ b/libempathy-gtk/empathy-individual-edit-dialog.c
@@ -21,13 +21,12 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-individual-edit-dialog.h"

 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

-#include "empathy-utils.h"
-
-#include "empathy-individual-edit-dialog.h"

 #include "empathy-individual-widget.h"
 #include "empathy-individual-widget.h"

+#include "empathy-utils.h"

 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualEditDialog)
 
 
 #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 f4f8bda928c46161804b3a6c8ad005a054980c33..2b8d64bd3d85166920ea87b381a4afa6da290b09 100644 (file)
--- a/libempathy-gtk/empathy-individual-information-dialog.c
+++ b/libempathy-gtk/empathy-individual-information-dialog.c
@@ -22,16 +22,15 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-individual-information-dialog.h"

 
 #include <glib/gi18n-lib.h>
 
 #include "empathy-individual-manager.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-individual-widget.h"

+#include "empathy-pkg-kit.h"

 #include "empathy-ui-utils.h"
 #include "empathy-ui-utils.h"

+#include "empathy-utils.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include "empathy-debug.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 907c678b363a676d53a75dc66d5b7d0724fa73da..e70146bf76349a439ad271875781687954da4d2e 100644 (file)
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -21,27 +21,27 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-individual-menu.h"

 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

+#include "empathy-account-selector-dialog.h"
+#include "empathy-call-utils.h"

 #include "empathy-camera-monitor.h"
 #include "empathy-camera-monitor.h"

-#include "empathy-request-util.h"
-#include "empathy-individual-manager.h"

 #include "empathy-chatroom-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-images.h"

-#include "empathy-log-window.h"

 #include "empathy-individual-dialogs.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-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-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"
 
 #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 5db93d5f17fd4a16cbd52eec661fd27886da0a00..16134a61c0c4e1c9056e7dcb9be314dcd5bfe061 100644 (file)
--- a/libempathy-gtk/empathy-individual-store-channel.c
+++ b/libempathy-gtk/empathy-individual-store-channel.c
@@ -24,11 +24,10 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-individual-store-channel.h"

 
 #include "empathy-utils.h"
 
 
 #include "empathy-utils.h"
 

-#include "empathy-individual-store-channel.h"
-

 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include "empathy-debug.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 2cc6b5be440bbd108d9b1250dd6980a7067a4fd6..07cc096ee26117e8b0729f504ce8a694dbd9a362 100644 (file)
--- 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>
 #define __EMPATHY_INDIVIDUAL_STORE_CHANNEL_H__
 
 #include <gtk/gtk.h>

+#include <telepathy-glib/telepathy-glib.h>

 
 #include "empathy-individual-store.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 ca0628717c98dac7034610167765752547836ad4..d080242ea360bcfc14bc0e971ed87c7e6331f1bd 100644 (file)
--- a/libempathy-gtk/empathy-individual-store-manager.c
+++ b/libempathy-gtk/empathy-individual-store-manager.c
@@ -24,7 +24,6 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-individual-store-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #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 4055091f1f5697f02494432bceed7d57c74310fc..3ebe35a6b03552f61bb1e4166270263d8a7596f0 100644 (file)
--- a/libempathy-gtk/empathy-individual-store.c
+++ b/libempathy-gtk/empathy-individual-store.c
@@ -25,13 +25,13 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-individual-store.h"

 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

-#include "empathy-utils.h"
-
-#include "empathy-ui-utils.h"

 #include "empathy-gtk-enum-types.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"
 
 #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 d02d3dea2d033a82a3267965b7da0153fa3d0ed5..87fa3d966d30d28bdc5908eb4c076b5df742e790 100644 (file)
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -25,22 +25,22 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-individual-view.h"

 
 #include <glib/gi18n-lib.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-connection-aggregator.h"

-#include "empathy-individual-manager.h"

 #include "empathy-contact-groups.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-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-ui-utils.h"

-#include "empathy-gtk-enum-types.h"
+#include "empathy-utils.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include "empathy-debug.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 371ddb1b05437e32f02735654f586f2ea0f20110..a267a7d79ed175727ce3817eb1f610ffc9ba8981 100644 (file)
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -20,6 +20,7 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-individual-widget.h"

 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 


@@ -28,15 +29,14 @@
 #include <champlain-gtk/champlain-gtk.h>
 #endif
 
 #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-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-ui-utils.h"

+#include "empathy-utils.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include "empathy-debug.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 78502ef83fe76567f108fd73d30d0263b6d0cab1..d7c24a68dc4a54e89b4c84f4311334f21df58e14 100644 (file)
--- 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>
  */
 
  *          Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
  */
 

+#include "config.h"

 #include "empathy-input-text-view.h"
 
 G_DEFINE_TYPE (EmpathyInputTextView, empathy_input_text_view,
 #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 cb937daa5d235e280bf5dfee073f4fb5ce537c88..60945aed6cef5057a541c866e448a3b08bfa06d2 100644 (file)
--- 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 "config.h"

+#include "empathy-irc-network-chooser-dialog.h"

 
 #include <glib/gi18n-lib.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-dialog.h"

+#include "empathy-irc-network-manager.h"

 #include "empathy-live-search.h"
 #include "empathy-live-search.h"

+#include "empathy-utils.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
 #include "empathy-debug.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 4945bb7c174cd87fd07751f30fc0f4ec8ae4f1ec..fab6a3a3f05a4eb8b9192ee5ab9f7d7a86ac7ea3 100644 (file)
--- a/libempathy-gtk/empathy-irc-network-chooser.c
+++ b/libempathy-gtk/empathy-irc-network-chooser.c
@@ -20,18 +20,16 @@
  */
 
 #include "config.h"
  */
 
 #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-irc-network-manager.h"

-

 #include "empathy-ui-utils.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"
 
 
 #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
 #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 8e4339cf9909e30d182eb415243e1d9ff521f4d4..fc3cc1fb3ea5e3fef481e9160cfb13423b5c6935 100644 (file)
--- a/libempathy-gtk/empathy-irc-network-dialog.c
+++ b/libempathy-gtk/empathy-irc-network-dialog.c
@@ -19,16 +19,14 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-irc-network-dialog.h"

 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

-#include "empathy-utils.h"
-

 #include "empathy-ui-utils.h"
 #include "empathy-ui-utils.h"

+#include "empathy-utils.h"

 #include "totem-subtitle-encoding.h"
 
 #include "totem-subtitle-encoding.h"
 

-#include "empathy-irc-network-dialog.h"
-

 typedef struct {
   EmpathyIrcNetwork *network;
 
 typedef struct {
   EmpathyIrcNetwork *network;
 

diff --git a/libempathy-gtk/empathy-live-search.c b/libempathy-gtk/empathy-live-search.c
index 3047612b03c7764fcaa767c9ee37ae289b3b2a82..51f6a2e07d7ac7abedc10c99e8a0cd1df726803c 100644 (file)
--- a/libempathy-gtk/empathy-live-search.c
+++ b/libempathy-gtk/empathy-live-search.c
@@ -22,11 +22,10 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-live-search.h"

 
 #include "empathy-utils.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)
 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 dea29762d9e73f37c00d2cfa50a2d6f4859adb12..f0f6aefecbc0a072e8cbcfca748145d8a5004f5b 100644 (file)
--- 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 <glib/gi18n-lib.h>
 

-#include "empathy-utils.h"
-

 #include "empathy-account-widget.h"
 #include "empathy-ui-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"
 
 #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 bb6dfa6da3ef165b4d2c31a61a721da4e4d39987..3a97c94cf49009b50dcd5f48e0fd00447c3441da 100644 (file)
--- a/libempathy-gtk/empathy-location-manager.c
+++ b/libempathy-gtk/empathy-location-manager.c
@@ -20,11 +20,10 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-location-manager.h"

 
 #include <geoclue/geoclue-master.h>
 
 
 #include <geoclue/geoclue-master.h>
 

-#include "empathy-location-manager.h"
-

 #include "empathy-gsettings.h"
 #include "empathy-location.h"
 #include "empathy-time.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 1f091f62d9eda6d117978e145b2b6bfd19c51b76..3650a33c3a04a619d98064ddf4cdc4c4f1bf5ffe 100644 (file)
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -23,29 +23,26 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-log-window.h"

 
 #include <glib/gi18n-lib.h>
 
 #include <glib/gi18n-lib.h>

-#include <webkit/webkit.h>
-

 #include <telepathy-glib/proxy-subclass.h>
 #include <telepathy-glib/proxy-subclass.h>

-
-#include "extensions.h"
+#include <webkit/webkit.h>

 
 #include "action-chain-internal.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-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-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-theme-manager.h"
 #include "empathy-ui-utils.h"

+#include "empathy-utils.h"

 #include "empathy-webkit-utils.h"
 #include "empathy-webkit-utils.h"

-#include "empathy-geometry.h"
+#include "extensions.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.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 f8f76905af9d356db55c358a39f2a13c25398dec..48554fc3eafb637e9c2866febd2f610227c2ec86 100644 (file)
--- 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__
 
 #ifndef __EMPATHY_LOG_WINDOW_H__
 #define __EMPATHY_LOG_WINDOW_H__
 

+#include <gtk/gtk.h>

 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 #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 09f41a4e8b154dbf34733fba408fb64b0d499a80..ed9242b58f8b9fd6bd0e3a789667963afb66ae1f 100644 (file)
--- 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>
 
 
 #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"
 
 #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)
 
 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 61b3870de48f30c1c89e11a36590ff884d6b25d6..7dda2f9e87ede95bf17c6574be06966a7630e0e9 100644 (file)
--- a/libempathy-gtk/empathy-new-call-dialog.c
+++ b/libempathy-gtk/empathy-new-call-dialog.c
@@ -19,22 +19,20 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-new-call-dialog.h"

 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

+#include "empathy-call-utils.h"

 #include "empathy-camera-monitor.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-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,
 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 7308d147225b58ddf23c2b9a5cf56efe01614f11..3661472591a8ffd665affefba407c14a4ae79e8c 100644 (file)
--- a/libempathy-gtk/empathy-new-message-dialog.c
+++ b/libempathy-gtk/empathy-new-message-dialog.c
@@ -19,19 +19,17 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-new-message-dialog.h"

 
 #include <glib/gi18n-lib.h>
 
 #include "empathy-request-util.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-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;
 
 
 static EmpathyNewMessageDialog *dialog_singleton = NULL;
 

diff --git a/libempathy-gtk/empathy-notify-manager.c b/libempathy-gtk/empathy-notify-manager.c
index b322ac7f94f942f5180ea3a4aecff0b0d04a08df..033557e8148cea4b8eacc5eb06bed998091bde8e 100644 (file)
--- a/libempathy-gtk/empathy-notify-manager.c
+++ b/libempathy-gtk/empathy-notify-manager.c
@@ -18,19 +18,17 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-notify-manager.h"

 
 #include <libnotify/notify.h>
 
 #include "empathy-gsettings.h"
 
 #include <libnotify/notify.h>
 
 #include "empathy-gsettings.h"

-#include "empathy-utils.h"
-

 #include "empathy-ui-utils.h"
 #include "empathy-ui-utils.h"

+#include "empathy-utils.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.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
 #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 e06a724955a06d08fafcb8372821e5bb432f82d1..ef03061a6dafbf488002b3a1a9a2d2d4c1975aac 100644 (file)
--- a/libempathy-gtk/empathy-password-dialog.c
+++ b/libempathy-gtk/empathy-password-dialog.c
@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-password-dialog.h"
 
 #include <glib/gi18n-lib.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 ddaa97b7ff7d429b5d27a8915059359bba6cdb63..e1113a073f91d69fa4aec1d71587b4ca5091d251 100644 (file)
--- a/libempathy-gtk/empathy-plist.c
+++ b/libempathy-gtk/empathy-plist.c
@@ -19,13 +19,12 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-plist.h"

 
 #include <string.h>
 #include <libxml/tree.h>
 #include <telepathy-glib/telepathy-glib.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 *
 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 cf2dbdf7712708904203a8625d7a1c255a48dcb4..445f79b639add4cef90a092a237c4259495d3acf 100644 (file)
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -25,12 +25,13 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-presence-chooser.h"

 
 #include <glib/gi18n-lib.h>
 
 #include "empathy-presence-manager.h"
 
 #include <glib/gi18n-lib.h>
 
 #include "empathy-presence-manager.h"

-#include "empathy-utils.h"

 #include "empathy-status-presets.h"
 #include "empathy-status-presets.h"

+#include "empathy-utils.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.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 4722462fe14dd34f4be1170b88f95dd987a18ed8..a060d9f7ec4059613490bb2e4a9dee6766c00d40 100644 (file)
--- a/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@ -21,14 +21,13 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-protocol-chooser.h"

 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

-#include "empathy-utils.h"

 #include "empathy-connection-managers.h"
 #include "empathy-connection-managers.h"

-
-#include "empathy-protocol-chooser.h"

 #include "empathy-ui-utils.h"
 #include "empathy-ui-utils.h"

+#include "empathy-utils.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include "empathy-debug.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 a560f09534285ce5b880efee83106e545308d5ce..2db024a3d8a9a5283483a4794dc60c3e89a264aa 100644 (file)
--- a/libempathy-gtk/empathy-roster-contact.c
+++ b/libempathy-gtk/empathy-roster-contact.c
@@ -1,13 +1,11 @@
 #include "config.h"
 #include "config.h"

-
-#include <glib/gi18n-lib.h>
-

 #include "empathy-roster-contact.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-images.h"
 #include "empathy-ui-utils.h"

+#include "empathy-utils.h"

 
 G_DEFINE_TYPE (EmpathyRosterContact, empathy_roster_contact, GTK_TYPE_ALIGNMENT)
 
 
 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 643fed5266dd215e6dea5a7b37d40384409fbdfb..9ca53a8e955ba7986c71f10e77079be04122a5a7 100644 (file)
--- a/libempathy-gtk/empathy-roster-group.c
+++ b/libempathy-gtk/empathy-roster-group.c
@@ -1,5 +1,4 @@
 #include "config.h"
 #include "config.h"

-

 #include "empathy-roster-group.h"
 
 #include <telepathy-glib/telepathy-glib.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 a81b2c254cdf92a239fb3626b256e0fca3177b6b..b82fd16201dd300d60ed9d9bcd43a8b972d62ab0 100644 (file)
--- a/libempathy-gtk/empathy-roster-model-aggregator.c
+++ b/libempathy-gtk/empathy-roster-model-aggregator.c
@@ -22,11 +22,10 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-roster-model-aggregator.h"

 
 #include <folks/folks-telepathy.h>
 
 
 #include <folks/folks-telepathy.h>
 

-#include "empathy-roster-model-aggregator.h"
-

 /**
  * SECTION: empathy-roster-model-aggregator
  * @title: EmpathyRosterModelAggregator
 /**
  * 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 99c929006c490968832714dac7fdd0bc267ae68b..e0fff03e9a3957d9257e665a24946285930066ca 100644 (file)
--- a/libempathy-gtk/empathy-roster-model-manager.c
+++ b/libempathy-gtk/empathy-roster-model-manager.c
@@ -22,13 +22,11 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-roster-model-manager.h"
 
 #include "empathy-roster-model-manager.h"
 

-#include "empathy-roster-model.h"
-

 #include <glib/gi18n-lib.h>
 
 #include <glib/gi18n-lib.h>
 

+#include "empathy-roster-model.h"

 #include "empathy-utils.h"
 
 static void roster_model_iface_init (EmpathyRosterModelInterface *iface);
 #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 3fd84b7fcfd4d7b82806f247796208e90a193008..994ab9896435704e67196468d7a48ebce9d3b410 100644 (file)
--- 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"
  * 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)
 #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 336f629c7b95eefab22467486e162818cbb1f465..657deaa96c3c5e06c29716622f0b247943796c28 100644 (file)
--- a/libempathy-gtk/empathy-roster-view.c
+++ b/libempathy-gtk/empathy-roster-view.c
@@ -1,11 +1,9 @@
 #include "config.h"
 #include "config.h"

-

 #include "empathy-roster-view.h"
 
 #include <glib/gi18n-lib.h>
 
 #include "empathy-contact-groups.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"
 #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 cfb595c2792264e5970f0456a0f661aa77bde336..dce1bdd1b25713986a54a33a7a364da5a819d0ed 100644 (file)
--- a/libempathy-gtk/empathy-search-bar.c
+++ b/libempathy-gtk/empathy-search-bar.c
@@ -18,13 +18,12 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-search-bar.h"

 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

-#include "empathy-utils.h"
-
-#include "empathy-search-bar.h"

 #include "empathy-ui-utils.h"
 #include "empathy-ui-utils.h"

+#include "empathy-utils.h"

 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathySearchBar)
 
 
 #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 78bf1472d433ccadba24f099fd33d1d8d2124315..9c29533c7d8e2a00bee4c58d4698c452176f22c2 100644 (file)
--- a/libempathy-gtk/empathy-share-my-desktop.c
+++ b/libempathy-gtk/empathy-share-my-desktop.c
@@ -19,12 +19,11 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-share-my-desktop.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_SHARE_DESKTOP
 #include "empathy-debug.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,
 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 77ea5b33db4bebaad83ffbaf470d49773df018da..2e8ef3aa58140f057f77bf38f3a64375b8916959 100644 (file)
--- a/libempathy-gtk/empathy-smiley-manager.c
+++ b/libempathy-gtk/empathy-smiley-manager.c
@@ -21,10 +21,10 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-
-#include "empathy-utils.h"

 #include "empathy-smiley-manager.h"
 #include "empathy-smiley-manager.h"

+

 #include "empathy-ui-utils.h"
 #include "empathy-ui-utils.h"

+#include "empathy-utils.h"

 
 typedef struct _SmileyManagerTree SmileyManagerTree;
 
 
 typedef struct _SmileyManagerTree SmileyManagerTree;
 

diff --git a/libempathy-gtk/empathy-sound-manager.c b/libempathy-gtk/empathy-sound-manager.c
index a66e5f4cf5d64c1d3aefc82b93c6ee8caa054a7a..600816f67ed9bfbdf77ceed7a7db09fb75a92b96 100644 (file)
--- a/libempathy-gtk/empathy-sound-manager.c
+++ b/libempathy-gtk/empathy-sound-manager.c
@@ -18,16 +18,16 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-sound-manager.h"
 
 #include <glib/gi18n-lib.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"
 
 #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;
 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 409b41bd53f02624333990b0c2f904484b4082d8..27f27f902f034f0b05a4a27db803a7b8db63f2c9 100644 (file)
--- a/libempathy-gtk/empathy-spell.c
+++ b/libempathy-gtk/empathy-spell.c
@@ -22,6 +22,7 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-spell.h"

 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 


@@ -29,11 +30,10 @@
 #include <enchant.h>
 #endif
 
 #include <enchant.h>
 #endif
 

-#include "empathy-spell.h"
+#include "empathy-gsettings.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"

-#include "empathy-gsettings.h"

 
 #ifdef HAVE_ENCHANT
 
 
 #ifdef HAVE_ENCHANT
 

diff --git a/libempathy-gtk/empathy-status-preset-dialog.c b/libempathy-gtk/empathy-status-preset-dialog.c
index 91c8160762ec8e39e8cc46dfceac6d8d8f62688e..b122f287ed659b8f15c6159201a9d70c0a353adc 100644 (file)
--- a/libempathy-gtk/empathy-status-preset-dialog.c
+++ b/libempathy-gtk/empathy-status-preset-dialog.c
@@ -35,18 +35,17 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-status-preset-dialog.h"

 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

-#include "empathy-utils.h"

 #include "empathy-status-presets.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"
 
 
 #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);
 #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 5cf0e3397593631f7ffe2332d91423ee6397fb4a..5de6071e34a09466c274d9d48f87856fa0fb0076 100644 (file)
--- 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>
 #define __EMPATHY_STATUS_PRESET_DIALOG_H__
 
 #include <glib.h>

+#include <gtk/gtk.h>

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

diff --git a/libempathy-gtk/empathy-string-parser.c b/libempathy-gtk/empathy-string-parser.c
index cb7d3c3e191a89e135a2ab90cbbf07fe96891738..7cbd290f3ee34a593b7ea1aee5a05fd277e7a76c 100644 (file)
--- a/libempathy-gtk/empathy-string-parser.c
+++ b/libempathy-gtk/empathy-string-parser.c
@@ -19,8 +19,8 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-string-parser.h"
 #include "empathy-string-parser.h"

+

 #include "empathy-smiley-manager.h"
 #include "empathy-ui-utils.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 9f8af521d8c0f7fcfc63960b4329a5fe3f590134..878832657c02b2f7c698926061501b002efa4dc2 100644 (file)
--- a/libempathy-gtk/empathy-subscription-dialog.c
+++ b/libempathy-gtk/empathy-subscription-dialog.c
@@ -19,14 +19,13 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-subscription-dialog.h"
 
 #include "empathy-subscription-dialog.h"
 

-#include "empathy-utils.h"
-#include "empathy-individual-widget.h"
-

 #include <glib/gi18n-lib.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
 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 851d7ad40e9e15413a0a73bcbe02e18a2360ea00..31715c305058dc99da393ff11a7f4090a7e04bfc 100644 (file)
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -20,18 +20,17 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-theme-adium.h"

 
 #include <glib/gi18n-lib.h>
 
 #include "empathy-gsettings.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-smiley-manager.h"

+#include "empathy-time.h"

 #include "empathy-ui-utils.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
 #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 461aca35b37c3668679025e8aae5bb872f23e71a..d921372abe80cadec7551ab02b15ec60c9da7179 100644 (file)
--- a/libempathy-gtk/empathy-theme-manager.c
+++ b/libempathy-gtk/empathy-theme-manager.c
@@ -21,15 +21,13 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-theme-manager.h"

 
 #include <string.h>
 
 #include <string.h>

-

 #include <gtk/gtk.h>
 
 #include "empathy-gsettings.h"
 
 #include <gtk/gtk.h>
 
 #include "empathy-gsettings.h"
 

-#include "empathy-theme-manager.h"
-

 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.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 ee4a943db891f252b9a8fcec451efe73d1cdd293..def31d2245eebfa134eba81d8047f25d8f04a4f9 100644 (file)
--- a/libempathy-gtk/empathy-tls-dialog.c
+++ b/libempathy-gtk/empathy-tls-dialog.c
@@ -19,15 +19,15 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-tls-dialog.h"
 
 #include <glib/gi18n-lib.h>
 #include <gcr/gcr.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"
 #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)
 
 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 1cadaf4176fbbbce85db5747fb861dfba14a7812..86edb3b0a158cdc2a98a7363cd7ac223e875b067 100644 (file)
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -30,20 +30,20 @@
  */
 
 #include "config.h"
  */
 
 #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 <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-images.h"
 #include "empathy-live-search.h"

+#include "empathy-utils.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.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)
 
 void
 empathy_gtk_init (void)

diff --git a/libempathy-gtk/empathy-user-info.c b/libempathy-gtk/empathy-user-info.c
index 0bbb57652b216cd8b14ccf99d2e83da6857b15ec..e63f320fe9c0a9d663cc823f2db5e7a388fbbe95 100644 (file)
--- a/libempathy-gtk/empathy-user-info.c
+++ b/libempathy-gtk/empathy-user-info.c
@@ -22,14 +22,14 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #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-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)
 
 
 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 d221e5f98c07ee1e1864f46366c69e9f905fcf8c..0fc31908814ab1a3b74fb8da64ca72117197d9ce 100644 (file)
--- a/libempathy-gtk/empathy-webkit-utils.c
+++ b/libempathy-gtk/empathy-webkit-utils.c
@@ -19,13 +19,13 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-webkit-utils.h"

 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

-#include "empathy-webkit-utils.h"

 #include "empathy-smiley-manager.h"
 #include "empathy-smiley-manager.h"

-#include "empathy-ui-utils.h"

 #include "empathy-theme-adium.h"
 #include "empathy-theme-adium.h"

+#include "empathy-ui-utils.h"

 
 #define BORING_DPI_DEFAULT 96
 
 
 #define BORING_DPI_DEFAULT 96
 

diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index 1a1391e16a754d66e8173f0288ea5dff7f098d46..064d4d21580e398900cb276955dcc84d0cf3b3f5 100644 (file)
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -19,12 +19,12 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-account-settings.h"
 #include "empathy-account-settings.h"

+

 #include "empathy-connection-managers.h"
 #include "empathy-keyring.h"
 #include "empathy-connection-managers.h"
 #include "empathy-keyring.h"

-#include "empathy-utils.h"

 #include "empathy-presence-manager.h"
 #include "empathy-presence-manager.h"

+#include "empathy-utils.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include "empathy-debug.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 92a59dab28a1f8d84439e52b28df4844fa41a119..cba4607a3e44af53b9df386e1e96e69d89cf3104 100644 (file)
--- a/libempathy/empathy-auth-factory.c
+++ b/libempathy/empathy-auth-factory.c
@@ -19,11 +19,8 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-auth-factory.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"
 #include "empathy-keyring.h"
 #include "empathy-sasl-mechanisms.h"
 #include "empathy-server-sasl-handler.h"


@@ -40,6 +37,9 @@
 
 #include "extensions.h"
 
 
 #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 {
 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 1e603e9890c94fdbab1cdb5399d9a5e5ab6337de..6e6691120fd501df075be6840389d9aa2e039470 100644 (file)
--- a/libempathy/empathy-camera-monitor.c
+++ b/libempathy/empathy-camera-monitor.c
@@ -19,8 +19,8 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-camera-monitor.h"
 #include "empathy-camera-monitor.h"

+

 #include "cheese-camera-device-monitor.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #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 7a6532f3e8bdc47e473ecfe8a6b5c1663543a5e0..3f1828612fd75983c7bc172a0b19be175100b926 100644 (file)
--- a/libempathy/empathy-chatroom-manager.c
+++ b/libempathy/empathy-chatroom-manager.c
@@ -22,11 +22,11 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-chatroom-manager.h"

 
 #include <sys/stat.h>
 
 #include "empathy-client-factory.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
 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

diff --git a/libempathy/empathy-chatroom.c b/libempathy/empathy-chatroom.c
index dcc72d5f730fe3e4f8d8028ae50b58e8bf6122c7..32bb4ce30afd1a3e67cbdbcde367f167f38aab22 100644 (file)
--- a/libempathy/empathy-chatroom.c
+++ b/libempathy/empathy-chatroom.c
@@ -20,8 +20,8 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-chatroom.h"
 #include "empathy-chatroom.h"

+

 #include "empathy-utils.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyChatroom)
 #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 1c8fc58cf85ac4d6c5a1c0141c56f618ed900483..39760998c54cfad4ab36ed37b1dbb957284701e7 100644 (file)
--- a/libempathy/empathy-client-factory.c
+++ b/libempathy/empathy-client-factory.c
@@ -20,7 +20,6 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-client-factory.h"
 
 #include "empathy-tp-chat.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 83e15f15d1b8206431af5f5af016bb9172199a65..763715f9e30c618beff4a56624de645c6762c0e0 100644 (file)
--- a/libempathy/empathy-connection-aggregator.c
+++ b/libempathy/empathy-connection-aggregator.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-connection-aggregator.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #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 6f2cd8c53ab25f8b5ae2e14da7d336087f4f90c0..b94ac125375bae1785ab616cf842b76477133457 100644 (file)
--- a/libempathy/empathy-connection-managers.c
+++ b/libempathy/empathy-connection-managers.c
@@ -19,8 +19,8 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-connection-managers.h"
 #include "empathy-connection-managers.h"

+

 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #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 7fb02499f21c3dd6814b3dab3eeefae2ce8d84c3..81a1b3133f681591419f1af467e4fe0acf552959 100644 (file)
--- a/libempathy/empathy-contact-groups.c
+++ b/libempathy/empathy-contact-groups.c
@@ -21,11 +21,11 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-contact-groups.h"

 
 #include <sys/stat.h>
 
 #include "empathy-utils.h"
 
 #include <sys/stat.h>
 
 #include "empathy-utils.h"

-#include "empathy-contact-groups.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include "empathy-debug.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 181b2875303c7a7cd6a0fc5755919be9f7a52a5d..0be1c81b3279a92527051aed0ab577a8fffa3d88 100644 (file)
--- 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__
 
 #ifndef __EMPATHY_CONTACT_GROUPS_H__
 #define __EMPATHY_CONTACT_GROUPS_H__
 

-G_BEGIN_DECLS
-

 #include <glib.h>
 
 #include <glib.h>
 

+G_BEGIN_DECLS
+

 void     empathy_contact_groups_get_all     (void);
 
 gboolean empathy_contact_group_get_expanded (const gchar *group);
 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 3c91e6319573fece88a48626256abed9edd7fb96..356104434f7916546bd3a147508358ccb4313c5b 100644 (file)
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -20,6 +20,7 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-contact.h"

 
 #ifdef HAVE_GEOCODE
 #include <geocode-glib/geocode-glib.h>
 
 #ifdef HAVE_GEOCODE
 #include <geocode-glib/geocode-glib.h>

diff --git a/libempathy/empathy-debug.c b/libempathy/empathy-debug.c
index 09573c39ae5b0b099ab3881c08f8b3d34f4bbcb7..75900f4ade604882c5d59c4e56b35d971d388411 100644 (file)
--- a/libempathy/empathy-debug.c
+++ b/libempathy/empathy-debug.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-debug.h"
 
 #ifdef ENABLE_DEBUG
 #include "empathy-debug.h"
 
 #ifdef ENABLE_DEBUG

diff --git a/libempathy/empathy-ft-factory.c b/libempathy/empathy-ft-factory.c
index 9cf90014b458b14bc38ad39993572cddf54ce55d..855ddb98f549a56abd83ee229a8e6155a22195d2 100644 (file)
--- a/libempathy/empathy-ft-factory.c
+++ b/libempathy/empathy-ft-factory.c
@@ -21,7 +21,9 @@
 
 /* empathy-ft-factory.c */
 
 
 /* empathy-ft-factory.c */
 

+#include "config.h"

 #include "empathy-ft-factory.h"
 #include "empathy-ft-factory.h"

+

 #include "empathy-request-util.h"
 #include "empathy-utils.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 30711c7d1197529481e02712bd8293f8966d66a3..96c8e47f528466b4697b8b061aa97abe15280bb6 100644 (file)
--- a/libempathy/empathy-ft-handler.c
+++ b/libempathy/empathy-ft-handler.c
@@ -22,10 +22,10 @@
 /* empathy-ft-handler.c */
 
 #include "config.h"
 /* empathy-ft-handler.c */
 
 #include "config.h"

+#include "empathy-ft-handler.h"

 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

-#include "empathy-ft-handler.h"

 #include "empathy-time.h"
 #include "empathy-utils.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 3659b372863c3704defc3b31da8393b018089bc5..37973000481de96f80ab35505ee5e0eaf2094a6e 100644 (file)
--- a/libempathy/empathy-goa-auth-handler.c
+++ b/libempathy/empathy-goa-auth-handler.c
@@ -19,14 +19,15 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-goa-auth-handler.h"

 
 #define GOA_API_IS_SUBJECT_TO_CHANGE /* awesome! */
 #include <goa/goa.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"
 #define DEBUG_FLAG EMPATHY_DEBUG_SASL
 #include "empathy-debug.h"

-#include "empathy-goa-auth-handler.h"
-#include "empathy-sasl-mechanisms.h"

 
 struct _EmpathyGoaAuthHandlerPriv
 {
 
 struct _EmpathyGoaAuthHandlerPriv
 {

diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c
index f3c7565a11798a9683e48df9e08978926da5b33b..71960b5d2887d409a2049a689561b35721870d67 100644 (file)
--- a/libempathy/empathy-individual-manager.c
+++ b/libempathy/empathy-individual-manager.c
@@ -21,8 +21,8 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-individual-manager.h"
 #include "empathy-individual-manager.h"

+

 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #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 3c2a31544c9e9c933659b9208f6f988b39edf727..3f53a49ad2ab17ee00acc0e547e80935a86eda2a 100644 (file)
--- a/libempathy/empathy-irc-network-manager.c
+++ b/libempathy/empathy-irc-network-manager.c
@@ -19,11 +19,11 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-irc-network-manager.h"

 
 #include <sys/stat.h>
 
 #include "empathy-utils.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"
 
 #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 e0bc84f7d99cb1b528f778c5a88990db53d99961..e01116e960174bdda55d7849efa212202a0b3c1f 100644 (file)
--- a/libempathy/empathy-irc-network.c
+++ b/libempathy/empathy-irc-network.c
@@ -20,8 +20,8 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-irc-network.h"
 #include "empathy-irc-network.h"

+

 #include "empathy-utils.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIrcNetwork)
 #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 5457f23a1ce7a957e4e7e438ddacb32c719844b2..75eb016dd5cfb7c4d5c7d9350f168db1a3678a2b 100644 (file)
--- a/libempathy/empathy-irc-server.c
+++ b/libempathy/empathy-irc-server.c
@@ -19,8 +19,8 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-irc-server.h"
 #include "empathy-irc-server.h"

+

 #include "empathy-utils.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIrcServer)
 #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 837b2d5199df003cd6471b4a6fef046c13b594a8..e7872f1b0d10476d86467ebdee25604812d3effa 100644 (file)
--- a/libempathy/empathy-keyring.c
+++ b/libempathy/empathy-keyring.c
@@ -17,11 +17,9 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-
-#include <glib/gi18n-lib.h>
-

 #include "empathy-keyring.h"
 
 #include "empathy-keyring.h"
 

+#include <glib/gi18n-lib.h>

 #include <libsecret/secret.h>
 
 #ifdef HAVE_UOA
 #include <libsecret/secret.h>
 
 #ifdef HAVE_UOA

diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c
index e19f69b090303bbc2d9dbdb5a2549ad4d6bbbefb..1115eddda1e925d5b1d515595bafac3341d506f9 100644 (file)
--- a/libempathy/empathy-message.c
+++ b/libempathy/empathy-message.c
@@ -23,11 +23,11 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-message.h"

 
 #include <glib/gi18n-lib.h>
 
 #include "empathy-client-factory.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"
 #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 c00ae52a801721c6292a63cc6a393b4df40fcc90..21f703b68166f59ac75b7193f1ef00d9941de3c5 100644 (file)
--- a/libempathy/empathy-pkg-kit.c
+++ b/libempathy/empathy-pkg-kit.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-pkg-kit.h"
 
 typedef struct
 #include "empathy-pkg-kit.h"
 
 typedef struct

diff --git a/libempathy/empathy-presence-manager.c b/libempathy/empathy-presence-manager.c
index cdc45fbe97646e392fa8c351e902a4e3bb130c87..1c288fb98c9c47d8e702868b574dd4e4877195d3 100644 (file)
--- a/libempathy/empathy-presence-manager.c
+++ b/libempathy/empathy-presence-manager.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-presence-manager.h"
 
 #include "empathy-utils.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 d7b53c82cad6cef7bef6270afacab075b983c298..c5f693f04734c7cb9497faf1434a3418bc1d3675 100644 (file)
--- a/libempathy/empathy-request-util.c
+++ b/libempathy/empathy-request-util.c
@@ -20,7 +20,6 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-request-util.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
 #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 303bf9e3e4665d5f8f6287127a6548bb6669b7ad..a6829c4504adc508316fcd3fc30c0a8d6f7872f4 100644 (file)
--- a/libempathy/empathy-sasl-mechanisms.c
+++ b/libempathy/empathy-sasl-mechanisms.c
@@ -19,13 +19,13 @@
  */
 
 #include "config.h"
  */
 
 #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 <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"
 
 #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 b9b908ed7a4045a23d71c4d7737a867a9de11a8c..b18d1a7356d1b28da91e22934da9ca7c27caa0dc 100644 (file)
--- a/libempathy/empathy-server-sasl-handler.c
+++ b/libempathy/empathy-server-sasl-handler.c
@@ -18,15 +18,14 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-server-sasl-handler.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 "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,
 
 enum {
   PROP_CHANNEL = 1,

diff --git a/libempathy/empathy-server-tls-handler.c b/libempathy/empathy-server-tls-handler.c
index 78be2f0a7a3cfdba38f7b9e72ae4887739cd1c70..34c3147a38c32fccdbd46569f7ed0df264ce829e 100644 (file)
--- a/libempathy/empathy-server-tls-handler.c
+++ b/libempathy/empathy-server-tls-handler.c
@@ -19,15 +19,14 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-server-tls-handler.h"
 
 #include "empathy-server-tls-handler.h"
 

-#define DEBUG_FLAG EMPATHY_DEBUG_TLS
-#include "empathy-debug.h"

 #include "empathy-utils.h"
 #include "empathy-utils.h"

-

 #include "extensions.h"
 
 #include "extensions.h"
 

+#define DEBUG_FLAG EMPATHY_DEBUG_TLS
+#include "empathy-debug.h"
+

 static void async_initable_iface_init (GAsyncInitableIface *iface);
 
 enum {
 static void async_initable_iface_init (GAsyncInitableIface *iface);
 
 enum {

diff --git a/libempathy/empathy-status-presets.c b/libempathy/empathy-status-presets.c
index 1de36d81ba4b4f4c5430ae84435b9d3d1d782f19..0e651f074ccca812bd88e12f0c19038d66dc13e5 100644 (file)
--- a/libempathy/empathy-status-presets.c
+++ b/libempathy/empathy-status-presets.c
@@ -21,11 +21,11 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-status-presets.h"

 
 #include <sys/stat.h>
 
 #include "empathy-utils.h"
 
 #include <sys/stat.h>
 
 #include "empathy-utils.h"

-#include "empathy-status-presets.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"

diff --git a/libempathy/empathy-time.c b/libempathy/empathy-time.c
index cbb6b3bdb8e0dac3f34a5f35797bb8cfc7778bcc..d14f2c4cc047f1f3dd4353840c97efe24e5059fb 100644 (file)
--- a/libempathy/empathy-time.c
+++ b/libempathy/empathy-time.c
@@ -20,11 +20,10 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-time.h"

 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

-#include "empathy-time.h"
-

 /* Note: EmpathyTime is always in UTC. */
 
 gint64
 /* Note: EmpathyTime is always in UTC. */
 
 gint64

diff --git a/libempathy/empathy-tls-verifier.c b/libempathy/empathy-tls-verifier.c
index 00447cc40f931f7085edc3162f06bbbc1b4edfb9..fcbc559b3f973d93fc76eba8dfa3078e7183b73b 100644 (file)
--- a/libempathy/empathy-tls-verifier.c
+++ b/libempathy/empathy-tls-verifier.c
@@ -20,14 +20,14 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-tls-verifier.h"
 
 #include <gcr/gcr.h>
 
 #include "empathy-tls-verifier.h"
 
 #include <gcr/gcr.h>
 

+#include "empathy-utils.h"
+

 #define DEBUG_FLAG EMPATHY_DEBUG_TLS
 #include "empathy-debug.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)
 
 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 e15a8c41b8cc78ef9cf533e9b7789838506cdb26..4711affcb28454b18e6aaca42661295a2dfc7691 100644 (file)
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -19,8 +19,8 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-tp-chat.h"
 #include "empathy-tp-chat.h"

+

 #include "empathy-request-util.h"
 #include "empathy-utils.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 a57dd6335320d2de56465f14e6017d8d408bd065..7e17b70894903c3113e64ba8acaca3e98fc0cd22 100644 (file)
--- a/libempathy/empathy-uoa-auth-handler.c
+++ b/libempathy/empathy-uoa-auth-handler.c
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-uoa-auth-handler.h"

 
 #include <libaccounts-glib/ag-account.h>
 #include <libaccounts-glib/ag-account-service.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>
 
 #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-keyring.h"
 #include "empathy-utils.h"

-#include "empathy-uoa-auth-handler.h"

 #include "empathy-uoa-utils.h"
 #include "empathy-sasl-mechanisms.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;
 struct _EmpathyUoaAuthHandlerPriv
 {
   AgManager *manager;

diff --git a/libempathy/empathy-uoa-utils.c b/libempathy/empathy-uoa-utils.c
index f63a1519386a3a715decbdbe601f377b322d41fa..6032d36bd69b1645d6d2eb9f979cdae2f6fc9281 100644 (file)
--- a/libempathy/empathy-uoa-utils.c
+++ b/libempathy/empathy-uoa-utils.c
@@ -19,10 +19,10 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-uoa-utils.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include "empathy-debug.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include "empathy-debug.h"

-#include "empathy-uoa-utils.h"

 
 static AgManager *singleton = NULL;
 
 
 static AgManager *singleton = NULL;
 

diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index f62d1e5f02be243163beac6e37e6ab194df4a8c1..962246f5242ba0483ada325159839f5a05a5f18e 100644 (file)
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -27,16 +27,14 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-utils.h"

 
 #include <glib/gi18n-lib.h>
 
 #include <glib/gi18n-lib.h>

-

 #include <libxml/uri.h>
 #include <dbus/dbus-protocol.h>
 
 #include "empathy-client-factory.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 "empathy-presence-manager.h"

-

 #include "extensions.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "extensions.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

diff --git a/src/empathy-about-dialog.c b/src/empathy-about-dialog.c
index 2480d756983d958fdcb40c409c46ff94f2914cdc..bd6b2f866397ea32e9e26f60dac72fafda0b658d 100644 (file)
--- a/src/empathy-about-dialog.c
+++ b/src/empathy-about-dialog.c
@@ -23,11 +23,10 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-about-dialog.h"

 
 #include <glib/gi18n.h>
 
 
 #include <glib/gi18n.h>
 

-#include "empathy-about-dialog.h"
-

 #define WEB_SITE "http://live.gnome.org/Empathy"
 
 static const char *authors[] = {
 #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 f84f28dba3454e983b2a387e2283d6b8618d520d..ccbaab9d8042b8807464f047819d97a45c2f1db8 100644 (file)
--- a/src/empathy-accounts-common.c
+++ b/src/empathy-accounts-common.c
@@ -25,11 +25,10 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-
-#include "empathy-ui-utils.h"
-

 #include "empathy-accounts-common.h"
 #include "empathy-accounts-common.h"

+

 #include "empathy-accounts-dialog.h"
 #include "empathy-accounts-dialog.h"

+#include "empathy-ui-utils.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include "empathy-debug.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 39d094d22ae44f9b6fb3ecec9770ce0e422d7f88..e4a4a6626414547b62cc4d2c021437b4431a2eec 100644 (file)
--- 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__
 
 #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);
 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);
 
     TpAccount *account,
     GApplication *app);
 

+G_END_DECLS
+

 #endif /* __EMPATHY_ACCOUNTS_COMMON_H__ */
 #endif /* __EMPATHY_ACCOUNTS_COMMON_H__ */

diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 421357c84056dc71bd59bd396f659f08b9c6c150..27f41d37b8829224fffce0ae85f436e34a9aeb80 100644 (file)
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -25,22 +25,20 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-accounts-dialog.h"

 
 #include <glib/gi18n-lib.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-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-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"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include "empathy-debug.h"

diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c
index 0cf4c9572bf8ec8af3bc490c35b1dc79d069ce7f..8e9ce98940523adb87084c46b3c20d104f6b95f6 100644 (file)
--- a/src/empathy-accounts.c
+++ b/src/empathy-accounts.c
@@ -25,6 +25,7 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-accounts.h"

 
 #include <glib/gi18n.h>
 
 
 #include <glib/gi18n.h>
 


@@ -32,10 +33,9 @@
 #include <cheese-gtk.h>
 #endif
 
 #include <cheese-gtk.h>
 #endif
 

-#include "empathy-utils.h"
-#include "empathy-ui-utils.h"
-

 #include "empathy-accounts-common.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"
 
 #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 0147b870679d56645be19566e0391440724cd399..985a1fa36d83d8f825277b1676dc543601e40cd6 100644 (file)
--- a/src/empathy-audio-sink.c
+++ b/src/empathy-audio-sink.c
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-audio-sink.h"

 
 #ifdef HAVE_GST1
 #include <gst/audio/streamvolume.h>
 
 #ifdef HAVE_GST1
 #include <gst/audio/streamvolume.h>


@@ -27,7 +28,6 @@
 #endif
 
 #include "empathy-audio-utils.h"
 #endif
 
 #include "empathy-audio-utils.h"

-#include "empathy-audio-sink.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include "empathy-debug.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 bdb25f80c8ae459eafc39bef340590be7220937a..bc3aa50cd77fcafe345af36b2eb9ab85a78d322c 100644 (file)
--- a/src/empathy-audio-src.c
+++ b/src/empathy-audio-src.c
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-audio-src.h"

 
 #ifdef HAVE_GST1
 #include <gst/audio/streamvolume.h>
 
 #ifdef HAVE_GST1
 #include <gst/audio/streamvolume.h>


@@ -26,11 +27,9 @@
 #include <gst/interfaces/streamvolume.h>
 #endif
 
 #include <gst/interfaces/streamvolume.h>
 #endif
 

-#include "empathy-utils.h"

 #include "empathy-audio-utils.h"
 #include "empathy-audio-utils.h"

-
-#include "empathy-audio-src.h"

 #include "empathy-mic-monitor.h"
 #include "empathy-mic-monitor.h"

+#include "empathy-utils.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include "empathy-debug.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 e1f9ec56f26d6dae169cfaf6d9db08c658e1151d..f7a00378fa964132346ad174c8be3df18fbba8cc 100644 (file)
--- a/src/empathy-audio-utils.c
+++ b/src/empathy-audio-utils.c
@@ -19,11 +19,10 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-audio-utils.h"

 
 #include <pulse/pulseaudio.h>
 
 
 #include <pulse/pulseaudio.h>
 

-#include "empathy-audio-utils.h"
-

 #include "empathy-gsettings.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #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 6da465665d410399c4631580f625375c90179ffa..be5b13a0b437dfd89d054afb923850fc343af069 100644 (file)
--- a/src/empathy-auth-client.c
+++ b/src/empathy-auth-client.c
@@ -22,21 +22,19 @@
 #include "config.h"
 
 #include <glib/gi18n.h>
 #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-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-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-dialog.h"

+#include "empathy-tls-verifier.h"

 #include "empathy-ui-utils.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
 
 
 #define TIMEOUT 60
 

diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c
index 865aeace247502b7eb7a679d51c00ff082a692da..60700ac0f03edc39088d7bd1c3584b03e053ac51 100644 (file)
--- a/src/empathy-call-factory.c
+++ b/src/empathy-call-factory.c
@@ -19,12 +19,11 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-client-factory.h"
 #include "empathy-client-factory.h"

-#include "empathy-request-util.h"

 
 #include "empathy-call-factory.h"
 #include "empathy-call-handler.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"
 
 #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 174fbf4bd6134faa34c442e0bca87fc3200b53d3..c400fc2fa3fb51762721b8fc7ed591624f76e29c 100644 (file)
--- 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>
 #define __EMPATHY_CALL_FACTORY_H__
 
 #include <glib-object.h>

+#include <telepathy-glib/telepathy-glib.h>

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

diff --git a/src/empathy-call-handler.c b/src/empathy-call-handler.c
index 28e8cda834de7430ff2446538a62004fedae3d58..1c4939af11f23e22ac89c2e3639581f3c47cc85c 100644 (file)
--- a/src/empathy-call-handler.c
+++ b/src/empathy-call-handler.c
@@ -19,14 +19,12 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-call-handler.h"

 
 #include <telepathy-farstream/telepathy-farstream.h>
 
 
 #include <telepathy-farstream/telepathy-farstream.h>
 

-#include "empathy-utils.h"
-

 #include "empathy-call-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"
 
 #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 2a60f6fe2a68d452ed794e2c48a3e8b5e7efd80c..41e9bdfc11e5e016da9689e3dc69c316372bf9d3 100644 (file)
--- a/src/empathy-call-observer.c
+++ b/src/empathy-call-observer.c
@@ -19,14 +19,13 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-call-observer.h"

 
 #include <glib/gi18n-lib.h>
 
 #include "empathy-images.h"
 #include "empathy-notify-manager.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"
 
 #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 6da478fbd653a11b79381dc227e492f6ed604e0a..e6dca486816cbfa7527fecf980c6c40fb0422550 100644 (file)
--- 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
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 

+#include "config.h"

 #include "empathy-call-window-fullscreen.h"
 
 #include "empathy-call-window-fullscreen.h"
 

-#include "empathy-utils.h"

 #include "empathy-ui-utils.h"
 #include "empathy-ui-utils.h"

+#include "empathy-utils.h"

 
 /* The number of seconds for which the "leave fullscreen" popup should
    be shown */
 
 /* 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 9b67bba4a97948ebb564dcbf32974499900a76bb..979d7e3bbded49b3c0f67d71f46f1ecc4321b602 100644 (file)
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -19,38 +19,35 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-call-window.h"

 
 #include <glib/gi18n.h>
 
 #include <glib/gi18n.h>

-

 #include <telepathy-farstream/telepathy-farstream.h>
 #include <telepathy-farstream/telepathy-farstream.h>

-

 #include <farstream/fs-element-added-notifier.h>
 #include <farstream/fs-utils.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-camera-monitor.h"

-#include "empathy-gsettings.h"
-#include "empathy-request-util.h"
-#include "empathy-utils.h"
-

 #include "empathy-dialpad-widget.h"
 #include "empathy-dialpad-widget.h"

-#include "empathy-ui-utils.h"
-#include "empathy-sound-manager.h"

 #include "empathy-geometry.h"
 #include "empathy-geometry.h"

+#include "empathy-gsettings.h"

 #include "empathy-images.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-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-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
 
 #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 9fccb5650fe4eb9824f52ba48a3a92fdeb6dc40b..8a5549694793189c5f31287a50d41ae0b663a754 100644 (file)
--- a/src/empathy-call.c
+++ b/src/empathy-call.c
@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include <glib/gi18n.h>
 #include "config.h"
 
 #include <glib/gi18n.h>

-

 #include <clutter-gtk/clutter-gtk.h>
 #include <clutter-gst/clutter-gst.h>
 
 #include <clutter-gtk/clutter-gtk.h>
 #include <clutter-gst/clutter-gst.h>
 


@@ -31,10 +30,9 @@
 #include <X11/Xlib.h>
 #endif
 
 #include <X11/Xlib.h>
 #endif
 

-#include "empathy-ui-utils.h"
-
-#include "empathy-call-window.h"

 #include "empathy-call-factory.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"
 
 #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 0674e7076cc5a576cac92ce01263671da015c281..8dc037bdbc866f227d6f8e9875313e727825b2e9 100644 (file)
--- a/src/empathy-camera-menu.c
+++ b/src/empathy-camera-menu.c
@@ -20,12 +20,11 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-camera-menu.h"

 
 #include "empathy-camera-monitor.h"
 #include "empathy-gsettings.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"
 
 #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 bc64cefc8be303a4f60b64cd82ba8affacef6e35..89f230dc31e2a366f0f06e8ccf63f751d3596e56 100644 (file)
--- a/src/empathy-chat-manager.c
+++ b/src/empathy-chat-manager.c
@@ -18,24 +18,20 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-chat-manager.h"

 
 #include <telepathy-glib/proxy-subclass.h>
 
 #include "empathy-chatroom-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-individual-manager.h"

-
+#include "empathy-request-util.h"

 #include "empathy-ui-utils.h"
 #include "empathy-ui-utils.h"

-
-#include "empathy-chat-window.h"
+#include "extensions.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.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,
 enum {
   CLOSED_CHATS_CHANGED,
   DISPLAYED_CHATS_CHANGED,

diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 47f588f08cedcb5d6bf3cdb34caa793127d89e74..9dafa5fe2c95ceae4926f9d164e796c652f14ee2 100644 (file)
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -26,28 +26,26 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-chat-window.h"

 
 #include <gtk/gtk.h>
 #include <glib/gi18n.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-chatroom-manager.h"

+#include "empathy-client-factory.h"
+#include "empathy-geometry.h"

 #include "empathy-gsettings.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-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-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"
 
 #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 cfd82a1284b31e88211cc6503d1f862e9ee156d7..8c59559722e95d9032dca4289bfff7b21348face 100644 (file)
--- 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 <glib-object.h>
 #include <gtk/gtk.h>

-

 #include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-chat.h"
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-chat.h"

+#include "empathy-individual-manager.h"

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

diff --git a/src/empathy-chat.c b/src/empathy-chat.c
index 9919b6edd5936c5eae1001cffed22e61496f2f0c..e6e8b1b3b886a538dc7794e36361dccba268cb14 100644 (file)
--- a/src/empathy-chat.c
+++ b/src/empathy-chat.c
@@ -23,17 +23,14 @@
 #include "config.h"
 
 #include <glib/gi18n.h>
 #include "config.h"
 
 #include <glib/gi18n.h>

-

 #include <libnotify/notify.h>
 
 #include <libnotify/notify.h>
 

+#include "empathy-chat-manager.h"
+#include "empathy-chat-resources.h"

 #include "empathy-presence-manager.h"
 #include "empathy-presence-manager.h"

-

 #include "empathy-theme-manager.h"
 #include "empathy-ui-utils.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"
 
 #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 ff45bed9c0a93fc3f19fca8318b36245b8a3f893..553c91290c700af506246213be710472cf508a14 100644 (file)
--- a/src/empathy-chatrooms-window.c
+++ b/src/empathy-chatrooms-window.c
@@ -24,16 +24,14 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-chatrooms-window.h"

 
 #include <glib/gi18n.h>
 
 
 #include <glib/gi18n.h>
 

-#include "empathy-chatroom-manager.h"
-#include "empathy-utils.h"
-

 #include "empathy-account-chooser.h"
 #include "empathy-account-chooser.h"

+#include "empathy-chatroom-manager.h"

 #include "empathy-ui-utils.h"
 #include "empathy-ui-utils.h"

-
-#include "empathy-chatrooms-window.h"
+#include "empathy-utils.h"

 
 typedef struct {
        EmpathyChatroomManager *manager;
 
 typedef struct {
        EmpathyChatroomManager *manager;

diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index 546e174068875d4174477037b5d84a23c84e21dc..6cc60098f97dbbb03a651059eff54017244f4b7f 100644 (file)
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -20,18 +20,17 @@
 */
 
 #include "config.h"
 */
 
 #include "config.h"

+#include "empathy-debug-window.h"

 
 #include <glib/gi18n.h>
 #include <libsoup/soup.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-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)
 
 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 42bb43ef7203a25fbe8f5c6cec096dd6d539058f..5269bcfc52d9e4390e4f6add24ae823ad070be85 100644 (file)
--- 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__
 
 #ifndef __EMPATHY_DEBUG_WINDOW_H__
 #define __EMPATHY_DEBUG_WINDOW_H__
 

-G_BEGIN_DECLS
-

 #include <glib-object.h>
 #include <gtk/gtk.h>
 
 #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))
 #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 ca348f3cd6ec88dc8cf65156d3ce701c8b2276da..abb73ac444d13e5159ec591c52159d816891c966 100644 (file)
--- a/src/empathy-debugger.c
+++ b/src/empathy-debugger.c
@@ -21,9 +21,8 @@
 
 #include <glib/gi18n.h>
 
 
 #include <glib/gi18n.h>
 

-#include "empathy-ui-utils.h"
-

 #include "empathy-debug-window.h"
 #include "empathy-debug-window.h"

+#include "empathy-ui-utils.h"

 
 #define EMPATHY_DEBUGGER_DBUS_NAME "org.gnome.Empathy.Debugger"
 
 
 #define EMPATHY_DEBUGGER_DBUS_NAME "org.gnome.Empathy.Debugger"
 

diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index c0b802d3bf13105844212eb15a75dc7b8501eaa8..a0171858a24ed04eac37b897d00c00221ebeb3bf 100644 (file)
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -20,23 +20,21 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-event-manager.h"

 
 #include <glib/gi18n.h>
 
 
 #include <glib/gi18n.h>
 

-#include "empathy-presence-manager.h"
+#include "empathy-call-utils.h"

 #include "empathy-connection-aggregator.h"
 #include "empathy-connection-aggregator.h"

-#include "empathy-tp-chat.h"
-#include "empathy-utils.h"

 #include "empathy-gsettings.h"
 #include "empathy-gsettings.h"

-#include "empathy-sasl-mechanisms.h"
-

 #include "empathy-images.h"
 #include "empathy-images.h"

+#include "empathy-presence-manager.h"
+#include "empathy-sasl-mechanisms.h"

 #include "empathy-sound-manager.h"
 #include "empathy-sound-manager.h"

-#include "empathy-ui-utils.h"
-#include "empathy-call-utils.h"

 #include "empathy-subscription-dialog.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"
 
 #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 9098250bf39ecc81c2d4936e9e5f318db6a8f16c..18e05dc1989d7188410294ba5bc7c1c1545fd720 100644 (file)
--- 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"
 /* The original file transfer manager code was copied from Epiphany */
 
 #include "config.h"

+#include "empathy-ft-manager.h"

 
 #include <glib/gi18n.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-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
 {
 
 enum
 {

diff --git a/src/empathy-import-dialog.c b/src/empathy-import-dialog.c
index ea1ce184147fbdecf92f4a057990daf405509ec0..5e6fa8d55d35499d22215f79fc032782f63dbf42 100644 (file)
--- a/src/empathy-import-dialog.c
+++ b/src/empathy-import-dialog.c
@@ -21,15 +21,15 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-import-dialog.h"

 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

-#include "empathy-import-dialog.h"

 #include "empathy-import-widget.h"
 #include "empathy-import-widget.h"

+#include "empathy-utils.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"

-#include "empathy-utils.h"

 
 enum {
   PROP_PARENT = 1,
 
 enum {
   PROP_PARENT = 1,

diff --git a/src/empathy-import-pidgin.c b/src/empathy-import-pidgin.c
index 22116648d4862ee2e35ee835a4d2ce82c8a9bdab..92adb861ea3204a96437f074b0675b1be019b204 100644 (file)
--- a/src/empathy-import-pidgin.c
+++ b/src/empathy-import-pidgin.c
@@ -20,16 +20,16 @@
  * */
 
 #include "config.h"
  * */
 
 #include "config.h"

+#include "empathy-import-pidgin.h"

 
 #include <glib/gstdio.h>
 #include <dbus/dbus-protocol.h>
 
 #include "empathy-import-utils.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"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"

-#include "empathy-utils.h"

 
 /* Pidgin to CM map */
 typedef struct
 
 /* Pidgin to CM map */
 typedef struct

diff --git a/src/empathy-import-utils.c b/src/empathy-import-utils.c
index 718c7d1e138772fa5568165bc4bd4fd134ded2b7..c382336474e5f9eddf418112135f8d8ca50a7c4f 100644 (file)
--- a/src/empathy-import-utils.c
+++ b/src/empathy-import-utils.c
@@ -19,11 +19,12 @@
  *          Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
  */
 
  *          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-import-utils.h"

+
+#include "empathy-connection-managers.h"

 #include "empathy-import-pidgin.h"
 #include "empathy-import-pidgin.h"

+#include "empathy-utils.h"

 
 EmpathyImportAccountData *
 empathy_import_account_data_new (const gchar *source)
 
 EmpathyImportAccountData *
 empathy_import_account_data_new (const gchar *source)

diff --git a/src/empathy-import-widget.c b/src/empathy-import-widget.c
index 68a71d5ffb1e1011fe91859a93e8b6e766d64f45..a572ad0c6c872c2baeae90990233cdfcbaa2a891 100644 (file)
--- a/src/empathy-import-widget.c
+++ b/src/empathy-import-widget.c
@@ -23,17 +23,16 @@
 /* empathy-import-widget.c */
 
 #include "config.h"
 /* empathy-import-widget.c */
 
 #include "config.h"

-
-#include "empathy-import-dialog.h"

 #include "empathy-import-widget.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-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)
 
 
 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 225350e6eb1063ab1526eed69091027792fd6ef5..508706fb819c15440682e4b8d952c4f851bd6175 100644 (file)
--- 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>
 #define __EMPATHY_IMPORT_WIDGET_H__
 
 #include <glib-object.h>

+#include <gtk/gtk.h>

 
 #include "empathy-connection-managers.h"
 
 #include "empathy-connection-managers.h"

-

 #include "empathy-import-utils.h"
 
 G_BEGIN_DECLS
 #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 f78052f8c65cfe178b9af2aaf72a5c8073a79bee..e562dc5644bf3e1865aba015a598e0a37c73c8f7 100644 (file)
--- a/src/empathy-invite-participant-dialog.c
+++ b/src/empathy-invite-participant-dialog.c
@@ -10,14 +10,12 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-
-#include <glib/gi18n.h>
-

 #include "empathy-invite-participant-dialog.h"
 
 #include "empathy-invite-participant-dialog.h"
 

-#include "empathy-utils.h"
+#include <glib/gi18n.h>

 
 #include "empathy-contact-chooser.h"
 
 #include "empathy-contact-chooser.h"

+#include "empathy-utils.h"

 
 G_DEFINE_TYPE (EmpathyInviteParticipantDialog,
     empathy_invite_participant_dialog, GTK_TYPE_DIALOG);
 
 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 0c6ed23a992e934499c9882fff402c9f2c40e7df..612ff34be7531762f4c59c3509acb323dcfd2dba 100644 (file)
--- a/src/empathy-mic-menu.c
+++ b/src/empathy-mic-menu.c
@@ -20,8 +20,8 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-mic-menu.h"
 #include "empathy-mic-menu.h"

+

 #include "empathy-mic-monitor.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #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 afc526ffa713ebdf38f68543f6f7b0401f53b55f..90d1088ff812d02ca22c0543d5182f9e2385795c 100644 (file)
--- a/src/empathy-mic-monitor.c
+++ b/src/empathy-mic-monitor.c
@@ -18,12 +18,11 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-mic-monitor.h"

 
 #include <gtk/gtk.h>
 #include <pulse/glib-mainloop.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
 #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 4ad4a28faac831d0ab3bfd441befc16ed842b3a3..6d545483ed8a0276681b1e8f5ea67a4ff9715a96 100644 (file)
--- 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>
 #define __EMPATHY_MIC_MONITOR_H__
 
 #include <glib-object.h>

-
+#include <gio/gio.h>

 #include <pulse/pulseaudio.h>
 
 G_BEGIN_DECLS
 #include <pulse/pulseaudio.h>
 
 G_BEGIN_DECLS

diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c
index cca729df928d5dd033bfdf089a4ce1ba8ad0ef6f..f0b6ec64132cd5537437d8a200fc3ce0f97d7d4b 100644 (file)
--- a/src/empathy-new-chatroom-dialog.c
+++ b/src/empathy-new-chatroom-dialog.c
@@ -22,17 +22,15 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-new-chatroom-dialog.h"

 
 #include <glib/gi18n.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-account-chooser.h"

+#include "empathy-gsettings.h"
+#include "empathy-request-util.h"

 #include "empathy-ui-utils.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"
 
 #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 02bf3b2a06ed9b609247a85955eb58730d9c4f5b..9f7796dbeac3edea92f1e2296633554aee8b09d5 100644 (file)
--- 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>
 #define __EMPATHY_NEW_CHATROOM_DIALOG_H__
 
 #include <glib-object.h>

+#include <gtk/gtk.h>

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

diff --git a/src/empathy-notifications-approver.c b/src/empathy-notifications-approver.c
index 7e06da1b7a69bd0d543f9d754dfc06a61c9a41e5..fb36f2ac34b19d3b7e2ef6cd26211bdfe122c6f7 100644 (file)
--- a/src/empathy-notifications-approver.c
+++ b/src/empathy-notifications-approver.c
@@ -18,19 +18,17 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-notifications-approver.h"

 
 #include <glib/gi18n.h>
 
 
 #include <glib/gi18n.h>
 

-#include "empathy-notify-manager.h"

 #include "empathy-call-utils.h"
 #include "empathy-call-utils.h"

-

 #include "empathy-event-manager.h"
 #include "empathy-event-manager.h"

+#include "empathy-notify-manager.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
 
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
 

-#include "empathy-notifications-approver.h"
-

 struct _EmpathyNotificationsApproverPrivate
 {
   EmpathyEventManager *event_mgr;
 struct _EmpathyNotificationsApproverPrivate
 {
   EmpathyEventManager *event_mgr;

diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index 735ba217504d0a762dcf1aad732d506839592d8e..c2be935b0ec9251a99d5272e5ba33157c096d908 100644 (file)
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -24,18 +24,16 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-preferences.h"

 
 #include <glib/gi18n.h>
 
 #include "empathy-client-factory.h"
 #include "empathy-gsettings.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-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"
 
 #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 2f64d877cfa35d333caed027c5956026b7cf5f53..c09094eb0b787c7e08129549635be54e511591d1 100644 (file)
--- a/src/empathy-roster-window.c
+++ b/src/empathy-roster-window.c
@@ -22,41 +22,39 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-roster-window.h"

 
 #include <sys/stat.h>
 #include <glib/gi18n.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-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-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-geometry.h"

+#include "empathy-gsettings.h"
+#include "empathy-gsettings.h"

 #include "empathy-gtk-enum-types.h"
 #include "empathy-individual-dialogs.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-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-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-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"
 
 #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 038cb49552b52ae911fe9049f218d25e5569777a..89e3144ccb15a97ca23eb1964140563d0c0f4a02 100644 (file)
--- a/src/empathy-rounded-actor.c
+++ b/src/empathy-rounded-actor.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-rounded-actor.h"
 
 G_DEFINE_TYPE(EmpathyRoundedActor, empathy_rounded_actor, GTK_CLUTTER_TYPE_ACTOR)
 #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 67c0e27c00b2d6c0e895db3b8c049a78ba503758..810fa0df7376016398930c44313be6bb3f036b55 100644 (file)
--- a/src/empathy-rounded-rectangle.c
+++ b/src/empathy-rounded-rectangle.c
@@ -19,11 +19,10 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-rounded-rectangle.h"

 
 #include <math.h>
 
 
 #include <math.h>
 

-#include "empathy-rounded-rectangle.h"
-

 G_DEFINE_TYPE (EmpathyRoundedRectangle,
     empathy_rounded_rectangle,
     CLUTTER_TYPE_CAIRO_TEXTURE)
 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 7ac7d040d72e20b80def4540d8ee40e097586c28..46c0b21354ff91c3be891038c4155b677ceab52f 100644 (file)
--- 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
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 

+#include "config.h"

 #include "empathy-rounded-texture.h"
 
 G_DEFINE_TYPE (EmpathyRoundedTexture,
 #include "empathy-rounded-texture.h"
 
 G_DEFINE_TYPE (EmpathyRoundedTexture,

diff --git a/src/empathy-sanity-cleaning.c b/src/empathy-sanity-cleaning.c
index 025c9b84178d0d15ead8a416490ba37452e8389f..5af3ff45fe1dce23fa4320f3c5a456a8330e3307 100644 (file)
--- a/src/empathy-sanity-cleaning.c
+++ b/src/empathy-sanity-cleaning.c
@@ -22,22 +22,20 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "empathy-sanity-cleaning.h"
 
 #include "empathy-sanity-cleaning.h"
 

-#include "empathy-gsettings.h"
-
-#include "empathy-theme-manager.h"
-

 #ifdef HAVE_UOA
 #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 <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
 
 #endif
 

+#include "empathy-gsettings.h"
+#include "empathy-theme-manager.h"
+

 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.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 b40ebed7b3da11abceb8bbe40ae7cb5de1044648..917fab3831364fa7b50e235084260ee08e502a72 100644 (file)
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -20,17 +20,15 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-status-icon.h"

 
 

+#include "empathy-event-manager.h"

 #include "empathy-gsettings.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-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"
 
 #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 ca21af83325766f33ce3141cd28e10a2a77e08e2..44a0b125316f613e95be201c0c5583768ef47a86 100644 (file)
--- a/src/empathy-status-icon.h
+++ b/src/empathy-status-icon.h
@@ -23,6 +23,7 @@
 #define __EMPATHY_STATUS_ICON_H__
 
 #include <glib.h>
 #define __EMPATHY_STATUS_ICON_H__
 
 #include <glib.h>

+#include <gtk/gtk.h>

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

diff --git a/src/empathy-video-src.c b/src/empathy-video-src.c
index b3b84d3e74cfb41323e167af3d8cd1f457af5023..9856efed91a7d4aa69c5537ce73287570c602ee6 100644 (file)
--- a/src/empathy-video-src.c
+++ b/src/empathy-video-src.c
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

+#include "empathy-video-src.h"

 
 #ifdef HAVE_GST1
 #include <gst/video/colorbalance.h>
 
 #ifdef HAVE_GST1
 #include <gst/video/colorbalance.h>


@@ -29,8 +30,6 @@
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include "empathy-debug.h"
 
 #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 */
 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 610150bbd73e507a01411cb83352c38005191afd..a8f23e82c3aa0cecd35c50cdd65e8cef29184694 100644 (file)
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -23,31 +23,28 @@
 
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
 
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>

+#include <libnotify/notify.h>

 
 #ifdef HAVE_LIBCHAMPLAIN
 #include <clutter-gtk/clutter-gtk.h>
 #endif
 
 
 #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-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-factory.h"

+#include "empathy-ft-manager.h"

 #include "empathy-gsettings.h"
 #include "empathy-gsettings.h"

-
-#include "empathy-ui-utils.h"

 #include "empathy-location-manager.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-roster-window.h"

-#include "empathy-accounts-common.h"
-#include "empathy-accounts-dialog.h"

 #include "empathy-status-icon.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"
 
 #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 e6e8258359a2bd34cd5cf5c8b1d92e27221dfff3..323bbb98b9428941f6649854a66d9d1a9006b389 100644 (file)
--- 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 <stdio.h>
 #include <string.h>
 #include <glib/gstdio.h>

-

 #include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-chatroom-manager.h"
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-chatroom-manager.h"

-

 #include "test-helper.h"
 
 #define CHATROOM_SAMPLE "chatrooms-sample.xml"
 #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 4a0f655e3c866a159e52ac09bbed819389912f1a..a64fd2ce078c86b5be31ad77e8eb32ff8bbc1658 100644 (file)
--- a/tests/empathy-chatroom-test.c
+++ b/tests/empathy-chatroom-test.c
@@ -3,7 +3,6 @@
 #include <string.h>
 
 #include "test-helper.h"
 #include <string.h>
 
 #include "test-helper.h"

-

 #include "empathy-chatroom.h"
 
 #if 0
 #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 9a3c46afeadcb798ec4df86c5d35124da9322a3d..7fb195f0276f4f15e35a7113ff8989842ba9994e 100644 (file)
--- 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 <string.h>
 #include <glib/gstdio.h>
 

-#include "test-irc-helper.h"
-#include "test-helper.h"
-

 #include "empathy-irc-network-manager.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"
 
 #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 d22e04f0545233fd082d6b3ebce99a064b405f29..5ca4fba7390fe856554dff6d286a880a519127ce 100644 (file)
--- 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 <stdio.h>
 #include <string.h>
 

-#include "test-irc-helper.h"
-#include "test-helper.h"
-

 #include "empathy-irc-network.h"
 #include "empathy-irc-network.h"

+#include "test-helper.h"
+#include "test-irc-helper.h"

 
 static void
 test_empathy_irc_network_new (void)
 
 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 291a34de1abe3ef5e1ec1123751f5c13a33fd3f7..225d57bc805b74ccedd566b043303a9f35e4aee6 100644 (file)
--- 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 <stdio.h>
 #include <string.h>
 

-#include "test-irc-helper.h"
-#include "test-helper.h"
-

 #include "empathy-irc-server.h"
 #include "empathy-irc-server.h"

+#include "test-helper.h"
+#include "test-irc-helper.h"

 
 static void
 test_empathy_irc_server_new (void)
 
 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 0934fe4c7d187015850d6ebd702c65fabe04e099..10f0346f32db591bedd1c387319d2cf91de643be 100644 (file)
--- 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 <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 "test-helper.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_TESTS
 #include "empathy-debug.h"
 

-#include "empathy-live-search.h"
-

 typedef struct
 {
   const gchar *string;
 typedef struct
 {
   const gchar *string;

diff --git a/tests/empathy-parser-test.c b/tests/empathy-parser-test.c
index 24cd5d67673c7ded19554359d6507bad1ea210fb..0cf0374441116e522819923bf6d0667c3f3a6cec 100644 (file)
--- 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 <stdlib.h>
 #include <stdio.h>
 #include <string.h>

+#include <telepathy-glib/telepathy-glib.h>

 
 

+#include "empathy-string-parser.h"

 #include "test-helper.h"
 
 #include "test-helper.h"
 

-#include <telepathy-glib/telepathy-glib.h>
-

 #define DEBUG_FLAG EMPATHY_DEBUG_TESTS
 #include "empathy-debug.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,
 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 03cc9d7a8b241e29e443a9ca218a8b1a10b597e0..3e5706c6a1c16f1e6d81180701e60cbee65dbae1 100644 (file)
--- 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 <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 <gcr/gcr.h>

-

 #include <gnutls/gnutls.h>
 #include <gnutls/gnutls.h>

-

 #include <telepathy-glib/telepathy-glib.h>
 #include <telepathy-glib/svc-tls.h>
 #include <telepathy-glib/svc-generic.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 */
 #define MOCK_TLS_CERTIFICATE_PATH "/mock/certificate"
 
 /* Forward decl */

diff --git a/tests/interactive/empathy-logs.c b/tests/interactive/empathy-logs.c
index 4a440f9edebd5aea7dc0fb7b9b6924957f2b26cb..613bf751613722b11e0ef5de0d69aed0c55c5195 100644 (file)
--- a/tests/interactive/empathy-logs.c
+++ b/tests/interactive/empathy-logs.c
@@ -19,15 +19,16 @@
  * Authors: Xavier Claessens <xclaesse@gmail.com>
  */
 
  * 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 <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-log-window.h"
 #include "empathy-ui-utils.h"

+#include "empathy-utils.h"

 
 static void
 destroy_cb (GtkWidget *dialog,
 
 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 8a4d08fcf51a8b7ca60c8bf1c7078f9716c0f807..159f8fcfa4bcf9633c6338bc3ce8b3f22891039c 100644 (file)
--- 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 <gtk/gtk.h>
 

-#include "empathy-ui-utils.h"

 #include "empathy-account-chooser.h"
 #include "empathy-account-chooser.h"

+#include "empathy-ui-utils.h"

 
 static void
 filter_func (TpAccount *account,
 
 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 d4a76933da0788018b935de36228467e04a061c6..185f4e9545a7ba39f17c4b45f7a5ff47ecbd655a 100644 (file)
--- 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>
  */
 
  * Authors: Danielle Madeley <danielle.madeley@collabora.co.uk>
  */
 

-#include <config.h>
+#include "config.h"

 
 #include <gtk/gtk.h>
 
 #include "empathy-client-factory.h"
 
 #include <gtk/gtk.h>
 
 #include "empathy-client-factory.h"

-
-#include "empathy-ui-utils.h"

 #include "empathy-contact-blocking-dialog.h"
 #include "empathy-contact-blocking-dialog.h"

+#include "empathy-ui-utils.h"

 
 static void
 am_prepare_cb (GObject *source,
 
 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 d7c54a6479562da498065697e2644e84b87a668f..74bb59f1797ecebaee28c9bc3001f0bf0ea44a1c 100644 (file)
--- 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-model.h"
 #include "empathy-roster-model-manager.h"

-

 #include "empathy-roster-view.h"
 #include "empathy-ui-utils.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 5710fb146918878ea8dd7484ac221e0c41c30e71..208c9a12ecbff128b75321d044d4c9a4bec67e1b 100644 (file)
--- 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>
  */
 
  * Authors: Davyd Madeley <davyd.madeley@collabora.co.uk>
  */
 

-#include <config.h>
+#include "config.h"

 
 #include <gtk/gtk.h>
 
 
 #include <gtk/gtk.h>
 

+#include "empathy-presence-chooser.h"

 #include "empathy-status-presets.h"
 #include "empathy-status-presets.h"

-

 #include "empathy-ui-utils.h"
 #include "empathy-ui-utils.h"

-#include "empathy-presence-chooser.h"

 
 int
 main (int argc, char **argv)
 
 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 f91cb1203257b4f501d5225c46ff69b42c01e05a..ca548a85bc925a8b93339003fc4c71f6a3559b34 100644 (file)
--- 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 <gtk/gtk.h>
 

-#include "empathy-ui-utils.h"

 #include "empathy-protocol-chooser.h"
 #include "empathy-protocol-chooser.h"

+#include "empathy-ui-utils.h"

 
 int
 main (int argc,
 
 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 bb3195022fefab5bf53bc8a07efc5395c4aadaf3..478b4e6cc537e0105bafd388206d1df751b774fd 100644 (file)
--- 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-aggregator.h"

-
+#include "empathy-roster-model.h"

 #include "empathy-roster-view.h"
 #include "empathy-ui-utils.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 ff5de0fdcd578d2e892a91a80bc7874907d07897..f814d9658322389331ebb6d6043f8abfbaa0cfc0 100644 (file)
--- 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-model.h"
 #include "empathy-roster-model-manager.h"

-

 #include "empathy-roster-view.h"
 #include "empathy-ui-utils.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 db9cd361d921c1e0810e407b4facb971fcbb1234..2494d78b7e8534457c2ddd0da8702b18aa1fe66f 100644 (file)
--- 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>
  */
 
  *   Will Thompson <will.thompson@collabora.co.uk>
  */
 

-#include <config.h>
+#include "config.h"

 
 #include <gtk/gtk.h>
 
 
 #include <gtk/gtk.h>
 

+#include "empathy-status-preset-dialog.h"

 #include "empathy-status-presets.h"
 #include "empathy-status-presets.h"

-

 #include "empathy-ui-utils.h"
 #include "empathy-ui-utils.h"

-#include "empathy-status-preset-dialog.h"

 
 int
 main (int argc, char **argv)
 
 int
 main (int argc, char **argv)

diff --git a/tests/mock-pkcs11.c b/tests/mock-pkcs11.c
index 4b1219f2c35a99eb54fa924d980990b534ae40cd..997b3311c543ac2b537388db22cb1f4c51b709c7 100644 (file)
--- a/tests/mock-pkcs11.c
+++ b/tests/mock-pkcs11.c
@@ -19,13 +19,10 @@
  */
 
 #include "config.h"
  */
 
 #include "config.h"

-

 #include "mock-pkcs11.h"
 
 #include <gcr/gcr.h>
 #include "mock-pkcs11.h"
 
 #include <gcr/gcr.h>

-

 #include <glib.h>
 #include <glib.h>

-

 #include <string.h>
 
 /*
 #include <string.h>
 
 /*

diff --git a/tests/test-helper.c b/tests/test-helper.c
index f6fc0ffda544bb0e1c665a09a36cdd34c35e87de..8d7be5f4a0c120cc1c4e73435c3bd56d74fdaf2c 100644 (file)
--- 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
  */
 
  * 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>
 #include <stdlib.h>
 #include <glib.h>
 #include <glib-object.h>


@@ -24,8 +27,6 @@
 
 #include "empathy-ui-utils.h"
 
 
 #include "empathy-ui-utils.h"
 

-#include "test-helper.h"
-

 void
 test_init (int argc,
     char **argv)
 void
 test_init (int argc,
     char **argv)

diff --git a/tests/test-irc-helper.c b/tests/test-irc-helper.c
index ade247f398bd29af71a12369a278ceaf1399a401..6fafac8048f300a59f5acb44cac12a99ad906cb3 100644 (file)
--- 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
 #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 439bbda65c324712861e786fb597f936c8d492ef..761e22154def81b9031c03111d1146c0dc638888 100644 (file)
--- 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 "config.h"

+#include "empathy-webcredentials-monitor.h"

 
 #include <gio/gio.h>
 
 #include <gio/gio.h>

-

 #include <telepathy-glib/telepathy-glib.h>
 #include <telepathy-glib/telepathy-glib.h>

-

 #include <libaccounts-glib/ag-account.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"
 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 8919065ef5bcda3d5bd4ff04011c860736207fbd..0607b9e2929516804ae767a57a7c8e0d47d872c2 100644 (file)
--- 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 "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 <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>
 
 #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 d7a33fd431d17c4e652ffc38be1d97135b37b2b9..3e61dc3ba4170010fbe068da3d6958af99e32143 100644 (file)
--- 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>
  */
 
  * 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"
 #include <mission-control-plugins/mission-control-plugins.h>
 
 #include "mcp-account-manager-uoa.h"