about summary refs log tree commit diff
path: root/src/vpn
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2020-03-13 16:27:57 +0100
committerSebastien Bacher <seb128@ubuntu.com>2020-03-13 16:27:57 +0100
commita46c3e57291e64e9258698dbe5b0ef11def833c5 (patch)
treede9a6dcb3ab058a02fa0a2d9e7d1b3572b588583 /src/vpn
parent767904eab32f132502230df57e146cb822dad7ba (diff)
parent19e73abd360f0198f94ce49f36ddf009056f6324 (diff)
Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master
Diffstat (limited to 'src/vpn')
-rw-r--r--src/vpn/nm-vpn-connection.c4
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);