Merge branch 'gnome-3-8'

[empathy.git] / libempathy-gtk / empathy-individual-view.c

diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index b88fd253d951b8b75dfd90a9fc5dca7f3c088393..87fa3d966d30d28bdc5908eb4c076b5df742e790 100644 (file)
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -25,25 +25,25 @@
  */
 
 #include "config.h"
+#include "empathy-individual-view.h"
 
 #include <glib/gi18n-lib.h>
 
-#include "libempathy/empathy-connection-aggregator.h"
-#include "libempathy/empathy-individual-manager.h"
-#include "libempathy/empathy-contact-groups.h"
-#include "libempathy/empathy-request-util.h"
-#include "libempathy/empathy-utils.h"
-
-#include "empathy-individual-edit-dialog.h"
-#include "empathy-images.h"
+#include "empathy-cell-renderer-activatable.h"
 #include "empathy-cell-renderer-expander.h"
 #include "empathy-cell-renderer-text.h"
-#include "empathy-cell-renderer-activatable.h"
-#include "empathy-ui-utils.h"
+#include "empathy-connection-aggregator.h"
+#include "empathy-contact-groups.h"
 #include "empathy-gtk-enum-types.h"
+#include "empathy-images.h"
+#include "empathy-individual-edit-dialog.h"
+#include "empathy-individual-manager.h"
+#include "empathy-request-util.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 /* Active users are those which have recently changed state
  * (e.g. online, offline or from normal to a busy state).