From 62b3d27e1d8b19d1b9f1e5461586f6609180f2e5 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 10 Jun 2016 00:59:35 +0200 Subject: [PATCH] Revert "Remove dns VPN/DEVICE DNS config before adding different one" This reverts commit 68122212e01a1c1c4f8191f11690bf7e69121939. --- src/dns-manager/nm-dns-manager.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c index 7285b89d99..b42af167cd 100644 --- a/src/dns-manager/nm-dns-manager.c +++ b/src/dns-manager/nm-dns-manager.c @@ -1142,17 +1142,9 @@ nm_dns_manager_add_ip4_config (NMDnsManager *self, switch (cfg_type) { case NM_DNS_IP_CONFIG_TYPE_VPN: - if (priv->ip4_vpn_config && priv->ip4_vpn_config != config) { - priv->configs = g_slist_remove (priv->configs, priv->ip4_vpn_config); - g_object_unref (priv->ip4_vpn_config); - } priv->ip4_vpn_config = config; break; case NM_DNS_IP_CONFIG_TYPE_BEST_DEVICE: - if (priv->ip4_device_config && priv->ip4_device_config != config) { - priv->configs = g_slist_remove (priv->configs, priv->ip4_device_config); - g_object_unref (priv->ip4_device_config); - } priv->ip4_device_config = config; break; default: @@ -1223,17 +1215,9 @@ nm_dns_manager_add_ip6_config (NMDnsManager *self, switch (cfg_type) { case NM_DNS_IP_CONFIG_TYPE_VPN: - if (priv->ip6_vpn_config && priv->ip6_vpn_config != config) { - priv->configs = g_slist_remove (priv->configs, priv->ip6_vpn_config); - g_object_unref (priv->ip6_vpn_config); - } priv->ip6_vpn_config = config; break; case NM_DNS_IP_CONFIG_TYPE_BEST_DEVICE: - if (priv->ip6_device_config && priv->ip6_device_config != config) { - priv->configs = g_slist_remove (priv->configs, priv->ip6_device_config); - g_object_unref (priv->ip6_device_config); - } priv->ip6_device_config = config; break; default: