From 4ec6481695ddbec2cd9700e0c4b635631cd0f9fe Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Tue, 20 Dec 2016 10:12:30 +0100
Subject: [PATCH] dns: remove duplicate declaration of singleton instance

---
 src/dns/nm-dns-manager.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/dns/nm-dns-manager.c b/src/dns/nm-dns-manager.c
index c52777cff7..bab00b8820 100644
--- a/src/dns/nm-dns-manager.c
+++ b/src/dns/nm-dns-manager.c
@@ -100,6 +100,8 @@ typedef enum {
 	SR_ERROR
 } SpawnResult;
 
+NM_DEFINE_SINGLETON_GETTER (NMDnsManager, nm_dns_manager_get, NM_TYPE_DNS_MANAGER);
+
 /*****************************************************************************/
 
 #define _NMLOG_PREFIX_NAME                "dns-mgr"
@@ -162,8 +164,6 @@ struct _NMDnsManagerClass {
 
 G_DEFINE_TYPE (NMDnsManager, nm_dns_manager, NM_TYPE_EXPORTED_OBJECT)
 
-NM_DEFINE_SINGLETON_INSTANCE (NMDnsManager);
-
 #define NM_DNS_MANAGER_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMDnsManager, NM_IS_DNS_MANAGER)
 
 /*****************************************************************************/
@@ -1604,8 +1604,6 @@ _check_resconf_immutable (NMDnsManagerResolvConfManager rc_manager)
 	}
 }
 
-NM_DEFINE_SINGLETON_GETTER (NMDnsManager, nm_dns_manager_get, NM_TYPE_DNS_MANAGER);
-
 static gboolean
 _resolvconf_resolved_managed (void)
 {