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

base-modem: ensure we cancel any ongoing operation when we're disposing

Browse Source
This commit is contained in:
Aleksander Morgado
2012-03-13 13:49:25 +01:00
parent 09026ed89a
commit 56e7b15f5c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/mm-base-modem.c
View File

@@ -916,6 +916,12 @@ dispose (GObject *object)
/* Cancel all ongoing auth requests */ /* Cancel all ongoing auth requests */
g_cancellable_cancel (self->priv->authp_cancellable); g_cancellable_cancel (self->priv->authp_cancellable);
g_clear_object (&self->priv->authp_cancellable);
g_clear_object (&self->priv->authp);
/* Ensure we cancel any ongoing operation */
g_cancellable_cancel (self->priv->cancellable);
g_clear_object (&self->priv->cancellable);
g_clear_object (&self->priv->primary); g_clear_object (&self->priv->primary);
g_clear_object (&self->priv->secondary); g_clear_object (&self->priv->secondary);
@@ -927,13 +933,8 @@ dispose (GObject *object)
self->priv->ports = NULL; self->priv->ports = NULL;
} }
g_clear_object (&self->priv->cancellable);
g_clear_object (&self->priv->connection); g_clear_object (&self->priv->connection);
g_clear_object (&self->priv->authp);
g_clear_object (&self->priv->authp_cancellable);
G_OBJECT_CLASS (mm_base_modem_parent_class)->dispose (object); G_OBJECT_CLASS (mm_base_modem_parent_class)->dispose (object);
} }