--- gtkcomboboxtext.c.old	2011-05-07 20:33:03.099505094 +0600
+++ gtkcomboboxtext.c	2011-05-07 20:34:54.874099898 +0600
@@ -596,8 +596,13 @@
 
       model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box));
       g_return_val_if_fail (GTK_IS_LIST_STORE (model), NULL);
+
       text_column = gtk_combo_box_get_entry_text_column (GTK_COMBO_BOX (combo_box));
-      g_return_val_if_fail (text_column >= 0, NULL);
+      if (gtk_combo_box_get_has_entry (GTK_COMBO_BOX (combo_box)))
+        g_return_if_fail (text_column >= 0);
+      else if (text_column < 0)
+        text_column = 0;
+
       column_type = gtk_tree_model_get_column_type (model, text_column);
       g_return_val_if_fail (column_type == G_TYPE_STRING, NULL);
       gtk_tree_model_get (model, &iter, text_column, &text, -1);
