diff options
Diffstat (limited to 'libnm-core/nm-setting-wifi-p2p.c')
-rw-r--r-- | libnm-core/nm-setting-wifi-p2p.c | 90 |
1 files changed, 45 insertions, 45 deletions
diff --git a/libnm-core/nm-setting-wifi-p2p.c b/libnm-core/nm-setting-wifi-p2p.c index 4c679a99d6..893170fc28 100644 --- a/libnm-core/nm-setting-wifi-p2p.c +++ b/libnm-core/nm-setting-wifi-p2p.c @@ -33,14 +33,14 @@ * SECTION:nm-setting-wifi-p2p * @short_description: Describes connection properties for 802.11 Wi-Fi P2P networks * - * The #NMSettingP2PWireless object is a #NMSetting subclass that describes properties + * The #NMSettingWifiP2P object is a #NMSetting subclass that describes properties * necessary for connection to 802.11 Wi-Fi P2P networks (aka Wi-Fi Direct). **/ /** - * NMSettingP2PWireless: + * NMSettingWifiP2P: * - * P2P Wi-Fi Settings + * Wi-Fi P2P Settings * * Since: 1.16 */ @@ -56,53 +56,53 @@ typedef struct { char *peer_mac_address; NMSettingWirelessSecurityWpsMethod wps_method; -} NMSettingP2PWirelessPrivate; +} NMSettingWifiP2PPrivate; -struct _NMSettingP2PWireless { +struct _NMSettingWifiP2P { NMSetting parent; - NMSettingP2PWirelessPrivate _priv; + NMSettingWifiP2PPrivate _priv; }; -struct _NMSettingP2PWirelessClass { +struct _NMSettingWifiP2PClass { NMSettingClass parent; }; -G_DEFINE_TYPE (NMSettingP2PWireless, nm_setting_p2p_wireless, NM_TYPE_SETTING) +G_DEFINE_TYPE (NMSettingWifiP2P, nm_setting_wifi_p2p, NM_TYPE_SETTING) -#define NM_SETTING_P2P_WIRELESS_GET_PRIVATE(self) _NM_GET_PRIVATE (self, NMSettingP2PWireless, NM_IS_SETTING_P2P_WIRELESS, NMSetting) +#define NM_SETTING_WIFI_P2P_GET_PRIVATE(self) _NM_GET_PRIVATE (self, NMSettingWifiP2P, NM_IS_SETTING_WIFI_P2P, NMSetting) /*****************************************************************************/ /** - * nm_setting_p2p_wireless_get_peer: - * @setting: the #NMSettingP2PWireless + * nm_setting_wifi_p2p_get_peer: + * @setting: the #NMSettingWifiP2P * - * Returns: the #NMSettingP2PWireless:peer property of the setting + * Returns: the #NMSettingWifiP2P:peer property of the setting * * Since: 1.16 **/ const char * -nm_setting_p2p_wireless_get_peer (NMSettingP2PWireless *setting) +nm_setting_wifi_p2p_get_peer (NMSettingWifiP2P *setting) { - g_return_val_if_fail (NM_IS_SETTING_P2P_WIRELESS (setting), NULL); + g_return_val_if_fail (NM_IS_SETTING_WIFI_P2P (setting), NULL); - return NM_SETTING_P2P_WIRELESS_GET_PRIVATE (setting)->peer_mac_address; + return NM_SETTING_WIFI_P2P_GET_PRIVATE (setting)->peer_mac_address; } /** - * nm_setting_p2p_wireless_get_wps_method: - * @setting: the #NMSettingP2PWireless + * nm_setting_wifi_p2p_get_wps_method: + * @setting: the #NMSettingWifiP2P * - * Returns: the #NMSettingP2PWireless:wps-method property of the setting + * Returns: the #NMSettingWifiP2P:wps-method property of the setting * * Since: 1.16 **/ NMSettingWirelessSecurityWpsMethod -nm_setting_p2p_wireless_get_wps_method (NMSettingP2PWireless *setting) +nm_setting_wifi_p2p_get_wps_method (NMSettingWifiP2P *setting) { - g_return_val_if_fail (NM_IS_SETTING_P2P_WIRELESS (setting), NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_DEFAULT); + g_return_val_if_fail (NM_IS_SETTING_WIFI_P2P (setting), NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_DEFAULT); - return NM_SETTING_P2P_WIRELESS_GET_PRIVATE (setting)->wps_method; + return NM_SETTING_WIFI_P2P_GET_PRIVATE (setting)->wps_method; } /*****************************************************************************/ @@ -110,14 +110,14 @@ nm_setting_p2p_wireless_get_wps_method (NMSettingP2PWireless *setting) static gboolean verify (NMSetting *setting, NMConnection *connection, GError **error) { - NMSettingP2PWirelessPrivate *priv = NM_SETTING_P2P_WIRELESS_GET_PRIVATE (setting); + NMSettingWifiP2PPrivate *priv = NM_SETTING_WIFI_P2P_GET_PRIVATE (setting); 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); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIFI_P2P_SETTING_NAME, NM_SETTING_WIFI_P2P_PEER); return FALSE; } @@ -126,13 +126,13 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, _("property is invalid")); - g_prefix_error (error, "%s.%s: ", NM_SETTING_P2P_WIRELESS_SETTING_NAME, NM_SETTING_P2P_WIRELESS_PEER); + g_prefix_error (error, "%s.%s: ", NM_SETTING_WIFI_P2P_SETTING_NAME, NM_SETTING_WIFI_P2P_PEER); return FALSE; } if (!_nm_utils_wps_method_validate (priv->wps_method, - NM_SETTING_P2P_WIRELESS_SETTING_NAME, - NM_SETTING_P2P_WIRELESS_WPS_METHOD, + NM_SETTING_WIFI_P2P_SETTING_NAME, + NM_SETTING_WIFI_P2P_WPS_METHOD, TRUE, error)) return FALSE; @@ -146,14 +146,14 @@ static void get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { - NMSettingP2PWireless *setting = NM_SETTING_P2P_WIRELESS (object); + NMSettingWifiP2P *setting = NM_SETTING_WIFI_P2P (object); switch (prop_id) { case PROP_PEER: - g_value_set_string (value, nm_setting_p2p_wireless_get_peer (setting)); + g_value_set_string (value, nm_setting_wifi_p2p_get_peer (setting)); break; case PROP_WPS_METHOD: - g_value_set_uint (value, nm_setting_p2p_wireless_get_wps_method (setting)); + g_value_set_uint (value, nm_setting_wifi_p2p_get_wps_method (setting)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -165,7 +165,7 @@ static void set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { - NMSettingP2PWirelessPrivate *priv = NM_SETTING_P2P_WIRELESS_GET_PRIVATE (object); + NMSettingWifiP2PPrivate *priv = NM_SETTING_WIFI_P2P_GET_PRIVATE (object); switch (prop_id) { case PROP_PEER: @@ -185,40 +185,40 @@ set_property (GObject *object, guint prop_id, /*****************************************************************************/ static void -nm_setting_p2p_wireless_init (NMSettingP2PWireless *setting) +nm_setting_wifi_p2p_init (NMSettingWifiP2P *setting) { } /** - * nm_setting_p2p_wireless_new: + * nm_setting_wifi_p2p_new: * - * Creates a new #NMSettingP2PWireless object with default values. + * Creates a new #NMSettingWifiP2P object with default values. * - * Returns: (transfer full): the new empty #NMSettingP2PWireless object + * Returns: (transfer full): the new empty #NMSettingWifiP2P object * * Since: 1.16 **/ NMSetting * -nm_setting_p2p_wireless_new (void) +nm_setting_wifi_p2p_new (void) { - return g_object_new (NM_TYPE_SETTING_P2P_WIRELESS, NULL); + return g_object_new (NM_TYPE_SETTING_WIFI_P2P, NULL); } static void finalize (GObject *object) { - NMSettingP2PWirelessPrivate *priv = NM_SETTING_P2P_WIRELESS_GET_PRIVATE (object); + NMSettingWifiP2PPrivate *priv = NM_SETTING_WIFI_P2P_GET_PRIVATE (object); g_free (priv->peer_mac_address); - G_OBJECT_CLASS (nm_setting_p2p_wireless_parent_class)->finalize (object); + G_OBJECT_CLASS (nm_setting_wifi_p2p_parent_class)->finalize (object); } static void -nm_setting_p2p_wireless_class_init (NMSettingP2PWirelessClass *setting_p2p_wireless_class) +nm_setting_wifi_p2p_class_init (NMSettingWifiP2PClass *setting_wifi_p2p_class) { - GObjectClass *object_class = G_OBJECT_CLASS (setting_p2p_wireless_class); - NMSettingClass *setting_class = NM_SETTING_CLASS (setting_p2p_wireless_class); + GObjectClass *object_class = G_OBJECT_CLASS (setting_wifi_p2p_class); + NMSettingClass *setting_class = NM_SETTING_CLASS (setting_wifi_p2p_class); object_class->get_property = get_property; object_class->set_property = set_property; @@ -227,7 +227,7 @@ nm_setting_p2p_wireless_class_init (NMSettingP2PWirelessClass *setting_p2p_wirel setting_class->verify = verify; /** - * NMSettingP2PWireless:peer: + * NMSettingWifiP2P:peer: * * The P2P device that should be connected to. Currently this is the only * way to create or join a group. @@ -243,13 +243,13 @@ nm_setting_p2p_wireless_class_init (NMSettingP2PWirelessClass *setting_p2p_wirel * ---end--- */ obj_properties[PROP_PEER] = - g_param_spec_string (NM_SETTING_P2P_WIRELESS_PEER, "", "", + g_param_spec_string (NM_SETTING_WIFI_P2P_PEER, "", "", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingP2PWireless:wps-method: + * NMSettingWifiP2P:wps-method: * * Flags indicating which mode of WPS is to be used. * @@ -269,5 +269,5 @@ nm_setting_p2p_wireless_class_init (NMSettingP2PWirelessClass *setting_p2p_wirel g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties); - _nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_P2P_WIRELESS); + _nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_WIFI_P2P); } |