diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 16:38:36 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 17:09:07 +0200 |
| commit | ccf6dc06bbee82c3d49f451545c5317337e0777e (patch) | |
| tree | a8fddc8c6e2b3b99bebab1d5bb2a64581eff4bfd /clients/cloud-setup/nm-http-client.c | |
| parent | f109e55ef130ce84054d5ba3acf4b71cd8c7564a (diff) | |
| parent | 7ffed1e6136de75188f10ba8763bcb942f932f8e (diff) | |
Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master
Diffstat (limited to 'clients/cloud-setup/nm-http-client.c')
| -rw-r--r-- | clients/cloud-setup/nm-http-client.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/clients/cloud-setup/nm-http-client.c b/clients/cloud-setup/nm-http-client.c index 17c6fcdf..94f3fe2b 100644 --- a/clients/cloud-setup/nm-http-client.c +++ b/clients/cloud-setup/nm-http-client.c @@ -5,7 +5,6 @@ #include "nm-http-client.h" #include <curl/curl.h> -#include <glib-unix.h> #include "nm-cloud-setup-utils.h" @@ -164,7 +163,7 @@ _ehandle_complete (EHandleData *edata, &edata->cancellable_id); if (error_take) { - if (nm_utils_error_is_cancelled (error_take, FALSE)) + if (nm_utils_error_is_cancelled (error_take)) _LOG2T (edata, "cancelled"); else _LOG2D (edata, "failed with %s", error_take->message); @@ -423,7 +422,7 @@ _poll_get_probe_finish_fcn (GObject *source, &local_error); if (!success) { - if (nm_utils_error_is_cancelled (local_error, FALSE)) { + if (nm_utils_error_is_cancelled (local_error)) { g_propagate_error (error, g_steal_pointer (&local_error)); return TRUE; } @@ -636,8 +635,12 @@ _mhandle_socketfunction_cb (CURL *e_handle, curl_socket_t fd, int what, void *us condition = 0; if (condition) { - priv->mhandle_source_socket = g_unix_fd_source_new (fd, condition); - g_source_set_callback (priv->mhandle_source_socket, G_SOURCE_FUNC (_mhandle_socket_cb), self, NULL); + priv->mhandle_source_socket = nm_g_unix_fd_source_new (fd, + condition, + G_PRIORITY_DEFAULT, + _mhandle_socket_cb, + self, + NULL); g_source_attach (priv->mhandle_source_socket, priv->context); } } |