From 0f48f804b665943a2fd848ab6efbe913003daa82 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Mon, 20 Apr 2009 13:14:32 +0200 Subject: [PATCH] Use g_cancellable_connect/disconnect Use the new cancellable helper functions to avoid races. (#572844) --- gio/gasynchelper.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gio/gasynchelper.c b/gio/gasynchelper.c index b7594dd..3e5fdf8 100644 --- 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; } -- 2.7.4