diff options
author | Hyunjee Kim <hj0426.kim@samsung.com> | 2019-12-03 10:55:17 +0900 |
---|---|---|
committer | Hyunjee Kim <hj0426.kim@samsung.com> | 2019-12-03 10:55:17 +0900 |
commit | d5a1e991c0c65ccab2b0cb9b8b9320ee3b2ea8e5 (patch) | |
tree | 8cc185ac77ddbf961f3f7356438007a72e7e1ba4 /gio/gfile.c | |
parent | 25d63acb6a98478b3fd901735198f87c644ffa64 (diff) | |
download | glib-d5a1e991c0c65ccab2b0cb9b8b9320ee3b2ea8e5.tar.gz glib-d5a1e991c0c65ccab2b0cb9b8b9320ee3b2ea8e5.tar.bz2 glib-d5a1e991c0c65ccab2b0cb9b8b9320ee3b2ea8e5.zip |
Imported Upstream version 2.61.0
Diffstat (limited to 'gio/gfile.c')
-rw-r--r-- | gio/gfile.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gio/gfile.c b/gio/gfile.c index 13b435480..24b136d80 100644 --- a/gio/gfile.c +++ b/gio/gfile.c @@ -3284,12 +3284,12 @@ file_copy_fallback (GFile *source, out = (GOutputStream*)_g_local_file_output_stream_replace (_g_local_file_get_filename (G_LOCAL_FILE (destination)), FALSE, NULL, flags & G_FILE_COPY_BACKUP, - G_FILE_CREATE_REPLACE_DESTINATION | - G_FILE_CREATE_PRIVATE, info, + G_FILE_CREATE_REPLACE_DESTINATION, + info, cancellable, error); else out = (GOutputStream*)_g_local_file_output_stream_create (_g_local_file_get_filename (G_LOCAL_FILE (destination)), - FALSE, G_FILE_CREATE_PRIVATE, info, + FALSE, 0, info, cancellable, error); } else if (flags & G_FILE_COPY_OVERWRITE) @@ -3297,13 +3297,12 @@ file_copy_fallback (GFile *source, out = (GOutputStream *)g_file_replace (destination, NULL, flags & G_FILE_COPY_BACKUP, - G_FILE_CREATE_REPLACE_DESTINATION | - G_FILE_CREATE_PRIVATE, + G_FILE_CREATE_REPLACE_DESTINATION, cancellable, error); } else { - out = (GOutputStream *)g_file_create (destination, G_FILE_CREATE_PRIVATE, cancellable, error); + out = (GOutputStream *)g_file_create (destination, 0, cancellable, error); } if (!out) @@ -6935,6 +6934,7 @@ query_default_handler_query_info_cb (GObject *object, /** * g_file_query_default_handler_async: * @file: a #GFile to open + * @io_priority: the [I/O priority][io-priority] of the request * @cancellable: optional #GCancellable object, %NULL to ignore * @callback: (nullable): a #GAsyncReadyCallback to call when the request is done * @user_data: (nullable): data to pass to @callback @@ -7964,7 +7964,7 @@ g_file_real_measure_disk_usage_finish (GFile *file, * * By default, errors are only reported against the toplevel file * itself. Errors found while recursing are silently ignored, unless - * %G_FILE_DISK_USAGE_REPORT_ALL_ERRORS is given in @flags. + * %G_FILE_MEASURE_REPORT_ANY_ERROR is given in @flags. * * The returned size, @disk_usage, is in bytes and should be formatted * with g_format_size() in order to get something reasonable for showing |