GSocket: Reset the timeout in the GSocket GSource after it was triggered

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

diff --git a/gio/gfileoutputstream.c b/gio/gfileoutputstream.c
index b3e16ec..ce09eb8 100644 (file)
--- a/gio/gfileoutputstream.c
+++ b/gio/gfileoutputstream.c
@@ -225,11 +225,10 @@ g_file_output_stream_query_info_async (GFileOutputStream     *stream,
  
   if (!g_output_stream_set_pending (output_stream, &error))
     {
-      g_simple_async_report_gerror_in_idle (G_OBJECT (stream),
+      g_simple_async_report_take_gerror_in_idle (G_OBJECT (stream),
                                            callback,
                                            user_data,
                                            error);
-      g_error_free (error);
       return;
     }
 
@@ -524,10 +523,7 @@ query_info_async_thread (GSimpleAsyncResult *res,
                          _("Stream doesn't support query_info"));
 
   if (info == NULL)
-    {
-      g_simple_async_result_set_from_error (res, error);
-      g_error_free (error);
-    }
+    g_simple_async_result_take_error (res, error);
   else
     data->info = info;
 }