diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2009-09-04 22:20:28 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2009-09-04 22:20:28 -0400 |
| commit | d6f3af077782527a26debc81740600b1abba605b (patch) | |
| tree | 3dec10548220704e456751738df30eca2cad4a34 /gtk/gtkcomboboxentry.c | |
| parent | 6b7fef09ca588ce6e24bb76284adf3fee576f6a5 (diff) | |
| download | gtk+-d6f3af077782527a26debc81740600b1abba605b.tar.gz | |
Make gtk_combo_box_entry_set_text_column more forgiving
The assertions in there were unnecessarily restrictive. This has
been reported in bug 564160.
Diffstat (limited to 'gtk/gtkcomboboxentry.c')
| -rw-r--r-- | gtk/gtkcomboboxentry.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gtk/gtkcomboboxentry.c b/gtk/gtkcomboboxentry.c index 93ae5aea01..c63c08561b 100644 --- a/gtk/gtkcomboboxentry.c +++ b/gtk/gtkcomboboxentry.c @@ -368,9 +368,10 @@ void gtk_combo_box_entry_set_text_column (GtkComboBoxEntry *entry_box, gint text_column) { + GtkTreeModel *model = gtk_combo_box_get_model (GTK_COMBO_BOX (entry_box)); + g_return_if_fail (text_column >= 0); - g_return_if_fail (text_column < gtk_tree_model_get_n_columns (gtk_combo_box_get_model (GTK_COMBO_BOX (entry_box)))); - g_return_if_fail (entry_box->priv->text_column == -1); + g_return_if_fail (model == NULL || text_column < gtk_tree_model_get_n_columns (model)); entry_box->priv->text_column = text_column; |