diff options
| author | Christopher James Lahey <clahey@ximian.com> | 2001-12-04 20:11:16 +0800 |
|---|---|---|
| committer | Chris Lahey <clahey@src.gnome.org> | 2001-12-04 20:11:16 +0800 |
| commit | 4b74a42adf77437cebda06977077664dc66cdf8c (patch) | |
| tree | 6529701cfc4e5d4899720dbb64d305228835d602 | |
| parent | 1994bab834d2b5d31608dd7c48882e673291d320 (diff) | |
| download | gsoc2013-evolution-4b74a42adf77437cebda06977077664dc66cdf8c.tar gsoc2013-evolution-4b74a42adf77437cebda06977077664dc66cdf8c.tar.gz gsoc2013-evolution-4b74a42adf77437cebda06977077664dc66cdf8c.tar.bz2 gsoc2013-evolution-4b74a42adf77437cebda06977077664dc66cdf8c.tar.lz gsoc2013-evolution-4b74a42adf77437cebda06977077664dc66cdf8c.tar.xz gsoc2013-evolution-4b74a42adf77437cebda06977077664dc66cdf8c.tar.zst gsoc2013-evolution-4b74a42adf77437cebda06977077664dc66cdf8c.zip | |
Merging changes:
2001-11-28 Christopher James Lahey <clahey@ximian.com>
* e-table.c (context_destroyed), e-tree.c (context_destroyed):
Check for et being destroyed here before doing anything. Fixes
Ximian bug #15728.
svn path=/trunk/; revision=14864
| -rw-r--r-- | widgets/table/e-table.c | 12 | ||||
| -rw-r--r-- | widgets/table/e-tree.c | 14 |
2 files changed, 15 insertions, 11 deletions
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index 61e911f4ea..d9afb4804f 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -2462,11 +2462,13 @@ static void context_destroyed (gpointer data) { ETable *et = data; - et->last_drop_x = 0; - et->last_drop_y = 0; - et->last_drop_time = 0; - et->last_drop_context = NULL; - scroll_off (et); + if (!GTK_OBJECT_DESTROYED (et)) { + et->last_drop_x = 0; + et->last_drop_y = 0; + et->last_drop_time = 0; + et->last_drop_context = NULL; + scroll_off (et); + } gtk_object_unref (GTK_OBJECT (et)); } diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index 300644f750..3e15e1db94 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -2375,12 +2375,14 @@ static void context_destroyed (gpointer data) { ETree *et = data; - et->priv->last_drop_x = 0; - et->priv->last_drop_y = 0; - et->priv->last_drop_time = 0; - et->priv->last_drop_context = NULL; - scroll_off (et); - hover_off (et); + if (et->priv) { + et->priv->last_drop_x = 0; + et->priv->last_drop_y = 0; + et->priv->last_drop_time = 0; + et->priv->last_drop_context = NULL; + scroll_off (et); + hover_off (et); + } gtk_object_unref (GTK_OBJECT (et)); } |