=== modified file 'gtk/gtkfilechooserbutton.c'
--- gtk/gtkfilechooserbutton.c	2011-06-14 19:41:19 +0000
+++ gtk/gtkfilechooserbutton.c	2012-03-13 11:28:09 +0000
@@ -299,11 +299,6 @@ static gboolean      filter_model_visibl
 static gboolean      combo_box_row_separator_func (GtkTreeModel         *model,
 						   GtkTreeIter          *iter,
 						   gpointer              user_data);
-static void          name_cell_data_func          (GtkCellLayout        *layout,
-						   GtkCellRenderer      *cell,
-						   GtkTreeModel         *model,
-						   GtkTreeIter          *iter,
-						   gpointer              user_data);
 static void          open_dialog                  (GtkFileChooserButton *button);
 static void          update_combo_box             (GtkFileChooserButton *button);
 static void          update_label_and_image       (GtkFileChooserButton *button);
@@ -537,9 +532,8 @@ gtk_file_chooser_button_init (GtkFileCho
 			      priv->name_cell, TRUE);
   gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (priv->combo_box),
 				 priv->name_cell, "text", DISPLAY_NAME_COLUMN);
-  gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (priv->combo_box),
-				      priv->name_cell, name_cell_data_func,
-				      NULL, NULL);
+  g_object_set (G_OBJECT (priv->name_cell), "ellipsize", 
+		 PANGO_ELLIPSIZE_END, NULL);
 
   gtk_widget_pop_composite_child ();
 
@@ -2157,27 +2151,6 @@ filter_model_visible_func (GtkTreeModel
   return retval;
 }
 
-/* Combo Box */
-static void
-name_cell_data_func (GtkCellLayout   *layout,
-		     GtkCellRenderer *cell,
-		     GtkTreeModel    *model,
-		     GtkTreeIter     *iter,
-		     gpointer         user_data)
-{
-  gchar type;
-
-  type = 0;
-  gtk_tree_model_get (model, iter,
-		      TYPE_COLUMN, &type,
-		      -1);
-
-  if (type == ROW_TYPE_CURRENT_FOLDER)
-    g_object_set (cell, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
-  else
-    g_object_set (cell, "ellipsize", PANGO_ELLIPSIZE_NONE, NULL);
-}
-
 static gboolean
 combo_box_row_separator_func (GtkTreeModel *model,
 			      GtkTreeIter  *iter,

