Revert upstream commits r12779 and r13045. We can do this because we fix GNOME #316087 in our GTK+ packages. Index: nautilus-2.29.92.1/src/file-manager/fm-list-view.c =================================================================== --- nautilus-2.29.92.1.orig/src/file-manager/fm-list-view.c 2010-03-10 14:59:13.000000000 +0100 +++ nautilus-2.29.92.1/src/file-manager/fm-list-view.c 2010-03-10 21:55:02.000000000 +0100 @@ -58,7 +58,6 @@ #include #include #include -#include struct FMListViewDetails { GtkTreeView *tree_view; @@ -1478,7 +1477,7 @@ for (l = nautilus_columns; l != NULL; l = l->next) { NautilusColumn *nautilus_column; - int column_num; + int column_num, font_size; char *name; char *label; float xalign; @@ -1501,6 +1500,9 @@ view->details->pixbuf_cell = (GtkCellRendererPixbuf *)cell; view->details->file_name_column = gtk_tree_view_column_new (); + gtk_tree_view_column_set_expand (view->details->file_name_column, TRUE); + font_size = PANGO_PIXELS (pango_font_description_get_size (GTK_WIDGET(view)->style->font_desc)); + gtk_tree_view_column_set_min_width (view->details->file_name_column, 20*font_size); g_object_ref_sink (view->details->file_name_column); view->details->file_name_column_num = column_num; @@ -1521,7 +1523,11 @@ "pixbuf_emblem", FM_LIST_MODEL_SMALLEST_EMBLEM_COLUMN, NULL); - cell = nautilus_cell_renderer_text_ellipsized_new (); + cell = gtk_cell_renderer_text_new (); + g_object_set (cell, + "ellipsize", PANGO_ELLIPSIZE_END, + "ellipsize-set", TRUE, + NULL); view->details->file_name_cell = (GtkCellRendererText *)cell; g_signal_connect (cell, "edited", G_CALLBACK (cell_renderer_edited), view); g_signal_connect (cell, "editing-canceled", G_CALLBACK (cell_renderer_editing_canceled), view);