From f60117b41d5433be1b4a96d82cd11d0c3dce9b63 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 23 Apr 2018 18:00:21 +0200 Subject: New upstream version 1.11.3 --- src/nm-act-request.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/nm-act-request.c') diff --git a/src/nm-act-request.c b/src/nm-act-request.c index 87070794..0ac20b85 100644 --- a/src/nm-act-request.c +++ b/src/nm-act-request.c @@ -28,7 +28,7 @@ #include #include -#include "nm-utils/c-list.h" +#include "c-list/src/c-list.h" #include "nm-setting-wireless-security.h" #include "nm-setting-8021x.h" @@ -242,8 +242,6 @@ _do_cancel_secrets (NMActRequest *self, NMActRequestGetSecretsCallId *call_id, g void nm_act_request_cancel_secrets (NMActRequest *self, NMActRequestGetSecretsCallId *call_id) { - NMActRequestPrivate *priv; - g_return_if_fail (call_id); if (self) { @@ -255,8 +253,6 @@ nm_act_request_cancel_secrets (NMActRequest *self, NMActRequestGetSecretsCallId self = call_id->self; } - priv = NM_ACT_REQUEST_GET_PRIVATE (self); - if (!c_list_is_linked (&call_id->call_ids_lst)) g_return_if_reached (); @@ -518,7 +514,7 @@ get_property (GObject *object, guint prop_id, || !NM_IN_SET (nm_active_connection_get_state (active), NM_ACTIVE_CONNECTION_STATE_ACTIVATED, NM_ACTIVE_CONNECTION_STATE_DEACTIVATING)) { - g_value_set_string (value, "/"); + g_value_set_string (value, NULL); return; } @@ -541,7 +537,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 +552,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 +566,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); } -- cgit 1.3.0-6-gf8a5 From ee9c73a923909e23a649407be77e25235d769e25 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 11 May 2018 22:08:45 +0200 Subject: New upstream version 1.10.8 --- src/nm-act-request.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/nm-act-request.c') diff --git a/src/nm-act-request.c b/src/nm-act-request.c index 0ac20b85..dd73947d 100644 --- a/src/nm-act-request.c +++ b/src/nm-act-request.c @@ -28,7 +28,7 @@ #include #include -#include "c-list/src/c-list.h" +#include "nm-utils/c-list.h" #include "nm-setting-wireless-security.h" #include "nm-setting-8021x.h" @@ -242,6 +242,8 @@ _do_cancel_secrets (NMActRequest *self, NMActRequestGetSecretsCallId *call_id, g void nm_act_request_cancel_secrets (NMActRequest *self, NMActRequestGetSecretsCallId *call_id) { + NMActRequestPrivate *priv; + g_return_if_fail (call_id); if (self) { @@ -253,6 +255,8 @@ nm_act_request_cancel_secrets (NMActRequest *self, NMActRequestGetSecretsCallId self = call_id->self; } + priv = NM_ACT_REQUEST_GET_PRIVATE (self); + if (!c_list_is_linked (&call_id->call_ids_lst)) g_return_if_reached (); @@ -514,7 +518,7 @@ get_property (GObject *object, guint prop_id, || !NM_IN_SET (nm_active_connection_get_state (active), NM_ACTIVE_CONNECTION_STATE_ACTIVATED, NM_ACTIVE_CONNECTION_STATE_DEACTIVATING)) { - g_value_set_string (value, NULL); + g_value_set_string (value, "/"); return; } -- cgit 1.3.0-6-gf8a5