From 49ba32e1953ee3ef148846b299a8596c7c220aa2 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 4 Oct 2004 03:33:59 +0000 Subject: [PATCH] Reset pointers pointing to the old model. (#154350) 2004-10-03 Matthias Clasen * gtk/gtkiconview.c (gtk_icon_view_set_model): Reset pointers pointing to the old model. (#154350) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-6 | 3 +++ ChangeLog.pre-2-8 | 3 +++ gtk/gtkiconview.c | 7 ++++--- 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2bcdd75536..72b10b5b10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-10-03 Matthias Clasen + * gtk/gtkiconview.c (gtk_icon_view_set_model): Reset pointers + pointing to the old model. (#154350) + * gtk/gtkwindow.c (icon_list_from_theme): Don't leak the sizes array. (#154310, Christian Persch) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2bcdd75536..72b10b5b10 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2004-10-03 Matthias Clasen + * gtk/gtkiconview.c (gtk_icon_view_set_model): Reset pointers + pointing to the old model. (#154350) + * gtk/gtkwindow.c (icon_list_from_theme): Don't leak the sizes array. (#154310, Christian Persch) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2bcdd75536..72b10b5b10 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,8 @@ 2004-10-03 Matthias Clasen + * gtk/gtkiconview.c (gtk_icon_view_set_model): Reset pointers + pointing to the old model. (#154350) + * gtk/gtkwindow.c (icon_list_from_theme): Don't leak the sizes array. (#154310, Christian Persch) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2bcdd75536..72b10b5b10 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2004-10-03 Matthias Clasen + * gtk/gtkiconview.c (gtk_icon_view_set_model): Reset pointers + pointing to the old model. (#154350) + * gtk/gtkwindow.c (icon_list_from_theme): Don't leak the sizes array. (#154310, Christian Persch) diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c index 514234b47f..1d9a46ec5c 100644 --- a/gtk/gtkiconview.c +++ b/gtk/gtkiconview.c @@ -2947,9 +2947,7 @@ gtk_icon_view_set_model (GtkIconView *icon_view, GtkTreeModel *model) { g_return_if_fail (GTK_IS_ICON_VIEW (icon_view)); - - if (model != NULL) - g_return_if_fail (GTK_IS_TREE_MODEL (model)); + g_return_if_fail (model == NULL || GTK_IS_TREE_MODEL (model)); if (icon_view->priv->model == model) return; @@ -2998,6 +2996,9 @@ gtk_icon_view_set_model (GtkIconView *icon_view, g_list_foreach (icon_view->priv->items, (GFunc)gtk_icon_view_item_free, NULL); g_list_free (icon_view->priv->items); icon_view->priv->items = NULL; + icon_view->priv->anchor_item = NULL; + icon_view->priv->cursor_item = NULL; + icon_view->priv->last_single_clicked = NULL; } icon_view->priv->model = model; -- GitLab