← Back to branch summary

~bratsche/ubuntu/maverick/gtk+2.0/menu-activation-fix

« back to all changes in this revision

Viewing changes to gtk/gtkcomboboxentry.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2009-09-05 07:16:24 UTC
  • mfrom: (1.3.2 upstream)
  • mto: This revision was merged to the branch mainline in revision 127.
  • Revision ID: james.westby@ubuntu.com-20090905071624-ehjbg50t3hvthzlm
Tags: upstream-2.17.11
Import upstream version 2.17.11

Show diffs side-by-side

added added

removed removed

Lines of Context:
gtk/gtkcomboboxentry.c
368
368
gtk_combo_box_entry_set_text_column (GtkComboBoxEntry *entry_box,
369
369
                                     gint              text_column)
370
370
{
 
371
  GtkTreeModel *model = gtk_combo_box_get_model (GTK_COMBO_BOX (entry_box));
 
372
 
371
373
  g_return_if_fail (text_column >= 0);
372
 
  g_return_if_fail (text_column < gtk_tree_model_get_n_columns (gtk_combo_box_get_model (GTK_COMBO_BOX (entry_box))));
373
 
  g_return_if_fail (entry_box->priv->text_column == -1);
 
374
  g_return_if_fail (model == NULL || text_column < gtk_tree_model_get_n_columns (model));
374
375
 
375
376
  entry_box->priv->text_column = text_column;
376
377