Bug 621213 – GDBusProxy and well-known names

[platform/upstream/glib.git] / gio / gtcpconnection.c

diff --git a/gio/gtcpconnection.c b/gio/gtcpconnection.c
index 738ccb0..59f9c1b 100644 (file)
--- a/gio/gtcpconnection.c
+++ b/gio/gtcpconnection.c
@@ -175,17 +175,9 @@ g_tcp_connection_close (GIOStream     *stream,
        {
          while (TRUE)
            {
-             if (!g_socket_condition_wait (socket,
-                                           G_IO_IN, cancellable, error))
-               {
-                 had_error = TRUE;
-                 error = NULL;
-                 break;
-               }
-
              my_error = NULL;
              ret = g_socket_receive (socket,  buffer, sizeof (buffer),
-                                     &my_error);
+                                     cancellable, &my_error);
              if (ret < 0)
                {
                  if (g_error_matches (my_error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK))
@@ -265,15 +257,8 @@ close_read_ready (GSocket        *socket,
   char buffer[1024];
   gssize ret;
 
-  if (g_cancellable_set_error_if_cancelled (data->cancellable,
-                                           &error))
-    {
-      async_close_finish (data, error, TRUE);
-      g_error_free (error);
-      return FALSE;
-    }
-
-  ret = g_socket_receive (socket,  buffer, sizeof (buffer), &error);
+  ret = g_socket_receive (socket,  buffer, sizeof (buffer),
+                         data->cancellable, &error);
   if (ret < 0)
     {
       if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK))
@@ -336,13 +321,13 @@ g_tcp_connection_close_async (GIOStream           *stream,
       g_source_set_callback (source,
                             (GSourceFunc) close_read_ready,
                             data, (GDestroyNotify)close_async_data_free);
-      g_source_attach (source, NULL);
+      g_source_attach (source, g_main_context_get_thread_default ());
       g_source_unref (source);
 
       return;
     }
 
-  return G_IO_STREAM_CLASS (g_tcp_connection_parent_class)
+  G_IO_STREAM_CLASS (g_tcp_connection_parent_class)
     ->close_async (stream, io_priority, cancellable, callback, user_data);
 }