aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-09-09 21:22:44 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-09-09 21:23:07 +0800
commit9129f3e31d22e7b375f3c90fd2e89e05f5e564eb (patch)
tree0fde4a31ca7efc6f1a2b63c5339b4b6c7c18a2a5
parentd0f21a3141e42af7db300c7ffe8d1f2c32843bc0 (diff)
parentfa72bed70086dc63d06577fde43dc6ed7196e0b9 (diff)
downloadgsoc2013-empathy-9129f3e31d22e7b375f3c90fd2e89e05f5e564eb.tar
gsoc2013-empathy-9129f3e31d22e7b375f3c90fd2e89e05f5e564eb.tar.gz
gsoc2013-empathy-9129f3e31d22e7b375f3c90fd2e89e05f5e564eb.tar.bz2
gsoc2013-empathy-9129f3e31d22e7b375f3c90fd2e89e05f5e564eb.tar.lz
gsoc2013-empathy-9129f3e31d22e7b375f3c90fd2e89e05f5e564eb.tar.xz
gsoc2013-empathy-9129f3e31d22e7b375f3c90fd2e89e05f5e564eb.tar.zst
gsoc2013-empathy-9129f3e31d22e7b375f3c90fd2e89e05f5e564eb.zip
Merge branch 'gnome-3-8'
Conflicts: libempathy/empathy-keyring.c
-rw-r--r--src/empathy-debug-window.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index fcf5804d4..9c9c5c3ab 100644
--- 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);