fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-14 22:28:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

settings: let NMSettingsConnection own reference to nm_session_monitor_get()

Browse source 
This way, the lifetime of the session monitor is guaranteed to exceed
the lifetime of it's user -- the NMSettingsConnection.
This commit is contained in:
Thomas Haller 2015-08-11 11:28:39 +02:00
parent 24d191d06c
commit 7168283871
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/settings/nm-settings-connection.c
View file

@ -111,6 +111,7 @@ typedef struct {
gboolean removed;
NMAgentManager *agent_mgr;
NMSessionMonitor *session_monitor;
guint session_changed_id;
NMSettingsConnectionFlags flags;
@ -333,7 +334,7 @@ nm_settings_connection_recheck_visibility (NMSettingsConnection *self)
continue;
if (!nm_session_monitor_user_to_uid (user, &uid))
continue;
if (!nm_session_monitor_session_exists (nm_session_monitor_get (), uid, FALSE))
if (!nm_session_monitor_session_exists (priv->session_monitor, uid, FALSE))
continue;
set_visible (self, TRUE);
@ -2325,7 +2326,8 @@ nm_settings_connection_init (NMSettingsConnection *self)
priv->visible = FALSE;
priv->ready = TRUE;
priv->session_changed_id = nm_session_monitor_connect (nm_session_monitor_get (), session_changed_cb, self);
priv->session_monitor = g_object_ref (nm_session_monitor_get ());
priv->session_changed_id = nm_session_monitor_connect (priv->session_monitor, session_changed_cb, self);
priv->agent_mgr = g_object_ref (nm_agent_manager_get ());
@ -2387,9 +2389,10 @@ dispose (GObject *object)
set_visible (self, FALSE);
if (priv->session_changed_id) {
nm_session_monitor_disconnect (nm_session_monitor_get (), priv->session_changed_id);
if (priv->session_monitor) {
nm_session_monitor_disconnect (priv->session_monitor, priv->session_changed_id);
priv->session_changed_id = 0;
g_clear_object (&priv->session_monitor);
}
g_clear_object (&priv->agent_mgr);