From: Juerg Billeter <j@bitron.ch>
Date: Tue, 22 Jan 2008 14:35:05 +0000 (+0000)
Subject: add bindings for gdk-pixbuf-2.0, fixes bug 501589
X-Git-Tag: VALA_0_1_7~208
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef79c8912ca5abd4f8aa87d85529324adbf1e12e;p=thirdparty%2Fvala.git

add bindings for gdk-pixbuf-2.0, fixes bug 501589

2008-01-22  Juerg Billeter  <j@bitron.ch>

	* vapi/packages/gdk-pixbuf-2.0/, vapi/packages/gdk-2.0/,
	  vapi/gdk-pixbuf-2.0.vapi, vapi/gdk-2.0.vapi: add bindings for
	  gdk-pixbuf-2.0, fixes bug 501589

	* vapi/packages/gnome-desktop-2.0/, vapi/packages/gtk+-2.0/,
	  vapi/packages/gtksourceview-2.0/, vapi/packages/hildon-1/,
	  vapi/packages/libglade-2.0/, vapi/packages/libgnomeui-2.0/,
	  vapi/packages/libnotify/. vapi/packages/libwnck-1.0/.
	  vapi/packages/poppler-glib/, vapi/packages/vte/, vapi/gdk-2.0.deps,
	  vapi/gnome-desktop-2.0.deps, vapi/gtk+-2.0.deps,
	  vapi/gtksourceview-2.0.deps, vapi/hildon-1.deps,
	  vapi/libglade-2.0.deps, vapi/libgnomeui-2.0.deps, vapi/libnotify.deps,
	  vapi/libwnck-1.0.deps, vapi/poppler-glib.deps, vapi/vte.deps: update
	  dependencies

	* vapi/Makefile.am: updated

svn path=/trunk/; revision=883
---

diff --git a/ChangeLog b/ChangeLog
index 4faf959ec..db978ab6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2008-01-22  Jürg Billeter  <j@bitron.ch>
+
+	* vapi/packages/gdk-pixbuf-2.0/, vapi/packages/gdk-2.0/,
+	  vapi/gdk-pixbuf-2.0.vapi, vapi/gdk-2.0.vapi: add bindings for
+	  gdk-pixbuf-2.0, fixes bug 501589
+
+	* vapi/packages/gnome-desktop-2.0/, vapi/packages/gtk+-2.0/,
+	  vapi/packages/gtksourceview-2.0/, vapi/packages/hildon-1/,
+	  vapi/packages/libglade-2.0/, vapi/packages/libgnomeui-2.0/,
+	  vapi/packages/libnotify/. vapi/packages/libwnck-1.0/.
+	  vapi/packages/poppler-glib/, vapi/packages/vte/, vapi/gdk-2.0.deps,
+	  vapi/gnome-desktop-2.0.deps, vapi/gtk+-2.0.deps,
+	  vapi/gtksourceview-2.0.deps, vapi/hildon-1.deps,
+	  vapi/libglade-2.0.deps, vapi/libgnomeui-2.0.deps, vapi/libnotify.deps,
+	  vapi/libwnck-1.0.deps, vapi/poppler-glib.deps, vapi/vte.deps: update
+	  dependencies
+
+	* vapi/Makefile.am: updated
+
 2008-01-22  Jürg Billeter  <j@bitron.ch>
 
 	* gee/arraylist.vala, gee/hashmap.vala, gee/hashset.vala,
diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index e15e7f30d..eb9acfdf5 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -18,6 +18,7 @@ dist_vapi_DATA = \
 	glib-2.0.vapi \
 	gdk-2.0.deps \
 	gdk-2.0.vapi \
+	gdk-pixbuf-2.0.vapi \
 	gio-2.0.vapi \
 	gnome-desktop-2.0.deps \
 	gnome-desktop-2.0.vapi \
@@ -76,6 +77,7 @@ dist_vapi_DATA = \
 	liboobs-1.vapi \
 	libpanelapplet-2.0.deps \
 	libpanelapplet-2.0.vapi \
+	libwnck-1.0.deps \
 	libwnck-1.0.vapi \
 	libsoup-2.2.vapi \
 	libxml-2.0.vapi \
diff --git a/vapi/gdk-2.0.deps b/vapi/gdk-2.0.deps
index 76490661c..25643ca35 100644
--- a/vapi/gdk-2.0.deps
+++ b/vapi/gdk-2.0.deps
@@ -1,3 +1,4 @@
+gdk-pixbuf-2.0
 cairo
 pango
 pangocairo
diff --git a/vapi/gdk-2.0.vapi b/vapi/gdk-2.0.vapi
index 8db0ff331..d8b613da4 100644
--- a/vapi/gdk-2.0.vapi
+++ b/vapi/gdk-2.0.vapi
@@ -25,10 +25,6 @@ namespace Gdk {
 		ROUND,
 		PROJECTING,
 	}
