Use g_simple_async_result_{new_,}take_error

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

diff --git a/gio/gtcpconnection.c b/gio/gtcpconnection.c
index 89aeaba..08364c1 100644 (file)
--- a/gio/gtcpconnection.c
+++ b/gio/gtcpconnection.c
@@ -210,7 +210,7 @@ close_async_data_free (CloseAsyncData *data)
 
 static void
 async_close_finish (CloseAsyncData *data,
-                    GError         *error,
+                    GError         *error /* consumed */,
                     gboolean        in_mainloop)
 {
   GIOStreamClass *parent = G_IO_STREAM_CLASS (g_tcp_connection_parent_class);
@@ -223,17 +223,14 @@ async_close_finish (CloseAsyncData *data,
   if (error)
     {
       parent->close_fn (stream, data->cancellable, NULL);
-      g_simple_async_result_set_from_error (data->res, error);
+      g_simple_async_result_take_error (data->res, error);
     }
   else
     {
       my_error = NULL;
       parent->close_fn (stream, data->cancellable, &my_error);
       if (my_error)
-       {
-         g_simple_async_result_set_from_error (data->res, my_error);
-         g_error_free (my_error);
-       }
+        g_simple_async_result_take_error (data->res, my_error);
     }
 
   if (in_mainloop)
@@ -260,7 +257,6 @@ close_read_ready (GSocket        *socket,
       else
        {
          async_close_finish (data, error, TRUE);
-         g_error_free (error);
          return FALSE;
        }
     }
@@ -306,7 +302,6 @@ g_tcp_connection_close_async (GIOStream           *stream,
       if (!g_socket_shutdown (socket, FALSE, TRUE, &error))
        {
          async_close_finish (data, error, FALSE);
-         g_error_free (error);
          close_async_data_free (data);
          return;
        }