fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-25 06:50:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

manager: keep reference on NMAuthManager singleton

Browse source 
A singleton (NMManager) subscribing to another singleton (NMAuthManager)
should take a reference on the latter, to ensure its lifetime is
longer.
This commit is contained in:
Thomas Haller 2016-07-01 14:25:34 +02:00
parent c827ad64cf
commit 9f22f4e1ee
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/nm-manager.c
View file

@ -130,6 +130,8 @@ typedef struct {
NMSleepMonitor *sleep_monitor;
NMAuthManager *auth_mgr;
GSList *auth_chains;
GHashTable *sleep_devices;
@ -5110,7 +5112,7 @@ _set_prop_filter (NMManager *self, GDBusConnection *connection)
/******************************************************************************/
static void
authority_changed_cb (NMAuthManager *auth_manager, gpointer user_data)
auth_mgr_changed (NMAuthManager *auth_manager, gpointer user_data)
{
/* Let clients know they should re-check their authorization */
g_signal_emit (NM_MANAGER (user_data), signals[CHECK_PERMISSIONS], 0);
@ -5405,9 +5407,10 @@ nm_manager_init (NMManager *self)
G_CALLBACK (sleeping_cb), self);
/* Listen for authorization changes */
g_signal_connect (nm_auth_manager_get (),
priv->auth_mgr = g_object_ref (nm_auth_manager_get ());
g_signal_connect (priv->auth_mgr,
NM_AUTH_MANAGER_SIGNAL_CHANGED,
G_CALLBACK (authority_changed_cb),
G_CALLBACK (auth_mgr_changed),
self);
@ -5589,9 +5592,12 @@ dispose (GObject *object)
g_slist_free_full (priv->auth_chains, (GDestroyNotify) nm_auth_chain_unref);
priv->auth_chains = NULL;
g_signal_handlers_disconnect_by_func (nm_auth_manager_get (),
G_CALLBACK (authority_changed_cb),
manager);
if (priv->auth_mgr) {
g_signal_handlers_disconnect_by_func (priv->auth_mgr,
G_CALLBACK (auth_mgr_changed),
manager);
g_clear_object (&priv->auth_mgr);
}
g_assert (priv->devices == NULL);