diff options
| author | Alexander Larsson <alexl@redhat.com> | 2009-05-15 10:47:49 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2009-05-15 20:16:30 +0200 |
| commit | 5bebce4592fee584bbc6db29a3e62b4005a1a71f (patch) | |
| tree | ba852ffb9c284575d604cd669534eaccce3ffc55 /common | |
| parent | 87741642cd920ef4e48d09755be1cc6db6a0774b (diff) | |
| download | gvfs-5bebce4592fee584bbc6db29a3e62b4005a1a71f.tar.gz | |
Use new race-free cancellable signal connect APIs (#572844)
Diffstat (limited to 'common')
| -rw-r--r-- | common/gdbusutils.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/common/gdbusutils.c b/common/gdbusutils.c index c3f3f332..f9d18894 100644 --- a/common/gdbusutils.c +++ b/common/gdbusutils.c @@ -679,8 +679,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); @@ -723,10 +723,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; } |