diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 16:38:51 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 16:38:51 +0200 |
| commit | 96642ebde58e1eea692aea6a92d33f45452fa9c0 (patch) | |
| tree | 106ddfa2180b3997e8965787b5cb122982ebab9d /clients/cloud-setup/nmcs-provider-ec2.c | |
| parent | 8f6881ac06714ef99cc470a03e7ac0ce1af49a16 (diff) | |
| parent | d460892bbfece74fb6d3cd846bf6ef548290be41 (diff) | |
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latestt pu
Diffstat (limited to 'clients/cloud-setup/nmcs-provider-ec2.c')
| -rw-r--r-- | clients/cloud-setup/nmcs-provider-ec2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clients/cloud-setup/nmcs-provider-ec2.c b/clients/cloud-setup/nmcs-provider-ec2.c index b6ac5a4c..82ed0949 100644 --- a/clients/cloud-setup/nmcs-provider-ec2.c +++ b/clients/cloud-setup/nmcs-provider-ec2.c @@ -98,7 +98,7 @@ _detect_get_meta_data_done_cb (GObject *source, NULL, &get_error); - if (nm_utils_error_is_cancelled (get_error, FALSE)) { + if (nm_utils_error_is_cancelled (get_error)) { g_task_return_error (task, g_steal_pointer (&get_error)); return; } @@ -168,7 +168,7 @@ _get_config_task_return (GetConfigIfaceData *iface_data, nm_g_slice_free (iface_data); if (error_take) { - if (nm_utils_error_is_cancelled (error_take, FALSE)) + if (nm_utils_error_is_cancelled (error_take)) _LOGD ("get-config: cancelled"); else _LOGD ("get-config: failed: %s", error_take->message); @@ -204,7 +204,7 @@ _get_config_fetch_done_cb (NMHttpClient *http_client, NULL, &response_data, &error); - if (nm_utils_error_is_cancelled (error, FALSE)) + if (nm_utils_error_is_cancelled (error)) return; get_config_data = iface_data->get_config_data; @@ -327,7 +327,7 @@ _get_config_metadata_ready_cb (GObject *source, .n_pending = 0, }; - if (nm_utils_error_is_cancelled (error, FALSE)) { + if (nm_utils_error_is_cancelled (error)) { _get_config_task_return (iface_data, g_steal_pointer (&error)); return; } |