diff options
| author | Dan Williams <dcbw@redhat.com> | 2009-05-14 13:00:22 -0400 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2009-05-14 13:00:22 -0400 |
| commit | 3af7068a87dbe193e0218557538ba9a25b7bf83c (patch) | |
| tree | 5b776f7146509cefd77f5bfb12a68672f5e99a15 /libnm-util | |
| parent | eddc6f67bba904922a1685c473decc1a52cedd2b (diff) | |
bluetooth: fix confusion about NAP and PAN
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.
Diffstat (limited to 'libnm-util')
| -rw-r--r-- | libnm-util/nm-setting-bluetooth.c | 4 | ||||
| -rw-r--r-- | libnm-util/nm-setting-bluetooth.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libnm-util/nm-setting-bluetooth.c b/libnm-util/nm-setting-bluetooth.c index 385b8ec02f..6d8c76abe2 100644 --- a/libnm-util/nm-setting-bluetooth.c +++ b/libnm-util/nm-setting-bluetooth.c @@ -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)); } diff --git a/libnm-util/nm-setting-bluetooth.h b/libnm-util/nm-setting-bluetooth.h index 3b8f53e048..44c7dfe783 100644 --- a/libnm-util/nm-setting-bluetooth.h +++ b/libnm-util/nm-setting-bluetooth.h @@ -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; |