From: Jürg Billeter <j@bitron.ch>
Date: Sun, 27 Jun 2010 21:59:22 +0000 (+0200)
Subject: Remove bindings for short-lived gdk-pixbuf-3.0
X-Git-Tag: 0.9.3~86
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0b2a3befd62aa288c7c7859cc3d39d04f9d8e671;p=thirdparty%2Fvala.git

Remove bindings for short-lived gdk-pixbuf-3.0
---

diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index 591ef40ca..d3e7d8d9e 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -38,8 +38,6 @@ dist_vapi_DATA = \
 	gdk-3.0.vapi \
 	gdk-pixbuf-2.0.deps \
 	gdk-pixbuf-2.0.vapi \
-	gdk-pixbuf-3.0.deps \
-	gdk-pixbuf-3.0.vapi \
 	gdk-x11-2.0.deps \
 	gdk-x11-2.0.vapi \
 	gdk-x11-3.0.deps \
diff --git a/vapi/gdk-3.0.deps b/vapi/gdk-3.0.deps
index 9c45e4224..31f76ac04 100644
--- a/vapi/gdk-3.0.deps
+++ b/vapi/gdk-3.0.deps
@@ -1,5 +1,5 @@
 gio-2.0
-gdk-pixbuf-3.0
+gdk-pixbuf-2.0
 cairo
 pango
 pangocairo
