Merge branch 'gnome-3-8'

[empathy.git] / src / empathy-accounts-dialog.c

diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index acfd9c290e00e2d2a066c50e1ba2134aaf276796..e2e63dc4a0ba713b579a4a165ed40d4648057cf8 100644 (file)
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -25,25 +25,23 @@
  */
 
 #include "config.h"
+#include "empathy-accounts-dialog.h"
 
 #include <glib/gi18n-lib.h>
 
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-pkg-kit.h"
-
-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-account-widget-sip.h"
-#include "libempathy-gtk/empathy-user-info.h"
-#include "libempathy-gtk/empathy-local-xmpp-assistant-widget.h"
-#include "libempathy-gtk/empathy-new-account-dialog.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-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 "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 /* Flashing delay for icons (milliseconds). */
 #define FLASH_TIMEOUT 500
@@ -2384,6 +2382,7 @@ accounts_dialog_build_ui (EmpathyAccountsDialog *dialog)
 
   /* first row */
   priv->label_name = gtk_label_new (NULL);
+  gtk_label_set_ellipsize (GTK_LABEL (priv->label_name), PANGO_ELLIPSIZE_END);
   gtk_grid_attach (GTK_GRID (grid), priv->label_name, 1, 0, 1, 1);
 
   /* second row */