g_return_if_fail() is the cell is not part of the combo instead of

2008-02-04  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkcombobox.c (gtk_combo_box_cell_layout_add_attribute):
	g_return_if_fail() is the cell is not part of the combo instead of
	crashing in the next line.


svn path=/trunk/; revision=19462
This commit is contained in:
Michael Natterer 2008-02-04 23:01:00 +00:00 committed by Michael Natterer
parent e4ae07eebd
commit ea8ffe42aa
2 changed files with 7 additions and 0 deletions

View File

@ -1,3 +1,9 @@
2008-02-04 Michael Natterer <mitch@imendio.com>
* gtk/gtkcombobox.c (gtk_combo_box_cell_layout_add_attribute):
g_return_if_fail() is the cell is not part of the combo instead of
crashing in the next line.
2008-02-01 Cody Russell <cody@jhu.edu> 2008-02-01 Cody Russell <cody@jhu.edu>
* modules/engines/ms-windows/xp_theme.[ch] * modules/engines/ms-windows/xp_theme.[ch]

View File

@ -4264,6 +4264,7 @@ gtk_combo_box_cell_layout_add_attribute (GtkCellLayout *layout,
combo_box = GTK_COMBO_BOX (layout); combo_box = GTK_COMBO_BOX (layout);
info = gtk_combo_box_get_cell_info (combo_box, cell); info = gtk_combo_box_get_cell_info (combo_box, cell);
g_return_if_fail (info != NULL);
info->attributes = g_slist_prepend (info->attributes, info->attributes = g_slist_prepend (info->attributes,
GINT_TO_POINTER (column)); GINT_TO_POINTER (column));