diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-03-13 16:23:07 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-03-13 16:23:07 +0100 |
| commit | 8f6881ac06714ef99cc470a03e7ac0ce1af49a16 (patch) | |
| tree | fcb5e39f41b8135e4b3a41b6951f21473e10fa5e /src/vpn | |
| parent | ee7b95167028fdbb2a4bd32aa686e27817d8dfe0 (diff) | |
| parent | b012fa6e1d808e0736c009799c62d835cbfcc1dd (diff) | |
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latest
Diffstat (limited to 'src/vpn')
| -rw-r--r-- | src/vpn/nm-vpn-connection.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vpn/nm-vpn-connection.c b/src/vpn/nm-vpn-connection.c index 6a25ddda..974009f9 100644 --- a/src/vpn/nm-vpn-connection.c +++ b/src/vpn/nm-vpn-connection.c @@ -619,7 +619,7 @@ _set_vpn_state (NMVpnConnection *self, } vpn_cleanup (self, parent_dev); - /* fall through */ + /* fall-through */ default: priv->secrets_idx = SECRETS_REQ_SYSTEM; break; @@ -1577,7 +1577,7 @@ nm_vpn_connection_ip4_config_get (NMVpnConnection *self, GVariant *dict) switch (g_variant_n_children (v)) { case 5: g_variant_get_child (v, 4, "u", &route.pref_src); - /* fall through */ + /* fall-through */ case 4: g_variant_get_child (v, 0, "u", &route.network); g_variant_get_child (v, 1, "u", &plen); |