diff options
| author | Jeremy Bicha <jbicha@ubuntu.com> | 2018-05-11 19:02:28 -0400 |
|---|---|---|
| committer | Jeremy Bicha <jbicha@ubuntu.com> | 2018-05-11 19:02:28 -0400 |
| commit | ee7f1100500dc431a6e8bf1e6efb2d41445fd28f (patch) | |
| tree | 3eef32d0e8412f4d2126a9be5820c85d387e313c /src/nm-act-request.c | |
| parent | 01bf2f7e474588126875a29125a1e248d7ae18db (diff) | |
| parent | 680d3db45106e7a18665a366e1b57e58cef61506 (diff) | |
Merge tag 'debian/1.10.8-1' into cosmic
network-manager Debian release 1.10.8-1
Diffstat (limited to 'src/nm-act-request.c')
| -rw-r--r-- | src/nm-act-request.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/nm-act-request.c b/src/nm-act-request.c index 87070794..dd73947d 100644 --- a/src/nm-act-request.c +++ b/src/nm-act-request.c @@ -541,7 +541,8 @@ nm_act_request_init (NMActRequest *req) * @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 - * @activation_type: the #NMActivationType. + * @activation_type: the #NMActivationType + * @activation_reason: the reason for activation * @device: the device/interface to configure according to @connection * * Creates a new device-based activation request. If an applied connection is @@ -555,6 +556,7 @@ nm_act_request_new (NMSettingsConnection *settings_connection, const char *specific_object, NMAuthSubject *subject, NMActivationType activation_type, + NMActivationReason activation_reason, NMDevice *device) { g_return_val_if_fail (!settings_connection || NM_IS_SETTINGS_CONNECTION (settings_connection), NULL); @@ -568,6 +570,7 @@ nm_act_request_new (NMSettingsConnection *settings_connection, NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT, specific_object, NM_ACTIVE_CONNECTION_INT_SUBJECT, subject, NM_ACTIVE_CONNECTION_INT_ACTIVATION_TYPE, (int) activation_type, + NM_ACTIVE_CONNECTION_INT_ACTIVATION_REASON, (int) activation_reason, NULL); } |