diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-12-16 13:06:19 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-12-20 15:53:41 +0100 |
| commit | bd89c8a9249657d388312d3e4ea8ce8253153ab8 (patch) | |
| tree | 7845e80758e96fe572a6719987240e759ae55107 /src/ppp/nm-ppp-manager.c | |
| parent | 3b95cf68e2c128e91a9556b10bc5f2af8895c3f5 (diff) | |
| download | NetworkManager-bd89c8a9249657d388312d3e4ea8ce8253153ab8.tar.gz | |
act-request: allow omitting the @self argument in nm_act_request_cancel_secrets()
Previously, we would require a @self argument and the @call_id in
nm_act_request_cancel_secrets(), although the @call_id already has
a pointer to @self.
In principle that is not necessary, but it makes the API a bit
more robust as you need to care about the lifetime of the @req
as well.
However it is a bit inconvenient, because it requires that caller to
track both the activation request and the call-id.
Now, allow nm_act_request_get_secrets() to instruct the call-id to
take an additional reference to @self. Later on, we would allow to omit
the argument during cancelling. We only allow this, if the call-id
takes a reference to @self.
Diffstat (limited to 'src/ppp/nm-ppp-manager.c')
| -rw-r--r-- | src/ppp/nm-ppp-manager.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/ppp/nm-ppp-manager.c b/src/ppp/nm-ppp-manager.c index e33d9fe6fc..bf24552fb3 100644 --- a/src/ppp/nm-ppp-manager.c +++ b/src/ppp/nm-ppp-manager.c @@ -346,6 +346,7 @@ impl_ppp_manager_need_secrets (NMPPPManager *manager, flags |= NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW; priv->secrets_id = nm_act_request_get_secrets (priv->act_req, + FALSE, priv->secrets_setting_name, flags, hints ? g_ptr_array_index (hints, 0) : NULL, |