Fix a memleak

diff --git a/ChangeLog b/ChangeLog
index f3fdacf5320c5048242d9825f0c19f4e3a327084..f71c7546c9ea5aaa254af6ce4fd636fe18502dc2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-07-21  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkiconview.c (gtk_icon_view_destroy): Don't
+       leak the adjustments.  (#348094, Chris Wilson)
+
        * gtk/gtknotebook.c (gtk_notebook_stop_reorder): Unset
        the during_reorder flag.  (#348049, Sven Herzberg, patch
        by Benjamin Otte)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f3fdacf5320c5048242d9825f0c19f4e3a327084..f71c7546c9ea5aaa254af6ce4fd636fe18502dc2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2006-07-21  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkiconview.c (gtk_icon_view_destroy): Don't
+       leak the adjustments.  (#348094, Chris Wilson)
+
        * gtk/gtknotebook.c (gtk_notebook_stop_reorder): Unset
        the during_reorder flag.  (#348049, Sven Herzberg, patch
        by Benjamin Otte)

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 4bb88335b673333af7772445af6d8b5b9966e2ab..a19f10dcd4321d57bc5b06f30b6147ea74246385 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -948,6 +948,18 @@ gtk_icon_view_destroy (GtkObject *object)
     }
 
   remove_scroll_timeout (icon_view);
+
+  if (icon_view->priv->hadjustment != NULL)
+    {
+      g_object_unref (icon_view->priv->hadjustment);
+      icon_view->priv->hadjustment = NULL;
+    }
+
+  if (icon_view->priv->vadjustment != NULL)
+    {
+      g_object_unref (icon_view->priv->vadjustment);
+      icon_view->priv->vadjustment = NULL;
+    }
   
   (* GTK_OBJECT_CLASS (gtk_icon_view_parent_class)->destroy) (object);
 }