Merge branch 'zbrown/gfile-not-nullable' into 'main'

gfile: resolve_relative_path isn't nullable

See merge request GNOME/glib!2468
This commit is contained in:
Sebastian Dröge 2022-02-02 11:21:54 +00:00
commit c7031164b1

View File

@ -989,9 +989,7 @@ g_file_get_relative_path (GFile *parent,
* If the @relative_path is an absolute path name, the resolution * If the @relative_path is an absolute path name, the resolution
* is done absolutely (without taking @file path as base). * is done absolutely (without taking @file path as base).
* *
* Returns: (transfer full) (nullable): #GFile to the resolved path. * Returns: (transfer full): a #GFile for the resolved path.
* %NULL if @relative_path is %NULL or if @file is invalid.
* Free the returned object with g_object_unref().
*/ */
GFile * GFile *
g_file_resolve_relative_path (GFile *file, g_file_resolve_relative_path (GFile *file,