diff options
| author | Sjoerd Simons <sjoerd@luon.net> | 2013-10-25 21:20:58 +0200 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd@luon.net> | 2013-10-25 21:20:58 +0200 |
| commit | a4256940da049f91bbbea5e53e469a59ea9c10f7 (patch) | |
| tree | 2211c102aea3a33f34f960f48c8b8a55daccd97b /libnm-util/nm-setting-wireless-security.c | |
| parent | 8d275584fc94f398f0a7c990dcd057533d9a5856 (diff) | |
Imported Upstream version 0.9.8.8 upstream/0.9.8.8
Diffstat (limited to 'libnm-util/nm-setting-wireless-security.c')
| -rw-r--r-- | libnm-util/nm-setting-wireless-security.c | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/libnm-util/nm-setting-wireless-security.c b/libnm-util/nm-setting-wireless-security.c index 5dec266f..9e4becca 100644 --- a/libnm-util/nm-setting-wireless-security.c +++ b/libnm-util/nm-setting-wireless-security.c @@ -1301,38 +1301,44 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting /** * NMSettingWirelessSecurity:pairwise: * - * If specified, will only connect to WPA networks that provide the - * specified pairwise encryption capabilities. Each element may be one of - * 'wep40', 'wep104', 'tkip', or 'ccmp'. + * A list of pairwise encryption algorithms which prevents connections to + * Wi-Fi networks that do not utilize one of the algorithms in the list. For + * maximum compatibility leave this property empty. Each list element may + * be one of 'wep40', 'wep104', 'tkip', or 'ccmp'. **/ g_object_class_install_property (object_class, PROP_PAIRWISE, _nm_param_spec_specialized (NM_SETTING_WIRELESS_SECURITY_PAIRWISE, - "Pairwise", - "If specified, will only connect to WPA networks " - "that provide the specified pairwise encryption " - "capabilities. Each element may be one of 'wep40', " - "'wep104', 'tkip', or 'ccmp'.", - DBUS_TYPE_G_LIST_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + "Pairwise", + "A list of pairwise encryption algorithms which " + "prevents connections to Wi-Fi networks that do " + "not utilize one of the algorithms in the list. " + "For maximum compatibility leave this property " + "empty. Each list element may be one of 'wep40', " + "'wep104', 'tkip' or 'ccmp'.", + DBUS_TYPE_G_LIST_OF_STRING, + G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); /** * NMSettingWirelessSecurity:group: * - * If specified, will only connect to WPA networks that provide the - * specified group/multicast encryption capabilities. Each element may be - * one of 'wep40', 'wep104', 'tkip', or 'ccmp'. + * A list of group/broadcast encryption algorithms which prevents + * connections to Wi-Fi networks that do not utilize one of the algorithms + * in the list. For maximum compatibility leave this property empty. Each + * list element may be one of 'wep40', 'wep104', 'tkip', or 'ccmp'. **/ g_object_class_install_property (object_class, PROP_GROUP, _nm_param_spec_specialized (NM_SETTING_WIRELESS_SECURITY_GROUP, - "Group", - "If specified, will only connect to WPA networks " - "that provide the specified group/multicast " - "encryption capabilities. Each element may be " - "one of 'wep40', 'wep104', 'tkip', or 'ccmp'.", - DBUS_TYPE_G_LIST_OF_STRING, - G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + "Group", + "A list of group/broadcast encryption algorithms " + "which prevents connections to Wi-Fi networks " + "that do not utilize one of the algorithms in " + "the list. For maximum compatibility leave this " + "property empty. Each list element may be one " + " of 'wep40', 'wep104', 'tkip', or 'ccmp'.", + DBUS_TYPE_G_LIST_OF_STRING, + G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); /** * NMSettingWirelessSecurity:leap-username: |