From ee15a7b948c3765000f8a9fb6d64d9c263e65e20 Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Fri, 2 Jul 2004 11:32:03 +0000 Subject: [PATCH] Make sure we check for a NULL model first. 2004-07-02 Anders Carlsson * gtk/gtktreeview.c (gtk_tree_view_set_model): Make sure we check for a NULL model first. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtktreeview.c | 4 +++- 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ee292c93f0..200ba33c68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-07-02 Anders Carlsson + + * gtk/gtktreeview.c (gtk_tree_view_set_model): + Make sure we check for a NULL model first. + 2004-07-01 J. Ali Harlow * gdk/win32/gdkinput-win32.c (_gdk_input_ungrab_pointer): Fix diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ee292c93f0..200ba33c68 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2004-07-02 Anders Carlsson + + * gtk/gtktreeview.c (gtk_tree_view_set_model): + Make sure we check for a NULL model first. + 2004-07-01 J. Ali Harlow * gdk/win32/gdkinput-win32.c (_gdk_input_ungrab_pointer): Fix diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ee292c93f0..200ba33c68 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2004-07-02 Anders Carlsson + + * gtk/gtktreeview.c (gtk_tree_view_set_model): + Make sure we check for a NULL model first. + 2004-07-01 J. Ali Harlow * gdk/win32/gdkinput-win32.c (_gdk_input_ungrab_pointer): Fix diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ee292c93f0..200ba33c68 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2004-07-02 Anders Carlsson + + * gtk/gtktreeview.c (gtk_tree_view_set_model): + Make sure we check for a NULL model first. + 2004-07-01 J. Ali Harlow * gdk/win32/gdkinput-win32.c (_gdk_input_ungrab_pointer): Fix diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index f1f567df7f..977ca2b32b 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -8747,7 +8747,9 @@ gtk_tree_view_set_model (GtkTreeView *tree_view, GtkTreeModel *model) { g_return_if_fail (GTK_IS_TREE_VIEW (tree_view)); - g_return_if_fail (GTK_IS_TREE_MODEL (model)); + + if (model != NULL) + g_return_if_fail (GTK_IS_TREE_MODEL (model)); if (model == tree_view->priv->model) return;