[gtk+] [GtkComboBoxText] Add checks for id-column/entry-text-column >= 0

[Milan Bouchet-Valat <milanbv src gnome org>]

commit 029083454b090eec50b894ba29c8e1e00801b6b6
Author: Milan Bouchet-Valat <nalimilan club fr>
Date:   Sat Dec 11 15:12:47 2010 +0100

    [GtkComboBoxText] Add checks for id-column/entry-text-column >= 0
    
    If the GtkComboBoxText doesn't have id-column or entry-text-column
    set for some reason (value -1), better warn and return. Else, unrelated
    assertions fail, and warnings from gtk_tree_model_get_column_type()
    are printed, which are not really obvious.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=637018

 gtk/gtkcomboboxtext.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/gtk/gtkcomboboxtext.c b/gtk/gtkcomboboxtext.c
index c7b82d1..4e67c6c 100644
--- a/gtk/gtkcomboboxtext.c
+++ b/gtk/gtkcomboboxtext.c
@@ -265,6 +265,7 @@ gtk_combo_box_text_insert (GtkComboBoxText *combo_box,
   store = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box)));
   g_return_if_fail (GTK_IS_LIST_STORE (store));
   text_column = gtk_combo_box_get_entry_text_column (GTK_COMBO_BOX (combo_box));
+  g_return_if_fail (text_column >= 0);
   column_type = gtk_tree_model_get_column_type (GTK_TREE_MODEL (store), text_column);
   g_return_if_fail (column_type == G_TYPE_STRING);
 
@@ -276,6 +277,7 @@ gtk_combo_box_text_insert (GtkComboBoxText *combo_box,
       gint id_column;
 
       id_column = gtk_combo_box_get_id_column (GTK_COMBO_BOX (combo_box));
+      g_return_if_fail (id_column >= 0);
       column_type = gtk_tree_model_get_column_type (GTK_TREE_MODEL (store), id_column);
       g_return_if_fail (column_type == G_TYPE_STRING);
 
@@ -359,6 +361,7 @@ gtk_combo_box_text_get_active_text (GtkComboBoxText *combo_box)
       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);
       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);