diff options
| author | Dan Winship <danw@gnome.org> | 2012-11-12 13:29:06 -0500 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2013-02-15 13:40:39 -0500 |
| commit | feeafb8cf1d91fa31a99923859cb28ddc9e172e5 (patch) | |
| tree | 26cae2e1f78b6b054f94fb2d3c82324925dc37eb /libnm-util/nm-connection.h | |
| parent | 5266e25e2badd61048e403c93a39091d8382f7f1 (diff) | |
| download | NetworkManager-feeafb8cf1d91fa31a99923859cb28ddc9e172e5.tar.gz | |
core: Update device activation for :carrier-detect
Add a "need_carrier" argument to nm_device_is_available(), to allow
distinguishing between "device is not available", "device is fully
available", and "device is available except for not having carrier".
Adjust various parts of NMDevice and NMManager to allow for the
possibility of activating a connection with :carrier-detect = "no" on
a device with no carrier, and to avoid auto-disconnecting devices with
:carrier-detect = "on-activate".
https://bugzilla.gnome.org/show_bug.cgi?id=688284
Diffstat (limited to 'libnm-util/nm-connection.h')
| -rw-r--r-- | libnm-util/nm-connection.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libnm-util/nm-connection.h b/libnm-util/nm-connection.h index 4d060cc98f..3ebffebcd5 100644 --- a/libnm-util/nm-connection.h +++ b/libnm-util/nm-connection.h @@ -183,9 +183,11 @@ GType nm_connection_lookup_setting_type (const char *name); GType nm_connection_lookup_setting_type_by_quark (GQuark error_quark); /* Helpers */ -const char * nm_connection_get_uuid (NMConnection *connection); +const char * nm_connection_get_uuid (NMConnection *connection); -const char * nm_connection_get_id (NMConnection *connection); +const char * nm_connection_get_id (NMConnection *connection); + +const char * nm_connection_get_carrier_detect (NMConnection *connection); NMSetting8021x * nm_connection_get_setting_802_1x (NMConnection *connection); NMSettingBluetooth * nm_connection_get_setting_bluetooth (NMConnection *connection); |