diff options
| author | Dan Williams <dcbw@redhat.com> | 2014-04-02 16:00:35 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2014-05-09 15:33:32 -0500 |
| commit | d336a78a0e08e838e90afdb31713d86b73625b07 (patch) | |
| tree | d33c4d8bb626dc4e2d999ca61df944d8ebd18679 /src/main.c | |
| parent | 11f9855223966c4fd927fe83e2cd9a623a74acad (diff) | |
| download | NetworkManager-d336a78a0e08e838e90afdb31713d86b73625b07.tar.gz | |
core: don't ref/unref the DHCP manager
It's a singleton anyway, so no need to ref/unref it. Just use it.
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main.c b/src/main.c index 5f386cef28..f73e8073c2 100644 --- a/src/main.c +++ b/src/main.c @@ -598,6 +598,11 @@ main (int argc, char *argv[]) dns_mgr = nm_dns_manager_get (); g_assert (dns_mgr != NULL); + /* Initialize DHCP manager */ + dhcp_mgr = nm_dhcp_manager_get (); + g_assert (dhcp_mgr != NULL); + nm_dhcp_manager_set_hostname_provider (dhcp_mgr, NM_HOSTNAME_PROVIDER (manager)); + settings = nm_settings_new (&error); if (!settings) { nm_log_err (LOGD_CORE, "failed to initialize settings storage: %s", @@ -622,11 +627,6 @@ main (int argc, char *argv[]) sup_mgr = nm_supplicant_manager_get (); g_assert (sup_mgr != NULL); - /* Initialize DHCP manager */ - dhcp_mgr = nm_dhcp_manager_get (); - g_assert (dhcp_mgr != NULL); - nm_dhcp_manager_set_hostname_provider (dhcp_mgr, NM_HOSTNAME_PROVIDER (manager)); - /* Initialize Firewall manager */ fw_mgr = nm_firewall_manager_get (); g_assert (fw_mgr != NULL); |