Index: gtk/gtkcomboboxentry.c
===================================================================
--- gtk/gtkcomboboxentry.c	(revision 20047)
+++ gtk/gtkcomboboxentry.c	(arbetskopia)
@@ -243,7 +243,6 @@
   GtkComboBoxEntry *entry_box = GTK_COMBO_BOX_ENTRY (combo_box);
   GtkTreeModel *model;
   GtkTreeIter iter;
-  gchar *str = NULL;
 
   if (gtk_combo_box_get_active_iter (combo_box, &iter))
     {
@@ -251,17 +250,18 @@
 
       if (entry)
 	{
-	  g_signal_handlers_block_by_func (entry,
+          GValue value = {0,};
+
+          g_signal_handlers_block_by_func (entry,
 					   gtk_combo_box_entry_contents_changed,
 					   combo_box);
 
 	  model = gtk_combo_box_get_model (combo_box);
 
-	  gtk_tree_model_get (model, &iter, 
-			      entry_box->priv->text_column, &str, 
-			      -1);
-	  gtk_entry_set_text (entry, str);
-	  g_free (str);
+          gtk_tree_model_get_value (model, &iter,
+                                    entry_box->priv->text_column, &value);
+          g_object_set_property (entry, "text", &value);
+          g_value_unset (&value);
 
 	  g_signal_handlers_unblock_by_func (entry,
 					     gtk_combo_box_entry_contents_changed,
