fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-18 03:40:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

supplicant: clean up NMSupplicantManager::dispose()

Browse source 
(cherry picked from commit 742b28fb1f)
This commit is contained in:
Dan Williams 2015-02-23 14:17:57 -06:00 • committed by Thomas Haller
parent 8cffaf3bf5
commit fae1a4f864
1 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/supplicant-manager/nm-supplicant-manager.c
View file

@ -57,7 +57,6 @@ typedef struct {
ApSupport ap_support;
guint die_count_reset_id;
guint die_count;
gboolean disposed;
} NMSupplicantManagerPrivate;
/********************************************************************/
@ -372,29 +371,23 @@ dispose (GObject *object)
{
NMSupplicantManagerPrivate *priv = NM_SUPPLICANT_MANAGER_GET_PRIVATE (object);
if (priv->disposed)
goto out;
priv->disposed = TRUE;
if (priv->die_count_reset_id)
if (priv->die_count_reset_id) {
g_source_remove (priv->die_count_reset_id);
priv->die_count_reset_id = 0;
}
if (priv->dbus_mgr) {
if (priv->name_owner_id)
if (priv->name_owner_id) {
g_signal_handler_disconnect (priv->dbus_mgr, priv->name_owner_id);
priv->name_owner_id = 0;
}
priv->dbus_mgr = NULL;
}
g_hash_table_destroy (priv->ifaces);
g_clear_pointer (&priv->ifaces, g_hash_table_unref);
g_clear_object (&priv->proxy);
g_clear_object (&priv->props_proxy);
if (priv->proxy)
g_object_unref (priv->proxy);
if (priv->props_proxy)
g_object_unref (priv->props_proxy);
out:
/* Chain up to the parent class */
G_OBJECT_CLASS (nm_supplicant_manager_parent_class)->dispose (object);
}