summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2006-07-02 13:44:23 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2006-07-02 13:44:23 +0000
commite734e2de47dc51407d7d136e38922bc4fa9e8eb5 (patch)
treefea988e5a7f4a7982407fb57b216e9fc103bbecc
parent7402a74a70a9dba24eaf175a764c1b4fb57e7cb4 (diff)
downloadgdk-pixbuf-e734e2de47dc51407d7d136e38922bc4fa9e8eb5.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--ChangeLog7
-rw-r--r--ChangeLog.pre-2-107
-rw-r--r--gtk/gtktreemodelsort.c7
3 files changed, 21 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 95b281fcd..36059bed5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
+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)
+
2006-06-29 Matthias Clasen <mclasen@redhat.com>
+ * NEWS: Updates
+
* gdk/x11/gdkevents-x11.c (gdk_event_translate): Update the
size of the drawable for the root window when the screen size
changes. (#346102, Sven Herzberg)
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 95b281fcd..36059bed5 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,12 @@
+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)
+
2006-06-29 Matthias Clasen <mclasen@redhat.com>
+ * NEWS: Updates
+
* gdk/x11/gdkevents-x11.c (gdk_event_translate): Update the
size of the drawable for the root window when the screen size
changes. (#346102, Sven Herzberg)
diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index ed1579421..48e42597a 100644
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -410,6 +410,13 @@ 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 */
parent_class->finalize (object);
}