colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sim: use g_clear_object() before setting new objects

Browse Source
This commit is contained in:
Aleksander Morgado
2012-01-03 19:55:57 +01:00
parent f3bc54eb40
commit 8c0d67a81a
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mm-sim.c
View File

@@ -1182,8 +1182,7 @@ set_property (GObject *object,
self->priv->path = g_value_dup_string (value); self->priv->path = g_value_dup_string (value);
break; break;
case PROP_CONNECTION: case PROP_CONNECTION:
if (self->priv->connection) g_clear_object (&self->priv->connection);
g_object_unref (self->priv->connection);
self->priv->connection = g_value_dup_object (value); self->priv->connection = g_value_dup_object (value);
/* Export when we get a DBus connection */ /* Export when we get a DBus connection */
@@ -1193,8 +1192,7 @@ set_property (GObject *object,
mm_sim_unexport (self); mm_sim_unexport (self);
break; break;
case PROP_MODEM: case PROP_MODEM:
if (self->priv->modem) g_clear_object (&self->priv->modem);
g_object_unref (self->priv->modem);
self->priv->modem = g_value_dup_object (value); self->priv->modem = g_value_dup_object (value);
if (self->priv->modem) { if (self->priv->modem) {
/* Bind the modem's connection (which is set when it is exported, /* 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); 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); G_OBJECT_CLASS (mm_sim_parent_class)->dispose (object);
} }