diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2016-09-21 09:27:53 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2016-09-21 09:27:53 +0200 |
| commit | 9ebc11815e998bf7c671a7f5abe997355deb6d6d (patch) | |
| tree | 6c429eef33f9ab29c995b7fcf581d359db827502 | |
| parent | ea6788ce67dbea506c7f640f0348d2b62fa24cc9 (diff) | |
| download | NetworkManager-bg/checkpoint-improvements-bgo770315.tar.gz | |
fixup! core: allow passing an applied connection to nm_act_request_new()bg/checkpoint-improvements-bgo770315
| -rw-r--r-- | src/nm-activation-request.c | 8 | ||||
| -rw-r--r-- | src/nm-manager.c | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/nm-activation-request.c b/src/nm-activation-request.c index 1b4f93676a..6da89432a8 100644 --- a/src/nm-activation-request.c +++ b/src/nm-activation-request.c @@ -462,18 +462,20 @@ master_failed (NMActiveConnection *self) * nm_act_request_new: * * @settings_connection: (allow-none): the connection to activate @device with + * @applied_connection: (allow-none): the applied connection * @specific_object: the object path of the specific object (ie, WiFi access point, * etc) that will be used to activate @connection and @device * @subject: the #NMAuthSubject representing the requestor of the activation * @device: the device/interface to configure according to @connection * - * Creates a new device-based activation request. + * Creates a new device-based activation request. If an applied connection is + * supplied, it shall not be modified by the caller afterwards. * * Returns: the new activation request on success, %NULL on error. */ NMActRequest * nm_act_request_new (NMSettingsConnection *settings_connection, - NMConnection *applied, + NMConnection *applied_connection, const char *specific_object, NMAuthSubject *subject, NMDevice *device) @@ -483,7 +485,7 @@ nm_act_request_new (NMSettingsConnection *settings_connection, g_return_val_if_fail (NM_IS_AUTH_SUBJECT (subject), NULL); return (NMActRequest *) g_object_new (NM_TYPE_ACT_REQUEST, - NM_ACTIVE_CONNECTION_INT_APPLIED_CONNECTION, applied, + NM_ACTIVE_CONNECTION_INT_APPLIED_CONNECTION, applied_connection, NM_ACTIVE_CONNECTION_INT_SETTINGS_CONNECTION, settings_connection, NM_ACTIVE_CONNECTION_INT_DEVICE, device, NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT, specific_object, diff --git a/src/nm-manager.c b/src/nm-manager.c index d3b14e397b..540b5b0f25 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -3227,6 +3227,7 @@ _internal_activation_auth_done (NMActiveConnection *active, * nm_manager_activate_connection(): * @self: the #NMManager * @connection: the #NMSettingsConnection to activate on @device + * @applied: (allow-none): the applied connection to activate on @device * @specific_object: the specific object path, if any, for the activation * @device: the #NMDevice to activate @connection on * @subject: the subject which requested activation @@ -3236,7 +3237,8 @@ _internal_activation_auth_done (NMActiveConnection *active, * @subject should be the subject of the activation that triggered this * one, or if this is an autoconnect request, a new internal subject. * The returned #NMActiveConnection is owned by the Manager and should be - * referenced by the caller if the caller continues to use it. + * referenced by the caller if the caller continues to use it. If @applied + * is supplied, it shall not be modified by the caller afterwards. * * Returns: (transfer none): the new #NMActiveConnection that tracks * activation of @connection on @device |