about summary refs log tree commit diff
path: root/libnm/nm-ip-config.c
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2019-01-25 10:52:15 +0100
committerSebastien Bacher <seb128@ubuntu.com>2019-01-25 11:24:27 +0100
commite8ac7dacdcf4b38addef4f8ac6ab038f9d29582c (patch)
tree017883e210043859ee695250f6285380b795f8e4 /libnm/nm-ip-config.c
parentb05c072fe2594e0369cbfb00a3fba176d2d309dc (diff)
parent1b878e595ff7be634a4800ca6cc506046e49548e (diff)
Merge remote-tracking branch 'salsa/master' into disco
Diffstat (limited to 'libnm/nm-ip-config.c')
-rw-r--r--libnm/nm-ip-config.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libnm/nm-ip-config.c b/libnm/nm-ip-config.c
index d1a69f38..c1e888be 100644
--- a/libnm/nm-ip-config.c
+++ b/libnm/nm-ip-config.c
@@ -173,9 +173,11 @@ init_dbus (NMObject *object)
 		{ "address-data",            &priv->addresses, demarshal_ip_address_data },
 		{ NM_IP_CONFIG_ROUTES,       &priv->routes, demarshal_ip_routes },
 		{ "route-data",              &priv->routes, demarshal_ip_route_data },
+		/* Still use deprecated "Nameservers" property instead of "NameserverData" */
 		{ NM_IP_CONFIG_NAMESERVERS,  &priv->nameservers, demarshal_ip_array },
 		{ NM_IP_CONFIG_DOMAINS,      &priv->domains, },
 		{ NM_IP_CONFIG_SEARCHES,     &priv->searches, },
+		/* Still use deprecated "WinsServers" property instead of "WinsServerData" */
 		{ NM_IP_CONFIG_WINS_SERVERS, &priv->wins, demarshal_ip_array },
 		{ NULL },
 	};