From 38200371a8b006cde3d745e34210a3c8fecf629a Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Wed, 6 Apr 2016 16:36:47 +0200
Subject: [PATCH] dns-manager: add 'priv' pointer to object structure

(cherry picked from commit 89306ebb2eec78eb7f507af720cafac93e9b2f15)
---
 src/dns-manager/nm-dns-manager.c | 13 +++++++------
 src/dns-manager/nm-dns-manager.h |  4 ++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c
index d7ab6ce981..5d4214858b 100644
--- a/src/dns-manager/nm-dns-manager.c
+++ b/src/dns-manager/nm-dns-manager.c
@@ -63,9 +63,7 @@
 
 G_DEFINE_TYPE (NMDnsManager, nm_dns_manager, G_TYPE_OBJECT)
 
-#define NM_DNS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
-                                       NM_TYPE_DNS_MANAGER, \
-                                       NMDnsManagerPrivate))
+#define NM_DNS_MANAGER_GET_PRIVATE(o) ((o)->priv)
 
 #define HASH_LEN 20
 
@@ -111,7 +109,7 @@ NM_DEFINE_SINGLETON_INSTANCE (NMDnsManager);
 
 /*********************************************************************************************/
 
-typedef struct {
+typedef struct _NMDnsManagerPrivate {
 	NMIP4Config *ip4_vpn_config;
 	NMIP4Config *ip4_device_config;
 	NMIP6Config *ip6_vpn_config;
@@ -1520,7 +1518,9 @@ config_changed_cb (NMConfig *config,
 static void
 nm_dns_manager_init (NMDnsManager *self)
 {
-	NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (self);
+	NMDnsManagerPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (self, NM_TYPE_DNS_MANAGER, NMDnsManagerPrivate);
+
+	self->priv = priv;
 
 	_LOGT ("creating...");
 
@@ -1579,7 +1579,8 @@ dispose (GObject *object)
 static void
 finalize (GObject *object)
 {
-	NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (object);
+	NMDnsManager *self = NM_DNS_MANAGER (object);
+	NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (self);
 
 	g_free (priv->hostname);
 
diff --git a/src/dns-manager/nm-dns-manager.h b/src/dns-manager/nm-dns-manager.h
index f1293f7ebb..37f104ad36 100644
--- a/src/dns-manager/nm-dns-manager.h
+++ b/src/dns-manager/nm-dns-manager.h
@@ -45,8 +45,12 @@ G_BEGIN_DECLS
 
 #define NM_DNS_MANAGER_CONFIG_CHANGED "config-changed"
 
+struct _NMDnsManagerPrivate;
+
 typedef struct {
 	GObject parent;
+	/* private */
+	struct _NMDnsManagerPrivate *priv;
 } NMDnsManager;
 
 typedef struct {