diff --git a/vapi/gdk-pixbuf-3.0.deps b/vapi/gdk-pixbuf-3.0.deps
deleted file mode 100644
index cd10dfde4..000000000
--- a/vapi/gdk-pixbuf-3.0.deps
+++ /dev/null
@@ -1 +0,0 @@
-gio-2.0
diff --git a/vapi/gdk-pixbuf-3.0.vapi b/vapi/gdk-pixbuf-3.0.vapi
deleted file mode 100644
index 1cdd20826..000000000
--- a/vapi/gdk-pixbuf-3.0.vapi
+++ /dev/null
@@ -1,220 +0,0 @@
-/* gdk-pixbuf-3.0.vapi generated by vapigen, do not modify. */
-
-[CCode (cprefix = "Gdk", lower_case_cprefix = "gdk_", gir_namespace = "GdkPixbuf", gir_version = "2.0")]
-namespace Gdk {
-	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public class Pixbuf : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public Pixbuf (Gdk.Colorspace colorspace, bool has_alpha, int bits_per_sample, int width, int height);
-		public unowned Gdk.Pixbuf add_alpha (bool substitute_color, uchar r, uchar g, uchar b);
-		public unowned Gdk.Pixbuf apply_embedded_orientation ();
-		public void composite (Gdk.Pixbuf dest, int dest_x, int dest_y, int dest_width, int dest_height, double offset_x, double offset_y, double scale_x, double scale_y, Gdk.InterpType interp_type, int overall_alpha);
-		public void composite_color (Gdk.Pixbuf dest, int dest_x, int dest_y, int dest_width, int dest_height, double offset_x, double offset_y, double scale_x, double scale_y, Gdk.InterpType interp_type, int overall_alpha, int check_x, int check_y, int check_size, uint32 color1, uint32 color2);
-		public unowned Gdk.Pixbuf composite_color_simple (int dest_width, int dest_height, Gdk.InterpType interp_type, int overall_alpha, int check_size, uint32 color1, uint32 color2);
-		public Gdk.Pixbuf copy ();
-		public void copy_area (int src_x, int src_y, int width, int height, Gdk.Pixbuf dest_pixbuf, int dest_x, int dest_y);
-		public static GLib.Quark error_quark ();
-		public void fill (uint32 pixel);
-		public Gdk.Pixbuf flip (bool horizontal);
-		[CCode (has_construct_function = false)]
-		public Pixbuf.from_data ([CCode (array_length = false)] uchar[] data, Gdk.Colorspace colorspace, bool has_alpha, int bits_per_sample, int width, int height, int rowstride, Gdk.PixbufDestroyNotify? destroy_fn);
-		[CCode (has_construct_function = false)]
-		public Pixbuf.from_file (string filename) throws GLib.Error;
-		[CCode (has_construct_function = false)]
-		public Pixbuf.from_file_at_scale (string filename, int width, int height, bool preserve_aspect_ratio) throws GLib.Error;
-		[CCode (has_construct_function = false)]
-		public Pixbuf.from_file_at_size (string filename, int width, int height) throws GLib.Error;
-		[CCode (has_construct_function = false)]
-		public Pixbuf.from_inline (int data_length, [CCode (array_length = false)] uchar[] data, bool copy_pixels) throws GLib.Error;
-		public static unowned Gdk.Pixbuf from_pixdata (Gdk.Pixdata pixdata, bool copy_pixels) throws GLib.Error;
-		[CCode (has_construct_function = false)]
-		public Pixbuf.from_stream (GLib.InputStream stream, GLib.Cancellable? cancellable) throws GLib.Error;
-		[CCode (has_construct_function = false)]
-		public Pixbuf.from_stream_at_scale (GLib.InputStream stream, int width, int height, bool preserve_aspect_ratio, GLib.Cancellable? cancellable) throws GLib.Error;
-		[CCode (has_construct_function = false)]
-		public Pixbuf.from_xpm_data ([CCode (array_length = false)] string[] data);
-		public int get_bits_per_sample ();
-		public Gdk.Colorspace get_colorspace ();
-		public static unowned Gdk.PixbufFormat get_file_info (string filename, out int width, out int height);
-		public static unowned GLib.SList get_formats ();
-		public bool get_has_alpha ();
-		public int get_height ();
-		public int get_n_channels ();
-		public unowned string get_option (string key);
-		[CCode (array_length = false)]
-		public unowned uchar[] get_pixels ();
-		public int get_rowstride ();
-		public int get_width ();
-		public Gdk.Pixbuf rotate_simple (Gdk.PixbufRotation angle);
-		public void saturate_and_pixelate (Gdk.Pixbuf dest, float saturation, bool pixelate);
-		public bool save (string filename, string type, ...) throws GLib.Error;
-		public bool save_to_callback (Gdk.PixbufSaveFunc save_func, string type, ...) throws GLib.Error;
-		public bool save_to_callbackv (Gdk.PixbufSaveFunc save_func, string type, string[] option_keys, string[] option_values) throws GLib.Error;
-		public bool save_to_stream (GLib.OutputStream stream, string type, GLib.Cancellable cancellable) throws GLib.Error;
-		public bool savev (string filename, string type, out unowned string option_keys, out unowned string option_values) throws GLib.Error;
-		public void scale (Gdk.Pixbuf dest, int dest_x, int dest_y, int dest_width, int dest_height, double offset_x, double offset_y, double scale_x, double scale_y, Gdk.InterpType interp_type);
-		public Gdk.Pixbuf scale_simple (int dest_width, int dest_height, Gdk.InterpType interp_type);
-		[CCode (has_construct_function = false)]
-		public Pixbuf.subpixbuf (Gdk.Pixbuf src_pixbuf, int src_x, int src_y, int width, int height);
-		public int bits_per_sample { get; construct; }
-		public Gdk.Colorspace colorspace { get; construct; }
-		public bool has_alpha { get; construct; }
-		public int height { get; construct; }
-		public int n_channels { get; construct; }
-		public void* pixels { get; construct; }
-		public int rowstride { get; construct; }
-		public int width { get; construct; }
-	}
-	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public class PixbufAnimation : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public PixbufAnimation.from_file (string filename) throws GLib.Error;
-		public int get_height ();
-		public unowned Gdk.PixbufAnimationIter get_iter (GLib.TimeVal start_time);
-		public unowned Gdk.Pixbuf get_static_image ();
-		public int get_width ();
-		public bool is_static_image ();
-	}
-	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public class PixbufAnimationIter : GLib.Object {
-		public bool advance (GLib.TimeVal current_time);
-		public int get_delay_time ();
-		public unowned Gdk.Pixbuf get_pixbuf ();
-		public bool on_currently_loading_frame ();
-	}
-	[Compact]
-	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public class PixbufFormat {
-		public unowned string get_description ();
-		public unowned string get_extensions ();
-		public unowned string get_license ();
-		public unowned string get_mime_types ();
-		public unowned string get_name ();
-		public bool is_disabled ();
-		public bool is_scalable ();
-		public bool is_writable ();
-		public void set_disabled (bool disabled);
-	}
-	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public class PixbufLoader : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public PixbufLoader ();
-		public bool close () throws GLib.Error;
-		public unowned Gdk.PixbufAnimation get_animation ();
-		public unowned Gdk.PixbufFormat get_format ();
-		public unowned Gdk.Pixbuf get_pixbuf ();
-		public void set_size (int width, int height);
-		[CCode (has_construct_function = false)]
-		public PixbufLoader.with_mime_type (string mime_type) throws GLib.Error;
-		[CCode (has_construct_function = false)]
-		public PixbufLoader.with_type (string image_type) throws GLib.Error;
-		public bool write ([CCode (array_length = false)] uchar[] buf, size_t count) throws GLib.Error;
-		public virtual signal void area_prepared ();
-		public virtual signal void area_updated (int x, int y, int width, int height);
-		public virtual signal void closed ();
-		public virtual signal void size_prepared (int width, int height);
-	}
-	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public class PixbufSimpleAnim : Gdk.PixbufAnimation {
-		[CCode (has_construct_function = false)]
-		public PixbufSimpleAnim (int width, int height, float rate);
-		public void add_frame (Gdk.Pixbuf pixbuf);
-		public bool get_loop ();
-		public void set_loop (bool loop);
-		public bool loop { get; set; }
-	}
-	[Compact]
-	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public class PixbufSimpleAnimClass {
-	}
-	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public class PixbufSimpleAnimIter : Gdk.PixbufAnimationIter {
-	}
-	[CCode (type_id = "GDK_TYPE_PIXDATA", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public struct Pixdata {
-		public uint32 magic;
-		public int32 length;
-		public uint32 pixdata_type;
-		public uint32 rowstride;
-		public uint32 width;
-		public uint32 height;
-		[CCode (array_length = false)]
-		public weak uchar[] pixel_data;
-		public bool deserialize ([CCode (array_length_pos = 0.9)] uchar[] stream) throws GLib.Error;
-		public void* from_pixbuf (Gdk.Pixbuf pixbuf, bool use_rle);
-		public unowned uchar[] serialize ();
-		public unowned GLib.StringBuilder to_csource (string name, Gdk.PixdataDumpType dump_type);
-	}
-	[CCode (cprefix = "GDK_COLORSPACE_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public enum Colorspace {
-		RGB
-	}
-	[CCode (cprefix = "GDK_INTERP_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public enum InterpType {
-		NEAREST,
-		TILES,
-		BILINEAR,
-		HYPER
-	}
-	[CCode (cprefix = "GDK_PIXBUF_ALPHA_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public enum PixbufAlphaMode {
-		BILEVEL,
-		FULL
-	}
-	[CCode (cprefix = "GDK_PIXBUF_ROTATE_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public enum PixbufRotation {
-		NONE,
-		COUNTERCLOCKWISE,
-		UPSIDEDOWN,
-		CLOCKWISE
-	}
-	[CCode (cprefix = "GDK_PIXDATA_DUMP_", has_type_id = false, cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public enum PixdataDumpType {
-		PIXDATA_STREAM,
-		PIXDATA_STRUCT,
-		MACROS,
-		GTYPES,
-		CTYPES,
-		STATIC,
-		CONST,
-		RLE_DECODER
-	}
-	[CCode (cprefix = "GDK_PIXDATA_", has_type_id = false, cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public enum PixdataType {
-		COLOR_TYPE_RGB,
-		COLOR_TYPE_RGBA,
-		COLOR_TYPE_MASK,
-		SAMPLE_WIDTH_8,
-		SAMPLE_WIDTH_MASK,
-		ENCODING_RAW,
-		ENCODING_RLE,
-		ENCODING_MASK
-	}
-	[CCode (cprefix = "GDK_PIXBUF_ERROR_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public errordomain PixbufError {
-		CORRUPT_IMAGE,
-		INSUFFICIENT_MEMORY,
-		BAD_OPTION,
-		UNKNOWN_TYPE,
-		UNSUPPORTED_OPERATION,
-		FAILED,
-	}
-	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public delegate void PixbufDestroyNotify ([CCode (array_length = false)] uchar[] pixels);
-	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public delegate bool PixbufSaveFunc (string buf, size_t count, GLib.Error error);
-	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public const int PIXBUF_FEATURES_H;
-	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public const int PIXBUF_MAGIC_NUMBER;
-	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public const int PIXBUF_MAJOR;
-	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public const int PIXBUF_MICRO;
-	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public const int PIXBUF_MINOR;
-	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public const string PIXBUF_VERSION;
-	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public const int PIXDATA_HEADER_LENGTH;
-}
diff --git a/vapi/gdk-x11-3.0.deps b/vapi/gdk-x11-3.0.deps
index 11e8596ef..5d3176013 100644
--- a/vapi/gdk-x11-3.0.deps
+++ b/vapi/gdk-x11-3.0.deps
@@ -1,6 +1,6 @@
 gio-2.0
 gdk-3.0
-gdk-pixbuf-3.0
+gdk-pixbuf-2.0
 cairo
 pango
 pangocairo
diff --git a/vapi/gtk+-3.0.deps b/vapi/gtk+-3.0.deps
index 3457ed62d..1b560e0d5 100644
--- a/vapi/gtk+-3.0.deps
+++ b/vapi/gtk+-3.0.deps
@@ -1,6 +1,6 @@
 gio-2.0
 atk
 cairo
-gdk-pixbuf-3.0
+gdk-pixbuf-2.0
 gdk-3.0
 pango
diff --git a/vapi/packages/gdk-3.0/gdk-3.0.deps b/vapi/packages/gdk-3.0/gdk-3.0.deps
index 9c45e4224..31f76ac04 100644
--- a/vapi/packages/gdk-3.0/gdk-3.0.deps
+++ b/vapi/packages/gdk-3.0/gdk-3.0.deps
@@ -1,5 +1,5 @@
 gio-2.0
-gdk-pixbuf-3.0
+gdk-pixbuf-2.0
 cairo
 pango
 pangocairo
diff --git a/vapi/packages/gdk-pixbuf-3.0/gdk-pixbuf-3.0-custom.vala b/vapi/packages/gdk-pixbuf-3.0/gdk-pixbuf-3.0-custom.vala
deleted file mode 100644
index 862331ee4..000000000
--- a/vapi/packages/gdk-pixbuf-3.0/gdk-pixbuf-3.0-custom.vala
+++ /dev/null
@@ -1,28 +0,0 @@
-/* gdk-pixbuf-2.0-custom.vala
- *
- * Copyright (C) 2010  Jakob Westhoff
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
-
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
-
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
- *
- * Author:
- *  Jakob Westhoff <jakob@westhoffswelt.de>
- */
-
-namespace Gdk {
-	public class Pixbuf {
-		public bool save_to_buffer ([CCode (array_length_type = "gsize")] out char[] buffer, string type, ...) throws GLib.Error;
-		public bool save_to_bufferv ([CCode (array_length_type = "gsize")] out char[] buffer, string type, string[] option_keys, string[] option_values) throws GLib.Error;
-    }
-}
diff --git a/vapi/packages/gdk-pixbuf-3.0/gdk-pixbuf-3.0.defines b/vapi/packages/gdk-pixbuf-3.0/gdk-pixbuf-3.0.defines
deleted file mode 100644
index 66fa4dc80..000000000
--- a/vapi/packages/gdk-pixbuf-3.0/gdk-pixbuf-3.0.defines
+++ /dev/null
@@ -1,3 +0,0 @@
--DGDK_PIXBUF_COMPILATION
--DGDK_PIXBUF_DISABLE_DEPRECATED
--DGSEAL_ENABLE
diff --git a/vapi/packages/gdk-pixbuf-3.0/gdk-pixbuf-3.0.deps b/vapi/packages/gdk-pixbuf-3.0/gdk-pixbuf-3.0.deps
deleted file mode 100644
index cd10dfde4..000000000
--- a/vapi/packages/gdk-pixbuf-3.0/gdk-pixbuf-3.0.deps
+++ /dev/null
@@ -1 +0,0 @@
-gio-2.0
diff --git a/vapi/packages/gdk-pixbuf-3.0/gdk-pixbuf-3.0.files b/vapi/packages/gdk-pixbuf-3.0/gdk-pixbuf-3.0.files
deleted file mode 100644
index 2b7359cdd..000000000
--- a/vapi/packages/gdk-pixbuf-3.0/gdk-pixbuf-3.0.files
+++ /dev/null
@@ -1,3 +0,0 @@
-include/gtk-3.0/gdk-pixbuf/gdk-pixbuf.h
-include/gtk-3.0/gdk-pixbuf
-lib/libgdk_pixbuf-3.0.so
diff --git a/vapi/packages/gdk-pixbuf-3.0/gdk-pixbuf-3.0.gi b/vapi/packages/gdk-pixbuf-3.0/gdk-pixbuf-3.0.gi
deleted file mode 100644
index d534ad1a2..000000000
--- a/vapi/packages/gdk-pixbuf-3.0/gdk-pixbuf-3.0.gi
+++ /dev/null
@@ -1,763 +0,0 @@
-<?xml version="1.0"?>
-<api version="1.0">
-	<namespace name="Gdk">
-		<callback name="GdkPixbufDestroyNotify">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="pixels" type="guchar*"/>
-				<parameter name="data" type="gpointer"/>
-			</parameters>
-		</callback>
-		<callback name="GdkPixbufSaveFunc">
-			<return-type type="gboolean"/>
-			<parameters>
-				<parameter name="buf" type="gchar*"/>
-				<parameter name="count" type="gsize"/>
-				<parameter name="error" type="GError**"/>
-				<parameter name="data" type="gpointer"/>
-			</parameters>
-		</callback>
-		<struct name="GdkPixbufFormat">
-			<method name="get_description" symbol="gdk_pixbuf_format_get_description">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="format" type="GdkPixbufFormat*"/>
-				</parameters>
-			</method>
-			<method name="get_extensions" symbol="gdk_pixbuf_format_get_extensions">
-				<return-type type="gchar**"/>
-				<parameters>
-					<parameter name="format" type="GdkPixbufFormat*"/>
-				</parameters>
-			</method>
-			<method name="get_license" symbol="gdk_pixbuf_format_get_license">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="format" type="GdkPixbufFormat*"/>
-				</parameters>
-			</method>
-			<method name="get_mime_types" symbol="gdk_pixbuf_format_get_mime_types">
-				<return-type type="gchar**"/>
-				<parameters>
-					<parameter name="format" type="GdkPixbufFormat*"/>
-				</parameters>
-			</method>
-			<method name="get_name" symbol="gdk_pixbuf_format_get_name">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="format" type="GdkPixbufFormat*"/>
-				</parameters>
-			</method>
-			<method name="is_disabled" symbol="gdk_pixbuf_format_is_disabled">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="format" type="GdkPixbufFormat*"/>
-				</parameters>
-			</method>
-			<method name="is_scalable" symbol="gdk_pixbuf_format_is_scalable">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="format" type="GdkPixbufFormat*"/>
-				</parameters>
-			</method>
-			<method name="is_writable" symbol="gdk_pixbuf_format_is_writable">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="format" type="GdkPixbufFormat*"/>
-				</parameters>
-			</method>
-			<method name="set_disabled" symbol="gdk_pixbuf_format_set_disabled">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="format" type="GdkPixbufFormat*"/>
-					<parameter name="disabled" type="gboolean"/>
-				</parameters>
-			</method>
-		</struct>
-		<struct name="GdkPixbufSimpleAnimClass">
-		</struct>
-		<struct name="GdkPixdata">
-			<method name="deserialize" symbol="gdk_pixdata_deserialize">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="pixdata" type="GdkPixdata*"/>
-					<parameter name="stream_length" type="guint"/>
-					<parameter name="stream" type="guint8*"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</method>
-			<method name="from_pixbuf" symbol="gdk_pixdata_from_pixbuf">
-				<return-type type="gpointer"/>
-				<parameters>
-					<parameter name="pixdata" type="GdkPixdata*"/>
-					<parameter name="pixbuf" type="GdkPixbuf*"/>
-					<parameter name="use_rle" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="serialize" symbol="gdk_pixdata_serialize">
-				<return-type type="guint8*"/>
-				<parameters>
-					<parameter name="pixdata" type="GdkPixdata*"/>
-					<parameter name="stream_length_p" type="guint*"/>
-				</parameters>
-			</method>
-			<method name="to_csource" symbol="gdk_pixdata_to_csource">
-				<return-type type="GString*"/>
-				<parameters>
-					<parameter name="pixdata" type="GdkPixdata*"/>
-					<parameter name="name" type="gchar*"/>
-					<parameter name="dump_type" type="GdkPixdataDumpType"/>
-				</parameters>
-			</method>
-			<field name="magic" type="guint32"/>
-			<field name="length" type="gint32"/>
-			<field name="pixdata_type" type="guint32"/>
-			<field name="rowstride" type="guint32"/>
-			<field name="width" type="guint32"/>
-			<field name="height" type="guint32"/>
-			<field name="pixel_data" type="guint8*"/>
-		</struct>
-		<enum name="GdkColorspace" type-name="GdkColorspace" get-type="gdk_colorspace_get_type">
-			<member name="GDK_COLORSPACE_RGB" value="0"/>
-		</enum>
-		<enum name="GdkInterpType" type-name="GdkInterpType" get-type="gdk_interp_type_get_type">
-			<member name="GDK_INTERP_NEAREST" value="0"/>
-			<member name="GDK_INTERP_TILES" value="1"/>
-			<member name="GDK_INTERP_BILINEAR" value="2"/>
-			<member name="GDK_INTERP_HYPER" value="3"/>
-		</enum>
-		<enum name="GdkPixbufAlphaMode" type-name="GdkPixbufAlphaMode" get-type="gdk_pixbuf_alpha_mode_get_type">
-			<member name="GDK_PIXBUF_ALPHA_BILEVEL" value="0"/>
-			<member name="GDK_PIXBUF_ALPHA_FULL" value="1"/>
-		</enum>
-		<enum name="GdkPixbufError" type-name="GdkPixbufError" get-type="gdk_pixbuf_error_get_type">
-			<member name="GDK_PIXBUF_ERROR_CORRUPT_IMAGE" value="0"/>
-			<member name="GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY" value="1"/>
-			<member name="GDK_PIXBUF_ERROR_BAD_OPTION" value="2"/>
-			<member name="GDK_PIXBUF_ERROR_UNKNOWN_TYPE" value="3"/>
-			<member name="GDK_PIXBUF_ERROR_UNSUPPORTED_OPERATION" value="4"/>
-			<member name="GDK_PIXBUF_ERROR_FAILED" value="5"/>
-		</enum>
-		<enum name="GdkPixbufRotation" type-name="GdkPixbufRotation" get-type="gdk_pixbuf_rotation_get_type">
-			<member name="GDK_PIXBUF_ROTATE_NONE" value="0"/>
-			<member name="GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE" value="90"/>
-			<member name="GDK_PIXBUF_ROTATE_UPSIDEDOWN" value="180"/>
-			<member name="GDK_PIXBUF_ROTATE_CLOCKWISE" value="270"/>
-		</enum>
-		<enum name="GdkPixdataDumpType">
-			<member name="GDK_PIXDATA_DUMP_PIXDATA_STREAM" value="0"/>
-			<member name="GDK_PIXDATA_DUMP_PIXDATA_STRUCT" value="1"/>
-			<member name="GDK_PIXDATA_DUMP_MACROS" value="2"/>
-			<member name="GDK_PIXDATA_DUMP_GTYPES" value="0"/>
-			<member name="GDK_PIXDATA_DUMP_CTYPES" value="256"/>
-			<member name="GDK_PIXDATA_DUMP_STATIC" value="512"/>
-			<member name="GDK_PIXDATA_DUMP_CONST" value="1024"/>
-			<member name="GDK_PIXDATA_DUMP_RLE_DECODER" value="65536"/>
-		</enum>
-		<enum name="GdkPixdataType">
-			<member name="GDK_PIXDATA_COLOR_TYPE_RGB" value="1"/>
-			<member name="GDK_PIXDATA_COLOR_TYPE_RGBA" value="2"/>
-			<member name="GDK_PIXDATA_COLOR_TYPE_MASK" value="255"/>
-			<member name="GDK_PIXDATA_SAMPLE_WIDTH_8" value="65536"/>
-			<member name="GDK_PIXDATA_SAMPLE_WIDTH_MASK" value="983040"/>
-			<member name="GDK_PIXDATA_ENCODING_RAW" value="16777216"/>
-			<member name="GDK_PIXDATA_ENCODING_RLE" value="33554432"/>
-			<member name="GDK_PIXDATA_ENCODING_MASK" value="251658240"/>
-		</enum>
-		<object name="GdkPixbuf" parent="GObject" type-name="GdkPixbuf" get-type="gdk_pixbuf_get_type">
-			<method name="add_alpha" symbol="gdk_pixbuf_add_alpha">
-				<return-type type="GdkPixbuf*"/>
-				<parameters>
-					<parameter name="pixbuf" type="GdkPixbuf*"/>
-					<parameter name="substitute_color" type="gboolean"/>
-					<parameter name="r" type="guchar"/>
-					<parameter name="g" type="guchar"/>
-					<parameter name="b" type="guchar"/>
-				</parameters>
-			</method>
-			<method name="apply_embedded_orientation" symbol="gdk_pixbuf_apply_embedded_orientation">
-				<return-type type="GdkPixbuf*"/>
-				<parameters>
-					<parameter name="src" type="GdkPixbuf*"/>
-				</parameters>
-			</method>
-			<method name="composite" symbol="gdk_pixbuf_composite">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="src" type="GdkPixbuf*"/>
-					<parameter name="dest" type="GdkPixbuf*"/>
-					<parameter name="dest_x" type="int"/>
-					<parameter name="dest_y" type="int"/>
-					<parameter name="dest_width" type="int"/>
-					<parameter name="dest_height" type="int"/>
-					<parameter name="offset_x" type="double"/>
-					<parameter name="offset_y" type="double"/>
-					<parameter name="scale_x" type="double"/>
-					<parameter name="scale_y" type="double"/>
-					<parameter name="interp_type" type="GdkInterpType"/>
-					<parameter name="overall_alpha" type="int"/>
-				</parameters>
-			</method>
-			<method name="composite_color" symbol="gdk_pixbuf_composite_color">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="src" type="GdkPixbuf*"/>
-					<parameter name="dest" type="GdkPixbuf*"/>
-					<parameter name="dest_x" type="int"/>
-					<parameter name="dest_y" type="int"/>
-					<parameter name="dest_width" type="int"/>
-					<parameter name="dest_height" type="int"/>
-					<parameter name="offset_x" type="double"/>
-					<parameter name="offset_y" type="double"/>
-					<parameter name="scale_x" type="double"/>
-					<parameter name="scale_y" type="double"/>
-					<parameter name="interp_type" type="GdkInterpType"/>
-					<parameter name="overall_alpha" type="int"/>
-					<parameter name="check_x" type="int"/>
-					<parameter name="check_y" type="int"/>
-					<parameter name="check_size" type="int"/>
-					<parameter name="color1" type="guint32"/>
-					<parameter name="color2" type="guint32"/>
-				</parameters>
-			</method>
-			<method name="composite_color_simple" symbol="gdk_pixbuf_composite_color_simple">
-				<return-type type="GdkPixbuf*"/>
-				<parameters>
-					<parameter name="src" type="GdkPixbuf*"/>
-					<parameter name="dest_width" type="int"/>
-					<parameter name="dest_height" type="int"/>
-					<parameter name="interp_type" type="GdkInterpType"/>
-					<parameter name="overall_alpha" type="int"/>
-					<parameter name="check_size" type="int"/>
-					<parameter name="color1" type="guint32"/>
-					<parameter name="color2" type="guint32"/>
-				</parameters>
-			</method>
-			<method name="copy" symbol="gdk_pixbuf_copy">
-				<return-type type="GdkPixbuf*"/>
-				<parameters>
-					<parameter name="pixbuf" type="GdkPixbuf*"/>
-				</parameters>
-			</method>
-			<method name="copy_area" symbol="gdk_pixbuf_copy_area">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="src_pixbuf" type="GdkPixbuf*"/>
-					<parameter name="src_x" type="int"/>
-					<parameter name="src_y" type="int"/>
-					<parameter name="width" type="int"/>
-					<parameter name="height" type="int"/>
-					<parameter name="dest_pixbuf" type="GdkPixbuf*"/>
-					<parameter name="dest_x" type="int"/>
-					<parameter name="dest_y" type="int"/>
-				</parameters>
-			</method>
-			<method name="error_quark" symbol="gdk_pixbuf_error_quark">
-				<return-type type="GQuark"/>
-			</method>
-			<method name="fill" symbol="gdk_pixbuf_fill">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="pixbuf" type="GdkPixbuf*"/>
-					<parameter name="pixel" type="guint32"/>
-				</parameters>
-			</method>
-			<method name="flip" symbol="gdk_pixbuf_flip">
-				<return-type type="GdkPixbuf*"/>
-				<parameters>
-					<parameter name="src" type="GdkPixbuf*"/>
-					<parameter name="horizontal" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="from_pixdata" symbol="gdk_pixbuf_from_pixdata">
-				<return-type type="GdkPixbuf*"/>
-				<parameters>
-					<parameter name="pixdata" type="GdkPixdata*"/>
-					<parameter name="copy_pixels" type="gboolean"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</method>
-			<method name="get_bits_per_sample" symbol="gdk_pixbuf_get_bits_per_sample">
-				<return-type type="int"/>
-				<parameters>
-					<parameter name="pixbuf" type="GdkPixbuf*"/>
-				</parameters>
-			</method>
-			<method name="get_colorspace" symbol="gdk_pixbuf_get_colorspace">
-				<return-type type="GdkColorspace"/>
-				<parameters>
-					<parameter name="pixbuf" type="GdkPixbuf*"/>
-				</parameters>
-			</method>
-			<method name="get_file_info" symbol="gdk_pixbuf_get_file_info">
-				<return-type type="GdkPixbufFormat*"/>
-				<parameters>
-					<parameter name="filename" type="gchar*"/>
-					<parameter name="width" type="gint*"/>
-					<parameter name="height" type="gint*"/>
-				</parameters>
-			</method>
-			<method name="get_formats" symbol="gdk_pixbuf_get_formats">
-				<return-type type="GSList*"/>
-			</method>
-			<method name="get_has_alpha" symbol="gdk_pixbuf_get_has_alpha">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="pixbuf" type="GdkPixbuf*"/>
-				</parameters>
-			</method>
-			<method name="get_height" symbol="gdk_pixbuf_get_height">
-				<return-type type="int"/>
-				<parameters>
-					<parameter name="pixbuf" type="GdkPixbuf*"/>
-				</parameters>
-			</method>
-			<method name="get_n_channels" symbol="gdk_pixbuf_get_n_channels">
-				<return-type type="int"/>
-				<parameters>
-					<parameter name="pixbuf" type="GdkPixbuf*"/>
-				</parameters>
-			</method>
-			<method name="get_option" symbol="gdk_pixbuf_get_option">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="pixbuf" type="GdkPixbuf*"/>
-					<parameter name="key" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="get_pixels" symbol="gdk_pixbuf_get_pixels">
-				<return-type type="guchar*"/>
-				<parameters>
-					<parameter name="pixbuf" type="GdkPixbuf*"/>
-				</parameters>
-			</method>
-			<method name="get_rowstride" symbol="gdk_pixbuf_get_rowstride">
-				<return-type type="int"/>
-				<parameters>
-					<parameter name="pixbuf" type="GdkPixbuf*"/>
-				</parameters>
-			</method>
-			<method name="get_width" symbol="gdk_pixbuf_get_width">
-				<return-type type="int"/>
-				<parameters>
-					<parameter name="pixbuf" type="GdkPixbuf*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="gdk_pixbuf_new">
-				<return-type type="GdkPixbuf*"/>
-				<parameters>
-					<parameter name="colorspace" type="GdkColorspace"/>
-					<parameter name="has_alpha" type="gboolean"/>
-					<parameter name="bits_per_sample" type="int"/>
-					<parameter name="width" type="int"/>
-					<parameter name="height" type="int"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_from_data" symbol="gdk_pixbuf_new_from_data">
-				<return-type type="GdkPixbuf*"/>
-				<parameters>
-					<parameter name="data" type="guchar*"/>
-					<parameter name="colorspace" type="GdkColorspace"/>
-					<parameter name="has_alpha" type="gboolean"/>
-					<parameter name="bits_per_sample" type="int"/>
-					<parameter name="width" type="int"/>
-					<parameter name="height" type="int"/>
-					<parameter name="rowstride" type="int"/>
-					<parameter name="destroy_fn" type="GdkPixbufDestroyNotify"/>
-					<parameter name="destroy_fn_data" type="gpointer"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_from_file" symbol="gdk_pixbuf_new_from_file">
-				<return-type type="GdkPixbuf*"/>
-				<parameters>
-					<parameter name="filename" type="char*"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_from_file_at_scale" symbol="gdk_pixbuf_new_from_file_at_scale">
-				<return-type type="GdkPixbuf*"/>
-				<parameters>
-					<parameter name="filename" type="char*"/>
-					<parameter name="width" type="int"/>
-					<parameter name="height" type="int"/>
-					<parameter name="preserve_aspect_ratio" type="gboolean"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_from_file_at_size" symbol="gdk_pixbuf_new_from_file_at_size">
-				<return-type type="GdkPixbuf*"/>
-				<parameters>
-					<parameter name="filename" type="char*"/>
-					<parameter name="width" type="int"/>
-					<parameter name="height" type="int"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_from_inline" symbol="gdk_pixbuf_new_from_inline">
-				<return-type type="GdkPixbuf*"/>
-				<parameters>
-					<parameter name="data_length" type="gint"/>
-					<parameter name="data" type="guint8*"/>
-					<parameter name="copy_pixels" type="gboolean"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_from_stream" symbol="gdk_pixbuf_new_from_stream">
-				<return-type type="GdkPixbuf*"/>
-				<parameters>
-					<parameter name="stream" type="GInputStream*"/>
-					<parameter name="cancellable" type="GCancellable*"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_from_stream_at_scale" symbol="gdk_pixbuf_new_from_stream_at_scale">
-				<return-type type="GdkPixbuf*"/>
-				<parameters>
-					<parameter name="stream" type="GInputStream*"/>
-					<parameter name="width" type="gint"/>
-					<parameter name="height" type="gint"/>
-					<parameter name="preserve_aspect_ratio" type="gboolean"/>
-					<parameter name="cancellable" type="GCancellable*"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_from_xpm_data" symbol="gdk_pixbuf_new_from_xpm_data">
-				<return-type type="GdkPixbuf*"/>
-				<parameters>
-					<parameter name="data" type="char**"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_subpixbuf" symbol="gdk_pixbuf_new_subpixbuf">
-				<return-type type="GdkPixbuf*"/>
-				<parameters>
-					<parameter name="src_pixbuf" type="GdkPixbuf*"/>
-					<parameter name="src_x" type="int"/>
-					<parameter name="src_y" type="int"/>
-					<parameter name="width" type="int"/>
-					<parameter name="height" type="int"/>
-				</parameters>
-			</constructor>
-			<method name="rotate_simple" symbol="gdk_pixbuf_rotate_simple">
-				<return-type type="GdkPixbuf*"/>
-				<parameters>
-					<parameter name="src" type="GdkPixbuf*"/>
-					<parameter name="angle" type="GdkPixbufRotation"/>
-				</parameters>
-			</method>
-			<method name="saturate_and_pixelate" symbol="gdk_pixbuf_saturate_and_pixelate">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="src" type="GdkPixbuf*"/>
-					<parameter name="dest" type="GdkPixbuf*"/>
-					<parameter name="saturation" type="gfloat"/>
-					<parameter name="pixelate" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="save" symbol="gdk_pixbuf_save">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="pixbuf" type="GdkPixbuf*"/>
-					<parameter name="filename" type="char*"/>
-					<parameter name="type" type="char*"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</method>
-			<method name="save_to_buffer" symbol="gdk_pixbuf_save_to_buffer">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="pixbuf" type="GdkPixbuf*"/>
-					<parameter name="buffer" type="gchar**"/>
-					<parameter name="buffer_size" type="gsize*"/>
-					<parameter name="type" type="char*"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</method>
-			<method name="save_to_bufferv" symbol="gdk_pixbuf_save_to_bufferv">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="pixbuf" type="GdkPixbuf*"/>
-					<parameter name="buffer" type="gchar**"/>
-					<parameter name="buffer_size" type="gsize*"/>
-					<parameter name="type" type="char*"/>
-					<parameter name="option_keys" type="char**"/>
-					<parameter name="option_values" type="char**"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</method>
-			<method name="save_to_callback" symbol="gdk_pixbuf_save_to_callback">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="pixbuf" type="GdkPixbuf*"/>
-					<parameter name="save_func" type="GdkPixbufSaveFunc"/>
-					<parameter name="user_data" type="gpointer"/>
-					<parameter name="type" type="char*"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</method>
-			<method name="save_to_callbackv" symbol="gdk_pixbuf_save_to_callbackv">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="pixbuf" type="GdkPixbuf*"/>
-					<parameter name="save_func" type="GdkPixbufSaveFunc"/>
-					<parameter name="user_data" type="gpointer"/>
-					<parameter name="type" type="char*"/>
-					<parameter name="option_keys" type="char**"/>
-					<parameter name="option_values" type="char**"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</method>
-			<method name="save_to_stream" symbol="gdk_pixbuf_save_to_stream">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="pixbuf" type="GdkPixbuf*"/>
-					<parameter name="stream" type="GOutputStream*"/>
-					<parameter name="type" type="char*"/>
-					<parameter name="cancellable" type="GCancellable*"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</method>
-			<method name="savev" symbol="gdk_pixbuf_savev">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="pixbuf" type="GdkPixbuf*"/>
-					<parameter name="filename" type="char*"/>
-					<parameter name="type" type="char*"/>
-					<parameter name="option_keys" type="char**"/>
-					<parameter name="option_values" type="char**"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</method>
-			<method name="scale" symbol="gdk_pixbuf_scale">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="src" type="GdkPixbuf*"/>
-					<parameter name="dest" type="GdkPixbuf*"/>
-					<parameter name="dest_x" type="int"/>
-					<parameter name="dest_y" type="int"/>
-					<parameter name="dest_width" type="int"/>
-					<parameter name="dest_height" type="int"/>
-					<parameter name="offset_x" type="double"/>
-					<parameter name="offset_y" type="double"/>
-					<parameter name="scale_x" type="double"/>
-					<parameter name="scale_y" type="double"/>
-					<parameter name="interp_type" type="GdkInterpType"/>
-				</parameters>
-			</method>
-			<method name="scale_simple" symbol="gdk_pixbuf_scale_simple">
-				<return-type type="GdkPixbuf*"/>
-				<parameters>
-					<parameter name="src" type="GdkPixbuf*"/>
-					<parameter name="dest_width" type="int"/>
-					<parameter name="dest_height" type="int"/>
-					<parameter name="interp_type" type="GdkInterpType"/>
-				</parameters>
-			</method>
-			<property name="bits-per-sample" type="gint" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="colorspace" type="GdkColorspace" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="has-alpha" type="gboolean" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="height" type="gint" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="n-channels" type="gint" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="pixels" type="gpointer" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="rowstride" type="gint" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="width" type="gint" readable="1" writable="1" construct="0" construct-only="1"/>
-		</object>
-		<object name="GdkPixbufAnimation" parent="GObject" type-name="GdkPixbufAnimation" get-type="gdk_pixbuf_animation_get_type">
-			<method name="get_height" symbol="gdk_pixbuf_animation_get_height">
-				<return-type type="int"/>
-				<parameters>
-					<parameter name="animation" type="GdkPixbufAnimation*"/>
-				</parameters>
-			</method>
-			<method name="get_iter" symbol="gdk_pixbuf_animation_get_iter">
-				<return-type type="GdkPixbufAnimationIter*"/>
-				<parameters>
-					<parameter name="animation" type="GdkPixbufAnimation*"/>
-					<parameter name="start_time" type="GTimeVal*"/>
-				</parameters>
-			</method>
-			<method name="get_static_image" symbol="gdk_pixbuf_animation_get_static_image">
-				<return-type type="GdkPixbuf*"/>
-				<parameters>
-					<parameter name="animation" type="GdkPixbufAnimation*"/>
-				</parameters>
-			</method>
-			<method name="get_width" symbol="gdk_pixbuf_animation_get_width">
-				<return-type type="int"/>
-				<parameters>
-					<parameter name="animation" type="GdkPixbufAnimation*"/>
-				</parameters>
-			</method>
-			<method name="is_static_image" symbol="gdk_pixbuf_animation_is_static_image">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="animation" type="GdkPixbufAnimation*"/>
-				</parameters>
-			</method>
-			<constructor name="new_from_file" symbol="gdk_pixbuf_animation_new_from_file">
-				<return-type type="GdkPixbufAnimation*"/>
-				<parameters>
-					<parameter name="filename" type="char*"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</constructor>
-		</object>
-		<object name="GdkPixbufAnimationIter" parent="GObject" type-name="GdkPixbufAnimationIter" get-type="gdk_pixbuf_animation_iter_get_type">
-			<method name="advance" symbol="gdk_pixbuf_animation_iter_advance">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="iter" type="GdkPixbufAnimationIter*"/>
-					<parameter name="current_time" type="GTimeVal*"/>
-				</parameters>
-			</method>
-			<method name="get_delay_time" symbol="gdk_pixbuf_animation_iter_get_delay_time">
-				<return-type type="int"/>
-				<parameters>
-					<parameter name="iter" type="GdkPixbufAnimationIter*"/>
-				</parameters>
-			</method>
-			<method name="get_pixbuf" symbol="gdk_pixbuf_animation_iter_get_pixbuf">
-				<return-type type="GdkPixbuf*"/>
-				<parameters>
-					<parameter name="iter" type="GdkPixbufAnimationIter*"/>
-				</parameters>
-			</method>
-			<method name="on_currently_loading_frame" symbol="gdk_pixbuf_animation_iter_on_currently_loading_frame">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="iter" type="GdkPixbufAnimationIter*"/>
-				</parameters>
-			</method>
-		</object>
-		<object name="GdkPixbufLoader" parent="GObject" type-name="GdkPixbufLoader" get-type="gdk_pixbuf_loader_get_type">
-			<method name="close" symbol="gdk_pixbuf_loader_close">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="loader" type="GdkPixbufLoader*"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</method>
-			<method name="get_animation" symbol="gdk_pixbuf_loader_get_animation">
-				<return-type type="GdkPixbufAnimation*"/>
-				<parameters>
-					<parameter name="loader" type="GdkPixbufLoader*"/>
-				</parameters>
-			</method>
-			<method name="get_format" symbol="gdk_pixbuf_loader_get_format">
-				<return-type type="GdkPixbufFormat*"/>
-				<parameters>
-					<parameter name="loader" type="GdkPixbufLoader*"/>
-				</parameters>
-			</method>
-			<method name="get_pixbuf" symbol="gdk_pixbuf_loader_get_pixbuf">
-				<return-type type="GdkPixbuf*"/>
-				<parameters>
-					<parameter name="loader" type="GdkPixbufLoader*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="gdk_pixbuf_loader_new">
-				<return-type type="GdkPixbufLoader*"/>
-			</constructor>
-			<constructor name="new_with_mime_type" symbol="gdk_pixbuf_loader_new_with_mime_type">
-				<return-type type="GdkPixbufLoader*"/>
-				<parameters>
-					<parameter name="mime_type" type="char*"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</constructor>
-			<constructor name="new_with_type" symbol="gdk_pixbuf_loader_new_with_type">
-				<return-type type="GdkPixbufLoader*"/>
-				<parameters>
-					<parameter name="image_type" type="char*"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</constructor>
-			<method name="set_size" symbol="gdk_pixbuf_loader_set_size">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="loader" type="GdkPixbufLoader*"/>
-					<parameter name="width" type="int"/>
-					<parameter name="height" type="int"/>
-				</parameters>
-			</method>
-			<method name="write" symbol="gdk_pixbuf_loader_write">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="loader" type="GdkPixbufLoader*"/>
-					<parameter name="buf" type="guchar*"/>
-					<parameter name="count" type="gsize"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</method>
-			<signal name="area-prepared" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="loader" type="GdkPixbufLoader*"/>
-				</parameters>
-			</signal>
-			<signal name="area-updated" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="loader" type="GdkPixbufLoader*"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-					<parameter name="width" type="gint"/>
-					<parameter name="height" type="gint"/>
-				</parameters>
-			</signal>
-			<signal name="closed" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="loader" type="GdkPixbufLoader*"/>
-				</parameters>
-			</signal>
-			<signal name="size-prepared" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="loader" type="GdkPixbufLoader*"/>
-					<parameter name="width" type="gint"/>
-					<parameter name="height" type="gint"/>
-				</parameters>
-			</signal>
-		</object>
-		<object name="GdkPixbufSimpleAnim" parent="GdkPixbufAnimation" type-name="GdkPixbufSimpleAnim" get-type="gdk_pixbuf_simple_anim_get_type">
-			<method name="add_frame" symbol="gdk_pixbuf_simple_anim_add_frame">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="animation" type="GdkPixbufSimpleAnim*"/>
-					<parameter name="pixbuf" type="GdkPixbuf*"/>
-				</parameters>
-			</method>
-			<method name="get_loop" symbol="gdk_pixbuf_simple_anim_get_loop">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="animation" type="GdkPixbufSimpleAnim*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="gdk_pixbuf_simple_anim_new">
-				<return-type type="GdkPixbufSimpleAnim*"/>
-				<parameters>
-					<parameter name="width" type="gint"/>
-					<parameter name="height" type="gint"/>
-					<parameter name="rate" type="gfloat"/>
-				</parameters>
-			</constructor>
-			<method name="set_loop" symbol="gdk_pixbuf_simple_anim_set_loop">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="animation" type="GdkPixbufSimpleAnim*"/>
-					<parameter name="loop" type="gboolean"/>
-				</parameters>
-			</method>
-			<property name="loop" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-		</object>
-		<object name="GdkPixbufSimpleAnimIter" parent="GdkPixbufAnimationIter" type-name="GdkPixbufSimpleAnimIter" get-type="gdk_pixbuf_simple_anim_iter_get_type">
-		</object>
-		<constant name="GDK_PIXBUF_FEATURES_H" type="int" value="1"/>
-		<constant name="GDK_PIXBUF_MAGIC_NUMBER" type="int" value="1197763408"/>
-		<constant name="GDK_PIXBUF_MAJOR" type="int" value="2"/>
-		<constant name="GDK_PIXBUF_MICRO" type="int" value="4"/>
-		<constant name="GDK_PIXBUF_MINOR" type="int" value="90"/>
-		<constant name="GDK_PIXBUF_VERSION" type="char*" value="2.90.4"/>
-		<constant name="GDK_PIXDATA_HEADER_LENGTH" type="int" value="24"/>
-	</namespace>
-</api>
diff --git a/vapi/packages/gdk-pixbuf-3.0/gdk-pixbuf-3.0.metadata b/vapi/packages/gdk-pixbuf-3.0/gdk-pixbuf-3.0.metadata
deleted file mode 100644
index 1f08d484b..000000000
--- a/vapi/packages/gdk-pixbuf-3.0/gdk-pixbuf-3.0.metadata
+++ /dev/null
@@ -1,30 +0,0 @@
-Gdk cheader_filename="gdk-pixbuf/gdk-pixdata.h" gir_namespace="GdkPixbuf" gir_version="2.0"
-gdk_pixbuf_copy transfer_ownership="1"
-gdk_pixbuf_get_file_info.width is_out="1"
-gdk_pixbuf_get_file_info.height is_out="1"
-gdk_pixbuf_get_pixels no_array_length="1"
-gdk_pixbuf_new_from_data.destroy_fn nullable="1"
-gdk_pixbuf_new_from_data.destroy_fn_data hidden="1"
-gdk_pixbuf_new_from_data.data no_array_length="1"
-gdk_pixbuf_new_from_stream.cancellable nullable="1"
-gdk_pixbuf_new_from_stream_at_scale.cancellable nullable="1"
-gdk_pixbuf_new_from_xpm_data.data is_array="1" no_array_length="1"
-gdk_pixbuf_new_from_inline.data is_array="1" no_array_length="1"
-gdk_pixbuf_save ellipsis="1"
-gdk_pixbuf_save_to_buffer hidden="1"
-gdk_pixbuf_save_to_bufferv hidden="1"
-gdk_pixbuf_save_to_callback ellipsis="1"
-gdk_pixbuf_save_to_callbackv.option_keys is_array="1"
-gdk_pixbuf_save_to_callbackv.option_values is_array="1"
-gdk_pixbuf_scale_simple transfer_ownership="1"
-gdk_pixbuf_rotate_simple transfer_ownership="1"
-gdk_pixbuf_flip transfer_ownership="1"
-gdk_pixbuf_loader_write.buf no_array_length="1"
-GdkPixbufDestroyNotify.pixels no_array_length="1"
-GdkPixbufError errordomain="1"
-GdkPixdata is_value_type="1"
-GdkPixdata.pixel_data is_array="1"
-gdk_pixdata_deserialize.stream is_array="1" array_length_pos="0.9"
-gdk_pixdata_deserialize.stream_length hidden="1"
-gdk_pixdata_serialize is_array="1" transfers_ownership="1"
-gdk_pixdata_serialize.stream_length_p hidden="1"
diff --git a/vapi/packages/gdk-pixbuf-3.0/gdk-pixbuf-3.0.namespace b/vapi/packages/gdk-pixbuf-3.0/gdk-pixbuf-3.0.namespace
deleted file mode 100644
index 2617db96f..000000000
--- a/vapi/packages/gdk-pixbuf-3.0/gdk-pixbuf-3.0.namespace
+++ /dev/null
@@ -1 +0,0 @@
-Gdk
diff --git a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.deps b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.deps
index 11e8596ef..5d3176013 100644
--- a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.deps
+++ b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.deps
@@ -1,6 +1,6 @@
 gio-2.0
 gdk-3.0
-gdk-pixbuf-3.0
+gdk-pixbuf-2.0
 cairo
 pango
 pangocairo
diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.deps b/vapi/packages/gtk+-3.0/gtk+-3.0.deps
index 3457ed62d..1b560e0d5 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.deps
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.deps
@@ -1,6 +1,6 @@
 gio-2.0
 atk
 cairo
-gdk-pixbuf-3.0
+gdk-pixbuf-2.0
 gdk-3.0
 pango