diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
| commit | 404ebe62622150e77e311777dff8617eb974e834 (patch) | |
| tree | cc7f73d3e435d5b3ee85e2bef833e8de1fb133e3 /libnm/nm-ip-config.c | |
| parent | 227c401a10a930af6fd5f123aef345fcd130d6aa (diff) | |
| parent | 3626b425d1bc017fdc6f1ea0cfd329d1e1681641 (diff) | |
Merge remote-tracking branch 'salsa/upstream' into upstream
Diffstat (limited to 'libnm/nm-ip-config.c')
| -rw-r--r-- | libnm/nm-ip-config.c | 2 |
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 }, }; |