diff options
author | Rico Tzschichholz <ricotz@ubuntu.com> | 2014-11-15 14:28:29 +0100 |
---|---|---|
committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2014-11-15 14:28:29 +0100 |
commit | 1a4de48da8e9c20d99b8136c31c8ae6cd17c6ebc (patch) | |
tree | fe3e7ff80097ff5fd86814e8e5b622b0d498038b /gir/gio-2.0.c | |
parent | a543d8563f8e9ca059afb7218c63496f577cd0fc (diff) | |
download | gobject-introspection-1a4de48da8e9c20d99b8136c31c8ae6cd17c6ebc.tar.gz |
Update glib annotations from git master
Diffstat (limited to 'gir/gio-2.0.c')
-rw-r--r-- | gir/gio-2.0.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index 9324c367..076ad488 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -13308,6 +13308,8 @@ * For convenience, you can call this with a %NULL #GCancellable, * in which case the source will never trigger. * + * The new #GSource will hold a reference to the #GCancellable. + * * Returns: (transfer full): the new #GSource. * Since: 2.28 */ @@ -22795,14 +22797,14 @@ * operation was cancelled, the error %G_IO_ERROR_CANCELLED will be * returned. * - * If you pass in a non-%NULL @etag value, then this value is - * compared to the current entity tag of the file, and if they differ - * an %G_IO_ERROR_WRONG_ETAG error is returned. This generally means - * that the file has been changed since you last read it. You can get - * the new etag from g_file_output_stream_get_etag() after you've - * finished writing and closed the #GFileOutputStream. When you load - * a new file you can use g_file_input_stream_query_info() to get - * the etag of the file. + * If you pass in a non-%NULL @etag value and @file already exists, then + * this value is compared to the current entity tag of the file, and if + * they differ an %G_IO_ERROR_WRONG_ETAG error is returned. This + * generally means that the file has been changed since you last read + * it. You can get the new etag from g_file_output_stream_get_etag() + * after you've finished writing and closed the #GFileOutputStream. When + * you load a new file you can use g_file_input_stream_query_info() to + * get the etag of the file. * * If @make_backup is %TRUE, this function will attempt to make a * backup of the current file before overwriting it. If this fails |