aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/e-table/e-table.c
diff options
context:
space:
mode:
authorChristopher James Lahey <clahey@helixcode.com>2000-03-08 16:31:12 +0800
committerChris Lahey <clahey@src.gnome.org>2000-03-08 16:31:12 +0800
commitc11cf5e774f9f1a2694a839a99c7ca4bc07f0b63 (patch)
treeb68c5f729edfec130032caf5140144f2b20fa7f2 /widgets/e-table/e-table.c
parent6dd08625faec99336f9a368e8277a55711d90fa2 (diff)
downloadgsoc2013-evolution-c11cf5e774f9f1a2694a839a99c7ca4bc07f0b63.tar.gz
gsoc2013-evolution-c11cf5e774f9f1a2694a839a99c7ca4bc07f0b63.tar.zst
gsoc2013-evolution-c11cf5e774f9f1a2694a839a99c7ca4bc07f0b63.zip
Changed the destroy function to disconnect from signals before unrefing
2000-03-08 Christopher James Lahey <clahey@helixcode.com> * e-table.c: Changed the destroy function to disconnect from signals before unrefing the objects the sinnals are on. Changed the destroy function to match the objects and signal ids properly in its disconnect section. * e-table-item.c, e-table-item.h: Changed this to do follow the canvas rules better. * e-table-header-item.c, e-table-header-item.h: Made ETableHeaderItem connect to the "sort_info_changed" on its ETableSortInfo instead of just manually redrawing itself. Fixed the update function a bit to follow the canvas rules a bit better. svn path=/trunk/; revision=2087
Diffstat (limited to 'widgets/e-table/e-table.c')
-rw-r--r--widgets/e-table/e-table.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/widgets/e-table/e-table.c b/widgets/e-table/e-table.c
index d75937d5ed..36f7d5a776 100644
--- a/widgets/e-table/e-table.c
+++ b/widgets/e-table/e-table.c
@@ -49,12 +49,6 @@ et_destroy (GtkObject *object)
{
ETable *et = E_TABLE (object);
- gtk_object_unref (GTK_OBJECT (et->model));
- gtk_object_unref (GTK_OBJECT (et->full_header));
- gtk_object_unref (GTK_OBJECT (et->header));
- gtk_object_unref (GTK_OBJECT (et->sort_info));
- gtk_widget_destroy (GTK_WIDGET (et->header_canvas));
- gtk_widget_destroy (GTK_WIDGET (et->table_canvas));
gtk_signal_disconnect (GTK_OBJECT (et->model),
et->table_model_change_id);
@@ -63,9 +57,16 @@ et_destroy (GtkObject *object)
gtk_signal_disconnect (GTK_OBJECT (et->model),
et->table_cell_change_id);
if (et->sort_info_change_id)
- gtk_signal_disconnect (GTK_OBJECT (et->model),
+ gtk_signal_disconnect (GTK_OBJECT (et->sort_info),
et->sort_info_change_id);
+ gtk_object_unref (GTK_OBJECT (et->model));
+ gtk_object_unref (GTK_OBJECT (et->full_header));
+ gtk_object_unref (GTK_OBJECT (et->header));
+ gtk_object_unref (GTK_OBJECT (et->sort_info));
+ gtk_widget_destroy (GTK_WIDGET (et->header_canvas));
+ gtk_widget_destroy (GTK_WIDGET (et->table_canvas));
+
if (et->rebuild_idle_id) {
g_source_remove(et->rebuild_idle_id);
et->rebuild_idle_id = 0;