Merge remote-tracking branch 'origin/gnome-3-8'

[empathy.git] / libempathy-gtk / empathy-contact-widget.c

diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index 2b770ca170a042676fa4655daa97611b5fcfc6f9..80a1aafb4e699a4119eaca36dff2cb8c2595e337 100644 (file)
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -19,34 +19,20 @@
  * Authors: Xavier Claessens <xclaesse@gmail.com>
  */
 
-#include <config.h>
-
-#include <string.h>
-#include <stdlib.h>
+#include "config.h"
+#include "empathy-contact-widget.h"
 
-#include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/account.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/interfaces.h>
-
-#include <libempathy/empathy-time.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-client-factory.h>
-
-#include "empathy-calendar-button.h"
-#include "empathy-contact-widget.h"
-#include "empathy-contactinfo-utils.h"
-#include "empathy-account-chooser.h"
-#include "empathy-avatar-chooser.h"
 #include "empathy-avatar-image.h"
+#include "empathy-client-factory.h"
 #include "empathy-groups-widget.h"
-#include "empathy-ui-utils.h"
 #include "empathy-string-parser.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 /**
  * SECTION:empathy-contact-widget