From 6993fc1c571c50c9d042cc26f0fd0e049492e37c Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Fri, 1 Sep 2000 22:28:55 +0000 Subject: Fixed a leak and a double unref. 2000-09-01 Christopher James Lahey * e-table-item.c, e-table.c: Fixed a leak and a double unref. svn path=/trunk/; revision=5174 --- widgets/e-table/ChangeLog | 4 ++++ widgets/e-table/e-table-item.c | 3 --- widgets/e-table/e-table.c | 1 + widgets/table/e-table-item.c | 3 --- widgets/table/e-table.c | 1 + 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog index a701b726ef..fd66cfa74e 100644 --- a/widgets/e-table/ChangeLog +++ b/widgets/e-table/ChangeLog @@ -1,3 +1,7 @@ +2000-09-01 Christopher James Lahey + + * e-table-item.c, e-table.c: Fixed a leak and a double unref. + 2000-09-01 Chris Toshok * e-tree-example-2.c: new test, a home grown 2 hour hack of a file diff --git a/widgets/e-table/e-table-item.c b/widgets/e-table/e-table-item.c index 35c0de5a6d..1cd37d1961 100644 --- a/widgets/e-table/e-table-item.c +++ b/widgets/e-table/e-table-item.c @@ -857,9 +857,6 @@ eti_destroy (GtkObject *object) eti_remove_table_model (eti); eti_remove_table_selection_model (eti); - if (eti->selection) - gtk_object_unref(GTK_OBJECT(eti->selection)); - if (eti->height_cache_idle_id) g_source_remove(eti->height_cache_idle_id); diff --git a/widgets/e-table/e-table.c b/widgets/e-table/e-table.c index 89f032b401..1a2a3cd8d6 100644 --- a/widgets/e-table/e-table.c +++ b/widgets/e-table/e-table.c @@ -146,6 +146,7 @@ et_destroy (GtkObject *object) gtk_object_unref (GTK_OBJECT (et->header)); gtk_object_unref (GTK_OBJECT (et->sort_info)); gtk_object_unref (GTK_OBJECT (et->sorter)); + gtk_object_unref (GTK_OBJECT (et->selection)); if (et->header_canvas != NULL) gtk_widget_destroy (GTK_WIDGET (et->header_canvas)); diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index 35c0de5a6d..1cd37d1961 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -857,9 +857,6 @@ eti_destroy (GtkObject *object) eti_remove_table_model (eti); eti_remove_table_selection_model (eti); - if (eti->selection) - gtk_object_unref(GTK_OBJECT(eti->selection)); - if (eti->height_cache_idle_id) g_source_remove(eti->height_cache_idle_id); diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index 89f032b401..1a2a3cd8d6 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -146,6 +146,7 @@ et_destroy (GtkObject *object) gtk_object_unref (GTK_OBJECT (et->header)); gtk_object_unref (GTK_OBJECT (et->sort_info)); gtk_object_unref (GTK_OBJECT (et->sorter)); + gtk_object_unref (GTK_OBJECT (et->selection)); if (et->header_canvas != NULL) gtk_widget_destroy (GTK_WIDGET (et->header_canvas)); -- cgit