diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-01-28 00:18:40 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-02-01 17:02:57 +0100 |
| commit | ab5b6f6f8130c809cc5c598e996db3c77b503c1d (patch) | |
| tree | 05d7e7c3871aab7145c18d27f9ef4a7a5149127d | |
| parent | 4ac6c7fdf1b7b99fb5199e071f5a9954f3cdb6a6 (diff) | |
| download | NetworkManager-ab5b6f6f8130c809cc5c598e996db3c77b503c1d.tar.gz | |
libnm-core: minor cleanup of NMSettingP2PWireless
| -rw-r--r-- | libnm-core/nm-setting-p2p-wireless.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/libnm-core/nm-setting-p2p-wireless.c b/libnm-core/nm-setting-p2p-wireless.c index e49ff0d995..32597e1dde 100644 --- a/libnm-core/nm-setting-p2p-wireless.c +++ b/libnm-core/nm-setting-p2p-wireless.c @@ -41,6 +41,8 @@ * NMSettingP2PWireless: * * P2P Wi-Fi Settings + * + * Since: 1.16 */ /*****************************************************************************/ @@ -107,12 +109,23 @@ nm_setting_p2p_wireless_get_wps_method (NMSettingP2PWireless *setting) return NM_SETTING_P2P_WIRELESS_GET_PRIVATE (setting)->wps_method; } +/*****************************************************************************/ + static gboolean verify (NMSetting *setting, NMConnection *connection, GError **error) { NMSettingP2PWirelessPrivate *priv = NM_SETTING_P2P_WIRELESS_GET_PRIVATE (setting); - if (!priv->peer_mac_address || !nm_utils_hwaddr_valid (priv->peer_mac_address, ETH_ALEN)) { + if (!priv->peer_mac_address) { + g_set_error_literal (error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_MISSING_PROPERTY, + _("property is missing")); + g_prefix_error (error, "%s.%s: ", NM_SETTING_P2P_WIRELESS_SETTING_NAME, NM_SETTING_P2P_WIRELESS_PEER); + return FALSE; + } + + if (!nm_utils_hwaddr_valid (priv->peer_mac_address, ETH_ALEN)) { g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, @@ -209,7 +222,7 @@ nm_setting_p2p_wireless_init (NMSettingP2PWireless *setting) NMSetting * nm_setting_p2p_wireless_new (void) { - return (NMSetting *) g_object_new (NM_TYPE_SETTING_P2P_WIRELESS, NULL); + return g_object_new (NM_TYPE_SETTING_P2P_WIRELESS, NULL); } static void @@ -228,8 +241,8 @@ nm_setting_p2p_wireless_class_init (NMSettingP2PWirelessClass *setting_p2p_wirel GObjectClass *object_class = G_OBJECT_CLASS (setting_p2p_wireless_class); NMSettingClass *setting_class = NM_SETTING_CLASS (setting_p2p_wireless_class); - object_class->set_property = set_property; object_class->get_property = get_property; + object_class->set_property = set_property; object_class->finalize = finalize; setting_class->verify = verify; |