Merge branch 'gnome-3-8'

Conflicts:
	libempathy/empathy-keyring.c

diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index fcf5804d486fc778271e016d8118dbd444e1c695..9c9c5c3ab5a958f7d5476375d50f00152bb9b042 100644 (file)
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -2063,7 +2063,12 @@ am_prepared_cb (GObject *am,
       (GtkTreeCellDataFunc) debug_window_level_formatter, NULL, NULL);
 
   renderer = gtk_cell_renderer_text_new ();
-  g_object_set (renderer, "family", "Monospace", NULL);
+
+  g_object_set (renderer,
+      "family", "Monospace",
+      "ellipsize", PANGO_ELLIPSIZE_END,
+      NULL);
+
   gtk_tree_view_insert_column_with_data_func (GTK_TREE_VIEW (self->priv->view),
       -1, _("Message"), renderer,
       (GtkTreeCellDataFunc) debug_window_message_formatter, NULL, NULL);