diff options
| author | Michael Biebl <biebl@debian.org> | 2019-03-26 23:26:14 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-03-26 23:26:14 +0100 |
| commit | 9bc3ff81969c896f6bf8e1c93f98f43f6ffffaf8 (patch) | |
| tree | 302fce2d1ab3a130ac0b684d168ab6312825fcd2 /libnm-util/nm-setting.c | |
| parent | f97666c6bd29a3228443acd6401a407a19ec8d25 (diff) | |
| parent | 9a6dcbf895f9da01768e64b73cec88c16157d91e (diff) | |
Update upstream source from tag 'upstream/1.16.0'
Update to upstream version '1.16.0' with Debian dir a0f3ffb137940d423625faae8bedbaced4d34cda
Diffstat (limited to 'libnm-util/nm-setting.c')
| -rw-r--r-- | libnm-util/nm-setting.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c index 9147dfe1..3edf4005 100644 --- a/libnm-util/nm-setting.c +++ b/libnm-util/nm-setting.c @@ -650,7 +650,7 @@ nm_setting_compare (NMSetting *a, return same; } -static inline gboolean +static gboolean should_compare_prop (NMSetting *setting, const char *prop_name, NMSettingCompareFlags comp_flags, @@ -674,7 +674,7 @@ should_compare_prop (NMSetting *setting, && g_strcmp0 (prop_name, NM_SETTING_VPN_SECRETS) == 0) { /* FIXME: NMSettingVPN:NM_SETTING_VPN_SECRETS has NM_SETTING_PARAM_SECRET. * nm_setting_get_secret_flags() quite possibly fails, but it might succeed if the - * setting accidently uses a key "secrets". */ + * setting accidentally uses a key "secrets". */ return FALSE; } |