summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorMichael Natterer <mitch@imendio.com>2007-05-21 12:43:50 +0000
committerMichael Natterer <mitch@src.gnome.org>2007-05-21 12:43:50 +0000
commitb3ce266b6ee429128d9abbabf50763bf32d6fb92 (patch)
treebfc01c8ea8ac85bc7db2542021c8ca33b39c6a50 /gtk
parent1ba507f09fbc43235cdf5c9a5278bec7e7efa1e1 (diff)
downloadgtk+-b3ce266b6ee429128d9abbabf50763bf32d6fb92.tar.gz
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
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gtkcombobox.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 6d3af0ea01..93e6b924cf 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -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;