AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 10:50:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'otte/for-master2' into 'master'

Browse Source 
Remove guarantees we do not intend to hold

See merge request GNOME/gtk!3066
This commit is contained in:
Matthias Clasen 2021-01-11 15:07:40 +00:00
commit 8af0d4b51f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gdk/gdktexture.c
View File

@ -316,9 +316,9 @@ gdk_texture_new_for_pixbuf (GdkPixbuf *pixbuf)
* @resource_path: the path of the resource file * @resource_path: the path of the resource file
* *
* Creates a new texture by loading an image from a resource. * Creates a new texture by loading an image from a resource.
* The file format is detected automatically, and can be any * The file format is detected automatically.
* format that is supported by the gdk-pixbuf library, such as * The supported formats are PNG and JPEG, though more formats might be
* JPEG or PNG. * available.
* *
* It is a fatal error if @resource_path does not specify a valid * It is a fatal error if @resource_path does not specify a valid
* image resource and the program will abort if that happens. * image resource and the program will abort if that happens.
@ -352,9 +352,9 @@ gdk_texture_new_from_resource (const char *resource_path)
* @error: Return location for an error * @error: Return location for an error
* *
* Creates a new texture by loading an image from a file. * Creates a new texture by loading an image from a file.
* The file format is detected automatically, and can be any * The file format is detected automatically.
* format that is supported by the gdk-pixbuf library, such as * The supported formats are PNG and JPEG, though more formats might be
* JPEG or PNG. * available.
* *
* If %NULL is returned, then @error will be set. * If %NULL is returned, then @error will be set.
* *