Reset pointers pointing to the old model. (#154350)

2004-10-03  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkiconview.c (gtk_icon_view_set_model): Reset pointers
	pointing to the old model.  (#154350)

diff --git a/ChangeLog b/ChangeLog
index 2bcdd75536f329ccc97fa21f0c9443ce58203155..72b10b5b10346c91cb8cfd1afb8382e20341cd15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-10-03  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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 2bcdd75536f329ccc97fa21f0c9443ce58203155..72b10b5b10346c91cb8cfd1afb8382e20341cd15 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2004-10-03  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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 2bcdd75536f329ccc97fa21f0c9443ce58203155..72b10b5b10346c91cb8cfd1afb8382e20341cd15 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2004-10-03  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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 2bcdd75536f329ccc97fa21f0c9443ce58203155..72b10b5b10346c91cb8cfd1afb8382e20341cd15 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2004-10-03  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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 514234b47f4cbc1fc95548425a11571e0f891a7a..1d9a46ec5c4160a61cc97a736e2c061699c1a632 100644 (file)
--- 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;