summaryrefslogtreecommitdiff
path: root/gtk/gtkentrycompletion.c
diff options
context:
space:
mode:
authorMatthias Clasen <maclas@gmx.de>2004-06-26 03:39:35 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2004-06-26 03:39:35 +0000
commit57e15782ffbed8be5f366816fc27463747a0deba (patch)
tree0ed741ea0e9555ffb503e6c0cb4e5d73862d65d8 /gtk/gtkentrycompletion.c
parentc3bb3bef04bef5fe6b8f6c663f9fa2428bfa83fe (diff)
downloadgtk+-57e15782ffbed8be5f366816fc27463747a0deba.tar.gz
Allow passing NULL to unset the model. (#137211, patch by Mariano
Fri Jun 25 23:35:42 2004 Matthias Clasen <maclas@gmx.de> * gtk/gtkentrycompletion.c (gtk_entry_completion_set_model): * gtk/gtkcombobox.c (gtk_combo_box_set_model): Allow passing NULL to unset the model. (#137211, patch by Mariano Suárez-Alvarez) Fri Jun 25 23:33:05 2004 Matthias Clasen <maclas@gmx.de> * gtk/gtkcombobox.c (gtk_combo_box_menu_position_below): Fix the placement policy for GtkComboBoxEntry to be: if it fits below, place below, if it fits above place above, else place in the larger space and scroll so that the scroll arrow appear at the far end. (#144362, David A. Knight)
Diffstat (limited to 'gtk/gtkentrycompletion.c')
-rw-r--r--gtk/gtkentrycompletion.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index 3d6f15a889..35a1470489 100644
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -827,7 +827,7 @@ gtk_entry_completion_set_model (GtkEntryCompletion *completion,
GtkTreeModel *model)
{
g_return_if_fail (GTK_IS_ENTRY_COMPLETION (completion));
- g_return_if_fail (GTK_IS_TREE_MODEL (model));
+ g_return_if_fail (model == NULL || GTK_IS_TREE_MODEL (model));
/* code will unref the old filter model (if any) */
completion->priv->filter_model =