diff options
| author | Jonny Lamb <jonnylamb@gnome.org> | 2010-12-14 16:30:41 +0000 |
|---|---|---|
| committer | Jonny Lamb <jonnylamb@gnome.org> | 2010-12-14 16:30:41 +0000 |
| commit | 6093afb467c0c2ae855d8635d9a10e9bc5f072c4 (patch) | |
| tree | 247582ee9c33db0944541922520772f0690f9cf5 | |
| parent | b51c1db854b9c367ea50d0a301fddca917486372 (diff) | |
account-settings: use tp_clear_object in dispose
Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
| -rw-r--r-- | libempathy/empathy-account-settings.c | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c index c1452ac68..fe08f52c0 100644 --- a/libempathy/empathy-account-settings.c +++ b/libempathy/empathy-account-settings.c @@ -350,25 +350,11 @@ empathy_account_settings_dispose (GObject *object) g_signal_handler_disconnect (priv->managers, priv->managers_ready_id); priv->managers_ready_id = 0; - if (priv->managers != NULL) - g_object_unref (priv->managers); - priv->managers = NULL; - - if (priv->manager != NULL) - g_object_unref (priv->manager); - priv->manager = NULL; - - if (priv->account_manager != NULL) - g_object_unref (priv->account_manager); - priv->account_manager = NULL; - - if (priv->account != NULL) - g_object_unref (priv->account); - priv->account = NULL; - - if (priv->protocol_obj != NULL) - g_object_unref (priv->protocol_obj); - priv->protocol_obj = NULL; + tp_clear_object (&priv->managers); + tp_clear_object (&priv->manager); + tp_clear_object (&priv->account_manager); + tp_clear_object (&priv->account); + tp_clear_object (&priv->protocol_obj); /* release any references held by the object here */ if (G_OBJECT_CLASS (empathy_account_settings_parent_class)->dispose) |