summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gmail.com>2021-01-02 17:37:53 +0000
committerEmmanuele Bassi <ebassi@gmail.com>2021-01-02 17:37:53 +0000
commitf3c485373ce8066e85b20abb76cb722e945f23fd (patch)
tree375a7b881e50c367a05164246098ce7575a9ed7e
parente979462d4776556816c4fc937bac2402a44ac20c (diff)
parent92f65a66621208b09b73b5ad67503b21e17c5edd (diff)
downloadgdk-pixbuf-f3c485373ce8066e85b20abb76cb722e945f23fd.tar.gz
Merge branch 'gir' into 'master'
Include pixbuf loader API in the gir file Closes #167 See merge request GNOME/gdk-pixbuf!97
-rw-r--r--gdk-pixbuf/gdk-pixbuf-animation.h13
-rw-r--r--gdk-pixbuf/meson.build1
2 files changed, 7 insertions, 7 deletions
diff --git a/gdk-pixbuf/gdk-pixbuf-animation.h b/gdk-pixbuf/gdk-pixbuf-animation.h
index 0aa788d79..ad0c39c3b 100644
--- a/gdk-pixbuf/gdk-pixbuf-animation.h
+++ b/gdk-pixbuf/gdk-pixbuf-animation.h
@@ -161,17 +161,16 @@ struct _GdkPixbufAnimationClass {
/*< public >*/
- gboolean (*is_static_image) (GdkPixbufAnimation *anim);
+ gboolean (*is_static_image) (GdkPixbufAnimation *animation);
- GdkPixbuf* (*get_static_image) (GdkPixbufAnimation *anim);
-
- void (*get_size) (GdkPixbufAnimation *anim,
+ GdkPixbuf* (*get_static_image) (GdkPixbufAnimation *animation);
+
+ void (*get_size) (GdkPixbufAnimation *animation,
int *width,
int *height);
-
- GdkPixbufAnimationIter* (*get_iter) (GdkPixbufAnimation *anim,
- const GTimeVal *start_time);
+ GdkPixbufAnimationIter* (*get_iter) (GdkPixbufAnimation *animation,
+ const GTimeVal *start_time);
};
G_GNUC_END_IGNORE_DEPRECATIONS
diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
index d9a254f14..e89889c13 100644
--- a/gdk-pixbuf/meson.build
+++ b/gdk-pixbuf/meson.build
@@ -188,6 +188,7 @@ if build_gir
gir_args = [
'--quiet',
'-DGDK_PIXBUF_COMPILATION',
+ '-DGDK_PIXBUF_ENABLE_BACKEND',
]
gdkpixbuf_gir = gnome.generate_gir(