diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2021-02-17 09:21:44 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2021-02-17 09:21:44 +0000 |
| commit | 49d5c4f85910ab80db6cdfd6c4761ef5406df220 (patch) | |
| tree | 3bf78c0bf0b349d68810890e8801e21118cfa27b | |
| parent | 4236672170fcf643fd7425fcc74cc8d8340ebd79 (diff) | |
| parent | b41147dfc9a993dd6af4c165c88135fd2da98190 (diff) | |
| download | glib-49d5c4f85910ab80db6cdfd6c4761ef5406df220.tar.gz | |
Merge branch 'gfile-etag-nullable' into 'master'
The ETag returned by various GFile functions is nullable
See merge request GNOME/glib!1956
| -rw-r--r-- | gio/gfile.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gio/gfile.c b/gio/gfile.c index 1f2a3e850..d7feca6b9 100644 --- a/gio/gfile.c +++ b/gio/gfile.c @@ -7057,7 +7057,7 @@ g_file_query_default_handler_finish (GFile *file, * @contents: (out) (transfer full) (element-type guint8) (array length=length): a location to place the contents of the file * @length: (out) (optional): a location to place the length of the contents of the file, * or %NULL if the length is not needed - * @etag_out: (out) (optional): a location to place the current entity tag for the file, + * @etag_out: (out) (optional) (nullable): a location to place the current entity tag for the file, * or %NULL if the entity tag is not needed * @error: a #GError, or %NULL * @@ -7345,7 +7345,7 @@ g_file_load_partial_contents_async (GFile *file, * @contents: (out) (transfer full) (element-type guint8) (array length=length): a location to place the contents of the file * @length: (out) (optional): a location to place the length of the contents of the file, * or %NULL if the length is not needed - * @etag_out: (out) (optional): a location to place the current entity tag for the file, + * @etag_out: (out) (optional) (nullable): a location to place the current entity tag for the file, * or %NULL if the entity tag is not needed * @error: a #GError, or %NULL * @@ -7443,7 +7443,7 @@ g_file_load_contents_async (GFile *file, * @contents: (out) (transfer full) (element-type guint8) (array length=length): a location to place the contents of the file * @length: (out) (optional): a location to place the length of the contents of the file, * or %NULL if the length is not needed - * @etag_out: (out) (optional): a location to place the current entity tag for the file, + * @etag_out: (out) (optional) (nullable): a location to place the current entity tag for the file, * or %NULL if the entity tag is not needed * @error: a #GError, or %NULL * @@ -7481,7 +7481,7 @@ g_file_load_contents_finish (GFile *file, * or %NULL * @make_backup: %TRUE if a backup should be created * @flags: a set of #GFileCreateFlags - * @new_etag: (out) (optional): a location to a new [entity tag][gfile-etag] + * @new_etag: (out) (optional) (nullable): a location to a new [entity tag][gfile-etag] * for the document. This should be freed with g_free() when no longer * needed, or %NULL * @cancellable: optional #GCancellable object, %NULL to ignore @@ -7789,7 +7789,7 @@ g_file_replace_contents_bytes_async (GFile *file, * g_file_replace_contents_finish: * @file: input #GFile * @res: a #GAsyncResult - * @new_etag: (out) (optional): a location of a new [entity tag][gfile-etag] + * @new_etag: (out) (optional) (nullable): a location of a new [entity tag][gfile-etag] * for the document. This should be freed with g_free() when it is no * longer needed, or %NULL * @error: a #GError, or %NULL |