diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2006-07-02 14:48:00 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-07-02 14:48:00 +0000 |
| commit | 007240648181866c360986e4862838aed1f16f7d (patch) | |
| tree | 5da341a428baab86694b7e5254d0c63e3b01baae | |
| parent | 26c3befdf0bcfd7aa3db7cfeb8e4a77df9c64e77 (diff) | |
| download | gdk-pixbuf-007240648181866c360986e4862838aed1f16f7d.tar.gz | |
Don't leak default_sort_data. (#346341, Christian Weiske)
2006-07-02 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreemodelsort.c (gtk_tree_model_sort_finalize):
Don't leak default_sort_data. (#346341, Christian Weiske)
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 3 | ||||
| -rw-r--r-- | gtk/gtktreemodelsort.c | 8 |
3 files changed, 14 insertions, 0 deletions
@@ -1,5 +1,8 @@ 2006-06-30 Matthias Clasen <mclasen@redhat.com> + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_finalize): + Don't leak default_sort_data. (#346341, Christian Weiske) + * gtk/Makefile.am: Make sure all win32-specific printing sources are distributed. (#346312, Erik van Pienbroek) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1358d65b2..fc000cfc3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2006-06-30 Matthias Clasen <mclasen@redhat.com> + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_finalize): + Don't leak default_sort_data. (#346341, Christian Weiske) + * gtk/Makefile.am: Make sure all win32-specific printing sources are distributed. (#346312, Erik van Pienbroek) diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c index 0a744aca7..b557fe3f1 100644 --- a/gtk/gtktreemodelsort.c +++ b/gtk/gtktreemodelsort.c @@ -353,6 +353,14 @@ gtk_tree_model_sort_finalize (GObject *object) tree_model_sort->sort_list = NULL; } + if (tree_model_sort->default_sort_destroy) + { + tree_model_sort->default_sort_destroy (tree_model_sort->default_sort_data); + tree_model_sort->default_sort_destroy = NULL; + tree_model_sort->default_sort_data = NULL; + } + + /* must chain up */ G_OBJECT_CLASS (gtk_tree_model_sort_parent_class)->finalize (object); } |