diff options
author | Dan Williams <dcbw@redhat.com> | 2012-03-12 13:46:20 -0500 |
---|---|---|
committer | Dan Williams <dcbw@redhat.com> | 2012-03-12 14:33:51 -0500 |
commit | 64edbeb32230fd7a7f086aec9381c12d229fa4a1 (patch) | |
tree | fc23c327d7fcb7030fe0e8ac03dd8e0bf0af1543 | |
parent | 4a370a9fa59a4b0b5dbfefaf3958767c667f4a27 (diff) | |
download | NetworkManager-64edbeb32230fd7a7f086aec9381c12d229fa4a1.tar.gz |
libnm-glib: ensure nm_device_set_device_type() stays private
Internal only function and should not be exported.
-rw-r--r-- | libnm-glib/nm-device-bond.c | 2 | ||||
-rw-r--r-- | libnm-glib/nm-device-bt.c | 2 | ||||
-rw-r--r-- | libnm-glib/nm-device-ethernet.c | 2 | ||||
-rw-r--r-- | libnm-glib/nm-device-infiniband.c | 2 | ||||
-rw-r--r-- | libnm-glib/nm-device-modem.c | 2 | ||||
-rw-r--r-- | libnm-glib/nm-device-olpc-mesh.c | 2 | ||||
-rw-r--r-- | libnm-glib/nm-device-private.h | 2 | ||||
-rw-r--r-- | libnm-glib/nm-device-vlan.c | 2 | ||||
-rw-r--r-- | libnm-glib/nm-device-wifi.c | 2 | ||||
-rw-r--r-- | libnm-glib/nm-device-wimax.c | 2 | ||||
-rw-r--r-- | libnm-glib/nm-device.c | 6 |
11 files changed, 13 insertions, 13 deletions
diff --git a/libnm-glib/nm-device-bond.c b/libnm-glib/nm-device-bond.c index f2e17d24f5..411dfdbd8a 100644 --- a/libnm-glib/nm-device-bond.c +++ b/libnm-glib/nm-device-bond.c @@ -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 diff --git a/libnm-glib/nm-device-bt.c b/libnm-glib/nm-device-bt.c index 53c80e194f..85419704a4 100644 --- a/libnm-glib/nm-device-bt.c +++ b/libnm-glib/nm-device-bt.c @@ -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 diff --git a/libnm-glib/nm-device-ethernet.c b/libnm-glib/nm-device-ethernet.c index 51ca7a0999..b062692734 100644 --- a/libnm-glib/nm-device-ethernet.c +++ b/libnm-glib/nm-device-ethernet.c @@ -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 diff --git a/libnm-glib/nm-device-infiniband.c b/libnm-glib/nm-device-infiniband.c index a0f000eceb..941f171b74 100644 --- a/libnm-glib/nm-device-infiniband.c +++ b/libnm-glib/nm-device-infiniband.c @@ -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 diff --git a/libnm-glib/nm-device-modem.c b/libnm-glib/nm-device-modem.c index ff028fe1bb..87cc52fda9 100644 --- a/libnm-glib/nm-device-modem.c +++ b/libnm-glib/nm-device-modem.c @@ -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 diff --git a/libnm-glib/nm-device-olpc-mesh.c b/libnm-glib/nm-device-olpc-mesh.c index b17b2ddb7f..f4cdac7678 100644 --- a/libnm-glib/nm-device-olpc-mesh.c +++ b/libnm-glib/nm-device-olpc-mesh.c @@ -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 diff --git a/libnm-glib/nm-device-private.h b/libnm-glib/nm-device-private.h index b186b997c1..5c674f2f78 100644 --- a/libnm-glib/nm-device-private.h +++ b/libnm-glib/nm-device-private.h @@ -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 */ diff --git a/libnm-glib/nm-device-vlan.c b/libnm-glib/nm-device-vlan.c index 9504360736..dacb326e30 100644 --- a/libnm-glib/nm-device-vlan.c +++ b/libnm-glib/nm-device-vlan.c @@ -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 diff --git a/libnm-glib/nm-device-wifi.c b/libnm-glib/nm-device-wifi.c index d5ce07b063..ab9261390a 100644 --- a/libnm-glib/nm-device-wifi.c +++ b/libnm-glib/nm-device-wifi.c @@ -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 diff --git a/libnm-glib/nm-device-wimax.c b/libnm-glib/nm-device-wimax.c index b4bb44285b..427a404cde 100644 --- a/libnm-glib/nm-device-wimax.c +++ b/libnm-glib/nm-device-wimax.c @@ -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 diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c index 7ce71cce4b..3f582ee9c6 100644 --- a/libnm-glib/nm-device.c +++ b/libnm-glib/nm-device.c @@ -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; |