Merge branch 'gnome-3-8'

[empathy.git] / src / empathy-roster-window.c

diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c
index 15500902298fb5486a6f41ad78c90b59920a376e..93001d8d428b18d1137ee0382e89bbe9418e3aa0 100644 (file)
--- a/src/empathy-roster-window.c
+++ b/src/empathy-roster-window.c
@@ -22,44 +22,42 @@
  */
 
 #include "config.h"
+#include "empathy-roster-window.h"
 
 #include <sys/stat.h>
 #include <glib/gi18n.h>
 
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-request-util.h"
-#include "libempathy/empathy-chatroom-manager.h"
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-status-presets.h"
-#include "libempathy/empathy-presence-manager.h"
-
-#include "libempathy-gtk/empathy-contact-blocking-dialog.h"
-#include "libempathy-gtk/empathy-contact-search-dialog.h"
-#include "libempathy-gtk/empathy-geometry.h"
-#include "libempathy-gtk/empathy-gtk-enum-types.h"
-#include "libempathy-gtk/empathy-individual-dialogs.h"
-#include "libempathy-gtk/empathy-roster-model-manager.h"
-#include "libempathy-gtk/empathy-roster-view.h"
-#include "libempathy-gtk/empathy-new-message-dialog.h"
-#include "libempathy-gtk/empathy-new-call-dialog.h"
-#include "libempathy-gtk/empathy-log-window.h"
-#include "libempathy-gtk/empathy-presence-chooser.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
-
+#include "empathy-about-dialog.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-chatroom-manager.h"
 #include "empathy-chatrooms-window.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-gsettings.h"
+#include "empathy-gsettings.h"
+#include "empathy-gtk-enum-types.h"
+#include "empathy-individual-dialogs.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-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-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 /* Flashing delay for icons (milliseconds). */
 #define FLASH_TIMEOUT 500
@@ -477,7 +475,7 @@ static void
 display_page_no_account (EmpathyRosterWindow *self)
 {
   display_page_message (self,
-      _("You need to setup an account to see contacts here."),
+      _("You need to set up an account to see contacts here."),
       PAGE_MESSAGE_FLAG_ACCOUNTS);
 }