From: Tobias Brunner Date: Wed, 6 Apr 2016 16:18:29 +0000 (+0200) Subject: nm: Remove incorrect top-level GtkWindow X-Git-Tag: 5.5.1dr3~13^2~1 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ab01ae3cae9936991b08ec602c32f56f0ce71c03;p=thirdparty%2Fstrongswan.git nm: Remove incorrect top-level GtkWindow Fixes #1013. --- diff --git a/src/frontends/gnome/properties/nm-strongswan-dialog.ui b/src/frontends/gnome/properties/nm-strongswan-dialog.ui index c90b645426..6aea549fb2 100644 --- a/src/frontends/gnome/properties/nm-strongswan-dialog.ui +++ b/src/frontends/gnome/properties/nm-strongswan-dialog.ui @@ -1,114 +1,129 @@ - + + True False - window1 + start + 12 + 16 - + True False - start - 12 - 16 + 6 - + True False - 6 - - - True - False - 0 - <b>Gateway</b> - True - - - False - False - 0 - - + 0 + <b>Gateway</b> + True + + + False + False + 0 + + + + + True + False + 12 - + True False - 12 + 2 + 2 + 6 + 6 + + + True + False + 0 + _Address: + True + address-entry + + + GTK_FILL + + + + + + True + True + True + An IP address or hostname the Gateway can be contacted. + + + 1 + 2 + + + + + + True + False + 0 + C_ertificate: + True + certificate-button + + + 1 + 2 + GTK_FILL + + + - + True False - 2 - 2 - 6 - 6 - - - True - False - 0 - _Address: - True - address-entry - - - GTK_FILL - - - - - - True - True - True - An IP address or hostname the Gateway can be contacted. - - - 1 - 2 - - - - - - True - False - 0 - C_ertificate: - True - certificate-button - - - 1 - 2 - GTK_FILL - - - - - - True - False - Gateway or CA certificate to use for gateway authentication. If none is specified, pre-installed CA certificates are used. - - - 1 - 2 - 1 - 2 - - + Gateway or CA certificate to use for gateway authentication. If none is specified, pre-installed CA certificates are used. + + 1 + 2 + 1 + 2 + - - True - True - 1 - + + True + True + 1 + + + + + False + False + 0 + + + + + True + False + 6 + + + True + False + 0 + <b>Client</b> + True + False False @@ -116,264 +131,243 @@ - + True False - 6 + 12 - + True False - 0 - <b>Client</b> - True - - - False - False - 0 - - - - - True - False - 12 + 4 + 2 + 6 + 6 + + + True + False + Private key to use for client authentication. This key has to match the certificates public key and may be encrypted. + + + 1 + 2 + 3 + 4 + + + + + True + False + 0 + Private _key: + True + userkey-button + + + 3 + 4 + GTK_FILL + + + + + + True + False + 0 + Au_thentication: + True + + + GTK_FILL + + + + + + True + False + 0 + _Username: + True + user-entry + + + 1 + 2 + GTK_FILL + + + + + + True + True + True + The username (identity) to use for authentication against the gateway. + + + 1 + 2 + 1 + 2 + + + - + True False - 4 - 2 - 6 - 6 - - - True - False - Private key to use for client authentication. This key has to match the certificates public key and may be encrypted. - - - 1 - 2 - 3 - 4 - - - - - True - False - 0 - Private _key: - True - userkey-button - - - 3 - 4 - GTK_FILL - - - - - - True - False - 0 - Au_thentication: - True - - - GTK_FILL - - - - - - True - False - 0 - _Username: - True - user-entry - - - 1 - 2 - GTK_FILL - - - - - - True - True - True - The username (identity) to use for authentication against the gateway. - - - 1 - 2 - 1 - 2 - - - - - - True - False - 0 - Ce_rtificate: - True - usercert-button - - - 2 - 3 - GTK_FILL - - - - - - True - False - Client certificate to use for client authentication. - - - 1 - 2 - 2 - 3 - - - - - True - False - - - 1 - 2 - - + 0 + Ce_rtificate: + True + usercert-button + + 2 + 3 + GTK_FILL + + + + + + True + False + Client certificate to use for client authentication. + + + 1 + 2 + 2 + 3 + + + + + True + False + + + 1 + 2 + - - True - True - 1 - + + True + True + 1 + + + + + False + False + 1 + + + + + True + False + 6 + + + True + False + 0 + <b>Options</b> + True + False False - 1 + 0 - + True False - 6 - - - True - False - 0 - <b>Options</b> - True - - - False - False - 0 - - + 12 - + True False - 12 - + + Request an _inner IP address True - False - - - Request an _inner IP address - True - True - False - True - The Gateway may provide addresses from a pool to use for communication in the Gateways network. Check to request such an address. - False - True - True - - - True - True - 0 - - - - - En_force UDP encapsulation - True - True - False - True - Some firewalls block ESP traffic. Enforcing UDP capsulation even if no NAT situation is detected might help in such cases. - False - True - True - - - True - True - 1 - - - - - Use IP c_ompression - True - True - False - True - IPComp compresses raw IP packets before they get encrypted. This saves some bandwidth, but uses more processing power. - False - True - True - - - True - True - 2 - - + True + False + True + The Gateway may provide addresses from a pool to use for communication in the Gateways network. Check to request such an address. + False + True + True + + + True + True + 0 + + + + + En_force UDP encapsulation + True + True + False + True + Some firewalls block ESP traffic. Enforcing UDP capsulation even if no NAT situation is detected might help in such cases. + False + True + True + + True + True + 1 + + + + + Use IP c_ompression + True + True + False + True + IPComp compresses raw IP packets before they get encrypted. This saves some bandwidth, but uses more processing power. + False + True + True + + + True + True + 2 + - - True - True - 1 - - False + True True - 2 + 1 + + False + True + 2 +