From c3f1a7ec98277fd68db12c61c30e6c5753a63fcd Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Tue, 3 Jan 2012 19:57:43 +0100 Subject: [PATCH] bearer: use g_clear_object() before setting new objects --- src/mm-bearer.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/mm-bearer.c b/src/mm-bearer.c index 2c3686ff..40cbf0a8 100644 --- a/src/mm-bearer.c +++ b/src/mm-bearer.c @@ -558,8 +558,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 */ @@ -569,8 +568,7 @@ set_property (GObject *object, mm_bearer_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,