colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bluetooth: fix confusion about NAP and PAN

Browse Source 
NMSettingBluetooth represents the local connection, and thus should
use "PANU" not NAP, because the local adapter will be in PANU mode.
For now, NAP is only relevant when talking about the *remote* device
in NMDeviceBt or NMBluezDevice.
This commit is contained in:
Dan Williams
2009-05-14 13:00:22 -04:00
parent eddc6f67bb
commit 3af7068a87
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libnm-util/nm-setting-bluetooth.c
View File

@@ -141,7 +141,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
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_SETTING_BLUETOOTH_ERROR,
NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY,
@@ -260,7 +260,7 @@ nm_setting_bluetooth_class_init (NMSettingBluetoothClass *setting_class)
(object_class, PROP_TYPE,
g_param_spec_string (NM_SETTING_BLUETOOTH_TYPE,
"Connection type",
"Either 'dun', 'panu' or 'pan-nap'",
"Either '" NM_SETTING_BLUETOOTH_TYPE_DUN "' or '" NM_SETTING_BLUETOOTH_TYPE_PANU "'",
NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
}

8
libnm-util/nm-setting-bluetooth.h
View File

@@ -54,11 +54,11 @@ GType nm_setting_bluetooth_error_get_type (void);
#define NM_SETTING_BLUETOOTH_ERROR nm_setting_bluetooth_error_quark ()
GQuark nm_setting_bluetooth_error_quark (void);
#define NM_SETTING_BLUETOOTH_BDADDR "bdaddr"
#define NM_SETTING_BLUETOOTH_TYPE "type"
#define NM_SETTING_BLUETOOTH_BDADDR "bdaddr"
#define NM_SETTING_BLUETOOTH_TYPE "type"
#define NM_SETTING_BLUETOOTH_TYPE_DUN "dun"
#define NM_SETTING_BLUETOOTH_TYPE_NAP "nap"
#define NM_SETTING_BLUETOOTH_TYPE_DUN "dun"
#define NM_SETTING_BLUETOOTH_TYPE_PANU "panu"
typedef struct {
NMSetting parent;

2
src/nm-device-bt.c
View File

@@ -110,7 +110,7 @@ get_connection_bt_type (NMConnection *connection)
if (!strcmp (bt_type, NM_SETTING_BLUETOOTH_TYPE_DUN))
return NM_BT_CAPABILITY_DUN;
else if (!strcmp (bt_type, NM_SETTING_BLUETOOTH_TYPE_NAP))
else if (!strcmp (bt_type, NM_SETTING_BLUETOOTH_TYPE_PANU))
return NM_BT_CAPABILITY_NAP;
return NM_BT_CAPABILITY_NONE;