summaryrefslogtreecommitdiff
path: root/src/nm-manager.c
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-07-01 14:30:00 +0200
committerThomas Haller <thaller@redhat.com>2016-07-01 14:30:00 +0200
commit5bded081a44d75d297a82c7d696678807c65119f (patch)
treec804b113ebfa792899e1a8c39fee44254c154081 /src/nm-manager.c
parent9f22f4e1eefdcd3347ab9e3ae863f9c3931aa5c9 (diff)
downloadNetworkManager-5bded081a44d75d297a82c7d696678807c65119f.tar.gz
manager: use priv->config instead of singleton getter nm_config_get()
Diffstat (limited to 'src/nm-manager.c')
-rw-r--r--src/nm-manager.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 260d65f48c..ab1a5744b7 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -914,7 +914,7 @@ check_if_startup_complete (NMManager *self)
g_signal_handlers_disconnect_by_func (dev, G_CALLBACK (device_has_pending_action_changed), self);
}
- if (nm_config_get_configure_and_quit (nm_config_get ()))
+ if (nm_config_get_configure_and_quit (priv->config))
g_signal_emit (self, signals[CONFIGURE_QUIT], 0);
}
@@ -960,7 +960,7 @@ remove_device (NMManager *self,
nm_device_set_unmanaged_by_quitting (device);
else
nm_device_set_unmanaged_by_flags (device, NM_UNMANAGED_PLATFORM_INIT, TRUE, NM_DEVICE_STATE_REASON_REMOVED);
- } else if (quitting && nm_config_get_configure_and_quit (nm_config_get ())) {
+ } else if (quitting && nm_config_get_configure_and_quit (priv->config)) {
nm_device_spawn_iface_helper (device);
}
}