summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <matthiasc@src.gnome.org>2006-07-21 05:02:27 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2006-07-21 05:02:27 +0000
commit3ddd7aef5a089380f41482f26e6e299a6285d1d7 (patch)
tree244fe70bf1360c03c53a1e9e18da27eca69b8821
parent53a94e60c95aa1e83c6dcd13b802e28dd2a5400a (diff)
downloadgtk+-3ddd7aef5a089380f41482f26e6e299a6285d1d7.tar.gz
Fix a memleak
-rw-r--r--ChangeLog3
-rw-r--r--ChangeLog.pre-2-103
-rw-r--r--gtk/gtkiconview.c12
3 files changed, 18 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f3fdacf532..f71c7546c9 100644
--- 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 f3fdacf532..f71c7546c9 100644
--- 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 4bb88335b6..a19f10dcd4 100644
--- 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);
}