Index: gtkcomboboxentry.c
===================================================================
--- gtkcomboboxentry.c	(revision 17564)
+++ gtkcomboboxentry.c	(working copy)
@@ -174,21 +174,22 @@
   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))
     {
+      GValue value = { 0, };
+
       g_signal_handlers_block_by_func (entry_box->priv->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 (GTK_ENTRY (entry_box->priv->entry), str);
-      g_free (str);
+      gtk_tree_model_get_value (model, &iter,
+				entry_box->priv->text_column,
+				&value);
+      g_object_set_property (entry_box->priv->entry, "text", &value);
+      g_value_unset (&value);
 
       g_signal_handlers_unblock_by_func (entry_box->priv->entry,
 					 gtk_combo_box_entry_contents_changed,