-	[CCode (cprefix = "GDK_COLORSPACE_", cheader_filename = "gdk/gdk.h")]
-	public enum Colorspace {
-		RGB,
-	}
 	[CCode (cprefix = "GDK_CROSSING_", cheader_filename = "gdk/gdk.h")]
 	public enum CrossingMode {
 		NORMAL,
@@ -255,13 +251,6 @@ namespace Gdk {
 		ERASER,
 		CURSOR,
 	}
-	[CCode (cprefix = "GDK_INTERP_", cheader_filename = "gdk/gdk.h")]
-	public enum InterpType {
-		NEAREST,
-		TILES,
-		BILINEAR,
-		HYPER,
-	}
 	[CCode (cprefix = "GDK_JOIN_", cheader_filename = "gdk/gdk.h")]
 	public enum JoinStyle {
 		MITER,
@@ -295,49 +284,6 @@ namespace Gdk {
 		DESTROY,
 		CLOSE,
 	}
-	[CCode (cprefix = "GDK_PIXBUF_ALPHA_", cheader_filename = "gdk/gdk.h")]
-	public enum PixbufAlphaMode {
-		BILEVEL,
-		FULL,
-	}
-	[CCode (cprefix = "GDK_PIXBUF_ERROR_", cheader_filename = "gdk/gdk.h")]
-	public enum PixbufError {
-		CORRUPT_IMAGE,
-		INSUFFICIENT_MEMORY,
-		BAD_OPTION,
-		UNKNOWN_TYPE,
-		UNSUPPORTED_OPERATION,
-		FAILED,
-	}
-	[CCode (cprefix = "GDK_PIXBUF_ROTATE_", cheader_filename = "gdk/gdk.h")]
-	public enum PixbufRotation {
-		NONE,
-		COUNTERCLOCKWISE,
-		UPSIDEDOWN,
-		CLOCKWISE,
-	}
-	[CCode (cprefix = "GDK_PIXDATA_DUMP_", cheader_filename = "gdk/gdk.h")]
-	public enum PixdataDumpType {
-		PIXDATA_STREAM,
-		PIXDATA_STRUCT,
-		MACROS,
-		GTYPES,
-		CTYPES,
-		STATIC,
-		CONST,
-		RLE_DECODER,
-	}
-	[CCode (cprefix = "GDK_PIXDATA_", cheader_filename = "gdk/gdk.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_PROP_MODE_", cheader_filename = "gdk/gdk.h")]
 	public enum PropMode {
 		REPLACE,
@@ -876,35 +822,6 @@ namespace Gdk {
 		public PangoAttrStipple (Gdk.Bitmap stipple);
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class PixbufFormat {
-		public weak string get_description ();
-		public weak string get_extensions ();
-		public weak string get_license ();
-		public weak string get_mime_types ();
-		public weak 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/gdk.h")]
-	public class PixbufSimpleAnimClass {
-	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class Pixdata {
-		public uint magic;
-		public int length;
-		public uint pixdata_type;
-		public uint rowstride;
-		public uint width;
-		public uint height;
-		public uchar pixel_data;
-		public bool deserialize (uint stream_length, uchar stream) throws GLib.Error;
-		public pointer from_pixbuf (Gdk.Pixbuf pixbuf, bool use_rle);
-		public uchar serialize (uint stream_length_p);
-		public weak GLib.String to_csource (string name, Gdk.PixdataDumpType dump_type);
-	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class Point {
 		public int x;
 		public int y;
@@ -1254,116 +1171,6 @@ namespace Gdk {
 		public weak Gdk.Screen screen { get; construct; }
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class Pixbuf : GLib.Object {
-		public weak Gdk.Pixbuf add_alpha (bool substitute_color, uchar r, uchar g, uchar b);
-		public weak 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, uint color1, uint color2);
-		public weak Gdk.Pixbuf composite_color_simple (int dest_width, int dest_height, Gdk.InterpType interp_type, int overall_alpha, int check_size, uint color1, uint color2);
-		public weak 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 (uint pixel);
-		public weak Gdk.Pixbuf flip (bool horizontal);
-		public static weak Gdk.Pixbuf from_pixdata (Gdk.Pixdata pixdata, bool copy_pixels) throws GLib.Error;
-		public int get_bits_per_sample ();
-		public Gdk.Colorspace get_colorspace ();
-		public static weak Gdk.PixbufFormat get_file_info (string filename, int width, int height);
-		public static weak GLib.SList get_formats ();
-		public weak Gdk.Pixbuf get_from_drawable (Gdk.Drawable src, Gdk.Colormap cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
-		public weak Gdk.Pixbuf get_from_image (Gdk.Image src, Gdk.Colormap cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
-		public bool get_has_alpha ();
-		public int get_height ();
-		public int get_n_channels ();
-		public weak string get_option (string key);
-		[NoArrayLength]
-		public weak uchar[] get_pixels ();
-		public int get_rowstride ();
-		public int get_width ();
-		public Pixbuf (Gdk.Colorspace colorspace, bool has_alpha, int bits_per_sample, int width, int height);
-		[NoArrayLength]
-		public Pixbuf.from_data (uchar[] data, Gdk.Colorspace colorspace, bool has_alpha, int bits_per_sample, int width, int height, int rowstride, Gdk.PixbufDestroyNotify destroy_fn, pointer destroy_fn_data);
-		public Pixbuf.from_file (string filename) throws GLib.Error;
-		public Pixbuf.from_file_at_scale (string filename, int width, int height, bool preserve_aspect_ratio) throws GLib.Error;
-		public Pixbuf.from_file_at_size (string filename, int width, int height) throws GLib.Error;
-		public Pixbuf.from_inline (int data_length, uchar data, bool copy_pixels) throws GLib.Error;
-		[NoArrayLength]
-		public Pixbuf.from_xpm_data (string[] data);
-		public Pixbuf.subpixbuf (Gdk.Pixbuf src_pixbuf, int src_x, int src_y, int width, int height);
-		public void render_pixmap_and_mask (out weak Gdk.Pixmap pixmap_return, out weak Gdk.Bitmap mask_return, int alpha_threshold);
-		public void render_pixmap_and_mask_for_colormap (Gdk.Colormap colormap, out weak Gdk.Pixmap pixmap_return, out weak Gdk.Bitmap mask_return, int alpha_threshold);
-		public void render_threshold_alpha (Gdk.Bitmap bitmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int alpha_threshold);
-		public weak 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_buffer (string buffer, ulong buffer_size, string type) throws GLib.Error;
-		[NoArrayLength]
-		public bool save_to_bufferv (string buffer, ulong buffer_size, string type, string[] option_keys, string[] option_values) throws GLib.Error;
-		public bool save_to_callback (Gdk.PixbufSaveFunc save_func, pointer user_data, string type) throws GLib.Error;
-		[NoArrayLength]
-		public bool save_to_callbackv (Gdk.PixbufSaveFunc save_func, pointer user_data, string type, string[] option_keys, string[] option_values) throws GLib.Error;
-		public bool savev (string filename, string type, out weak string option_keys, out weak 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 weak Gdk.Pixbuf scale_simple (int dest_width, int dest_height, Gdk.InterpType interp_type);
-		[NoAccessorMethod]
-		public weak int bits_per_sample { get; construct; }
-		[NoAccessorMethod]
-		public weak Gdk.Colorspace colorspace { get; construct; }
-		[NoAccessorMethod]
-		public weak bool has_alpha { get; construct; }
-		[NoAccessorMethod]
-		public weak int height { get; construct; }
-		[NoAccessorMethod]
-		public weak int n_channels { get; construct; }
-		[NoAccessorMethod]
-		public weak pointer pixels { get; construct; }
-		[NoAccessorMethod]
-		public weak int rowstride { get; construct; }
-		[NoAccessorMethod]
-		public weak int width { get; construct; }
-	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class PixbufAnimation : GLib.Object {
-		public int get_height ();
-		public weak Gdk.PixbufAnimationIter get_iter (GLib.TimeVal start_time);
-		public weak Gdk.Pixbuf get_static_image ();
-		public int get_width ();
-		public bool is_static_image ();
-		public PixbufAnimation.from_file (string filename) throws GLib.Error;
-	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class PixbufAnimationIter : GLib.Object {
-		public bool advance (GLib.TimeVal current_time);
-		public int get_delay_time ();
-		public weak Gdk.Pixbuf get_pixbuf ();
-		public bool on_currently_loading_frame ();
-	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class PixbufLoader : GLib.Object {
-		public bool close () throws GLib.Error;
-		public weak Gdk.PixbufAnimation get_animation ();
-		public weak Gdk.PixbufFormat get_format ();
-		public weak Gdk.Pixbuf get_pixbuf ();
-		public PixbufLoader ();
-		public PixbufLoader.with_mime_type (string mime_type) throws GLib.Error;
-		public PixbufLoader.with_type (string image_type) throws GLib.Error;
-		public void set_size (int width, int height);
-		[NoArrayLength]
-		public bool write (uchar[] buf, ulong count) throws GLib.Error;
-		public signal void area_prepared ();
-		public signal void area_updated (int x, int y, int width, int height);
-		public signal void closed ();
-		public signal void size_prepared (int width, int height);
-	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class PixbufSimpleAnim : Gdk.PixbufAnimation {
-		public void add_frame (Gdk.Pixbuf pixbuf);
-		public PixbufSimpleAnim (int width, int height, float rate);
-	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class PixbufSimpleAnimIter : Gdk.PixbufAnimationIter {
-	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class Pixmap : Gdk.Drawable {
 		public static weak Gdk.Pixmap colormap_create_from_xpm (Gdk.Drawable drawable, Gdk.Colormap colormap, out weak Gdk.Bitmap mask, Gdk.Color transparent_color, string filename);
 		public static weak Gdk.Pixmap colormap_create_from_xpm_d (Gdk.Drawable drawable, Gdk.Colormap colormap, out weak Gdk.Bitmap mask, Gdk.Color transparent_color, string data);
@@ -1617,19 +1424,10 @@ namespace Gdk {
 	public static delegate void EventFunc (Gdk.Event event, pointer data);
 	public static delegate Gdk.FilterReturn FilterFunc (Gdk.XEvent xevent, Gdk.Event event, pointer data);
 	public static delegate void InputFunction (pointer data, int source, Gdk.InputCondition condition);
-	public static delegate void PixbufDestroyNotify (uchar[] pixels, pointer data);
-	public static delegate bool PixbufSaveFunc (string buf, ulong count, GLib.Error error, pointer data);
 	public static delegate void SpanFunc (Gdk.Span span, pointer data);
 	public const int CURRENT_TIME;
 	public const int MAX_TIMECOORD_AXES;
 	public const int PARENT_RELATIVE;
-	public const int PIXBUF_FEATURES_H;
-	public const int PIXBUF_MAGIC_NUMBER;
-	public const int PIXBUF_MAJOR;
-	public const int PIXBUF_MICRO;
-	public const int PIXBUF_MINOR;
-	public const string PIXBUF_VERSION;
-	public const int PIXDATA_HEADER_LENGTH;
 	public const int PRIORITY_REDRAW;
 	public static void add_client_message_filter (Gdk.Atom message_type, Gdk.FilterFunc func, pointer data);
 	public static void add_option_entries_libgtk_only (GLib.OptionGroup group);
@@ -1719,6 +1517,11 @@ namespace Gdk {
 	public static weak Gdk.Region pango_layout_get_clip_region (Pango.Layout layout, int x_origin, int y_origin, int index_ranges, int n_ranges);
 	public static weak Gdk.Region pango_layout_line_get_clip_region (Pango.LayoutLine line, int x_origin, int y_origin, int index_ranges, int n_ranges);
 	public static void parse_args (int argc, string argv);
+	public static weak Gdk.Pixbuf pixbuf_get_from_drawable (Gdk.Pixbuf dest, Gdk.Drawable src, Gdk.Colormap cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
+	public static weak Gdk.Pixbuf pixbuf_get_from_image (Gdk.Pixbuf dest, Gdk.Image src, Gdk.Colormap cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
+	public static void pixbuf_render_pixmap_and_mask (Gdk.Pixbuf pixbuf, out weak Gdk.Pixmap pixmap_return, out weak Gdk.Bitmap mask_return, int alpha_threshold);
+	public static void pixbuf_render_pixmap_and_mask_for_colormap (Gdk.Pixbuf pixbuf, Gdk.Colormap colormap, out weak Gdk.Pixmap pixmap_return, out weak Gdk.Bitmap mask_return, int alpha_threshold);
+	public static void pixbuf_render_threshold_alpha (Gdk.Pixbuf pixbuf, Gdk.Bitmap bitmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int alpha_threshold);
 	public static Gdk.GrabStatus pointer_grab (Gdk.Window window, bool owner_events, Gdk.EventMask event_mask, Gdk.Window confine_to, Gdk.Cursor cursor, uint time_);
 	public static bool pointer_grab_info_libgtk_only (Gdk.Display display, out weak Gdk.Window grab_window, bool owner_events);
 	public static bool pointer_is_grabbed ();
diff --git a/vapi/gdk-pixbuf-2.0.vapi b/vapi/gdk-pixbuf-2.0.vapi
new file mode 100644
index 000000000..e19863cd9
--- /dev/null
+++ b/vapi/gdk-pixbuf-2.0.vapi
@@ -0,0 +1,202 @@
+/* gdk-pixbuf-2.0.vapi generated by lt-vapigen, do not modify. */
+
+[CCode (cprefix = "Gdk", lower_case_cprefix = "gdk_")]
+namespace Gdk {
+	[CCode (cprefix = "GDK_COLORSPACE_", cheader_filename = "gdk-pixbuf/gdk-pixbuf.h")]
+	public enum Colorspace {
+		RGB,
+	}
+	[CCode (cprefix = "GDK_INTERP_", cheader_filename = "gdk-pixbuf/gdk-pixbuf.h")]
+	public enum InterpType {
+		NEAREST,
+		TILES,
+		BILINEAR,
+		HYPER,
+	}
+	[CCode (cprefix = "GDK_PIXBUF_ALPHA_", cheader_filename = "gdk-pixbuf/gdk-pixbuf.h")]
+	public enum PixbufAlphaMode {
+		BILEVEL,
+		FULL,
+	}
+	[CCode (cprefix = "GDK_PIXBUF_ERROR_", cheader_filename = "gdk-pixbuf/gdk-pixbuf.h")]
+	public enum PixbufError {
+		CORRUPT_IMAGE,
+		INSUFFICIENT_MEMORY,
+		BAD_OPTION,
+		UNKNOWN_TYPE,
+		UNSUPPORTED_OPERATION,
+		FAILED,
+	}
+	[CCode (cprefix = "GDK_PIXBUF_ROTATE_", cheader_filename = "gdk-pixbuf/gdk-pixbuf.h")]
+	public enum PixbufRotation {
+		NONE,
+		COUNTERCLOCKWISE,
+		UPSIDEDOWN,
+		CLOCKWISE,
+	}
+	[CCode (cprefix = "GDK_PIXDATA_DUMP_", cheader_filename = "gdk-pixbuf/gdk-pixbuf.h")]
+	public enum PixdataDumpType {
+		PIXDATA_STREAM,
+		PIXDATA_STRUCT,
+		MACROS,
+		GTYPES,
+		CTYPES,
+		STATIC,
+		CONST,
+		RLE_DECODER,
+	}
+	[CCode (cprefix = "GDK_PIXDATA_", cheader_filename = "gdk-pixbuf/gdk-pixbuf.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 (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h")]
+	public class PixbufFormat {
+		public weak string get_description ();
+		public weak string get_extensions ();
+		public weak string get_license ();
+		public weak string get_mime_types ();
+		public weak 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-pixbuf.h")]
+	public class PixbufSimpleAnimClass {
+	}
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h")]
+	public class Pixdata {
+		public uint magic;
+		public int length;
+		public uint pixdata_type;
+		public uint rowstride;
+		public uint width;
+		public uint height;
+		public uchar pixel_data;
+		public bool deserialize (uint stream_length, uchar stream) throws GLib.Error;
+		public pointer from_pixbuf (Gdk.Pixbuf pixbuf, bool use_rle);
+		public uchar serialize (uint stream_length_p);
+		public weak GLib.String to_csource (string name, Gdk.PixdataDumpType dump_type);
+	}
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h")]
+	public class Pixbuf : GLib.Object {
+		public weak Gdk.Pixbuf add_alpha (bool substitute_color, uchar r, uchar g, uchar b);
+		public weak 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, uint color1, uint color2);
+		public weak Gdk.Pixbuf composite_color_simple (int dest_width, int dest_height, Gdk.InterpType interp_type, int overall_alpha, int check_size, uint color1, uint color2);
+		public weak 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 (uint pixel);
+		public weak Gdk.Pixbuf flip (bool horizontal);
+		public static weak Gdk.Pixbuf from_pixdata (Gdk.Pixdata pixdata, bool copy_pixels) throws GLib.Error;
+		public int get_bits_per_sample ();
+		public Gdk.Colorspace get_colorspace ();
+		public static weak Gdk.PixbufFormat get_file_info (string filename, int width, int height);
+		public static weak GLib.SList get_formats ();
+		public bool get_has_alpha ();
+		public int get_height ();
+		public int get_n_channels ();
+		public weak string get_option (string key);
+		[NoArrayLength]
+		public weak uchar[] get_pixels ();
+		public int get_rowstride ();
+		public int get_width ();
+		public Pixbuf (Gdk.Colorspace colorspace, bool has_alpha, int bits_per_sample, int width, int height);
+		[NoArrayLength]
+		public Pixbuf.from_data (uchar[] data, Gdk.Colorspace colorspace, bool has_alpha, int bits_per_sample, int width, int height, int rowstride, Gdk.PixbufDestroyNotify destroy_fn, pointer destroy_fn_data);
+		public Pixbuf.from_file (string filename) throws GLib.Error;
+		public Pixbuf.from_file_at_scale (string filename, int width, int height, bool preserve_aspect_ratio) throws GLib.Error;
+		public Pixbuf.from_file_at_size (string filename, int width, int height) throws GLib.Error;
+		public Pixbuf.from_inline (int data_length, uchar data, bool copy_pixels) throws GLib.Error;
+		[NoArrayLength]
+		public Pixbuf.from_xpm_data (string[] data);
+		public Pixbuf.subpixbuf (Gdk.Pixbuf src_pixbuf, int src_x, int src_y, int width, int height);
+		public weak 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_buffer (string buffer, ulong buffer_size, string type) throws GLib.Error;
+		[NoArrayLength]
+		public bool save_to_bufferv (string buffer, ulong buffer_size, string type, string[] option_keys, string[] option_values) throws GLib.Error;
+		public bool save_to_callback (Gdk.PixbufSaveFunc save_func, pointer user_data, string type) throws GLib.Error;
+		[NoArrayLength]
+		public bool save_to_callbackv (Gdk.PixbufSaveFunc save_func, pointer user_data, string type, string[] option_keys, string[] option_values) throws GLib.Error;
+		public bool savev (string filename, string type, out weak string option_keys, out weak 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 weak Gdk.Pixbuf scale_simple (int dest_width, int dest_height, Gdk.InterpType interp_type);
+		[NoAccessorMethod]
+		public weak int bits_per_sample { get; construct; }
+		[NoAccessorMethod]
+		public weak Gdk.Colorspace colorspace { get; construct; }
+		[NoAccessorMethod]
+		public weak bool has_alpha { get; construct; }
+		[NoAccessorMethod]
+		public weak int height { get; construct; }
+		[NoAccessorMethod]
+		public weak int n_channels { get; construct; }
+		[NoAccessorMethod]
+		public weak pointer pixels { get; construct; }
+		[NoAccessorMethod]
+		public weak int rowstride { get; construct; }
+		[NoAccessorMethod]
+		public weak int width { get; construct; }
+	}
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h")]
+	public class PixbufAnimation : GLib.Object {
+		public int get_height ();
+		public weak Gdk.PixbufAnimationIter get_iter (GLib.TimeVal start_time);
+		public weak Gdk.Pixbuf get_static_image ();
+		public int get_width ();
+		public bool is_static_image ();
+		public PixbufAnimation.from_file (string filename) throws GLib.Error;
+	}
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h")]
+	public class PixbufAnimationIter : GLib.Object {
+		public bool advance (GLib.TimeVal current_time);
+		public int get_delay_time ();
+		public weak Gdk.Pixbuf get_pixbuf ();
+		public bool on_currently_loading_frame ();
+	}
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h")]
+	public class PixbufLoader : GLib.Object {
+		public bool close () throws GLib.Error;
+		public weak Gdk.PixbufAnimation get_animation ();
+		public weak Gdk.PixbufFormat get_format ();
+		public weak Gdk.Pixbuf get_pixbuf ();
+		public PixbufLoader ();
+		public PixbufLoader.with_mime_type (string mime_type) throws GLib.Error;
+		public PixbufLoader.with_type (string image_type) throws GLib.Error;
+		public void set_size (int width, int height);
+		[NoArrayLength]
+		public bool write (uchar[] buf, ulong count) throws GLib.Error;
+		public signal void area_prepared ();
+		public signal void area_updated (int x, int y, int width, int height);
+		public signal void closed ();
+		public signal void size_prepared (int width, int height);
+	}
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h")]
+	public class PixbufSimpleAnim : Gdk.PixbufAnimation {
+		public void add_frame (Gdk.Pixbuf pixbuf);
+		public PixbufSimpleAnim (int width, int height, float rate);
+	}
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h")]
+	public class PixbufSimpleAnimIter : Gdk.PixbufAnimationIter {
+	}
+	public static delegate void PixbufDestroyNotify (uchar[] pixels, pointer data);
+	public static delegate bool PixbufSaveFunc (string buf, ulong count, GLib.Error error, pointer data);
+	public const int PIXBUF_FEATURES_H;
+	public const int PIXBUF_MAGIC_NUMBER;
+	public const int PIXBUF_MAJOR;
+	public const int PIXBUF_MICRO;
+	public const int PIXBUF_MINOR;
+	public const string PIXBUF_VERSION;
+	public const int PIXDATA_HEADER_LENGTH;
+}
diff --git a/vapi/gnome-desktop-2.0.deps b/vapi/gnome-desktop-2.0.deps
index 659d658dd..57ed9cf58 100644
--- a/vapi/gnome-desktop-2.0.deps
+++ b/vapi/gnome-desktop-2.0.deps
@@ -1,5 +1,6 @@
 atk
 cairo
+gdk-pixbuf-2.0
 gdk-2.0
 pango
 gtk+-2.0
diff --git a/vapi/gtk+-2.0.deps b/vapi/gtk+-2.0.deps
index e02a9ef81..341815e6b 100644
--- a/vapi/gtk+-2.0.deps
+++ b/vapi/gtk+-2.0.deps
@@ -1,4 +1,5 @@
 atk
 cairo
+gdk-pixbuf-2.0
 gdk-2.0
 pango
diff --git a/vapi/gtksourceview-2.0.deps b/vapi/gtksourceview-2.0.deps
index 24a223777..96053965b 100644
--- a/vapi/gtksourceview-2.0.deps
+++ b/vapi/gtksourceview-2.0.deps
@@ -1 +1,6 @@
+atk
+cairo
+gdk-pixbuf-2.0
+gdk-2.0
+pango
 gtk+-2.0
diff --git a/vapi/hildon-1.deps b/vapi/hildon-1.deps
index 0dec08afe..449f66cea 100644
--- a/vapi/hildon-1.deps
+++ b/vapi/hildon-1.deps
@@ -1,4 +1,5 @@
 gtk+-2.0
+gdk-pixbuf-2.0
 gdk-2.0
 pango
 atk
diff --git a/vapi/libglade-2.0.deps b/vapi/libglade-2.0.deps
index 0dec08afe..96053965b 100644
--- a/vapi/libglade-2.0.deps
+++ b/vapi/libglade-2.0.deps
@@ -1,5 +1,6 @@
-gtk+-2.0
-gdk-2.0
-pango
 atk
 cairo
+gdk-pixbuf-2.0
+gdk-2.0
+pango
+gtk+-2.0
diff --git a/vapi/libgnomeui-2.0.deps b/vapi/libgnomeui-2.0.deps
index 1a5d5c29f..687dfd6b6 100644
--- a/vapi/libgnomeui-2.0.deps
+++ b/vapi/libgnomeui-2.0.deps
@@ -1,5 +1,6 @@
 atk
 cairo
+gdk-pixbuf-2.0
 gdk-2.0
 pango
 gtk+-2.0
diff --git a/vapi/libnotify.deps b/vapi/libnotify.deps
index 24a223777..96053965b 100644
--- a/vapi/libnotify.deps
+++ b/vapi/libnotify.deps
@@ -1 +1,6 @@
+atk
+cairo
+gdk-pixbuf-2.0
+gdk-2.0
+pango
 gtk+-2.0
diff --git a/vapi/libwnck-1.0.deps b/vapi/libwnck-1.0.deps
new file mode 100644
index 000000000..96053965b
--- /dev/null
+++ b/vapi/libwnck-1.0.deps
@@ -0,0 +1,6 @@
+atk
+cairo
+gdk-pixbuf-2.0
+gdk-2.0
+pango
+gtk+-2.0
diff --git a/vapi/packages/gdk-2.0/gdk-2.0.defines b/vapi/packages/gdk-2.0/gdk-2.0.defines
index c6bf89887..fcc34bdc0 100644
--- a/vapi/packages/gdk-2.0/gdk-2.0.defines
+++ b/vapi/packages/gdk-2.0/gdk-2.0.defines
@@ -1,2 +1,2 @@
 -DGDK_DISABLE_DEPRECATED
--DGDK_PIXBUF_DISABLE_DEPRECATED
+
diff --git a/vapi/packages/gdk-2.0/gdk-2.0.deps b/vapi/packages/gdk-2.0/gdk-2.0.deps
index 76490661c..25643ca35 100644
--- a/vapi/packages/gdk-2.0/gdk-2.0.deps
+++ b/vapi/packages/gdk-2.0/gdk-2.0.deps
@@ -1,3 +1,4 @@
+gdk-pixbuf-2.0
 cairo
 pango
 pangocairo
diff --git a/vapi/packages/gdk-2.0/gdk-2.0.files b/vapi/packages/gdk-2.0/gdk-2.0.files
index d3c9c3619..2e4fb69b8 100644
--- a/vapi/packages/gdk-2.0/gdk-2.0.files
+++ b/vapi/packages/gdk-2.0/gdk-2.0.files
@@ -1,3 +1,2 @@
 include/gtk-2.0/gdk
-include/gtk-2.0/gdk-pixbuf
 lib/libgdk-x11-2.0.so
diff --git a/vapi/packages/gdk-2.0/gdk-2.0.gi b/vapi/packages/gdk-2.0/gdk-2.0.gi
index 9f197e136..f2f60bb48 100644
--- a/vapi/packages/gdk-2.0/gdk-2.0.gi
+++ b/vapi/packages/gdk-2.0/gdk-2.0.gi
@@ -648,6 +648,67 @@
 				<parameter name="argv" type="gchar***"/>
 			</parameters>
 		</function>
+		<function name="pixbuf_get_from_drawable" symbol="gdk_pixbuf_get_from_drawable">
+			<return-type type="GdkPixbuf*"/>
+			<parameters>
+				<parameter name="dest" type="GdkPixbuf*"/>
+				<parameter name="src" type="GdkDrawable*"/>
+				<parameter name="cmap" type="GdkColormap*"/>
+				<parameter name="src_x" type="int"/>
+				<parameter name="src_y" type="int"/>
+				<parameter name="dest_x" type="int"/>
+				<parameter name="dest_y" type="int"/>
+				<parameter name="width" type="int"/>
+				<parameter name="height" type="int"/>
+			</parameters>
+		</function>
+		<function name="pixbuf_get_from_image" symbol="gdk_pixbuf_get_from_image">
+			<return-type type="GdkPixbuf*"/>
+			<parameters>
+				<parameter name="dest" type="GdkPixbuf*"/>
+				<parameter name="src" type="GdkImage*"/>
+				<parameter name="cmap" type="GdkColormap*"/>
+				<parameter name="src_x" type="int"/>
+				<parameter name="src_y" type="int"/>
+				<parameter name="dest_x" type="int"/>
+				<parameter name="dest_y" type="int"/>
+				<parameter name="width" type="int"/>
+				<parameter name="height" type="int"/>
+			</parameters>
+		</function>
+		<function name="pixbuf_render_pixmap_and_mask" symbol="gdk_pixbuf_render_pixmap_and_mask">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="pixbuf" type="GdkPixbuf*"/>
+				<parameter name="pixmap_return" type="GdkPixmap**"/>
+				<parameter name="mask_return" type="GdkBitmap**"/>
+				<parameter name="alpha_threshold" type="int"/>
+			</parameters>
+		</function>
+		<function name="pixbuf_render_pixmap_and_mask_for_colormap" symbol="gdk_pixbuf_render_pixmap_and_mask_for_colormap">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="pixbuf" type="GdkPixbuf*"/>
+				<parameter name="colormap" type="GdkColormap*"/>
+				<parameter name="pixmap_return" type="GdkPixmap**"/>
+				<parameter name="mask_return" type="GdkBitmap**"/>
+				<parameter name="alpha_threshold" type="int"/>
+			</parameters>
+		</function>
+		<function name="pixbuf_render_threshold_alpha" symbol="gdk_pixbuf_render_threshold_alpha">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="pixbuf" type="GdkPixbuf*"/>
+				<parameter name="bitmap" type="GdkBitmap*"/>
+				<parameter name="src_x" type="int"/>
+				<parameter name="src_y" type="int"/>
+				<parameter name="dest_x" type="int"/>
+				<parameter name="dest_y" type="int"/>
+				<parameter name="width" type="int"/>
+				<parameter name="height" type="int"/>
+				<parameter name="alpha_threshold" type="int"/>
+			</parameters>
+		</function>
 		<function name="pointer_grab" symbol="gdk_pointer_grab">
 			<return-type type="GdkGrabStatus"/>
 			<parameters>
@@ -1100,22 +1161,6 @@
 				<parameter name="condition" type="GdkInputCondition"/>
 			</parameters>
 		</callback>
-		<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>
 		<callback name="GdkSpanFunc">
 			<return-type type="void"/>
 			<parameters>
@@ -1426,106 +1471,6 @@
 			<field name="attr" type="PangoAttribute"/>
 			<field name="stipple" type="GdkBitmap*"/>
 		</struct>
-		<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>
 		<struct name="GdkPixmapObject">
 			<field name="parent_instance" type="GdkDrawable"/>
 			<field name="impl" type="GdkDrawable*"/>
@@ -2073,9 +2018,6 @@
 			<member name="GDK_CAP_ROUND" value="2"/>
 			<member name="GDK_CAP_PROJECTING" value="3"/>
 		</enum>
-		<enum name="GdkColorspace">
-			<member name="GDK_COLORSPACE_RGB" value="0"/>
-		</enum>
 		<enum name="GdkCrossingMode">
 			<member name="GDK_CROSSING_NORMAL" value="0"/>
 			<member name="GDK_CROSSING_GRAB" value="1"/>
@@ -2287,12 +2229,6 @@
 			<member name="GDK_SOURCE_ERASER" value="2"/>
 			<member name="GDK_SOURCE_CURSOR" value="3"/>
 		</enum>
-		<enum name="GdkInterpType">
-			<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="GdkJoinStyle">
 			<member name="GDK_JOIN_MITER" value="0"/>
 			<member name="GDK_JOIN_ROUND" value="1"/>
@@ -2321,44 +2257,6 @@
 			<member name="GDK_OWNER_CHANGE_DESTROY" value="1"/>
 			<member name="GDK_OWNER_CHANGE_CLOSE" value="2"/>
 		</enum>
-		<enum name="GdkPixbufAlphaMode">
-			<member name="GDK_PIXBUF_ALPHA_BILEVEL" value="0"/>
-			<member name="GDK_PIXBUF_ALPHA_FULL" value="1"/>
-		</enum>
-		<enum name="GdkPixbufError">
-			<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">
-			<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>
 		<enum name="GdkPropMode">
 			<member name="GDK_PROP_MODE_REPLACE" value="0"/>
 			<member name="GDK_PROP_MODE_PREPEND" value="1"/>
@@ -3782,612 +3680,6 @@
 			</method>
 			<property name="screen" type="GdkScreen*" readable="1" writable="1" construct="0" construct-only="1"/>
 		</object>
-		<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_from_drawable" symbol="gdk_pixbuf_get_from_drawable">
-				<return-type type="GdkPixbuf*"/>
-				<parameters>
-					<parameter name="dest" type="GdkPixbuf*"/>
-					<parameter name="src" type="GdkDrawable*"/>
-					<parameter name="cmap" type="GdkColormap*"/>
-					<parameter name="src_x" type="int"/>
-					<parameter name="src_y" type="int"/>
-					<parameter name="dest_x" type="int"/>
-					<parameter name="dest_y" type="int"/>
-					<parameter name="width" type="int"/>
-					<parameter name="height" type="int"/>
-				</parameters>
-			</method>
-			<method name="get_from_image" symbol="gdk_pixbuf_get_from_image">
-				<return-type type="GdkPixbuf*"/>
-				<parameters>
-					<parameter name="dest" type="GdkPixbuf*"/>
-					<parameter name="src" type="GdkImage*"/>
-					<parameter name="cmap" type="GdkColormap*"/>
-					<parameter name="src_x" type="int"/>
-					<parameter name="src_y" type="int"/>
-					<parameter name="dest_x" type="int"/>
-					<parameter name="dest_y" type="int"/>
-					<parameter name="width" type="int"/>
-					<parameter name="height" type="int"/>
-				</parameters>
-			</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_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="render_pixmap_and_mask" symbol="gdk_pixbuf_render_pixmap_and_mask">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="pixbuf" type="GdkPixbuf*"/>
-					<parameter name="pixmap_return" type="GdkPixmap**"/>
-					<parameter name="mask_return" type="GdkBitmap**"/>
-					<parameter name="alpha_threshold" type="int"/>
-				</parameters>
-			</method>
-			<method name="render_pixmap_and_mask_for_colormap" symbol="gdk_pixbuf_render_pixmap_and_mask_for_colormap">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="pixbuf" type="GdkPixbuf*"/>
-					<parameter name="colormap" type="GdkColormap*"/>
-					<parameter name="pixmap_return" type="GdkPixmap**"/>
-					<parameter name="mask_return" type="GdkBitmap**"/>
-					<parameter name="alpha_threshold" type="int"/>
-				</parameters>
-			</method>
-			<method name="render_threshold_alpha" symbol="gdk_pixbuf_render_threshold_alpha">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="pixbuf" type="GdkPixbuf*"/>
-					<parameter name="bitmap" type="GdkBitmap*"/>
-					<parameter name="src_x" type="int"/>
-					<parameter name="src_y" type="int"/>
-					<parameter name="dest_x" type="int"/>
-					<parameter name="dest_y" type="int"/>
-					<parameter name="width" type="int"/>
-					<parameter name="height" type="int"/>
-					<parameter name="alpha_threshold" type="int"/>
-				</parameters>
-			</method>
-			<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="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>
-			<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>
-		</object>
-		<object name="GdkPixbufSimpleAnimIter" parent="GdkPixbufAnimationIter" type-name="GdkPixbufSimpleAnimIter" get-type="gdk_pixbuf_simple_anim_iter_get_type">
-		</object>
 		<object name="GdkPixmap" parent="GdkDrawable" type-name="GdkPixmap" get-type="gdk_pixmap_get_type">
 			<method name="colormap_create_from_xpm" symbol="gdk_pixmap_colormap_create_from_xpm">
 				<return-type type="GdkPixmap*"/>
@@ -5571,13 +4863,6 @@
 		<constant name="GDK_CURRENT_TIME" type="int" value="0"/>
 		<constant name="GDK_MAX_TIMECOORD_AXES" type="int" value="128"/>
 		<constant name="GDK_PARENT_RELATIVE" type="int" value="1"/>
-		<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="3"/>
-		<constant name="GDK_PIXBUF_MINOR" type="int" value="12"/>
-		<constant name="GDK_PIXBUF_VERSION" type="char*" value="2.12.3"/>
-		<constant name="GDK_PIXDATA_HEADER_LENGTH" type="int" value="24"/>
 		<constant name="GDK_PRIORITY_REDRAW" type="int" value="20"/>
 	</namespace>
 </api>
diff --git a/vapi/packages/gdk-2.0/gdk-2.0.metadata b/vapi/packages/gdk-2.0/gdk-2.0.metadata
index 3016ace2f..47016fd66 100644
--- a/vapi/packages/gdk-2.0/gdk-2.0.metadata
+++ b/vapi/packages/gdk-2.0/gdk-2.0.metadata
@@ -8,11 +8,6 @@ gdk_colormap_free_colors.colors is_array="1"
 gdk_colormap_query_color.result is_out="1"
 GdkCursor is_value_type="0"
 GdkDisplay.closed hidden="1"
-gdk_pixbuf_new_from_xpm_data.data is_array="1"
-gdk_pixbuf_save_to_bufferv.option_keys is_array="1"
-gdk_pixbuf_save_to_bufferv.option_values is_array="1"
-gdk_pixbuf_save_to_callbackv.option_keys is_array="1"
-gdk_pixbuf_save_to_callbackv.option_values is_array="1"
 GdkPixmapObject hidden="1"
 GdkPixmapObjectClass hidden="1"
 gdk_property_get.actual_property_type is_out="1"
diff --git a/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.defines b/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.defines
new file mode 100644
index 000000000..ab923f7c8
--- /dev/null
+++ b/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.defines
@@ -0,0 +1 @@
+-DGDK_PIXBUF_DISABLE_DEPRECATED
diff --git a/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.files b/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.files
new file mode 100644
index 000000000..0a12133d7
--- /dev/null
+++ b/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.files
@@ -0,0 +1,2 @@
+include/gtk-2.0/gdk-pixbuf
+lib/libgdk_pixbuf-2.0.so
diff --git a/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.gi b/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.gi
new file mode 100644
index 000000000..5a5f439ca
--- /dev/null
+++ b/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.gi
@@ -0,0 +1,720 @@
+<?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">
+			<member name="GDK_COLORSPACE_RGB" value="0"/>
+		</enum>
+		<enum name="GdkInterpType">
+			<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">
+			<member name="GDK_PIXBUF_ALPHA_BILEVEL" value="0"/>
+			<member name="GDK_PIXBUF_ALPHA_FULL" value="1"/>
+		</enum>
+		<enum name="GdkPixbufError">
+			<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">
+			<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_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="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>
+			<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>
+		</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="5"/>
+		<constant name="GDK_PIXBUF_MINOR" type="int" value="12"/>
+		<constant name="GDK_PIXBUF_VERSION" type="char*" value="2.12.5"/>
+		<constant name="GDK_PIXDATA_HEADER_LENGTH" type="int" value="24"/>
+	</namespace>
+</api>
diff --git a/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.metadata b/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.metadata
new file mode 100644
index 000000000..cd1f99e87
--- /dev/null
+++ b/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.metadata
@@ -0,0 +1,7 @@
+Gdk cheader_filename="gdk-pixbuf/gdk-pixbuf.h"
+gdk_pixbuf_new_from_xpm_data.data is_array="1"
+gdk_pixbuf_save_to_bufferv.option_keys is_array="1"
+gdk_pixbuf_save_to_bufferv.option_values is_array="1"
+gdk_pixbuf_save_to_callbackv.option_keys is_array="1"
+gdk_pixbuf_save_to_callbackv.option_values is_array="1"
+
diff --git a/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.namespace b/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.namespace
new file mode 100644
index 000000000..2617db96f
--- /dev/null
+++ b/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.namespace
@@ -0,0 +1 @@
+Gdk
diff --git a/vapi/packages/gnome-desktop-2.0/gnome-desktop-2.0.deps b/vapi/packages/gnome-desktop-2.0/gnome-desktop-2.0.deps
index 659d658dd..57ed9cf58 100644
--- a/vapi/packages/gnome-desktop-2.0/gnome-desktop-2.0.deps
+++ b/vapi/packages/gnome-desktop-2.0/gnome-desktop-2.0.deps
@@ -1,5 +1,6 @@
 atk
 cairo
+gdk-pixbuf-2.0
 gdk-2.0
 pango
 gtk+-2.0
diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.deps b/vapi/packages/gtk+-2.0/gtk+-2.0.deps
index e02a9ef81..341815e6b 100644
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.deps
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.deps
@@ -1,4 +1,5 @@
 atk
 cairo
+gdk-pixbuf-2.0
 gdk-2.0
 pango
diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.gi b/vapi/packages/gtk+-2.0/gtk+-2.0.gi
index 5fed2461d..b1af10a1f 100644
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.gi
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.gi
@@ -24708,13 +24708,13 @@
 			</vfunc>
 		</interface>
 		<constant name="GTK_ARG_READWRITE" type="int" value="0"/>
-		<constant name="GTK_BINARY_AGE" type="int" value="1203"/>
+		<constant name="GTK_BINARY_AGE" type="int" value="1205"/>
 		<constant name="GTK_BUTTONBOX_DEFAULT" type="int" value="-1"/>
 		<constant name="GTK_INPUT_ERROR" type="int" value="-1"/>
-		<constant name="GTK_INTERFACE_AGE" type="int" value="3"/>
+		<constant name="GTK_INTERFACE_AGE" type="int" value="5"/>
 		<constant name="GTK_MAJOR_VERSION" type="int" value="2"/>
 		<constant name="GTK_MAX_COMPOSE_LEN" type="int" value="7"/>
-		<constant name="GTK_MICRO_VERSION" type="int" value="3"/>
+		<constant name="GTK_MICRO_VERSION" type="int" value="5"/>
 		<constant name="GTK_MINOR_VERSION" type="int" value="12"/>
 		<constant name="GTK_PAPER_NAME_A3" type="char*" value="iso_a3"/>
 		<constant name="GTK_PAPER_NAME_A4" type="char*" value="iso_a4"/>
diff --git a/vapi/packages/gtksourceview-2.0/gtksourceview-2.0.deps b/vapi/packages/gtksourceview-2.0/gtksourceview-2.0.deps
index 41a2aa1b5..96053965b 100644
--- a/vapi/packages/gtksourceview-2.0/gtksourceview-2.0.deps
+++ b/vapi/packages/gtksourceview-2.0/gtksourceview-2.0.deps
@@ -1,5 +1,6 @@
 atk
 cairo
+gdk-pixbuf-2.0
 gdk-2.0
 pango
 gtk+-2.0
diff --git a/vapi/packages/hildon-1/hildon-1.deps b/vapi/packages/hildon-1/hildon-1.deps
index 0dec08afe..449f66cea 100644
--- a/vapi/packages/hildon-1/hildon-1.deps
+++ b/vapi/packages/hildon-1/hildon-1.deps
@@ -1,4 +1,5 @@
 gtk+-2.0
+gdk-pixbuf-2.0
 gdk-2.0
 pango
 atk
diff --git a/vapi/packages/libglade-2.0/libglade-2.0.deps b/vapi/packages/libglade-2.0/libglade-2.0.deps
index 41a2aa1b5..96053965b 100644
--- a/vapi/packages/libglade-2.0/libglade-2.0.deps
+++ b/vapi/packages/libglade-2.0/libglade-2.0.deps
@@ -1,5 +1,6 @@
 atk
 cairo
+gdk-pixbuf-2.0
 gdk-2.0
 pango
 gtk+-2.0
diff --git a/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.deps b/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.deps
index 1a5d5c29f..687dfd6b6 100644
--- a/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.deps
+++ b/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.deps
@@ -1,5 +1,6 @@
 atk
 cairo
+gdk-pixbuf-2.0
 gdk-2.0
 pango
 gtk+-2.0
diff --git a/vapi/packages/libnotify/libnotify.deps b/vapi/packages/libnotify/libnotify.deps
index 41a2aa1b5..96053965b 100644
--- a/vapi/packages/libnotify/libnotify.deps
+++ b/vapi/packages/libnotify/libnotify.deps
@@ -1,5 +1,6 @@
 atk
 cairo
+gdk-pixbuf-2.0
 gdk-2.0
 pango
 gtk+-2.0
diff --git a/vapi/packages/libwnck-1.0/libwnck-1.0.deps b/vapi/packages/libwnck-1.0/libwnck-1.0.deps
index 41a2aa1b5..96053965b 100644
--- a/vapi/packages/libwnck-1.0/libwnck-1.0.deps
+++ b/vapi/packages/libwnck-1.0/libwnck-1.0.deps
@@ -1,5 +1,6 @@
 atk
 cairo
+gdk-pixbuf-2.0
 gdk-2.0
 pango
 gtk+-2.0
diff --git a/vapi/packages/poppler-glib/poppler-glib.deps b/vapi/packages/poppler-glib/poppler-glib.deps
index fd098cda4..f2c20337e 100644
--- a/vapi/packages/poppler-glib/poppler-glib.deps
+++ b/vapi/packages/poppler-glib/poppler-glib.deps
@@ -1,3 +1,4 @@
 pango
+gdk-pixbuf-2.0
 gdk-2.0
 cairo
diff --git a/vapi/packages/vte/vte.deps b/vapi/packages/vte/vte.deps
index 0dec08afe..449f66cea 100644
--- a/vapi/packages/vte/vte.deps
+++ b/vapi/packages/vte/vte.deps
@@ -1,4 +1,5 @@
 gtk+-2.0
+gdk-pixbuf-2.0
 gdk-2.0
 pango
 atk
diff --git a/vapi/poppler-glib.deps b/vapi/poppler-glib.deps
index ed798603b..f2c20337e 100644
--- a/vapi/poppler-glib.deps
+++ b/vapi/poppler-glib.deps
@@ -1,4 +1,4 @@
-cairo
 pango
+gdk-pixbuf-2.0
 gdk-2.0
-
+cairo
diff --git a/vapi/vte.deps b/vapi/vte.deps
index 0dec08afe..449f66cea 100644
--- a/vapi/vte.deps
+++ b/vapi/vte.deps
@@ -1,4 +1,5 @@
 gtk+-2.0
+gdk-pixbuf-2.0
 gdk-2.0
 pango
 atk