mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-02-04 06:00:32 +01:00
libnm-glib: ensure nm_device_set_device_type() stays private
Internal only function and should not be exported.
This commit is contained in:
parent
4a370a9fa5
commit
64edbeb322
11 changed files with 13 additions and 13 deletions
|
|
@ -148,7 +148,7 @@ connection_valid (NMDevice *device, NMConnection *connection)
|
|||
static void
|
||||
nm_device_bond_init (NMDeviceBond *device)
|
||||
{
|
||||
nm_device_set_device_type (NM_DEVICE (device), NM_DEVICE_TYPE_BOND);
|
||||
_nm_device_set_device_type (NM_DEVICE (device), NM_DEVICE_TYPE_BOND);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
|||
|
|
@ -198,7 +198,7 @@ connection_valid (NMDevice *device, NMConnection *connection)
|
|||
static void
|
||||
nm_device_bt_init (NMDeviceBt *device)
|
||||
{
|
||||
nm_device_set_device_type (NM_DEVICE (device), NM_DEVICE_TYPE_BT);
|
||||
_nm_device_set_device_type (NM_DEVICE (device), NM_DEVICE_TYPE_BT);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
|||
|
|
@ -205,7 +205,7 @@ connection_valid (NMDevice *device, NMConnection *connection)
|
|||
static void
|
||||
nm_device_ethernet_init (NMDeviceEthernet *device)
|
||||
{
|
||||
nm_device_set_device_type (NM_DEVICE (device), NM_DEVICE_TYPE_ETHERNET);
|
||||
_nm_device_set_device_type (NM_DEVICE (device), NM_DEVICE_TYPE_ETHERNET);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@ connection_valid (NMDevice *device, NMConnection *connection)
|
|||
static void
|
||||
nm_device_infiniband_init (NMDeviceInfiniband *device)
|
||||
{
|
||||
nm_device_set_device_type (NM_DEVICE (device), NM_DEVICE_TYPE_INFINIBAND);
|
||||
_nm_device_set_device_type (NM_DEVICE (device), NM_DEVICE_TYPE_INFINIBAND);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ connection_valid (NMDevice *device, NMConnection *connection)
|
|||
static void
|
||||
nm_device_modem_init (NMDeviceModem *device)
|
||||
{
|
||||
nm_device_set_device_type (NM_DEVICE (device), NM_DEVICE_TYPE_MODEM);
|
||||
_nm_device_set_device_type (NM_DEVICE (device), NM_DEVICE_TYPE_MODEM);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
|||
|
|
@ -161,7 +161,7 @@ connection_valid (NMDevice *device, NMConnection *connection)
|
|||
static void
|
||||
nm_device_olpc_mesh_init (NMDeviceOlpcMesh *device)
|
||||
{
|
||||
nm_device_set_device_type (NM_DEVICE (device), NM_DEVICE_TYPE_OLPC_MESH);
|
||||
_nm_device_set_device_type (NM_DEVICE (device), NM_DEVICE_TYPE_OLPC_MESH);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
|||
|
|
@ -23,6 +23,6 @@
|
|||
#ifndef NM_DEVICE_PRIVATE_H
|
||||
#define NM_DEVICE_PRIVATE_H
|
||||
|
||||
void nm_device_set_device_type (NMDevice *device, NMDeviceType dtype);
|
||||
void _nm_device_set_device_type (NMDevice *device, NMDeviceType dtype);
|
||||
|
||||
#endif /* NM_DEVICE_PRIVATE_H */
|
||||
|
|
|
|||
|
|
@ -167,7 +167,7 @@ connection_valid (NMDevice *device, NMConnection *connection)
|
|||
static void
|
||||
nm_device_vlan_init (NMDeviceVlan *device)
|
||||
{
|
||||
nm_device_set_device_type (NM_DEVICE (device), NM_DEVICE_TYPE_VLAN);
|
||||
_nm_device_set_device_type (NM_DEVICE (device), NM_DEVICE_TYPE_VLAN);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
|||
|
|
@ -451,7 +451,7 @@ connection_valid (NMDevice *device, NMConnection *connection)
|
|||
static void
|
||||
nm_device_wifi_init (NMDeviceWifi *device)
|
||||
{
|
||||
nm_device_set_device_type (NM_DEVICE (device), NM_DEVICE_TYPE_WIFI);
|
||||
_nm_device_set_device_type (NM_DEVICE (device), NM_DEVICE_TYPE_WIFI);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
|||
|
|
@ -400,7 +400,7 @@ connection_valid (NMDevice *device, NMConnection *connection)
|
|||
static void
|
||||
nm_device_wimax_init (NMDeviceWimax *device)
|
||||
{
|
||||
nm_device_set_device_type (NM_DEVICE (device), NM_DEVICE_TYPE_WIMAX);
|
||||
_nm_device_set_device_type (NM_DEVICE (device), NM_DEVICE_TYPE_WIMAX);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
|||
|
|
@ -232,7 +232,7 @@ constructed (GObject *object)
|
|||
G_OBJECT_CLASS (nm_device_parent_class)->constructed (object);
|
||||
|
||||
priv = NM_DEVICE_GET_PRIVATE (object);
|
||||
/* Catch failure of subclasses to call nm_device_set_device_type() */
|
||||
/* Catch failure of subclasses to call _nm_device_set_device_type() */
|
||||
g_warn_if_fail (priv->device_type != NM_DEVICE_TYPE_UNKNOWN);
|
||||
/* Catch a subclass setting the wrong type */
|
||||
g_warn_if_fail (G_OBJECT_TYPE (object) == _nm_device_gtype_from_dtype (priv->device_type));
|
||||
|
|
@ -660,7 +660,7 @@ nm_device_class_init (NMDeviceClass *device_class)
|
|||
}
|
||||
|
||||
/**
|
||||
* nm_device_set_device_type:
|
||||
* _nm_device_set_device_type:
|
||||
* @device: the device
|
||||
* @dtype: the NM device type
|
||||
*
|
||||
|
|
@ -668,7 +668,7 @@ nm_device_class_init (NMDeviceClass *device_class)
|
|||
* ONLY METHOD.
|
||||
**/
|
||||
void
|
||||
nm_device_set_device_type (NMDevice *device, NMDeviceType dtype)
|
||||
_nm_device_set_device_type (NMDevice *device, NMDeviceType dtype)
|
||||
{
|
||||
NMDevicePrivate *priv;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue