revert last change.

2007-05-21  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkcombobox.c (gtk_combo_box_set_model): revert last change.


svn path=/trunk/; revision=17886
This commit is contained in:
Michael Natterer 2007-05-21 12:43:50 +00:00 committed by Michael Natterer
parent 1ba507f09f
commit b3ce266b6e
2 changed files with 5 additions and 1 deletions

View File

@ -1,3 +1,7 @@
2007-05-21 Michael Natterer <mitch@imendio.com>
* gtk/gtkcombobox.c (gtk_combo_box_set_model): revert last change.
Mon May 21 13:58:32 2007 Tim Janik <timj@imendio.com>
* gtk/gtkcombobox.c (gtk_combo_box_set_model): removed redundant check.

View File

@ -4807,7 +4807,7 @@ gtk_combo_box_set_model (GtkComboBox *combo_box,
GtkTreeModel *model)
{
g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
g_return_if_fail (GTK_IS_TREE_MODEL (model));
g_return_if_fail (model == NULL || GTK_IS_TREE_MODEL (model));
if (model == combo_box->priv->model)
return;