diff options
author | Matthias Clasen <mclasen@redhat.com> | 2021-01-11 15:07:40 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2021-01-11 15:07:40 +0000 |
commit | 8af0d4b51f0fdeb42842ada4ce02a3b51bec468c (patch) | |
tree | 95bbb260fbebefb95e35cf6943d405b7ba1617f9 | |
parent | 01d19e2aa430a7f0a5386ce5697bef0f9abc4dfe (diff) | |
parent | 0f052d46b2c4b85e84a5e99ffb186edc82e4a031 (diff) | |
download | gtk+-8af0d4b51f0fdeb42842ada4ce02a3b51bec468c.tar.gz |
Merge branch 'otte/for-master2' into 'master'
Remove guarantees we do not intend to hold
See merge request GNOME/gtk!3066
-rw-r--r-- | gdk/gdktexture.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gdk/gdktexture.c b/gdk/gdktexture.c index d54bb73e16..f69cc47f06 100644 --- a/gdk/gdktexture.c +++ b/gdk/gdktexture.c @@ -316,9 +316,9 @@ gdk_texture_new_for_pixbuf (GdkPixbuf *pixbuf) * @resource_path: the path of the resource file * * Creates a new texture by loading an image from a resource. - * The file format is detected automatically, and can be any - * format that is supported by the gdk-pixbuf library, such as - * JPEG or PNG. + * The file format is detected automatically. + * The supported formats are PNG and JPEG, though more formats might be + * available. * * It is a fatal error if @resource_path does not specify a valid * 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 * * Creates a new texture by loading an image from a file. - * The file format is detected automatically, and can be any - * format that is supported by the gdk-pixbuf library, such as - * JPEG or PNG. + * The file format is detected automatically. + * The supported formats are PNG and JPEG, though more formats might be + * available. * * If %NULL is returned, then @error will be set. * |