diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-03-29 13:01:18 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-03-29 13:01:18 +0200 |
| commit | 53011592af2d282947a513b2b7da1b3b08be2aea (patch) | |
| tree | af9f3943aac5ff2ea1a685567301e287b400d961 /libnm-core/nm-setting-connection.c | |
| parent | c473cb42d0d7a2157ddba119aac17fdb9c448e2d (diff) | |
| parent | b645a3b39d574fdf4e02bae3ee18bea8a3d3f95c (diff) | |
| download | NetworkManager-th/mif.tar.gz | |
Merge branch master of git://anongit.freedesktop.org/NetworkManager/NetworkManagerth/mif
Diffstat (limited to 'libnm-core/nm-setting-connection.c')
| -rw-r--r-- | libnm-core/nm-setting-connection.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c index 365bc38c3c..8f584b19d2 100644 --- a/libnm-core/nm-setting-connection.c +++ b/libnm-core/nm-setting-connection.c @@ -1127,11 +1127,13 @@ find_virtual_interface_name (GVariant *connection_dict) return interface_name; } -static void +static gboolean nm_setting_connection_set_interface_name (NMSetting *setting, GVariant *connection_dict, const char *property, - GVariant *value) + GVariant *value, + NMSettingParseFlags parse_flags, + GError **error) { const char *interface_name; @@ -1146,12 +1148,16 @@ nm_setting_connection_set_interface_name (NMSetting *setting, g_object_set (G_OBJECT (setting), NM_SETTING_CONNECTION_INTERFACE_NAME, interface_name, NULL); + + return TRUE; } -static void +static gboolean nm_setting_connection_no_interface_name (NMSetting *setting, GVariant *connection_dict, - const char *property) + const char *property, + NMSettingParseFlags parse_flags, + GError **error) { const char *virtual_interface_name; @@ -1159,6 +1165,7 @@ nm_setting_connection_no_interface_name (NMSetting *setting, g_object_set (G_OBJECT (setting), NM_SETTING_CONNECTION_INTERFACE_NAME, virtual_interface_name, NULL); + return TRUE; } static gboolean |