From 8c0d67a81a4658102be6338b6dd5bc8338cf7f8c Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Tue, 3 Jan 2012 19:55:57 +0100 Subject: sim: use g_clear_object() before setting new objects --- src/mm-sim.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/mm-sim.c b/src/mm-sim.c index 8380a80f..f8030094 100644 --- a/src/mm-sim.c +++ b/src/mm-sim.c @@ -1182,8 +1182,7 @@ set_property (GObject *object, self->priv->path = g_value_dup_string (value); break; case PROP_CONNECTION: - if (self->priv->connection) - g_object_unref (self->priv->connection); + g_clear_object (&self->priv->connection); self->priv->connection = g_value_dup_object (value); /* Export when we get a DBus connection */ @@ -1193,8 +1192,7 @@ set_property (GObject *object, mm_sim_unexport (self); break; case PROP_MODEM: - if (self->priv->modem) - g_object_unref (self->priv->modem); + g_clear_object (&self->priv->modem); self->priv->modem = g_value_dup_object (value); if (self->priv->modem) { /* Bind the modem's connection (which is set when it is exported, @@ -1265,8 +1263,7 @@ dispose (GObject *object) g_clear_object (&self->priv->connection); } - if (self->priv->modem) - g_clear_object (&self->priv->modem); + g_clear_object (&self->priv->modem); G_OBJECT_CLASS (mm_sim_parent_class)->dispose (object); } -- cgit v1.2.3-70-g09d2