about summary refs log tree commit diff
path: root/src/core/nm-connectivity.c
diff options
context:
space:
mode:
authorJeremy Bicha <jeremy.bicha@canonical.com>2022-02-03 09:24:19 -0500
committerJeremy Bicha <jeremy.bicha@canonical.com>2022-02-03 12:01:26 -0500
commit240934659cd8326a14324c73d4f0f88eecfddcab (patch)
treee07cde48aa0a143bebf10ca7103cc0e69febad25 /src/core/nm-connectivity.c
parentfbe61ddadf4a89800a8e3651ae91099259ddf2ad (diff)
parent1628eda029ba4dede8d4d45572c6b60367882436 (diff)
Merge tag 'debian/1.34.0-2' into ubuntu/master
network-manager Debian release 1.34.0-2
Diffstat (limited to 'src/core/nm-connectivity.c')
-rw-r--r--src/core/nm-connectivity.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/core/nm-connectivity.c b/src/core/nm-connectivity.c
index 85d41b49..13fb0265 100644
--- a/src/core/nm-connectivity.c
+++ b/src/core/nm-connectivity.c
@@ -10,10 +10,9 @@
 #include "nm-connectivity.h"
 
 #if WITH_CONCHECK
-    #include <curl/curl.h>
+#include <curl/curl.h>
 #endif
 #include <linux/rtnetlink.h>
-#include <glib-unix.h>
 
 #include "c-list/src/c-list.h"
 #include "libnm-core-intern/nm-core-internal.h"
@@ -509,15 +508,8 @@ multi_socket_cb(CURL *e_handle, curl_socket_t fd, int what, void *userdata, void
         else
             condition = 0;
 
-        if (condition) {
-            fdp->source = nm_g_unix_fd_source_new(fd,
-                                                  condition,
-                                                  G_PRIORITY_DEFAULT,
-                                                  _con_curl_socketevent_cb,
-                                                  fdp,
-                                                  NULL);
-            g_source_attach(fdp->source, NULL);
-        }
+        if (condition)
+            fdp->source = nm_g_unix_fd_add_source(fd, condition, _con_curl_socketevent_cb, fdp);
     }
 
     return CURLM_OK;