diff options
| author | Mike Kestner <mkestner@src.gnome.org> | 2002-11-01 05:30:57 +0800 |
|---|---|---|
| committer | Mike Kestner <mkestner@src.gnome.org> | 2002-11-01 05:30:57 +0800 |
| commit | 613453b1095e325149b8d37e5731d415e1d5f9bd (patch) | |
| tree | 1c0d7f9be4d4a87aa67d8e185ae2bb23d02254b7 /widgets/table/e-table-sorted.c | |
| parent | ec242d6c30d7bf056c8f59710b8576c942f93583 (diff) | |
| download | gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.gz gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.bz2 gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.lz gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.xz gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.zst gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.zip | |
merging the gal-2 branch back to the trunk.
merging the gal-2 branch back to the trunk.
svn path=/trunk/; revision=18471
Diffstat (limited to 'widgets/table/e-table-sorted.c')
| -rw-r--r-- | widgets/table/e-table-sorted.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/widgets/table/e-table-sorted.c b/widgets/table/e-table-sorted.c index 5cc9c5bfd7..c84d6c15c0 100644 --- a/widgets/table/e-table-sorted.c +++ b/widgets/table/e-table-sorted.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* +/* * e-table-sorted.c * Copyright 2000, 2001, Ximian, Inc. * @@ -53,21 +53,24 @@ ets_destroy (GtkObject *object) { ETableSorted *ets = E_TABLE_SORTED (object); - if (ets->sort_idle_id) { + if (ets->sort_idle_id) g_source_remove(ets->sort_idle_id); - } - if (ets->insert_idle_id) { + ets->sort_idle_id = 0; + + if (ets->insert_idle_id) g_source_remove(ets->insert_idle_id); - } + ets->insert_idle_id = 0; if (ets->sort_info) { gtk_signal_disconnect (GTK_OBJECT (ets->sort_info), ets->sort_info_changed_id); gtk_object_unref(GTK_OBJECT(ets->sort_info)); + ets->sort_info = NULL; } if (ets->full_header) gtk_object_unref(GTK_OBJECT(ets->full_header)); + ets->full_header = NULL; GTK_OBJECT_CLASS (ets_parent_class)->destroy (object); } |