summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2014-08-04 19:57:20 -0400
committerDan Winship <danw@gnome.org>2014-09-04 09:18:44 -0400
commit6217c1e74c093b95b16880a30286c8e60a6fb746 (patch)
tree90374b3a26efc0261685bc5b9f44b2e9e5196c6c /src
parent40bb402898903d90b76f5f01f783717b838ba090 (diff)
downloadNetworkManager-6217c1e74c093b95b16880a30286c8e60a6fb746.tar.gz
libnm-core: drop :interface-name properties on virtual NMSetting types
Remove the virtual :interface-name properties and their getters, and use property overrides to do backward-compat handling when serializing/deserializing. Now when constructing an NMConnection from a hash, if the virtual property is set and the NMSettingConnection property isn't, then the override for NMSettingConnection:interface-name will set that property to the value of the virtual interface-name. And when converting an NMConnection to a hash, the overrides for the virtual properties will return the value of NMSettingConnection:interface-name.
Diffstat (limited to 'src')
-rw-r--r--src/settings/plugins/keyfile/tests/test-keyfile.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/settings/plugins/keyfile/tests/test-keyfile.c b/src/settings/plugins/keyfile/tests/test-keyfile.c
index 24a09ec44b..3d5fce5367 100644
--- a/src/settings/plugins/keyfile/tests/test-keyfile.c
+++ b/src/settings/plugins/keyfile/tests/test-keyfile.c
@@ -2980,10 +2980,6 @@ test_write_bridge_main (void)
g_assert (s_bridge);
nm_connection_add_setting (connection, NM_SETTING (s_bridge));
- g_object_set (s_bridge,
- NM_SETTING_BRIDGE_INTERFACE_NAME, "br0",
- NULL);
-
/* IP4 setting */
s_ip4 = (NMSettingIP4Config *) nm_setting_ip4_config_new ();
g_assert (s_ip4);