Use g_cancellable_connect/disconnect

Use the new cancellable helper functions to avoid races. (#572844)

diff --git a/gio/gasynchelper.c b/gio/gasynchelper.c
index b7594dd..3e5fdf8 100644 (file)
--- a/gio/gasynchelper.c
+++ b/gio/gasynchelper.c
@@ -123,8 +123,8 @@ fd_source_finalize (GSource *source)
   FDSource *fd_source = (FDSource *)source;
 
   if (fd_source->cancelled_tag)
-    g_signal_handler_disconnect (fd_source->cancellable,
-                                fd_source->cancelled_tag);
+    g_cancellable_disconnect (fd_source->cancellable,
+                             fd_source->cancelled_tag);
 
   if (fd_source->cancellable)
     g_object_unref (fd_source->cancellable);
@@ -166,10 +166,9 @@ _g_fd_source_new (int           fd,
 
   if (cancellable)
     fd_source->cancelled_tag =
-      g_signal_connect_data (cancellable, "cancelled",
+      g_cancellable_connect (cancellable, 
                             (GCallback)fd_source_cancelled_cb,
-                            NULL, NULL,
-                            0);
+                            NULL, NULL);
   
   return source;
 }