fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 10:08:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm,libnm-glib: add Device.Managed setter

Browse source
This commit is contained in:
Lubomir Rintel 2015-03-23 13:31:10 +01:00 • committed by Thomas Haller
parent 0eebf580c1
commit b2fa116486
6 changed files with 69 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libnm-glib/libnm-glib.ver
View file

@ -173,6 +173,7 @@ global:
nm_device_olpc_mesh_get_type; nm_device_olpc_mesh_get_type;
nm_device_olpc_mesh_new; nm_device_olpc_mesh_new;
nm_device_set_autoconnect; nm_device_set_autoconnect;
nm_device_set_managed;
nm_device_team_error_get_type; nm_device_team_error_get_type;
nm_device_team_error_quark; nm_device_team_error_quark;
nm_device_team_get_carrier; nm_device_team_get_carrier;

34
libnm-glib/nm-device.c
View file

@ -515,6 +515,11 @@ set_property (GObject *object,
/* Construct only */ /* Construct only */
priv->device_type = g_value_get_uint (value); priv->device_type = g_value_get_uint (value);
break; break;
case PROP_MANAGED:
b = g_value_get_boolean (value);
if (priv->managed != b)
nm_device_set_managed (NM_DEVICE (object), b);
break;
case PROP_AUTOCONNECT: case PROP_AUTOCONNECT:
b = g_value_get_boolean (value); b = g_value_get_boolean (value);
if (priv->autoconnect != b) if (priv->autoconnect != b)
@ -1213,6 +1218,35 @@ nm_device_get_managed (NMDevice *device)
return NM_DEVICE_GET_PRIVATE (device)->managed; return NM_DEVICE_GET_PRIVATE (device)->managed;
} }
/**
* nm_device_set_managed:
* @device: a #NMDevice
* @managed: %TRUE to make the device managed by NetworkManager.
*
* Enables or disables management of #NMDevice by NetworkManager.
*
* Since: 1.2
**/
void
nm_device_set_managed (NMDevice *device, gboolean managed)
{
GValue value = G_VALUE_INIT;
g_return_if_fail (NM_IS_DEVICE (device));
managed = !!managed;
g_value_init (&value, G_TYPE_BOOLEAN);
g_value_set_boolean (&value, managed);
NM_DEVICE_GET_PRIVATE (device)->managed = managed;
_nm_object_set_property (NM_OBJECT (device),
NM_DBUS_INTERFACE_DEVICE,
"Managed",
&value);
}
/** /**
* nm_device_get_autoconnect: * nm_device_get_autoconnect:
* @device: a #NMDevice * @device: a #NMDevice

2
libnm-glib/nm-device.h
View file

@ -127,6 +127,8 @@ NM_AVAILABLE_IN_0_9_10
const char * nm_device_get_hw_address (NMDevice *device); const char * nm_device_get_hw_address (NMDevice *device);
NMDeviceCapabilities nm_device_get_capabilities (NMDevice *device); NMDeviceCapabilities nm_device_get_capabilities (NMDevice *device);
gboolean nm_device_get_managed (NMDevice *device); gboolean nm_device_get_managed (NMDevice *device);
NM_AVAILABLE_IN_1_2
void nm_device_set_managed (NMDevice *device, gboolean managed);
gboolean nm_device_get_autoconnect (NMDevice *device); gboolean nm_device_get_autoconnect (NMDevice *device);
void nm_device_set_autoconnect (NMDevice *device, gboolean autoconnect); void nm_device_set_autoconnect (NMDevice *device, gboolean autoconnect);
gboolean nm_device_get_firmware_missing (NMDevice *device); gboolean nm_device_get_firmware_missing (NMDevice *device);

1
libnm/libnm.ver
View file

@ -860,6 +860,7 @@ global:
nm_access_point_get_last_seen; nm_access_point_get_last_seen;
nm_device_get_metered; nm_device_get_metered;
nm_device_get_nm_plugin_missing; nm_device_get_nm_plugin_missing;
nm_device_set_managed;
nm_device_wifi_request_scan_options; nm_device_wifi_request_scan_options;
nm_device_wifi_request_scan_options_async; nm_device_wifi_request_scan_options_async;
nm_metered_get_type; nm_metered_get_type;

29
libnm/nm-device.c
View file

@ -482,6 +482,11 @@ set_property (GObject *object,
/* Construct only */ /* Construct only */
priv->device_type = g_value_get_enum (value); priv->device_type = g_value_get_enum (value);
break; break;
case PROP_MANAGED:
b = g_value_get_boolean (value);
if (priv->managed != b)
nm_device_set_managed (NM_DEVICE (object), b);
break;
case PROP_AUTOCONNECT: case PROP_AUTOCONNECT:
b = g_value_get_boolean (value); b = g_value_get_boolean (value);
if (priv->autoconnect != b) if (priv->autoconnect != b)
@ -1094,6 +1099,30 @@ nm_device_get_managed (NMDevice *device)
return NM_DEVICE_GET_PRIVATE (device)->managed; return NM_DEVICE_GET_PRIVATE (device)->managed;
} }
/**
* nm_device_set_managed:
* @device: a #NMDevice
* @managed: %TRUE to make the device managed by NetworkManager.
*
* Enables or disables management of #NMDevice by NetworkManager.
*
* Since: 1.2
**/
void
nm_device_set_managed (NMDevice *device, gboolean managed)
{
g_return_if_fail (NM_IS_DEVICE (device));
managed = !!managed;
NM_DEVICE_GET_PRIVATE (device)->managed = managed;
_nm_object_set_property (NM_OBJECT (device),
NM_DBUS_INTERFACE_DEVICE,
"Managed",
"b", managed);
}
/** /**
* nm_device_get_autoconnect: * nm_device_get_autoconnect:
* @device: a #NMDevice * @device: a #NMDevice

2
libnm/nm-device.h
View file

@ -103,6 +103,8 @@ const char * nm_device_get_type_description (NMDevice *device);
const char * nm_device_get_hw_address (NMDevice *device); const char * nm_device_get_hw_address (NMDevice *device);
NMDeviceCapabilities nm_device_get_capabilities (NMDevice *device); NMDeviceCapabilities nm_device_get_capabilities (NMDevice *device);
gboolean nm_device_get_managed (NMDevice *device); gboolean nm_device_get_managed (NMDevice *device);
NM_AVAILABLE_IN_1_2
void nm_device_set_managed (NMDevice *device, gboolean managed);
gboolean nm_device_get_autoconnect (NMDevice *device); gboolean nm_device_get_autoconnect (NMDevice *device);
void nm_device_set_autoconnect (NMDevice *device, gboolean autoconnect); void nm_device_set_autoconnect (NMDevice *device, gboolean autoconnect);
gboolean nm_device_get_firmware_missing (NMDevice *device); gboolean nm_device_get_firmware_missing (NMDevice *device);