colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

device: refactor nm_device_get_applied_setting()

Browse Source
This commit is contained in:
Thomas Haller
2016-06-02 22:16:54 +02:00
parent 76aa6f8e0d
commit 89970b5ca6
1 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/devices/nm-device.c
View File

@@ -1130,7 +1130,11 @@ nm_device_get_settings_connection (NMDevice *self)
NMConnection * NMConnection *
nm_device_get_applied_connection (NMDevice *self) nm_device_get_applied_connection (NMDevice *self)
{ {
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); NMDevicePrivate *priv;
g_return_val_if_fail (NM_IS_DEVICE (self), NULL);
priv = NM_DEVICE_GET_PRIVATE (self);
return priv->act_request ? nm_act_request_get_applied_connection (priv->act_request) : NULL; return priv->act_request ? nm_act_request_get_applied_connection (priv->act_request) : NULL;
} }
@@ -1147,23 +1151,12 @@ nm_device_has_unmodified_applied_connection (NMDevice *self, NMSettingCompareFla
} }
NMSetting * NMSetting *
nm_device_get_applied_setting (NMDevice *device, GType setting_type) nm_device_get_applied_setting (NMDevice *self, GType setting_type)
{ {
NMActRequest *req; NMConnection *connection;
NMSetting *setting = NULL;
g_return_val_if_fail (NM_IS_DEVICE (device), NULL); connection = nm_device_get_applied_connection (self);
return connection ? nm_connection_get_setting (connection, setting_type) : NULL;
req = nm_device_get_act_request (device);
if (req) {
NMConnection *connection;
connection = nm_act_request_get_applied_connection (req);
if (connection)
setting = nm_connection_get_setting (connection, setting_type);
}
return setting;
} }
RfKillType RfKillType