colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: declare nm_dns_manager_get() using NM_DEFINE_SINGLETON_GETTER()

Browse Source
This commit is contained in:
Thomas Haller
2015-01-05 17:20:23 +01:00
parent a8ebd1aa1a
commit e439637ada
3 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/dns-manager/nm-dns-manager.c
View File

@@ -1080,18 +1080,7 @@ nm_dns_manager_end_updates (NMDnsManager *mgr, const char *func)
/******************************************************************/ /******************************************************************/
NMDnsManager * NM_DEFINE_SINGLETON_GETTER (NMDnsManager, nm_dns_manager_get, NM_TYPE_DNS_MANAGER);
nm_dns_manager_get (void)
{
static NMDnsManager * singleton = NULL;
if (!singleton) {
singleton = NM_DNS_MANAGER (g_object_new (NM_TYPE_DNS_MANAGER, NULL));
g_assert (singleton);
}
return singleton;
}
static void static void
init_resolv_conf_mode (NMDnsManager *self) init_resolv_conf_mode (NMDnsManager *self)

5
src/main.c
View File

@@ -46,7 +46,6 @@
#include "main-utils.h" #include "main-utils.h"
#include "nm-manager.h" #include "nm-manager.h"
#include "nm-linux-platform.h" #include "nm-linux-platform.h"
#include "nm-dns-manager.h"
#include "nm-dbus-manager.h" #include "nm-dbus-manager.h"
#include "nm-supplicant-manager.h" #include "nm-supplicant-manager.h"
#include "nm-dhcp-manager.h" #include "nm-dhcp-manager.h"
@@ -204,7 +203,6 @@ main (int argc, char *argv[])
gboolean success, show_version = FALSE; gboolean success, show_version = FALSE;
NMManager *manager = NULL; NMManager *manager = NULL;
gs_unref_object NMVpnManager *vpn_manager = NULL; gs_unref_object NMVpnManager *vpn_manager = NULL;
gs_unref_object NMDnsManager *dns_mgr = NULL;
gs_unref_object NMDBusManager *dbus_mgr = NULL; gs_unref_object NMDBusManager *dbus_mgr = NULL;
gs_unref_object NMSupplicantManager *sup_mgr = NULL; gs_unref_object NMSupplicantManager *sup_mgr = NULL;
gs_unref_object NMDhcpManager *dhcp_mgr = NULL; gs_unref_object NMDhcpManager *dhcp_mgr = NULL;
@@ -402,9 +400,6 @@ main (int argc, char *argv[])
vpn_manager = nm_vpn_manager_get (); vpn_manager = nm_vpn_manager_get ();
g_assert (vpn_manager != NULL); g_assert (vpn_manager != NULL);
dns_mgr = nm_dns_manager_get ();
g_assert (dns_mgr != NULL);
/* Initialize DHCP manager */ /* Initialize DHCP manager */
dhcp_mgr = nm_dhcp_manager_get (); dhcp_mgr = nm_dhcp_manager_get ();
g_assert (dhcp_mgr != NULL); g_assert (dhcp_mgr != NULL);

4
src/nm-policy.c
View File

@@ -1788,7 +1788,7 @@ nm_policy_new (NMManager *manager, NMSettings *settings)
priv->fw_started_id = g_signal_connect (nm_firewall_manager_get (), "started", priv->fw_started_id = g_signal_connect (nm_firewall_manager_get (), "started",
G_CALLBACK (firewall_started), policy); G_CALLBACK (firewall_started), policy);
priv->dns_manager = nm_dns_manager_get (); priv->dns_manager = g_object_ref (nm_dns_manager_get ());
nm_dns_manager_set_initial_hostname (priv->dns_manager, priv->orig_hostname); nm_dns_manager_set_initial_hostname (priv->dns_manager, priv->orig_hostname);
priv->config_changed_id = g_signal_connect (priv->dns_manager, "config-changed", priv->config_changed_id = g_signal_connect (priv->dns_manager, "config-changed",
G_CALLBACK (dns_config_changed), policy); G_CALLBACK (dns_config_changed), policy);
@@ -1899,7 +1899,7 @@ dispose (GObject *object)
if (priv->dns_manager) { if (priv->dns_manager) {
g_signal_handler_disconnect (priv->dns_manager, priv->config_changed_id); g_signal_handler_disconnect (priv->dns_manager, priv->config_changed_id);
priv->dns_manager = NULL; g_clear_object (&priv->dns_manager);
} }
for (iter = priv->manager_ids; iter; iter = g_slist_next (iter)) for (iter = priv->manager_ids; iter; iter = g_slist_next (iter))