diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2017-05-22 18:47:42 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2017-05-31 20:15:52 +0200 |
| commit | 7c5a2be96618787bfa94ad1179c101796b4f986d (patch) | |
| tree | 60f8dcdfe876ef67a7406f42775c585ae797ab18 | |
| parent | 2c1a178f5bd815146a3079c3a188fae3b0491377 (diff) | |
| download | NetworkManager-7c5a2be96618787bfa94ad1179c101796b4f986d.tar.gz | |
core/bluetooth: add NAP type
| -rw-r--r-- | libnm-core/nm-setting-bluetooth.c | 5 | ||||
| -rw-r--r-- | libnm-core/nm-setting-bluetooth.h | 12 |
2 files changed, 13 insertions, 4 deletions
diff --git a/libnm-core/nm-setting-bluetooth.c b/libnm-core/nm-setting-bluetooth.c index 669c1be3b9..d25d4db269 100644 --- a/libnm-core/nm-setting-bluetooth.c +++ b/libnm-core/nm-setting-bluetooth.c @@ -80,8 +80,8 @@ NMSetting *nm_setting_bluetooth_new (void) * Returns the connection method for communicating with the remote device (i.e. * either DUN to a DUN-capable device or PANU to a NAP-capable device). * - * Returns: the type, either %NM_SETTING_BLUETOOTH_TYPE_PANU or - * %NM_SETTING_BLUETOOTH_TYPE_DUN + * Returns: the type, either %NM_SETTING_BLUETOOTH_TYPE_PANU, + * %NM_SETTING_BLUETOOTH_TYPE_NAP or %NM_SETTING_BLUETOOTH_TYPE_DUN **/ const char * nm_setting_bluetooth_get_connection_type (NMSettingBluetooth *setting) @@ -139,6 +139,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) g_prefix_error (error, "%s.%s: ", NM_SETTING_BLUETOOTH_SETTING_NAME, NM_SETTING_BLUETOOTH_TYPE); return FALSE; } else if (!g_str_equal (priv->type, NM_SETTING_BLUETOOTH_TYPE_DUN) && + !g_str_equal (priv->type, NM_SETTING_BLUETOOTH_TYPE_NAP) && !g_str_equal (priv->type, NM_SETTING_BLUETOOTH_TYPE_PANU)) { g_set_error (error, NM_CONNECTION_ERROR, diff --git a/libnm-core/nm-setting-bluetooth.h b/libnm-core/nm-setting-bluetooth.h index 312aab1440..58326702ce 100644 --- a/libnm-core/nm-setting-bluetooth.h +++ b/libnm-core/nm-setting-bluetooth.h @@ -54,12 +54,20 @@ G_BEGIN_DECLS /** * NM_SETTING_BLUETOOTH_TYPE_PANU: * - * Connection type describing a connection to devices that support the Bluetooth - * NAP (Network Access Point) protocol, which accepts connections via PANU. + * Connection type describing PANU connection to a Bluetooth NAP (Network + * Access Point). */ #define NM_SETTING_BLUETOOTH_TYPE_PANU "panu" /** + * NM_SETTING_BLUETOOTH_TYPE_NAP: + * + * Connection type describing a Bluetooth NAP (Network Access Point), + * which accepts PANU clients. + */ +#define NM_SETTING_BLUETOOTH_TYPE_NAP "nap" + +/** * NMSettingBluetooth: * * Bluetooth Settings |