diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-04-07 13:40:22 +0100 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-04-07 14:44:27 +0200 |
| commit | dc1a7834fa4749d090dd6b3ad4a3aac332941c50 (patch) | |
| tree | bb098617a2541fc716c5ba1fed4f2f8856ba10c9 | |
| parent | 37aa027a859b69982d9569d7cb0d54ae21860cbc (diff) | |
| download | empathy-dc1a7834fa4749d090dd6b3ad4a3aac332941c50.tar.gz | |
location_manager_dispose: chain up to the parent's dispose, not the parent's finalize
This leads to crashes when other code is relying on weak reference
notifications happening in the right order.
| -rw-r--r-- | libempathy-gtk/empathy-location-manager.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c index 4ef27dba7..0422f5cc6 100644 --- a/libempathy-gtk/empathy-location-manager.c +++ b/libempathy-gtk/empathy-location-manager.c @@ -98,6 +98,8 @@ static void location_manager_dispose (GObject *object) { EmpathyLocationManagerPriv *priv = GET_PRIV (object); + void (*dispose) (GObject *) = + G_OBJECT_CLASS (empathy_location_manager_parent_class)->dispose; if (priv->account_manager != NULL) { @@ -129,7 +131,8 @@ location_manager_dispose (GObject *object) priv->location = NULL; } - G_OBJECT_CLASS (empathy_location_manager_parent_class)->finalize (object); + if (dispose != NULL) + dispose (object); } static void |