vala r1585 - in trunk: . vapi vapi/packages/atk vapi/packages/gdk-2.0 vapi/packages/gdk-pixbuf-2.0 vapi/packages/gio-2.0 vapi/packages/gio-unix-2.0 vapi/packages/gtk+-2.0 vapi/packages/pango vapi/packages/pangocairo



Author: juergbi
Date: Sun Jun 15 20:14:19 2008
New Revision: 1585
URL: http://svn.gnome.org/viewvc/vala?rev=1585&view=rev

Log:
2008-06-15  JÃrg Billeter  <j bitron ch>

	* vapi/Makefile.am
	* vapi/gdk-pixbuf-2.0.deps:
	* vapi/packages/atk/:
	* vapi/packages/gdk-2.0/:
	* vapi/packages/gdk-pixbuf-2.0/:
	* vapi/packages/gio-2.0/:
	* vapi/packages/gio-unix-2.0/:
	* vapi/packages/gtk+-2.0/:
	* vapi/packages/pango/:
	* vapi/packages/pangocairo/:

	Update to GTK+ 2.13.3, fixes bug 536369

	* vapi/atk.vapi:
	* vapi/gdk-2.0.vapi:
	* vapi/gdk-pixbuf-2.0.vapi:
	* vapi/gio-2.0.vapi:
	* vapi/gio-unix-2.0.vapi:
	* vapi/gtk+-2.0.vapi:
	* vapi/pango.vapi:
	* vapi/pangocairo.vapi:

	Regenerated


Added:
   trunk/vapi/gdk-pixbuf-2.0.deps
   trunk/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.deps
Modified:
   trunk/ChangeLog
   trunk/vapi/Makefile.am
   trunk/vapi/atk.vapi
   trunk/vapi/gdk-2.0.vapi
   trunk/vapi/gdk-pixbuf-2.0.vapi
   trunk/vapi/gio-2.0.vapi
   trunk/vapi/gio-unix-2.0.vapi
   trunk/vapi/gtk+-2.0.vapi
   trunk/vapi/packages/atk/atk.gi
   trunk/vapi/packages/gdk-2.0/gdk-2.0.defines
   trunk/vapi/packages/gdk-2.0/gdk-2.0.deps
   trunk/vapi/packages/gdk-2.0/gdk-2.0.files
   trunk/vapi/packages/gdk-2.0/gdk-2.0.gi
   trunk/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.files
   trunk/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.gi
   trunk/vapi/packages/gio-2.0/gio-2.0.gi
   trunk/vapi/packages/gio-unix-2.0/gio-unix-2.0.gi
   trunk/vapi/packages/gtk+-2.0/gtk+-2.0.defines
   trunk/vapi/packages/gtk+-2.0/gtk+-2.0.deps
   trunk/vapi/packages/gtk+-2.0/gtk+-2.0.gi
   trunk/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
   trunk/vapi/packages/pango/pango.gi
   trunk/vapi/packages/pangocairo/pangocairo.gi
   trunk/vapi/pango.vapi
   trunk/vapi/pangocairo.vapi

Modified: trunk/vapi/Makefile.am
==============================================================================
--- trunk/vapi/Makefile.am	(original)
+++ trunk/vapi/Makefile.am	Sun Jun 15 20:14:19 2008
@@ -19,6 +19,7 @@
 	glib-2.0.vapi \
 	gdk-2.0.deps \
 	gdk-2.0.vapi \
+	gdk-pixbuf-2.0.deps \
 	gdk-pixbuf-2.0.vapi \
 	gdk-x11-2.0.deps \
 	gdk-x11-2.0.vapi \

Modified: trunk/vapi/atk.vapi
==============================================================================
--- trunk/vapi/atk.vapi	(original)
+++ trunk/vapi/atk.vapi	Sun Jun 15 20:14:19 2008
@@ -2,18 +2,18 @@
 
 [CCode (cprefix = "Atk", lower_case_cprefix = "atk_")]
 namespace Atk {
-	[CCode (cprefix = "ATK_XY_", has_type_id = "0", cheader_filename = "atk/atk.h")]
+	[CCode (cprefix = "ATK_XY_", cheader_filename = "atk/atk.h")]
 	public enum CoordType {
 		SCREEN,
 		WINDOW
 	}
-	[CCode (cprefix = "ATK_KEY_EVENT_", has_type_id = "0", cheader_filename = "atk/atk.h")]
+	[CCode (cprefix = "ATK_KEY_EVENT_", cheader_filename = "atk/atk.h")]
 	public enum KeyEventType {
 		PRESS,
 		RELEASE,
 		LAST_DEFINED
 	}
-	[CCode (cprefix = "ATK_LAYER_", has_type_id = "0", cheader_filename = "atk/atk.h")]
+	[CCode (cprefix = "ATK_LAYER_", cheader_filename = "atk/atk.h")]
 	public enum Layer {
 		INVALID,
 		BACKGROUND,
@@ -24,7 +24,7 @@
 		OVERLAY,
 		WINDOW
 	}
-	[CCode (cprefix = "ATK_RELATION_", has_type_id = "0", cheader_filename = "atk/atk.h")]
+	[CCode (cprefix = "ATK_RELATION_", cheader_filename = "atk/atk.h")]
 	public enum RelationType {
 		NULL,
 		CONTROLLED_BY,
@@ -44,7 +44,7 @@
 		DESCRIPTION_FOR,
 		LAST_DEFINED
 	}
-	[CCode (cprefix = "ATK_ROLE_", has_type_id = "0", cheader_filename = "atk/atk.h")]
+	[CCode (cprefix = "ATK_ROLE_", cheader_filename = "atk/atk.h")]
 	public enum Role {
 		INVALID,
 		ACCEL_LABEL,
@@ -136,7 +136,7 @@
 		INPUT_METHOD_WINDOW,
 		LAST_DEFINED
 	}
-	[CCode (cprefix = "ATK_STATE_", has_type_id = "0", cheader_filename = "atk/atk.h")]
+	[CCode (cprefix = "ATK_STATE_", cheader_filename = "atk/atk.h")]
 	public enum StateType {
 		INVALID,
 		ACTIVE,
@@ -179,7 +179,7 @@
 		VISITED,
 		LAST_DEFINED
 	}
-	[CCode (cprefix = "ATK_TEXT_ATTR_", has_type_id = "0", cheader_filename = "atk/atk.h")]
+	[CCode (cprefix = "ATK_TEXT_ATTR_", cheader_filename = "atk/atk.h")]
 	public enum TextAttribute {
 		INVALID,
 		LEFT_MARGIN,
@@ -211,7 +211,7 @@
 		STYLE,
 		LAST_DEFINED
 	}
-	[CCode (cprefix = "ATK_TEXT_BOUNDARY_", has_type_id = "0", cheader_filename = "atk/atk.h")]
+	[CCode (cprefix = "ATK_TEXT_BOUNDARY_", cheader_filename = "atk/atk.h")]
 	public enum TextBoundary {
 		CHAR,
 		WORD_START,
@@ -221,14 +221,14 @@
 		LINE_START,
 		LINE_END
 	}
-	[CCode (cprefix = "ATK_TEXT_CLIP_", has_type_id = "0", cheader_filename = "atk/atk.h")]
+	[CCode (cprefix = "ATK_TEXT_CLIP_", cheader_filename = "atk/atk.h")]
 	public enum TextClipType {
 		NONE,
 		MIN,
 		MAX,
 		BOTH
 	}
-	[CCode (cprefix = "ATK_HYPERLINK_IS_", has_type_id = "0", cheader_filename = "atk/atk.h")]
+	[CCode (cprefix = "ATK_HYPERLINK_IS_", cheader_filename = "atk/atk.h")]
 	[Flags]
 	public enum HyperlinkStateFlags {
 		INLINE
@@ -317,7 +317,7 @@
 		public virtual void threads_leave ();
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
-	public class NoOpObject : Atk.Object, Atk.Table, Atk.Action, Atk.Text, Atk.EditableText, Atk.Selection, Atk.Component, Atk.Document, Atk.Hypertext, Atk.Image, Atk.Value {
+	public class NoOpObject : Atk.Object, Atk.Text, Atk.Action, Atk.Hypertext, Atk.Selection, Atk.Table, Atk.Image, Atk.Value, Atk.Component, Atk.EditableText, Atk.Document {
 		public NoOpObject (GLib.Object obj);
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
@@ -643,7 +643,7 @@
 		public abstract void get_minimum_value (GLib.Value value);
 		public abstract bool set_current_value (GLib.Value value);
 	}
-	[CCode (cheader_filename = "atk/atk.h")]
+	[CCode (type_id = "ATK_TYPE_RECTANGLE", cheader_filename = "atk/atk.h")]
 	public struct Rectangle {
 		public int x;
 		public int y;

Modified: trunk/vapi/gdk-2.0.vapi
==============================================================================
--- trunk/vapi/gdk-2.0.vapi	(original)
+++ trunk/vapi/gdk-2.0.vapi	Sun Jun 15 20:14:19 2008
@@ -2,7 +2,7 @@
 
 [CCode (cprefix = "Gdk", lower_case_cprefix = "gdk_")]
 namespace Gdk {
-	[CCode (cprefix = "GDK_AXIS_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_AXIS_", cheader_filename = "gdk/gdk.h")]
 	public enum AxisUse {
 		IGNORE,
 		X,
@@ -13,25 +13,25 @@
 		WHEEL,
 		LAST
 	}
-	[CCode (cprefix = "GDK_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
 	public enum ByteOrder {
 		LSB_FIRST,
 		MSB_FIRST
 	}
-	[CCode (cprefix = "GDK_CAP_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_CAP_", cheader_filename = "gdk/gdk.h")]
 	public enum CapStyle {
 		NOT_LAST,
 		BUTT,
 		ROUND,
 		PROJECTING
 	}
-	[CCode (cprefix = "GDK_CROSSING_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_CROSSING_", cheader_filename = "gdk/gdk.h")]
 	public enum CrossingMode {
 		NORMAL,
 		GRAB,
 		UNGRAB
 	}
-	[CCode (cprefix = "GDK_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
 	public enum CursorType {
 		X_CURSOR,
 		ARROW,
@@ -113,7 +113,7 @@
 		LAST_CURSOR,
 		CURSOR_IS_PIXMAP
 	}
-	[CCode (cprefix = "GDK_DRAG_PROTO_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_DRAG_PROTO_", cheader_filename = "gdk/gdk.h")]
 	public enum DragProtocol {
 		MOTIF,
 		XDND,
@@ -123,7 +123,7 @@
 		OLE2,
 		LOCAL
 	}
-	[CCode (cprefix = "GDK_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
 	public enum EventType {
 		NOTHING,
 		DELETE,
@@ -161,38 +161,39 @@
 		WINDOW_STATE,
 		SETTING,
 		OWNER_CHANGE,
-		GRAB_BROKEN
+		GRAB_BROKEN,
+		DAMAGE
 	}
-	[CCode (cprefix = "GDK_EXTENSION_EVENTS_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_EXTENSION_EVENTS_", cheader_filename = "gdk/gdk.h")]
 	public enum ExtensionMode {
 		NONE,
 		ALL,
 		CURSOR
 	}
-	[CCode (cprefix = "GDK_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
 	public enum Fill {
 		SOLID,
 		TILED,
 		STIPPLED,
 		OPAQUE_STIPPLED
 	}
-	[CCode (cprefix = "GDK_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
 	public enum FillRule {
 		EVEN_ODD_RULE,
 		WINDING_RULE
 	}
-	[CCode (cprefix = "GDK_FILTER_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_FILTER_", cheader_filename = "gdk/gdk.h")]
 	public enum FilterReturn {
 		CONTINUE,
 		TRANSLATE,
 		REMOVE
 	}
-	[CCode (cprefix = "GDK_FONT_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_FONT_", cheader_filename = "gdk/gdk.h")]
 	public enum FontType {
 		FONT,
 		FONTSET
 	}
-	[CCode (cprefix = "GDK_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
 	public enum Function {
 		COPY,
 		INVERT,
@@ -211,7 +212,7 @@
 		NOR,
 		SET
 	}
-	[CCode (cprefix = "GDK_GRAB_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_GRAB_", cheader_filename = "gdk/gdk.h")]
 	public enum GrabStatus {
 		SUCCESS,
 		ALREADY_GRABBED,
@@ -219,7 +220,7 @@
 		NOT_VIEWABLE,
 		FROZEN
 	}
-	[CCode (cprefix = "GDK_GRAVITY_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_GRAVITY_", cheader_filename = "gdk/gdk.h")]
 	public enum Gravity {
 		NORTH_WEST,
 		NORTH,
@@ -232,38 +233,38 @@
 		SOUTH_EAST,
 		STATIC
 	}
-	[CCode (cprefix = "GDK_IMAGE_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_IMAGE_", cheader_filename = "gdk/gdk.h")]
 	public enum ImageType {
 		NORMAL,
 		SHARED,
 		FASTEST
 	}
-	[CCode (cprefix = "GDK_MODE_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_MODE_", cheader_filename = "gdk/gdk.h")]
 	public enum InputMode {
 		DISABLED,
 		SCREEN,
 		WINDOW
 	}
-	[CCode (cprefix = "GDK_SOURCE_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_SOURCE_", cheader_filename = "gdk/gdk.h")]
 	public enum InputSource {
 		MOUSE,
 		PEN,
 		ERASER,
 		CURSOR
 	}
-	[CCode (cprefix = "GDK_JOIN_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_JOIN_", cheader_filename = "gdk/gdk.h")]
 	public enum JoinStyle {
 		MITER,
 		ROUND,
 		BEVEL
 	}
-	[CCode (cprefix = "GDK_LINE_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_LINE_", cheader_filename = "gdk/gdk.h")]
 	public enum LineStyle {
 		SOLID,
 		ON_OFF_DASH,
 		DOUBLE_DASH
 	}
-	[CCode (cprefix = "GDK_NOTIFY_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_NOTIFY_", cheader_filename = "gdk/gdk.h")]
 	public enum NotifyType {
 		ANCESTOR,
 		VIRTUAL,
@@ -272,49 +273,49 @@
 		NONLINEAR_VIRTUAL,
 		UNKNOWN
 	}
-	[CCode (cprefix = "GDK_OVERLAP_RECTANGLE_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_OVERLAP_RECTANGLE_", cheader_filename = "gdk/gdk.h")]
 	public enum OverlapType {
 		IN,
 		OUT,
 		PART
 	}
-	[CCode (cprefix = "GDK_OWNER_CHANGE_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_OWNER_CHANGE_", cheader_filename = "gdk/gdk.h")]
 	public enum OwnerChange {
 		NEW_OWNER,
 		DESTROY,
 		CLOSE
 	}
-	[CCode (cprefix = "GDK_PROP_MODE_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_PROP_MODE_", cheader_filename = "gdk/gdk.h")]
 	public enum PropMode {
 		REPLACE,
 		PREPEND,
 		APPEND
 	}
-	[CCode (cprefix = "GDK_PROPERTY_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_PROPERTY_", cheader_filename = "gdk/gdk.h")]
 	public enum PropertyState {
 		NEW_VALUE,
 		DELETE
 	}
-	[CCode (cprefix = "GDK_RGB_DITHER_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_RGB_DITHER_", cheader_filename = "gdk/gdk.h")]
 	public enum RgbDither {
 		NONE,
 		NORMAL,
 		MAX
 	}
-	[CCode (cprefix = "GDK_SCROLL_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_SCROLL_", cheader_filename = "gdk/gdk.h")]
 	public enum ScrollDirection {
 		UP,
 		DOWN,
 		LEFT,
 		RIGHT
 	}
-	[CCode (cprefix = "GDK_SETTING_ACTION_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_SETTING_ACTION_", cheader_filename = "gdk/gdk.h")]
 	public enum SettingAction {
 		NEW,
 		CHANGED,
 		DELETED
 	}
-	[CCode (cprefix = "GDK_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
 	public enum Status {
 		OK,
 		ERROR,
@@ -322,18 +323,18 @@
 		ERROR_FILE,
 		ERROR_MEM
 	}
-	[CCode (cprefix = "GDK_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
 	public enum SubwindowMode {
 		CLIP_BY_CHILDREN,
 		INCLUDE_INFERIORS
 	}
-	[CCode (cprefix = "GDK_VISIBILITY_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_VISIBILITY_", cheader_filename = "gdk/gdk.h")]
 	public enum VisibilityState {
 		UNOBSCURED,
 		PARTIAL,
 		FULLY_OBSCURED
 	}
-	[CCode (cprefix = "GDK_VISUAL_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_VISUAL_", cheader_filename = "gdk/gdk.h")]
 	public enum VisualType {
 		STATIC_GRAY,
 		GRAYSCALE,
@@ -342,12 +343,12 @@
 		TRUE_COLOR,
 		DIRECT_COLOR
 	}
-	[CCode (cprefix = "GDK_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
 	public enum WindowClass {
 		INPUT_OUTPUT,
 		INPUT_ONLY
 	}
-	[CCode (cprefix = "GDK_WINDOW_EDGE_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_WINDOW_EDGE_", cheader_filename = "gdk/gdk.h")]
 	public enum WindowEdge {
 		NORTH_WEST,
 		NORTH,
@@ -358,7 +359,7 @@
 		SOUTH,
 		SOUTH_EAST
 	}
-	[CCode (cprefix = "GDK_WINDOW_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_WINDOW_", cheader_filename = "gdk/gdk.h")]
 	public enum WindowType {
 		ROOT,
 		TOPLEVEL,
@@ -367,7 +368,7 @@
 		TEMP,
 		FOREIGN
 	}
-	[CCode (cprefix = "GDK_WINDOW_TYPE_HINT_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_WINDOW_TYPE_HINT_", cheader_filename = "gdk/gdk.h")]
 	public enum WindowTypeHint {
 		NORMAL,
 		DIALOG,
@@ -384,7 +385,7 @@
 		COMBO,
 		DND
 	}
-	[CCode (cprefix = "GDK_ACTION_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_ACTION_", cheader_filename = "gdk/gdk.h")]
 	[Flags]
 	public enum DragAction {
 		DEFAULT,
@@ -394,7 +395,7 @@
 		PRIVATE,
 		ASK
 	}
-	[CCode (cprefix = "GDK_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
 	[Flags]
 	public enum EventMask {
 		EXPOSURE_MASK,
@@ -420,7 +421,7 @@
 		SCROLL_MASK,
 		ALL_EVENTS_MASK
 	}
-	[CCode (cprefix = "GDK_GC_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_GC_", cheader_filename = "gdk/gdk.h")]
 	[Flags]
 	public enum GCValuesMask {
 		FOREGROUND,
@@ -442,14 +443,14 @@
 		CAP_STYLE,
 		JOIN_STYLE
 	}
-	[CCode (cprefix = "GDK_INPUT_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_INPUT_", cheader_filename = "gdk/gdk.h")]
 	[Flags]
 	public enum InputCondition {
 		READ,
 		WRITE,
 		EXCEPTION
 	}
-	[CCode (cprefix = "GDK_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
 	[Flags]
 	public enum ModifierType {
 		SHIFT_MASK,
@@ -471,7 +472,7 @@
 		RELEASE_MASK,
 		MODIFIER_MASK
 	}
-	[CCode (cprefix = "GDK_DECOR_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_DECOR_", cheader_filename = "gdk/gdk.h")]
 	[Flags]
 	public enum WMDecoration {
 		ALL,
@@ -482,7 +483,7 @@
 		MINIMIZE,
 		MAXIMIZE
 	}
-	[CCode (cprefix = "GDK_FUNC_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_FUNC_", cheader_filename = "gdk/gdk.h")]
 	[Flags]
 	public enum WMFunction {
 		ALL,
@@ -492,7 +493,7 @@
 		MAXIMIZE,
 		CLOSE
 	}
-	[CCode (cprefix = "GDK_WA_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_WA_", cheader_filename = "gdk/gdk.h")]
 	[Flags]
 	public enum WindowAttributesType {
 		TITLE,
@@ -505,7 +506,7 @@
 		NOREDIR,
 		TYPE_HINT
 	}
-	[CCode (cprefix = "GDK_HINT_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_HINT_", cheader_filename = "gdk/gdk.h")]
 	[Flags]
 	public enum WindowHints {
 		POS,
@@ -518,7 +519,7 @@
 		USER_POS,
 		USER_SIZE
 	}
-	[CCode (cprefix = "GDK_WINDOW_STATE_", has_type_id = "0", cheader_filename = "gdk/gdk.h")]
+	[CCode (cprefix = "GDK_WINDOW_STATE_", cheader_filename = "gdk/gdk.h")]
 	[Flags]
 	public enum WindowState {
 		WITHDRAWN,
@@ -531,6 +532,10 @@
 	}
 	[Compact]
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	public class AppLaunchContextClass {
+	}
+	[Compact]
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class Bitmap {
 		public weak GLib.Object parent_instance;
 		public static weak Gdk.Bitmap create_from_data (Gdk.Drawable drawable, string data, int width, int height);
@@ -561,10 +566,6 @@
 	}
 	[Compact]
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class Font {
-	}
-	[Compact]
-	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class GCValues {
 		public Gdk.Color foreground;
 		public Gdk.Color background;
@@ -656,7 +657,7 @@
 		public Region ();
 		public void offset (int dx, int dy);
 		public bool point_in (int x, int y);
-		public static weak Gdk.Region polygon (Gdk.Point points, int npoints, Gdk.FillRule fill_rule);
+		public static weak Gdk.Region polygon (Gdk.Point[] points, Gdk.FillRule fill_rule);
 		public Gdk.OverlapType rect_in (Gdk.Rectangle rectangle);
 		public static weak Gdk.Region rectangle (Gdk.Rectangle rectangle);
 		public void shrink (int dx, int dy);
@@ -717,11 +718,16 @@
 	}
 	[Compact]
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	public class WindowRedirect {
+		public static void to_drawable (Gdk.Window window, Gdk.Drawable drawable, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
+	}
+	[Compact]
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class XEvent {
 	}
 	[Compact]
 	[CCode (ref_function = "gdk_cursor_ref", unref_function = "gdk_cursor_unref", cheader_filename = "gdk/gdk.h")]
-	public class Cursor : GLib.Boxed {
+	public class Cursor {
 		public Gdk.CursorType type;
 		public uint ref_count;
 		public weak Gdk.Display get_display ();
@@ -732,6 +738,27 @@
 		public Cursor.from_pixbuf (Gdk.Display display, Gdk.Pixbuf pixbuf, int x, int y);
 		public Cursor.from_pixmap (Gdk.Pixmap source, Gdk.Pixmap mask, Gdk.Color fg, Gdk.Color bg, int x, int y);
 	}
+	[Compact]
+	[CCode (ref_function = "gdk_font_ref", unref_function = "gdk_font_unref", cheader_filename = "gdk/gdk.h")]
+	public class Font {
+		public Gdk.FontType type;
+		public int ascent;
+		public int descent;
+		public bool equal (Gdk.Font fontb);
+		public static weak Gdk.Font from_description_for_display (Gdk.Display display, Pango.FontDescription font_desc);
+		public int id ();
+		public static weak Gdk.Font load_for_display (Gdk.Display display, string font_name);
+	}
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public class AppLaunchContext : GLib.AppLaunchContext {
+		public AppLaunchContext ();
+		public void set_desktop (int desktop);
+		public void set_display (Gdk.Display display);
+		public void set_icon (GLib.Icon icon);
+		public void set_icon_name (string icon_name);
+		public void set_screen (Gdk.Screen screen);
+		public void set_timestamp (uint timestamp);
+	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class Colormap : GLib.Object {
 		public int size;
@@ -739,8 +766,9 @@
 		public weak Gdk.Visual visual;
 		public void* windowing_data;
 		public bool alloc_color (Gdk.Color color, bool writeable, bool best_match);
-		public int alloc_colors (Gdk.Color[] colors, int ncolors, bool writeable, bool best_match, bool success);
-		public void free_colors (Gdk.Color[] colors, int ncolors);
+		public int alloc_colors (Gdk.Color[][] colors, bool writeable, bool best_match, bool success);
+		public void change (int ncolors);
+		public void free_colors (Gdk.Color[][] colors);
 		public weak Gdk.Screen get_screen ();
 		public static weak Gdk.Colormap get_system ();
 		public weak Gdk.Visual get_visual ();
@@ -1009,6 +1037,9 @@
 		public int get_monitor_at_point (int x, int y);
 		public int get_monitor_at_window (Gdk.Window window);
 		public void get_monitor_geometry (int monitor_num, out Gdk.Rectangle dest);
+		public int get_monitor_height_mm (int monitor_num);
+		public weak string get_monitor_plug_name (int monitor_num);
+		public int get_monitor_width_mm (int monitor_num);
 		public int get_n_monitors ();
 		public int get_number ();
 		public double get_resolution ();
@@ -1037,6 +1068,7 @@
 		public void* font_options { get; set; }
 		public double resolution { get; set; }
 		public virtual signal void composited_changed ();
+		public virtual signal void monitors_changed ();
 		public virtual signal void size_changed ();
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
@@ -1133,6 +1165,7 @@
 		public void raise ();
 		public void register_dnd ();
 		public void remove_filter (Gdk.FilterFunc function, void* data);
+		public void remove_redirection ();
 		public void reparent (Gdk.Window new_parent, int x, int y);
 		public void resize (int width, int height);
 		public void scroll (int dx, int dy);
@@ -1408,7 +1441,7 @@
 		public bool override_redirect;
 		public Gdk.WindowTypeHint type_hint;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_COLOR", cheader_filename = "gdk/gdk.h")]
 	public struct Color {
 		public uint pixel;
 		public ushort red;
@@ -1421,7 +1454,7 @@
 		public static bool parse (string spec, out Gdk.Color color);
 		public weak string to_string ();
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_EVENT", cheader_filename = "gdk/gdk.h")]
 	public struct Event {
 		public Gdk.EventType type;
 		public Gdk.EventAny any;
@@ -1465,7 +1498,7 @@
 		public void send_clientmessage_toall ();
 		public void set_screen (Gdk.Screen screen);
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (type_id = "GDK_TYPE_RECTANGLE", cheader_filename = "gdk/gdk.h")]
 	public struct Rectangle {
 		public int x;
 		public int y;
@@ -1517,6 +1550,10 @@
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void cairo_set_source_pixmap (Cairo.Context cr, Gdk.Pixmap pixmap, double pixmap_x, double pixmap_y);
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	public static int colors_alloc (Gdk.Colormap colormap, bool contiguous, ulong planes, int nplanes, ulong pixels, int npixels);
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public static void colors_free (Gdk.Colormap colormap, ulong pixels, int npixels, ulong planes);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static weak GLib.List devices_list ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void drag_abort (Gdk.DragContext context, uint time_);
@@ -1565,15 +1602,15 @@
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_line (Gdk.Drawable drawable, Gdk.GC gc, int x1_, int y1_, int x2_, int y2_);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_lines (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Point points, int npoints);
+	public static void draw_lines (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Point[] points);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_pixbuf (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Pixbuf pixbuf, int src_x, int src_y, int dest_x, int dest_y, int width, int height, Gdk.RgbDither dither, int x_dither, int y_dither);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_point (Gdk.Drawable drawable, Gdk.GC gc, int x, int y);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_points (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Point points, int npoints);
+	public static void draw_points (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Point[] points);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_polygon (Gdk.Drawable drawable, Gdk.GC gc, bool filled, Gdk.Point points, int npoints);
+	public static void draw_polygon (Gdk.Drawable drawable, Gdk.GC gc, bool filled, Gdk.Point[] points);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_rectangle (Gdk.Drawable drawable, Gdk.GC gc, bool filled, int x, int y, int width, int height);
 	[CCode (cheader_filename = "gdk/gdk.h")]
@@ -1585,7 +1622,11 @@
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_rgb_image_dithalign (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, uchar[] rgb_buf, int rowstride, int xdith, int ydith);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_segments (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Segment segs, int nsegs);
+	public static void draw_segments (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Segment[] segs);
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public static void draw_text (Gdk.Drawable drawable, Gdk.Font font, Gdk.GC gc, int x, int y, string text, int text_length);
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public static void draw_text_wc (Gdk.Drawable drawable, Gdk.Font font, Gdk.GC gc, int x, int y, Gdk.WChar text, int text_length);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_trapezoids (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Trapezoid[] trapezoids);
 	[CCode (cheader_filename = "gdk/gdk.h")]
@@ -1601,6 +1642,8 @@
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void flush ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	public static weak Gdk.Font fontset_load_for_display (Gdk.Display display, string fontset_name);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void free_compound_text (uchar[] ctext);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void free_text_list (string list);
@@ -1747,6 +1790,12 @@
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void synthesize_window_state (Gdk.Window window, Gdk.WindowState unset_flags, Gdk.WindowState set_flags);
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	public static void test_render_sync (Gdk.Window window);
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public static bool test_simulate_button (Gdk.Window window, int x, int y, uint button, Gdk.ModifierType modifiers, Gdk.EventType button_pressrelease);
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public static bool test_simulate_key (Gdk.Window window, int x, int y, uint keyval, Gdk.ModifierType modifiers, Gdk.EventType key_pressrelease);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static int text_property_to_text_list (Gdk.Atom encoding, int format, uchar[] text, int length, string list);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static int text_property_to_text_list_for_display (Gdk.Display display, Gdk.Atom encoding, int format, uchar[] text, int length, string list);

Added: trunk/vapi/gdk-pixbuf-2.0.deps
==============================================================================
--- (empty file)
+++ trunk/vapi/gdk-pixbuf-2.0.deps	Sun Jun 15 20:14:19 2008
@@ -0,0 +1 @@
+gio-2.0

Modified: trunk/vapi/gdk-pixbuf-2.0.vapi
==============================================================================
--- trunk/vapi/gdk-pixbuf-2.0.vapi	(original)
+++ trunk/vapi/gdk-pixbuf-2.0.vapi	Sun Jun 15 20:14:19 2008
@@ -2,23 +2,23 @@
 
 [CCode (cprefix = "Gdk", lower_case_cprefix = "gdk_")]
 namespace Gdk {
-	[CCode (cprefix = "GDK_COLORSPACE_", has_type_id = "0", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+	[CCode (cprefix = "GDK_COLORSPACE_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public enum Colorspace {
 		RGB
 	}
-	[CCode (cprefix = "GDK_INTERP_", has_type_id = "0", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+	[CCode (cprefix = "GDK_INTERP_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public enum InterpType {
 		NEAREST,
 		TILES,
 		BILINEAR,
 		HYPER
 	}
-	[CCode (cprefix = "GDK_PIXBUF_ALPHA_", has_type_id = "0", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+	[CCode (cprefix = "GDK_PIXBUF_ALPHA_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public enum PixbufAlphaMode {
 		BILEVEL,
 		FULL
 	}
-	[CCode (cprefix = "GDK_PIXBUF_ERROR_", has_type_id = "0", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+	[CCode (cprefix = "GDK_PIXBUF_ERROR_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public enum PixbufError {
 		CORRUPT_IMAGE,
 		INSUFFICIENT_MEMORY,
@@ -27,7 +27,7 @@
 		UNSUPPORTED_OPERATION,
 		FAILED
 	}
-	[CCode (cprefix = "GDK_PIXBUF_ROTATE_", has_type_id = "0", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+	[CCode (cprefix = "GDK_PIXBUF_ROTATE_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public enum PixbufRotation {
 		NONE,
 		COUNTERCLOCKWISE,
@@ -103,6 +103,8 @@
 		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;
+		public Pixbuf.from_stream (GLib.InputStream stream, GLib.Cancellable cancellable) throws GLib.Error;
+		public Pixbuf.from_stream_at_scale (GLib.InputStream stream, int width, int height, bool preserve_aspect_ratio, GLib.Cancellable cancellable) throws GLib.Error;
 		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);
@@ -112,6 +114,7 @@
 		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, string type) throws GLib.Error;
 		public bool save_to_callbackv (Gdk.PixbufSaveFunc save_func, string type, string[] option_keys, string[] option_values) throws GLib.Error;
+		public bool save_to_stream (GLib.OutputStream stream, string type, GLib.Cancellable cancellable) throws GLib.Error;
 		public bool savev (string filename, string type, out 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);

Modified: trunk/vapi/gio-2.0.vapi
==============================================================================
--- trunk/vapi/gio-2.0.vapi	(original)
+++ trunk/vapi/gio-2.0.vapi	Sun Jun 15 20:14:19 2008
@@ -500,6 +500,7 @@
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class MemoryOutputStream : GLib.OutputStream, GLib.Seekable {
 		public void* get_data ();
+		public ulong get_data_size ();
 		public ulong get_size ();
 		public MemoryOutputStream (void* data, ulong len, GLib.ReallocFunc realloc_fn, GLib.DestroyNotify destroy);
 	}
@@ -586,6 +587,7 @@
 		public ThemedIcon (string iconname);
 		public ThemedIcon.from_names (string[] iconnames, int len);
 		public ThemedIcon.with_default_fallbacks (string iconname);
+		public void prepend_name (string iconname);
 		[NoAccessorMethod]
 		public string name { construct; }
 		[NoAccessorMethod]
@@ -688,12 +690,14 @@
 		public bool load_contents_finish (GLib.AsyncResult res, out weak string contents, out ulong length, out weak string etag_out) throws GLib.Error;
 		public void load_partial_contents_async (GLib.Cancellable? cancellable, GLib.FileReadMoreCallback read_more_callback, GLib.AsyncReadyCallback callback);
 		public bool load_partial_contents_finish (GLib.AsyncResult res, out weak string contents, ulong length, out weak string etag_out) throws GLib.Error;
+		public bool make_directory_with_parents (GLib.Cancellable? cancellable) throws GLib.Error;
 		public static GLib.File new_for_commandline_arg (string arg);
 		public static GLib.File new_for_path (string path);
 		public static GLib.File new_for_uri (string uri);
 		public static weak GLib.File parse_name (string parse_name);
 		public weak GLib.AppInfo query_default_handler (GLib.Cancellable? cancellable) throws GLib.Error;
 		public bool query_exists (GLib.Cancellable? cancellable);
+		public GLib.FileType query_file_type (GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable);
 		public weak GLib.FileInputStream read (GLib.Cancellable? cancellable) throws GLib.Error;
 		public bool replace_contents (string contents, ulong length, string etag, bool make_backup, GLib.FileCreateFlags flags, out weak string new_etag, GLib.Cancellable? cancellable) throws GLib.Error;
 		public void replace_contents_async (string contents, ulong length, string etag, bool make_backup, GLib.FileCreateFlags flags, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
@@ -997,6 +1001,8 @@
 	public static bool g_content_type_can_be_executable (string type);
 	[CCode (cname = "g_content_type_equals", cheader_filename = "gio/gio.h")]
 	public static bool g_content_type_equals (string type1, string type2);
+	[CCode (cname = "g_content_type_from_mime_type", cheader_filename = "gio/gio.h")]
+	public static weak string g_content_type_from_mime_type (string mime_type);
 	[CCode (cname = "g_content_type_get_description", cheader_filename = "gio/gio.h")]
 	public static weak string g_content_type_get_description (string type);
 	[CCode (cname = "g_content_type_get_icon", cheader_filename = "gio/gio.h")]

Modified: trunk/vapi/gio-unix-2.0.vapi
==============================================================================
--- trunk/vapi/gio-unix-2.0.vapi	(original)
+++ trunk/vapi/gio-unix-2.0.vapi	Sun Jun 15 20:14:19 2008
@@ -38,6 +38,7 @@
 	[CCode (cheader_filename = "gio/gunixmounts.h")]
 	public class UnixMountMonitor : GLib.Object {
 		public UnixMountMonitor ();
+		public void set_rate_limit (int limit_msec);
 		public virtual signal void mountpoints_changed ();
 		public virtual signal void mounts_changed ();
 	}

Modified: trunk/vapi/gtk+-2.0.vapi
==============================================================================
--- trunk/vapi/gtk+-2.0.vapi	(original)
+++ trunk/vapi/gtk+-2.0.vapi	Sun Jun 15 20:14:19 2008
@@ -2,7 +2,7 @@
 
 [CCode (cprefix = "Gtk", lower_case_cprefix = "gtk_")]
 namespace Gtk {
-	[CCode (cprefix = "GTK_ANCHOR_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_ANCHOR_", cheader_filename = "gtk/gtk.h")]
 	public enum AnchorType {
 		CENTER,
 		NORTH,
@@ -22,7 +22,7 @@
 		W,
 		E
 	}
-	[CCode (cprefix = "GTK_ARROW_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_ARROW_", cheader_filename = "gtk/gtk.h")]
 	public enum ArrowType {
 		UP,
 		DOWN,
@@ -30,7 +30,7 @@
 		RIGHT,
 		NONE
 	}
-	[CCode (cprefix = "GTK_ASSISTANT_PAGE_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_ASSISTANT_PAGE_", cheader_filename = "gtk/gtk.h")]
 	public enum AssistantPageType {
 		CONTENT,
 		INTRO,
@@ -38,7 +38,7 @@
 		SUMMARY,
 		PROGRESS
 	}
-	[CCode (cprefix = "GTK_BUTTONBOX_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_BUTTONBOX_", cheader_filename = "gtk/gtk.h")]
 	public enum ButtonBoxStyle {
 		DEFAULT_STYLE,
 		SPREAD,
@@ -47,7 +47,7 @@
 		END,
 		CENTER
 	}
-	[CCode (cprefix = "GTK_BUTTONS_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_BUTTONS_", cheader_filename = "gtk/gtk.h")]
 	public enum ButtonsType {
 		NONE,
 		OK,
@@ -56,21 +56,21 @@
 		YES_NO,
 		OK_CANCEL
 	}
-	[CCode (cprefix = "GTK_CLIST_DRAG_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_CLIST_DRAG_", cheader_filename = "gtk/gtk.h")]
 	public enum CListDragPos {
 		NONE,
 		BEFORE,
 		INTO,
 		AFTER
 	}
-	[CCode (cprefix = "GTK_CTREE_EXPANDER_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_CTREE_EXPANDER_", cheader_filename = "gtk/gtk.h")]
 	public enum CTreeExpanderStyle {
 		NONE,
 		SQUARE,
 		TRIANGLE,
 		CIRCULAR
 	}
-	[CCode (cprefix = "GTK_CTREE_EXPANSION_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_CTREE_EXPANSION_", cheader_filename = "gtk/gtk.h")]
 	public enum CTreeExpansionType {
 		EXPAND,
 		EXPAND_RECURSIVE,
@@ -79,31 +79,31 @@
 		TOGGLE,
 		TOGGLE_RECURSIVE
 	}
-	[CCode (cprefix = "GTK_CTREE_LINES_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_CTREE_LINES_", cheader_filename = "gtk/gtk.h")]
 	public enum CTreeLineStyle {
 		NONE,
 		SOLID,
 		DOTTED,
 		TABBED
 	}
-	[CCode (cprefix = "GTK_CTREE_POS_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_CTREE_POS_", cheader_filename = "gtk/gtk.h")]
 	public enum CTreePos {
 		BEFORE,
 		AS_CHILD,
 		AFTER
 	}
-	[CCode (cprefix = "GTK_CELL_RENDERER_ACCEL_MODE_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_CELL_RENDERER_ACCEL_MODE_", cheader_filename = "gtk/gtk.h")]
 	public enum CellRendererAccelMode {
 		GTK,
 		OTHER
 	}
-	[CCode (cprefix = "GTK_CELL_RENDERER_MODE_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_CELL_RENDERER_MODE_", cheader_filename = "gtk/gtk.h")]
 	public enum CellRendererMode {
 		INERT,
 		ACTIVATABLE,
 		EDITABLE
 	}
-	[CCode (cprefix = "GTK_CELL_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_CELL_", cheader_filename = "gtk/gtk.h")]
 	public enum CellType {
 		EMPTY,
 		TEXT,
@@ -111,20 +111,20 @@
 		PIXTEXT,
 		WIDGET
 	}
-	[CCode (cprefix = "GTK_CORNER_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_CORNER_", cheader_filename = "gtk/gtk.h")]
 	public enum CornerType {
 		TOP_LEFT,
 		BOTTOM_LEFT,
 		TOP_RIGHT,
 		BOTTOM_RIGHT
 	}
-	[CCode (cprefix = "GTK_CURVE_TYPE_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_CURVE_TYPE_", cheader_filename = "gtk/gtk.h")]
 	public enum CurveType {
 		LINEAR,
 		SPLINE,
 		FREE
 	}
-	[CCode (cprefix = "GTK_DELETE_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_DELETE_", cheader_filename = "gtk/gtk.h")]
 	public enum DeleteType {
 		CHARS,
 		WORD_ENDS,
@@ -135,7 +135,7 @@
 		PARAGRAPHS,
 		WHITESPACE
 	}
-	[CCode (cprefix = "GTK_DIR_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_DIR_", cheader_filename = "gtk/gtk.h")]
 	public enum DirectionType {
 		TAB_FORWARD,
 		TAB_BACKWARD,
@@ -144,7 +144,7 @@
 		LEFT,
 		RIGHT
 	}
-	[CCode (cprefix = "GTK_DRAG_RESULT_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_DRAG_RESULT_", cheader_filename = "gtk/gtk.h")]
 	public enum DragResult {
 		SUCCESS,
 		NO_TARGET,
@@ -153,45 +153,45 @@
 		GRAB_BROKEN,
 		ERROR
 	}
-	[CCode (cprefix = "GTK_EXPANDER_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_EXPANDER_", cheader_filename = "gtk/gtk.h")]
 	public enum ExpanderStyle {
 		COLLAPSED,
 		SEMI_COLLAPSED,
 		SEMI_EXPANDED,
 		EXPANDED
 	}
-	[CCode (cprefix = "GTK_FILE_CHOOSER_ACTION_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_FILE_CHOOSER_ACTION_", cheader_filename = "gtk/gtk.h")]
 	public enum FileChooserAction {
 		OPEN,
 		SAVE,
 		SELECT_FOLDER,
 		CREATE_FOLDER
 	}
-	[CCode (cprefix = "GTK_FILE_CHOOSER_CONFIRMATION_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_FILE_CHOOSER_CONFIRMATION_", cheader_filename = "gtk/gtk.h")]
 	public enum FileChooserConfirmation {
 		CONFIRM,
 		ACCEPT_FILENAME,
 		SELECT_AGAIN
 	}
-	[CCode (cprefix = "GTK_FILE_CHOOSER_ERROR_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_FILE_CHOOSER_ERROR_", cheader_filename = "gtk/gtk.h")]
 	public enum FileChooserError {
 		NONEXISTENT,
 		BAD_FILENAME,
 		ALREADY_EXISTS
 	}
-	[CCode (cprefix = "GTK_IM_PREEDIT_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_IM_PREEDIT_", cheader_filename = "gtk/gtk.h")]
 	public enum IMPreeditStyle {
 		NOTHING,
 		CALLBACK,
 		NONE
 	}
-	[CCode (cprefix = "GTK_IM_STATUS_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_IM_STATUS_", cheader_filename = "gtk/gtk.h")]
 	public enum IMStatusStyle {
 		NOTHING,
 		CALLBACK,
 		NONE
 	}
-	[CCode (cprefix = "GTK_ICON_SIZE_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_ICON_SIZE_", cheader_filename = "gtk/gtk.h")]
 	public enum IconSize {
 		INVALID,
 		MENU,
@@ -201,12 +201,12 @@
 		DND,
 		DIALOG
 	}
-	[CCode (cprefix = "GTK_ICON_THEME_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_ICON_THEME_", cheader_filename = "gtk/gtk.h")]
 	public enum IconThemeError {
 		NOT_FOUND,
 		FAILED
 	}
-	[CCode (cprefix = "GTK_ICON_VIEW_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_ICON_VIEW_", cheader_filename = "gtk/gtk.h")]
 	public enum IconViewDropPosition {
 		NO_DROP,
 		DROP_INTO,
@@ -215,7 +215,7 @@
 		DROP_ABOVE,
 		DROP_BELOW
 	}
-	[CCode (cprefix = "GTK_IMAGE_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_IMAGE_", cheader_filename = "gtk/gtk.h")]
 	public enum ImageType {
 		EMPTY,
 		PIXMAP,
@@ -224,16 +224,17 @@
 		STOCK,
 		ICON_SET,
 		ANIMATION,
-		ICON_NAME
+		ICON_NAME,
+		GICON
 	}
-	[CCode (cprefix = "GTK_JUSTIFY_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_JUSTIFY_", cheader_filename = "gtk/gtk.h")]
 	public enum Justification {
 		LEFT,
 		RIGHT,
 		CENTER,
 		FILL
 	}
-	[CCode (cprefix = "GTK_MATCH_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_MATCH_", cheader_filename = "gtk/gtk.h")]
 	public enum MatchType {
 		ALL,
 		ALL_TAIL,
@@ -242,14 +243,14 @@
 		EXACT,
 		LAST
 	}
-	[CCode (cprefix = "GTK_MENU_DIR_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_MENU_DIR_", cheader_filename = "gtk/gtk.h")]
 	public enum MenuDirectionType {
 		PARENT,
 		CHILD,
 		NEXT,
 		PREV
 	}
-	[CCode (cprefix = "GTK_MESSAGE_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_MESSAGE_", cheader_filename = "gtk/gtk.h")]
 	public enum MessageType {
 		INFO,
 		WARNING,
@@ -257,13 +258,13 @@
 		ERROR,
 		OTHER
 	}
-	[CCode (cprefix = "GTK_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_", cheader_filename = "gtk/gtk.h")]
 	public enum MetricType {
 		PIXELS,
 		INCHES,
 		CENTIMETERS
 	}
-	[CCode (cprefix = "GTK_MOVEMENT_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_MOVEMENT_", cheader_filename = "gtk/gtk.h")]
 	public enum MovementStep {
 		LOGICAL_POSITIONS,
 		VISUAL_POSITIONS,
@@ -276,42 +277,42 @@
 		BUFFER_ENDS,
 		HORIZONTAL_PAGES
 	}
-	[CCode (cprefix = "GTK_NOTEBOOK_TAB_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_NOTEBOOK_TAB_", cheader_filename = "gtk/gtk.h")]
 	public enum NotebookTab {
 		FIRST,
 		LAST
 	}
-	[CCode (cprefix = "GTK_ORIENTATION_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_ORIENTATION_", cheader_filename = "gtk/gtk.h")]
 	public enum Orientation {
 		HORIZONTAL,
 		VERTICAL
 	}
-	[CCode (cprefix = "GTK_PACK_DIRECTION_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_PACK_DIRECTION_", cheader_filename = "gtk/gtk.h")]
 	public enum PackDirection {
 		LTR,
 		RTL,
 		TTB,
 		BTT
 	}
-	[CCode (cprefix = "GTK_PACK_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_PACK_", cheader_filename = "gtk/gtk.h")]
 	public enum PackType {
 		START,
 		END
 	}
-	[CCode (cprefix = "GTK_PAGE_ORIENTATION_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_PAGE_ORIENTATION_", cheader_filename = "gtk/gtk.h")]
 	public enum PageOrientation {
 		PORTRAIT,
 		LANDSCAPE,
 		REVERSE_PORTRAIT,
 		REVERSE_LANDSCAPE
 	}
-	[CCode (cprefix = "GTK_PAGE_SET_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_PAGE_SET_", cheader_filename = "gtk/gtk.h")]
 	public enum PageSet {
 		ALL,
 		EVEN,
 		ODD
 	}
-	[CCode (cprefix = "GTK_PATH_PRIO_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_PATH_PRIO_", cheader_filename = "gtk/gtk.h")]
 	public enum PathPriorityType {
 		LOWEST,
 		GTK,
@@ -320,71 +321,71 @@
 		RC,
 		HIGHEST
 	}
-	[CCode (cprefix = "GTK_PATH_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_PATH_", cheader_filename = "gtk/gtk.h")]
 	public enum PathType {
 		WIDGET,
 		WIDGET_CLASS,
 		CLASS
 	}
-	[CCode (cprefix = "GTK_POLICY_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_POLICY_", cheader_filename = "gtk/gtk.h")]
 	public enum PolicyType {
 		ALWAYS,
 		AUTOMATIC,
 		NEVER
 	}
-	[CCode (cprefix = "GTK_POS_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_POS_", cheader_filename = "gtk/gtk.h")]
 	public enum PositionType {
 		LEFT,
 		RIGHT,
 		TOP,
 		BOTTOM
 	}
-	[CCode (cprefix = "GTK_PREVIEW_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_PREVIEW_", cheader_filename = "gtk/gtk.h")]
 	public enum PreviewType {
 		COLOR,
 		GRAYSCALE
 	}
-	[CCode (cprefix = "GTK_PRINT_DUPLEX_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_PRINT_DUPLEX_", cheader_filename = "gtk/gtk.h")]
 	public enum PrintDuplex {
 		SIMPLEX,
 		HORIZONTAL,
 		VERTICAL
 	}
-	[CCode (cprefix = "GTK_PRINT_ERROR_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_PRINT_ERROR_", cheader_filename = "gtk/gtk.h")]
 	public enum PrintError {
 		GENERAL,
 		INTERNAL_ERROR,
 		NOMEM,
 		INVALID_FILE
 	}
-	[CCode (cprefix = "GTK_PRINT_OPERATION_ACTION_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_PRINT_OPERATION_ACTION_", cheader_filename = "gtk/gtk.h")]
 	public enum PrintOperationAction {
 		PRINT_DIALOG,
 		PRINT,
 		PREVIEW,
 		EXPORT
 	}
-	[CCode (cprefix = "GTK_PRINT_OPERATION_RESULT_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_PRINT_OPERATION_RESULT_", cheader_filename = "gtk/gtk.h")]
 	public enum PrintOperationResult {
 		ERROR,
 		APPLY,
 		CANCEL,
 		IN_PROGRESS
 	}
-	[CCode (cprefix = "GTK_PRINT_PAGES_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_PRINT_PAGES_", cheader_filename = "gtk/gtk.h")]
 	public enum PrintPages {
 		ALL,
 		CURRENT,
 		RANGES
 	}
-	[CCode (cprefix = "GTK_PRINT_QUALITY_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_PRINT_QUALITY_", cheader_filename = "gtk/gtk.h")]
 	public enum PrintQuality {
 		LOW,
 		NORMAL,
 		HIGH,
 		DRAFT
 	}
-	[CCode (cprefix = "GTK_PRINT_STATUS_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_PRINT_STATUS_", cheader_filename = "gtk/gtk.h")]
 	public enum PrintStatus {
 		INITIAL,
 		PREPARING,
@@ -396,19 +397,19 @@
 		FINISHED,
 		FINISHED_ABORTED
 	}
-	[CCode (cprefix = "GTK_PROGRESS_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_PROGRESS_", cheader_filename = "gtk/gtk.h")]
 	public enum ProgressBarOrientation {
 		LEFT_TO_RIGHT,
 		RIGHT_TO_LEFT,
 		BOTTOM_TO_TOP,
 		TOP_TO_BOTTOM
 	}
-	[CCode (cprefix = "GTK_PROGRESS_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_PROGRESS_", cheader_filename = "gtk/gtk.h")]
 	public enum ProgressBarStyle {
 		CONTINUOUS,
 		DISCRETE
 	}
-	[CCode (cprefix = "GTK_RC_TOKEN_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_RC_TOKEN_", cheader_filename = "gtk/gtk.h")]
 	public enum RcTokenType {
 		INVALID,
 		INCLUDE,
@@ -451,12 +452,12 @@
 		UNBIND,
 		LAST
 	}
-	[CCode (cprefix = "GTK_RECENT_CHOOSER_ERROR_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_RECENT_CHOOSER_ERROR_", cheader_filename = "gtk/gtk.h")]
 	public enum RecentChooserError {
 		NOT_FOUND,
 		INVALID_URI
 	}
-	[CCode (cprefix = "GTK_RECENT_MANAGER_ERROR_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_RECENT_MANAGER_ERROR_", cheader_filename = "gtk/gtk.h")]
 	public enum RecentManagerError {
 		NOT_FOUND,
 		INVALID_URI,
@@ -466,26 +467,26 @@
 		WRITE,
 		UNKNOWN
 	}
-	[CCode (cprefix = "GTK_RECENT_SORT_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_RECENT_SORT_", cheader_filename = "gtk/gtk.h")]
 	public enum RecentSortType {
 		NONE,
 		MRU,
 		LRU,
 		CUSTOM
 	}
-	[CCode (cprefix = "GTK_RELIEF_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_RELIEF_", cheader_filename = "gtk/gtk.h")]
 	public enum ReliefStyle {
 		NORMAL,
 		HALF,
 		NONE
 	}
-	[CCode (cprefix = "GTK_RESIZE_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_RESIZE_", cheader_filename = "gtk/gtk.h")]
 	public enum ResizeMode {
 		PARENT,
 		QUEUE,
 		IMMEDIATE
 	}
-	[CCode (cprefix = "GTK_RESPONSE_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_RESPONSE_", cheader_filename = "gtk/gtk.h")]
 	public enum ResponseType {
 		NONE,
 		REJECT,
@@ -499,7 +500,7 @@
 		APPLY,
 		HELP
 	}
-	[CCode (cprefix = "GTK_SCROLL_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_SCROLL_", cheader_filename = "gtk/gtk.h")]
 	public enum ScrollStep {
 		STEPS,
 		PAGES,
@@ -508,7 +509,7 @@
 		HORIZONTAL_PAGES,
 		HORIZONTAL_ENDS
 	}
-	[CCode (cprefix = "GTK_SCROLL_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_SCROLL_", cheader_filename = "gtk/gtk.h")]
 	public enum ScrollType {
 		NONE,
 		JUMP,
@@ -527,7 +528,7 @@
 		START,
 		END
 	}
-	[CCode (cprefix = "GTK_SELECTION_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_SELECTION_", cheader_filename = "gtk/gtk.h")]
 	public enum SelectionMode {
 		NONE,
 		SINGLE,
@@ -535,13 +536,13 @@
 		MULTIPLE,
 		EXTENDED
 	}
-	[CCode (cprefix = "GTK_SENSITIVITY_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_SENSITIVITY_", cheader_filename = "gtk/gtk.h")]
 	public enum SensitivityType {
 		AUTO,
 		ON,
 		OFF
 	}
-	[CCode (cprefix = "GTK_SHADOW_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_SHADOW_", cheader_filename = "gtk/gtk.h")]
 	public enum ShadowType {
 		NONE,
 		IN,
@@ -549,31 +550,31 @@
 		ETCHED_IN,
 		ETCHED_OUT
 	}
-	[CCode (cprefix = "GTK_SIDE_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_SIDE_", cheader_filename = "gtk/gtk.h")]
 	public enum SideType {
 		TOP,
 		BOTTOM,
 		LEFT,
 		RIGHT
 	}
-	[CCode (cprefix = "GTK_SIZE_GROUP_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_SIZE_GROUP_", cheader_filename = "gtk/gtk.h")]
 	public enum SizeGroupMode {
 		NONE,
 		HORIZONTAL,
 		VERTICAL,
 		BOTH
 	}
-	[CCode (cprefix = "GTK_SORT_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_SORT_", cheader_filename = "gtk/gtk.h")]
 	public enum SortType {
 		ASCENDING,
 		DESCENDING
 	}
-	[CCode (cprefix = "GTK_UPDATE_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_UPDATE_", cheader_filename = "gtk/gtk.h")]
 	public enum SpinButtonUpdatePolicy {
 		ALWAYS,
 		IF_VALID
 	}
-	[CCode (cprefix = "GTK_SPIN_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_SPIN_", cheader_filename = "gtk/gtk.h")]
 	public enum SpinType {
 		STEP_FORWARD,
 		STEP_BACKWARD,
@@ -583,7 +584,7 @@
 		END,
 		USER_DEFINED
 	}
-	[CCode (cprefix = "GTK_STATE_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_STATE_", cheader_filename = "gtk/gtk.h")]
 	public enum StateType {
 		NORMAL,
 		ACTIVE,
@@ -591,29 +592,29 @@
 		SELECTED,
 		INSENSITIVE
 	}
-	[CCode (cprefix = "GTK_DIRECTION_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_DIRECTION_", cheader_filename = "gtk/gtk.h")]
 	public enum SubmenuDirection {
 		LEFT,
 		RIGHT
 	}
-	[CCode (cprefix = "GTK_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_", cheader_filename = "gtk/gtk.h")]
 	public enum SubmenuPlacement {
 		TOP_BOTTOM,
 		LEFT_RIGHT
 	}
-	[CCode (cprefix = "GTK_TEXT_BUFFER_TARGET_INFO_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_TEXT_BUFFER_TARGET_INFO_", cheader_filename = "gtk/gtk.h")]
 	public enum TextBufferTargetInfo {
 		BUFFER_CONTENTS,
 		RICH_TEXT,
 		TEXT
 	}
-	[CCode (cprefix = "GTK_TEXT_DIR_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_TEXT_DIR_", cheader_filename = "gtk/gtk.h")]
 	public enum TextDirection {
 		NONE,
 		LTR,
 		RTL
 	}
-	[CCode (cprefix = "GTK_TEXT_WINDOW_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_TEXT_WINDOW_", cheader_filename = "gtk/gtk.h")]
 	public enum TextWindowType {
 		PRIVATE,
 		WIDGET,
@@ -623,7 +624,7 @@
 		TOP,
 		BOTTOM
 	}
-	[CCode (cprefix = "GTK_TOOLBAR_CHILD_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_TOOLBAR_CHILD_", cheader_filename = "gtk/gtk.h")]
 	public enum ToolbarChildType {
 		SPACE,
 		BUTTON,
@@ -631,68 +632,68 @@
 		RADIOBUTTON,
 		WIDGET
 	}
-	[CCode (cprefix = "GTK_TOOLBAR_SPACE_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_TOOLBAR_SPACE_", cheader_filename = "gtk/gtk.h")]
 	public enum ToolbarSpaceStyle {
 		EMPTY,
 		LINE
 	}
-	[CCode (cprefix = "GTK_TOOLBAR_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_TOOLBAR_", cheader_filename = "gtk/gtk.h")]
 	public enum ToolbarStyle {
 		ICONS,
 		TEXT,
 		BOTH,
 		BOTH_HORIZ
 	}
-	[CCode (cprefix = "GTK_TREE_VIEW_COLUMN_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_TREE_VIEW_COLUMN_", cheader_filename = "gtk/gtk.h")]
 	public enum TreeViewColumnSizing {
 		GROW_ONLY,
 		AUTOSIZE,
 		FIXED
 	}
-	[CCode (cprefix = "GTK_TREE_VIEW_DROP_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_TREE_VIEW_DROP_", cheader_filename = "gtk/gtk.h")]
 	public enum TreeViewDropPosition {
 		BEFORE,
 		AFTER,
 		INTO_OR_BEFORE,
 		INTO_OR_AFTER
 	}
-	[CCode (cprefix = "GTK_TREE_VIEW_GRID_LINES_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_TREE_VIEW_GRID_LINES_", cheader_filename = "gtk/gtk.h")]
 	public enum TreeViewGridLines {
 		NONE,
 		HORIZONTAL,
 		VERTICAL,
 		BOTH
 	}
-	[CCode (cprefix = "GTK_TREE_VIEW_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_TREE_VIEW_", cheader_filename = "gtk/gtk.h")]
 	public enum TreeViewMode {
 		LINE,
 		ITEM
 	}
-	[CCode (cprefix = "GTK_UNIT_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_UNIT_", cheader_filename = "gtk/gtk.h")]
 	public enum Unit {
 		PIXEL,
 		POINTS,
 		INCH,
 		MM
 	}
-	[CCode (cprefix = "GTK_UPDATE_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_UPDATE_", cheader_filename = "gtk/gtk.h")]
 	public enum UpdateType {
 		CONTINUOUS,
 		DISCONTINUOUS,
 		DELAYED
 	}
-	[CCode (cprefix = "GTK_VISIBILITY_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_VISIBILITY_", cheader_filename = "gtk/gtk.h")]
 	public enum Visibility {
 		NONE,
 		PARTIAL,
 		FULL
 	}
-	[CCode (cprefix = "GTK_WIDGET_HELP_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_WIDGET_HELP_", cheader_filename = "gtk/gtk.h")]
 	public enum WidgetHelpType {
 		TOOLTIP,
 		WHATS_THIS
 	}
-	[CCode (cprefix = "GTK_WIN_POS_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_WIN_POS_", cheader_filename = "gtk/gtk.h")]
 	public enum WindowPosition {
 		NONE,
 		CENTER,
@@ -700,26 +701,26 @@
 		CENTER_ALWAYS,
 		CENTER_ON_PARENT
 	}
-	[CCode (cprefix = "GTK_WINDOW_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_WINDOW_", cheader_filename = "gtk/gtk.h")]
 	public enum WindowType {
 		TOPLEVEL,
 		POPUP
 	}
-	[CCode (cprefix = "GTK_WRAP_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_WRAP_", cheader_filename = "gtk/gtk.h")]
 	public enum WrapMode {
 		NONE,
 		CHAR,
 		WORD,
 		WORD_CHAR
 	}
-	[CCode (cprefix = "GTK_ACCEL_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_ACCEL_", cheader_filename = "gtk/gtk.h")]
 	[Flags]
 	public enum AccelFlags {
 		VISIBLE,
 		LOCKED,
 		MASK
 	}
-	[CCode (cprefix = "GTK_ARG_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_ARG_", cheader_filename = "gtk/gtk.h")]
 	[Flags]
 	public enum ArgFlags {
 		READABLE,
@@ -728,14 +729,14 @@
 		CONSTRUCT_ONLY,
 		CHILD_ARG
 	}
-	[CCode (cprefix = "GTK_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_", cheader_filename = "gtk/gtk.h")]
 	[Flags]
 	public enum AttachOptions {
 		EXPAND,
 		SHRINK,
 		FILL
 	}
-	[CCode (cprefix = "GTK_BUTTON_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_BUTTON_", cheader_filename = "gtk/gtk.h")]
 	[Flags]
 	public enum ButtonAction {
 		IGNORED,
@@ -743,16 +744,17 @@
 		DRAGS,
 		EXPANDS
 	}
-	[CCode (cprefix = "GTK_CALENDAR_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_CALENDAR_", cheader_filename = "gtk/gtk.h")]
 	[Flags]
 	public enum CalendarDisplayOptions {
 		SHOW_HEADING,
 		SHOW_DAY_NAMES,
 		NO_MONTH_CHANGE,
 		SHOW_WEEK_NUMBERS,
-		WEEK_START_MONDAY
+		WEEK_START_MONDAY,
+		SHOW_DETAILS
 	}
-	[CCode (cprefix = "GTK_CELL_RENDERER_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_CELL_RENDERER_", cheader_filename = "gtk/gtk.h")]
 	[Flags]
 	public enum CellRendererState {
 		SELECTED,
@@ -761,7 +763,7 @@
 		SORTED,
 		FOCUSED
 	}
-	[CCode (cprefix = "GTK_DEBUG_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_DEBUG_", cheader_filename = "gtk/gtk.h")]
 	[Flags]
 	public enum DebugFlag {
 		MISC,
@@ -777,7 +779,7 @@
 		PRINTING,
 		BUILDER
 	}
-	[CCode (cprefix = "GTK_DEST_DEFAULT_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_DEST_DEFAULT_", cheader_filename = "gtk/gtk.h")]
 	[Flags]
 	public enum DestDefaults {
 		MOTION,
@@ -785,14 +787,14 @@
 		DROP,
 		ALL
 	}
-	[CCode (cprefix = "GTK_DIALOG_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_DIALOG_", cheader_filename = "gtk/gtk.h")]
 	[Flags]
 	public enum DialogFlags {
 		MODAL,
 		DESTROY_WITH_PARENT,
 		NO_SEPARATOR
 	}
-	[CCode (cprefix = "GTK_FILE_FILTER_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_FILE_FILTER_", cheader_filename = "gtk/gtk.h")]
 	[Flags]
 	public enum FileFilterFlags {
 		FILENAME,
@@ -800,15 +802,16 @@
 		DISPLAY_NAME,
 		MIME_TYPE
 	}
-	[CCode (cprefix = "GTK_ICON_LOOKUP_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_ICON_LOOKUP_", cheader_filename = "gtk/gtk.h")]
 	[Flags]
 	public enum IconLookupFlags {
 		NO_SVG,
 		FORCE_SVG,
 		USE_BUILTIN,
-		GENERIC_FALLBACK
+		GENERIC_FALLBACK,
+		FORCE_SIZE
 	}
-	[CCode (cprefix = "GTK_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_", cheader_filename = "gtk/gtk.h")]
 	[Flags]
 	public enum ObjectFlags {
 		IN_DESTRUCTION,
@@ -816,7 +819,7 @@
 		RESERVED_1,
 		RESERVED_2
 	}
-	[CCode (cprefix = "PRIVATE_GTK_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "PRIVATE_GTK_", cheader_filename = "gtk/gtk.h")]
 	[Flags]
 	public enum PrivateFlags {
 		USER_STYLE,
@@ -832,7 +835,7 @@
 		ALLOC_NEEDED,
 		REQUEST_NEEDED
 	}
-	[CCode (cprefix = "GTK_RC_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_RC_", cheader_filename = "gtk/gtk.h")]
 	[Flags]
 	public enum RcFlags {
 		FG,
@@ -840,7 +843,7 @@
 		TEXT,
 		BASE
 	}
-	[CCode (cprefix = "GTK_RECENT_FILTER_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_RECENT_FILTER_", cheader_filename = "gtk/gtk.h")]
 	[Flags]
 	public enum RecentFilterFlags {
 		URI,
@@ -850,7 +853,7 @@
 		GROUP,
 		AGE
 	}
-	[CCode (cprefix = "GTK_RUN_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_RUN_", cheader_filename = "gtk/gtk.h")]
 	[Flags]
 	public enum SignalRunType {
 		FIRST,
@@ -860,7 +863,7 @@
 		ACTION,
 		NO_HOOKS
 	}
-	[CCode (cprefix = "GTK_TARGET_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_TARGET_", cheader_filename = "gtk/gtk.h")]
 	[Flags]
 	public enum TargetFlags {
 		SAME_APP,
@@ -868,19 +871,19 @@
 		OTHER_APP,
 		OTHER_WIDGET
 	}
-	[CCode (cprefix = "GTK_TEXT_SEARCH_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_TEXT_SEARCH_", cheader_filename = "gtk/gtk.h")]
 	[Flags]
 	public enum TextSearchFlags {
 		VISIBLE_ONLY,
 		TEXT_ONLY
 	}
-	[CCode (cprefix = "GTK_TREE_MODEL_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_TREE_MODEL_", cheader_filename = "gtk/gtk.h")]
 	[Flags]
 	public enum TreeModelFlags {
 		ITERS_PERSIST,
 		LIST_ONLY
 	}
-	[CCode (cprefix = "GTK_UI_MANAGER_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_UI_MANAGER_", cheader_filename = "gtk/gtk.h")]
 	[Flags]
 	public enum UIManagerItemType {
 		AUTO,
@@ -894,7 +897,7 @@
 		SEPARATOR,
 		ACCELERATOR
 	}
-	[CCode (cprefix = "GTK_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "GTK_", cheader_filename = "gtk/gtk.h")]
 	[Flags]
 	public enum WidgetFlags {
 		TOPLEVEL,
@@ -926,6 +929,7 @@
 		INVALID_TAG,
 		MISSING_PROPERTY_VALUE,
 		INVALID_VALUE,
+		VERSION_MISMATCH,
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Widget : Gtk.Object, Atk.Implementor, Gtk.Buildable {
@@ -987,6 +991,7 @@
 		public weak Gdk.Screen get_screen ();
 		public weak Gtk.Settings get_settings ();
 		public void get_size_request (out int width, out int height);
+		public weak Gdk.Pixmap get_snapshot (Gdk.Rectangle clip_rect);
 		public weak Gtk.Style get_style ();
 		public weak string get_tooltip_markup ();
 		public weak string get_tooltip_text ();
@@ -1107,6 +1112,7 @@
 		public virtual signal bool client_event (Gdk.Event event);
 		public virtual signal void composited_changed ();
 		public virtual signal bool configure_event (Gdk.Event event);
+		public virtual signal bool damage_event (Gdk.Event p0);
 		public virtual signal bool delete_event (Gdk.Event event);
 		public virtual signal bool destroy_event (Gdk.Event event);
 		public virtual signal void direction_changed (Gtk.TextDirection previous_direction);
@@ -1200,6 +1206,8 @@
 	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Arg {
+		public weak Gtk.Type type;
+		public weak string name;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -1291,6 +1299,13 @@
 	}
 	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class ImageGIconData {
+		public weak GLib.Icon icon;
+		public weak Gdk.Pixbuf pixbuf;
+		public uint theme_change_id;
+	}
+	[Compact]
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ImageIconNameData {
 		public weak string icon_name;
 		public weak Gdk.Pixbuf pixbuf;
@@ -1327,6 +1342,10 @@
 	}
 	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class MountOperationClass {
+	}
+	[Compact]
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class NotebookPage {
 		public static int num (Gtk.Notebook notebook, Gtk.Widget child);
 	}
@@ -1482,6 +1501,7 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Type {
 		public void* @class ();
+		public static void init (GLib.TypeDebugFlags debug_flags);
 	}
 	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -1515,6 +1535,7 @@
 		public bool get_embedded_rect (out Gdk.Rectangle rectangle);
 		public weak string get_filename ();
 		public weak Gdk.Pixbuf load_icon () throws GLib.Error;
+		public IconInfo.for_pixbuf (Gtk.IconTheme icon_theme, Gdk.Pixbuf pixbuf);
 		public void set_raw_coordinates (bool raw_coordinates);
 	}
 	[Compact]
@@ -2129,15 +2150,22 @@
 		public weak char[] grow_space;
 		public void clear_marks ();
 		public void get_date (out uint year, out uint month, out uint day);
+		public int get_detail_height_rows ();
+		public int get_detail_width_chars ();
 		public Gtk.CalendarDisplayOptions get_display_options ();
 		public bool mark_day (uint day);
 		public Calendar ();
 		public void select_day (uint day);
 		public bool select_month (uint month, uint year);
+		public void set_detail_func (Gtk.CalendarDetailFunc func, void* data, GLib.DestroyNotify destroy);
+		public void set_detail_height_rows (int rows);
+		public void set_detail_width_chars (int chars);
 		public void set_display_options (Gtk.CalendarDisplayOptions flags);
 		public bool unmark_day (uint day);
 		[NoAccessorMethod]
 		public int day { get; set; }
+		public int detail_height_rows { get; set; }
+		public int detail_width_chars { get; set; }
 		[NoAccessorMethod]
 		public int month { get; set; }
 		[NoAccessorMethod]
@@ -2145,6 +2173,8 @@
 		[NoAccessorMethod]
 		public bool show_day_names { get; set; }
 		[NoAccessorMethod]
+		public bool show_details { get; set; }
+		[NoAccessorMethod]
 		public bool show_heading { get; set; }
 		[NoAccessorMethod]
 		public bool show_week_numbers { get; set; }
@@ -2227,6 +2257,7 @@
 		public Gtk.TreeModel model { get; set; }
 		[NoAccessorMethod]
 		public int text_column { get; set; }
+		public virtual signal void changed (string p0, Gtk.TreeIter p1);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class CellRendererPixbuf : Gtk.CellRenderer {
@@ -2754,6 +2785,8 @@
 		public void set_visibility (bool visible);
 		public void set_width_chars (int n_chars);
 		public int text_index_to_layout_index (int text_index);
+		[NoWrapper]
+		public virtual void get_text_area_size (int x, int y, int width, int height);
 		public bool activates_default { get; set; }
 		[NoAccessorMethod]
 		public int cursor_position { get; }
@@ -3107,7 +3140,7 @@
 		public IMMulticontext ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class IconFactory : GLib.Object {
+	public class IconFactory : GLib.Object, Gtk.Buildable {
 		public weak GLib.HashTable icons;
 		public void add (string stock_id, Gtk.IconSet icon_set);
 		public void add_default ();
@@ -3131,6 +3164,7 @@
 		public weak GLib.List list_contexts ();
 		public weak GLib.List list_icons (string context);
 		public weak Gdk.Pixbuf load_icon (string icon_name, int size, Gtk.IconLookupFlags flags) throws GLib.Error;
+		public weak Gtk.IconInfo lookup_by_gicon (GLib.Icon icon, int size, Gtk.IconLookupFlags flags);
 		public weak Gtk.IconInfo lookup_icon (string icon_name, int size, Gtk.IconLookupFlags flags);
 		public IconTheme ();
 		public void prepend_search_path (string path);
@@ -3224,6 +3258,7 @@
 	public class Image : Gtk.Misc, Atk.Implementor, Gtk.Buildable {
 		public void clear ();
 		public weak Gdk.PixbufAnimation get_animation ();
+		public void get_gicon (out weak GLib.Icon gicon, Gtk.IconSize size);
 		public void get_icon_name (out weak string icon_name, out Gtk.IconSize size);
 		public void get_icon_set (out weak Gtk.IconSet icon_set, out Gtk.IconSize size);
 		public void get_image (out weak Gdk.Image gdk_image, out weak Gdk.Bitmap mask);
@@ -3235,6 +3270,7 @@
 		public Image ();
 		public Image.from_animation (Gdk.PixbufAnimation animation);
 		public Image.from_file (string filename);
+		public Image.from_gicon (GLib.Icon icon, Gtk.IconSize size);
 		public Image.from_icon_name (string icon_name, Gtk.IconSize size);
 		public Image.from_icon_set (Gtk.IconSet icon_set, Gtk.IconSize size);
 		public Image.from_image (Gdk.Image image, Gdk.Bitmap mask);
@@ -3243,6 +3279,7 @@
 		public Image.from_stock (string stock_id, Gtk.IconSize size);
 		public void set_from_animation (Gdk.PixbufAnimation animation);
 		public void set_from_file (string filename);
+		public void set_from_gicon (GLib.Icon icon, Gtk.IconSize size);
 		public void set_from_icon_name (string icon_name, Gtk.IconSize size);
 		public void set_from_icon_set (Gtk.IconSet icon_set, Gtk.IconSize size);
 		public void set_from_image (Gdk.Image gdk_image, Gdk.Bitmap mask);
@@ -3253,6 +3290,8 @@
 		[NoAccessorMethod]
 		public string file { get; set; }
 		[NoAccessorMethod]
+		public GLib.Icon gicon { get; set; }
+		[NoAccessorMethod]
 		public string icon_name { get; set; }
 		[NoAccessorMethod]
 		public Gtk.IconSet icon_set { get; set; }
@@ -3652,6 +3691,18 @@
 		public int ypad { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class MountOperation : GLib.MountOperation {
+		public weak Gtk.Window get_parent ();
+		public weak Gdk.Screen get_screen ();
+		public MountOperation (Gtk.Window parent);
+		public void set_parent (Gtk.Window parent);
+		public void set_screen (Gdk.Screen screen);
+		[NoAccessorMethod]
+		public bool is_showing { get; }
+		public Gtk.Window parent { get; set; }
+		public Gtk.Window screen { get; set; }
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Notebook : Gtk.Container, Atk.Implementor, Gtk.Buildable {
 		public weak Gtk.NotebookPage cur_page;
 		public weak GLib.List children;
@@ -3767,6 +3818,8 @@
 		public double get_paper_width (Gtk.Unit unit);
 		public double get_right_margin (Gtk.Unit unit);
 		public double get_top_margin (Gtk.Unit unit);
+		public bool load_file (string file_name) throws GLib.Error;
+		public bool load_key_file (GLib.KeyFile key_file, string group_name) throws GLib.Error;
 		public PageSetup ();
 		public PageSetup.from_file (string file_name) throws GLib.Error;
 		public PageSetup.from_key_file (GLib.KeyFile key_file, string group_name) throws GLib.Error;
@@ -3804,6 +3857,7 @@
 		public int original_position;
 		public void add1 (Gtk.Widget child);
 		public void add2 (Gtk.Widget child);
+		public void compute_position (int allocation, int child1_req, int child2_req);
 		public weak Gtk.Widget get_child1 ();
 		public weak Gtk.Widget get_child2 ();
 		public int get_position ();
@@ -3944,6 +3998,8 @@
 		public double get_scale ();
 		public bool get_use_color ();
 		public bool has_key (string key);
+		public bool load_file (string file_name) throws GLib.Error;
+		public bool load_key_file (GLib.KeyFile key_file, string group_name) throws GLib.Error;
 		public PrintSettings ();
 		public PrintSettings.from_file (string file_name) throws GLib.Error;
 		public PrintSettings.from_key_file (GLib.KeyFile key_file, string group_name) throws GLib.Error;
@@ -4388,10 +4444,14 @@
 		[NoAccessorMethod]
 		public string gtk_font_name { get; set; }
 		[NoAccessorMethod]
+		public int gtk_fontconfig_timestamp { get; set; }
+		[NoAccessorMethod]
 		public string gtk_icon_sizes { get; set; }
 		[NoAccessorMethod]
 		public string gtk_icon_theme_name { get; set; }
 		[NoAccessorMethod]
+		public string gtk_im_module { get; set; }
+		[NoAccessorMethod]
 		public string gtk_key_theme_name { get; set; }
 		[NoAccessorMethod]
 		public bool gtk_keynav_cursor_only { get; set; }
@@ -4408,6 +4468,8 @@
 		[NoAccessorMethod]
 		public int gtk_recent_files_limit { get; set; }
 		[NoAccessorMethod]
+		public int gtk_recent_files_max_age { get; set; }
+		[NoAccessorMethod]
 		public bool gtk_show_input_method_menu { get; set; }
 		[NoAccessorMethod]
 		public bool gtk_show_unicode_menu { get; set; }
@@ -4540,6 +4602,7 @@
 		public weak string get_stock ();
 		public Gtk.ImageType get_storage_type ();
 		public bool get_visible ();
+		public uint get_x11_window_id ();
 		public bool is_embedded ();
 		public StatusIcon ();
 		public StatusIcon.from_file (string filename);
@@ -5247,7 +5310,7 @@
 		public virtual signal void toolbar_reconfigured ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Toolbar : Gtk.Container, Atk.Implementor, Gtk.Buildable {
+	public class Toolbar : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.ToolShell {
 		public int num_children;
 		public weak GLib.List children;
 		public Gtk.ToolbarStyle style;
@@ -5255,14 +5318,10 @@
 		public int button_maxh;
 		public uint style_set;
 		public int get_drop_index (int x, int y);
-		public Gtk.IconSize get_icon_size ();
 		public int get_item_index (Gtk.ToolItem item);
 		public int get_n_items ();
 		public weak Gtk.ToolItem get_nth_item (int n);
-		public Gtk.Orientation get_orientation ();
-		public Gtk.ReliefStyle get_relief_style ();
 		public bool get_show_arrow ();
-		public Gtk.ToolbarStyle get_style ();
 		public bool get_tooltips ();
 		public void insert (Gtk.ToolItem item, int pos);
 		public Toolbar ();
@@ -5291,6 +5350,7 @@
 	public class Tooltip : GLib.Object {
 		public void set_custom (Gtk.Widget custom_widget);
 		public void set_icon (Gdk.Pixbuf pixbuf);
+		public void set_icon_from_icon_name (string icon_name, Gtk.IconSize size);
 		public void set_icon_from_stock (string stock_id, Gtk.IconSize size);
 		public void set_markup (string markup);
 		public void set_text (string text);
@@ -5334,7 +5394,7 @@
 		public uint deleted_id;
 		public uint reordered_id;
 		public void clear_cache ();
-		public void convert_child_iter_to_iter (out Gtk.TreeIter sort_iter, Gtk.TreeIter child_iter);
+		public bool convert_child_iter_to_iter (out Gtk.TreeIter sort_iter, Gtk.TreeIter child_iter);
 		public weak Gtk.TreePath convert_child_path_to_path (Gtk.TreePath child_path);
 		public void convert_iter_to_child_iter (out Gtk.TreeIter child_iter, Gtk.TreeIter sorted_iter);
 		public weak Gtk.TreePath convert_path_to_child_path (Gtk.TreePath sorted_path);
@@ -6076,6 +6136,14 @@
 		public virtual signal void selection_changed ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public interface ToolShell : Gtk.Widget {
+		public abstract Gtk.IconSize get_icon_size ();
+		public abstract Gtk.Orientation get_orientation ();
+		public abstract Gtk.ReliefStyle get_relief_style ();
+		public abstract Gtk.ToolbarStyle get_style ();
+		public abstract void rebuild_menu ();
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public interface TreeDragDest {
 		public abstract bool drag_data_received (Gtk.TreePath dest, Gtk.SelectionData selection_data);
 		public abstract bool row_drop_possible (Gtk.TreePath dest_path, Gtk.SelectionData selection_data);
@@ -6190,6 +6258,8 @@
 		public int bottom;
 		public Gtk.Border copy ();
 		public void free ();
+		[CCode (cname = "gtk_border_new")]
+		public Border ();
 	}
 	[CCode (type_id = "GTK_TYPE_REQUISITION", cheader_filename = "gtk/gtk.h")]
 	public struct Requisition {
@@ -6333,6 +6403,8 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void BuilderConnectFunc (Gtk.Builder builder, GLib.Object object, string signal_name, string handler_name, GLib.Object connect_object, GLib.ConnectFlags flags);
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public delegate weak string CalendarDetailFunc (Gtk.Calendar calendar, uint year, uint month, uint day);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void Callback (Gtk.Widget widget);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void CellLayoutDataFunc (Gtk.CellLayout cell_layout, Gtk.CellRenderer cell, Gtk.TreeModel tree_model, Gtk.TreeIter iter);
@@ -6665,14 +6737,22 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_ORIENTATION_REVERSE_PORTRAIT;
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STOCK_PAGE_SETUP;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_PASTE;
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_PREFERENCES;
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_PRINT;
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STOCK_PRINT_ERROR;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_PRINT_PREVIEW;
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STOCK_PRINT_REPORT;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const string STOCK_PRINT_WARNING;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_PROPERTIES;
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_QUIT;
@@ -6913,7 +6993,7 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void paint_option (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void paint_polygon (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, Gdk.Point points, int npoints, bool fill);
+	public static void paint_polygon (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, Gdk.Point[] points, bool fill);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void paint_resize_grip (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, Gdk.WindowEdge edge, int x, int y, int width, int height);
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -6991,6 +7071,8 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void selection_add_targets (Gtk.Widget widget, Gdk.Atom selection, Gtk.TargetEntry[] targets, uint ntargets);
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static bool selection_clear (Gtk.Widget widget, Gdk.EventSelection event);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void selection_clear_targets (Gtk.Widget widget, Gdk.Atom selection);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool selection_convert (Gtk.Widget widget, Gdk.Atom selection, Gdk.Atom target, uint time_);
@@ -7005,6 +7087,8 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void show_about_dialog (Gtk.Window parent, ...);
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static bool show_uri (Gdk.Screen screen, string uri, uint timestamp) throws GLib.Error;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void stock_add (Gtk.StockItem[] items);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void stock_add_static (Gtk.StockItem[] items);
@@ -7027,6 +7111,38 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool targets_include_uri (Gdk.Atom[] targets);
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static weak Gtk.Widget test_create_simple_window (string window_title, string dialog_text);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static weak Gtk.Widget test_create_widget (GLib.Type widget_type, ...);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static weak Gtk.Widget test_display_button_window (string window_title, string dialog_text);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static weak Gtk.Widget test_find_label (Gtk.Widget widget, string label_pattern);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static weak Gtk.Widget test_find_sibling (Gtk.Widget base_widget, GLib.Type widget_type);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static weak Gtk.Widget test_find_widget (Gtk.Widget widget, string label_pattern, GLib.Type widget_type);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static void test_init (int argcp, out weak string argvp);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static weak GLib.Type[] test_list_all_types (uint n_types);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static void test_register_all_types ();
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static double test_slider_get_value (Gtk.Widget widget);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static void test_slider_set_perc (Gtk.Widget widget, double percentage);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static bool test_spin_button_click (Gtk.SpinButton spinner, uint button, bool upwards);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static weak string test_text_get (Gtk.Widget widget);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static void test_text_set (Gtk.Widget widget, string str);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static bool test_widget_click (Gtk.Widget widget, uint button, Gdk.ModifierType modifiers);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static bool test_widget_send_key (Gtk.Widget widget, uint keyval, Gdk.ModifierType modifiers);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool tree_get_row_drag_data (Gtk.SelectionData selection_data, out weak Gtk.TreeModel tree_model, out weak Gtk.TreePath path);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool tree_set_row_drag_data (Gtk.SelectionData selection_data, Gtk.TreeModel tree_model, Gtk.TreePath path);

Modified: trunk/vapi/packages/atk/atk.gi
==============================================================================
--- trunk/vapi/packages/atk/atk.gi	(original)
+++ trunk/vapi/packages/atk/atk.gi	Sun Jun 15 20:14:19 2008
@@ -193,16 +193,16 @@
 			<field name="width" type="gint"/>
 			<field name="height" type="gint"/>
 		</boxed>
-		<enum name="AtkCoordType">
+		<enum name="AtkCoordType" type-name="AtkCoordType" get-type="atk_coord_type_get_type">
 			<member name="ATK_XY_SCREEN" value="0"/>
 			<member name="ATK_XY_WINDOW" value="1"/>
 		</enum>
-		<enum name="AtkKeyEventType">
+		<enum name="AtkKeyEventType" type-name="AtkKeyEventType" get-type="atk_key_event_type_get_type">
 			<member name="ATK_KEY_EVENT_PRESS" value="0"/>
 			<member name="ATK_KEY_EVENT_RELEASE" value="1"/>
 			<member name="ATK_KEY_EVENT_LAST_DEFINED" value="2"/>
 		</enum>
-		<enum name="AtkLayer">
+		<enum name="AtkLayer" type-name="AtkLayer" get-type="atk_layer_get_type">
 			<member name="ATK_LAYER_INVALID" value="0"/>
 			<member name="ATK_LAYER_BACKGROUND" value="1"/>
 			<member name="ATK_LAYER_CANVAS" value="2"/>
@@ -212,7 +212,7 @@
 			<member name="ATK_LAYER_OVERLAY" value="6"/>
 			<member name="ATK_LAYER_WINDOW" value="7"/>
 		</enum>
-		<enum name="AtkRelationType">
+		<enum name="AtkRelationType" type-name="AtkRelationType" get-type="atk_relation_type_get_type">
 			<member name="ATK_RELATION_NULL" value="0"/>
 			<member name="ATK_RELATION_CONTROLLED_BY" value="1"/>
 			<member name="ATK_RELATION_CONTROLLER_FOR" value="2"/>
@@ -231,7 +231,7 @@
 			<member name="ATK_RELATION_DESCRIPTION_FOR" value="15"/>
 			<member name="ATK_RELATION_LAST_DEFINED" value="16"/>
 		</enum>
-		<enum name="AtkRole">
+		<enum name="AtkRole" type-name="AtkRole" get-type="atk_role_get_type">
 			<member name="ATK_ROLE_INVALID" value="0"/>
 			<member name="ATK_ROLE_ACCEL_LABEL" value="1"/>
 			<member name="ATK_ROLE_ALERT" value="2"/>
@@ -322,7 +322,7 @@
 			<member name="ATK_ROLE_INPUT_METHOD_WINDOW" value="87"/>
 			<member name="ATK_ROLE_LAST_DEFINED" value="88"/>
 		</enum>
-		<enum name="AtkStateType">
+		<enum name="AtkStateType" type-name="AtkStateType" get-type="atk_state_type_get_type">
 			<member name="ATK_STATE_INVALID" value="0"/>
 			<member name="ATK_STATE_ACTIVE" value="1"/>
 			<member name="ATK_STATE_ARMED" value="2"/>
@@ -364,7 +364,7 @@
 			<member name="ATK_STATE_VISITED" value="38"/>
 			<member name="ATK_STATE_LAST_DEFINED" value="39"/>
 		</enum>
-		<enum name="AtkTextAttribute">
+		<enum name="AtkTextAttribute" type-name="AtkTextAttribute" get-type="atk_text_attribute_get_type">
 			<member name="ATK_TEXT_ATTR_INVALID" value="0"/>
 			<member name="ATK_TEXT_ATTR_LEFT_MARGIN" value="1"/>
 			<member name="ATK_TEXT_ATTR_RIGHT_MARGIN" value="2"/>
@@ -395,7 +395,7 @@
 			<member name="ATK_TEXT_ATTR_STYLE" value="27"/>
 			<member name="ATK_TEXT_ATTR_LAST_DEFINED" value="28"/>
 		</enum>
-		<enum name="AtkTextBoundary">
+		<enum name="AtkTextBoundary" type-name="AtkTextBoundary" get-type="atk_text_boundary_get_type">
 			<member name="ATK_TEXT_BOUNDARY_CHAR" value="0"/>
 			<member name="ATK_TEXT_BOUNDARY_WORD_START" value="1"/>
 			<member name="ATK_TEXT_BOUNDARY_WORD_END" value="2"/>
@@ -404,13 +404,13 @@
 			<member name="ATK_TEXT_BOUNDARY_LINE_START" value="5"/>
 			<member name="ATK_TEXT_BOUNDARY_LINE_END" value="6"/>
 		</enum>
-		<enum name="AtkTextClipType">
+		<enum name="AtkTextClipType" type-name="AtkTextClipType" get-type="atk_text_clip_type_get_type">
 			<member name="ATK_TEXT_CLIP_NONE" value="0"/>
 			<member name="ATK_TEXT_CLIP_MIN" value="1"/>
 			<member name="ATK_TEXT_CLIP_MAX" value="2"/>
 			<member name="ATK_TEXT_CLIP_BOTH" value="3"/>
 		</enum>
-		<flags name="AtkHyperlinkStateFlags">
+		<flags name="AtkHyperlinkStateFlags" type-name="AtkHyperlinkStateFlags" get-type="atk_hyperlink_state_flags_get_type">
 			<member name="ATK_HYPERLINK_IS_INLINE" value="1"/>
 		</flags>
 		<object name="AtkGObjectAccessible" parent="AtkObject" type-name="AtkGObjectAccessible" get-type="atk_gobject_accessible_get_type">
@@ -573,16 +573,16 @@
 		</object>
 		<object name="AtkNoOpObject" parent="AtkObject" type-name="AtkNoOpObject" get-type="atk_no_op_object_get_type">
 			<implements>
-				<interface name="AtkTable"/>
-				<interface name="AtkAction"/>
 				<interface name="AtkText"/>
-				<interface name="AtkEditableText"/>
-				<interface name="AtkSelection"/>
-				<interface name="AtkComponent"/>
-				<interface name="AtkDocument"/>
+				<interface name="AtkAction"/>
 				<interface name="AtkHypertext"/>
+				<interface name="AtkSelection"/>
+				<interface name="AtkTable"/>
 				<interface name="AtkImage"/>
 				<interface name="AtkValue"/>
+				<interface name="AtkComponent"/>
+				<interface name="AtkEditableText"/>
+				<interface name="AtkDocument"/>
 			</implements>
 			<constructor name="new" symbol="atk_no_op_object_new">
 				<return-type type="AtkObject*"/>

Modified: trunk/vapi/packages/gdk-2.0/gdk-2.0.defines
==============================================================================
--- trunk/vapi/packages/gdk-2.0/gdk-2.0.defines	(original)
+++ trunk/vapi/packages/gdk-2.0/gdk-2.0.defines	Sun Jun 15 20:14:19 2008
@@ -1,2 +1,3 @@
+-DGDK_COMPILATION
 -DGDK_DISABLE_DEPRECATED
 

Modified: trunk/vapi/packages/gdk-2.0/gdk-2.0.deps
==============================================================================
--- trunk/vapi/packages/gdk-2.0/gdk-2.0.deps	(original)
+++ trunk/vapi/packages/gdk-2.0/gdk-2.0.deps	Sun Jun 15 20:14:19 2008
@@ -1,3 +1,4 @@
+gio-2.0
 gdk-pixbuf-2.0
 cairo
 pango

Modified: trunk/vapi/packages/gdk-2.0/gdk-2.0.files
==============================================================================
--- trunk/vapi/packages/gdk-2.0/gdk-2.0.files	(original)
+++ trunk/vapi/packages/gdk-2.0/gdk-2.0.files	Sun Jun 15 20:14:19 2008
@@ -1,2 +1,3 @@
+include/gtk-2.0/gdk/gdk.h
 include/gtk-2.0/gdk
 lib/libgdk-x11-2.0.so

Modified: trunk/vapi/packages/gdk-2.0/gdk-2.0.gi
==============================================================================
--- trunk/vapi/packages/gdk-2.0/gdk-2.0.gi	(original)
+++ trunk/vapi/packages/gdk-2.0/gdk-2.0.gi	Sun Jun 15 20:14:19 2008
@@ -63,6 +63,26 @@
 				<parameter name="pixmap_y" type="double"/>
 			</parameters>
 		</function>
+		<function name="colors_alloc" symbol="gdk_colors_alloc">
+			<return-type type="gint"/>
+			<parameters>
+				<parameter name="colormap" type="GdkColormap*"/>
+				<parameter name="contiguous" type="gboolean"/>
+				<parameter name="planes" type="gulong*"/>
+				<parameter name="nplanes" type="gint"/>
+				<parameter name="pixels" type="gulong*"/>
+				<parameter name="npixels" type="gint"/>
+			</parameters>
+		</function>
+		<function name="colors_free" symbol="gdk_colors_free">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="colormap" type="GdkColormap*"/>
+				<parameter name="pixels" type="gulong*"/>
+				<parameter name="npixels" type="gint"/>
+				<parameter name="planes" type="gulong"/>
+			</parameters>
+		</function>
 		<function name="devices_list" symbol="gdk_devices_list">
 			<return-type type="GList*"/>
 		</function>
@@ -313,7 +333,7 @@
 				<parameter name="drawable" type="GdkDrawable*"/>
 				<parameter name="gc" type="GdkGC*"/>
 				<parameter name="points" type="GdkPoint*"/>
-				<parameter name="npoints" type="gint"/>
+				<parameter name="n_points" type="gint"/>
 			</parameters>
 		</function>
 		<function name="draw_pixbuf" symbol="gdk_draw_pixbuf">
@@ -348,7 +368,7 @@
 				<parameter name="drawable" type="GdkDrawable*"/>
 				<parameter name="gc" type="GdkGC*"/>
 				<parameter name="points" type="GdkPoint*"/>
-				<parameter name="npoints" type="gint"/>
+				<parameter name="n_points" type="gint"/>
 			</parameters>
 		</function>
 		<function name="draw_polygon" symbol="gdk_draw_polygon">
@@ -358,7 +378,7 @@
 				<parameter name="gc" type="GdkGC*"/>
 				<parameter name="filled" type="gboolean"/>
 				<parameter name="points" type="GdkPoint*"/>
-				<parameter name="npoints" type="gint"/>
+				<parameter name="n_points" type="gint"/>
 			</parameters>
 		</function>
 		<function name="draw_rectangle" symbol="gdk_draw_rectangle">
@@ -439,7 +459,31 @@
 				<parameter name="drawable" type="GdkDrawable*"/>
 				<parameter name="gc" type="GdkGC*"/>
 				<parameter name="segs" type="GdkSegment*"/>
-				<parameter name="nsegs" type="gint"/>
+				<parameter name="n_segs" type="gint"/>
+			</parameters>
+		</function>
+		<function name="draw_text" symbol="gdk_draw_text">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="drawable" type="GdkDrawable*"/>
+				<parameter name="font" type="GdkFont*"/>
+				<parameter name="gc" type="GdkGC*"/>
+				<parameter name="x" type="gint"/>
+				<parameter name="y" type="gint"/>
+				<parameter name="text" type="gchar*"/>
+				<parameter name="text_length" type="gint"/>
+			</parameters>
+		</function>
+		<function name="draw_text_wc" symbol="gdk_draw_text_wc">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="drawable" type="GdkDrawable*"/>
+				<parameter name="font" type="GdkFont*"/>
+				<parameter name="gc" type="GdkGC*"/>
+				<parameter name="x" type="gint"/>
+				<parameter name="y" type="gint"/>
+				<parameter name="text" type="GdkWChar*"/>
+				<parameter name="text_length" type="gint"/>
 			</parameters>
 		</function>
 		<function name="draw_trapezoids" symbol="gdk_draw_trapezoids">
@@ -479,6 +523,13 @@
 		<function name="flush" symbol="gdk_flush">
 			<return-type type="void"/>
 		</function>
+		<function name="fontset_load_for_display" symbol="gdk_fontset_load_for_display">
+			<return-type type="GdkFont*"/>
+			<parameters>
+				<parameter name="display" type="GdkDisplay*"/>
+				<parameter name="fontset_name" type="gchar*"/>
+			</parameters>
+		</function>
 		<function name="free_compound_text" symbol="gdk_free_compound_text">
 			<return-type type="void"/>
 			<parameters>
@@ -1007,6 +1058,34 @@
 				<parameter name="set_flags" type="GdkWindowState"/>
 			</parameters>
 		</function>
+		<function name="test_render_sync" symbol="gdk_test_render_sync">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="window" type="GdkWindow*"/>
+			</parameters>
+		</function>
+		<function name="test_simulate_button" symbol="gdk_test_simulate_button">
+			<return-type type="gboolean"/>
+			<parameters>
+				<parameter name="window" type="GdkWindow*"/>
+				<parameter name="x" type="gint"/>
+				<parameter name="y" type="gint"/>
+				<parameter name="button" type="guint"/>
+				<parameter name="modifiers" type="GdkModifierType"/>
+				<parameter name="button_pressrelease" type="GdkEventType"/>
+			</parameters>
+		</function>
+		<function name="test_simulate_key" symbol="gdk_test_simulate_key">
+			<return-type type="gboolean"/>
+			<parameters>
+				<parameter name="window" type="GdkWindow*"/>
+				<parameter name="x" type="gint"/>
+				<parameter name="y" type="gint"/>
+				<parameter name="keyval" type="guint"/>
+				<parameter name="modifiers" type="GdkModifierType"/>
+				<parameter name="key_pressrelease" type="GdkEventType"/>
+			</parameters>
+		</function>
 		<function name="text_property_to_text_list" symbol="gdk_text_property_to_text_list">
 			<return-type type="gint"/>
 			<parameters>
@@ -1168,6 +1247,8 @@
 				<parameter name="data" type="gpointer"/>
 			</parameters>
 		</callback>
+		<struct name="GdkAppLaunchContextClass">
+		</struct>
 		<struct name="GdkAtom">
 			<method name="intern" symbol="gdk_atom_intern">
 				<return-type type="GdkAtom"/>
@@ -1399,8 +1480,6 @@
 			<field name="changed_mask" type="GdkWindowState"/>
 			<field name="new_window_state" type="GdkWindowState"/>
 		</struct>
-		<struct name="GdkFont">
-		</struct>
 		<struct name="GdkGCValues">
 			<field name="foreground" type="GdkColor"/>
 			<field name="background" type="GdkColor"/>
@@ -1558,7 +1637,7 @@
 				<return-type type="GdkRegion*"/>
 				<parameters>
 					<parameter name="points" type="GdkPoint*"/>
-					<parameter name="npoints" type="gint"/>
+					<parameter name="n_points" type="gint"/>
 					<parameter name="fill_rule" type="GdkFillRule"/>
 				</parameters>
 			</method>
@@ -1714,10 +1793,26 @@
 			<field name="shaped" type="guint"/>
 			<field name="event_mask" type="GdkEventMask"/>
 			<field name="update_and_descendants_freeze_count" type="guint"/>
+			<field name="redirect" type="GdkWindowRedirect*"/>
 		</struct>
 		<struct name="GdkWindowObjectClass">
 			<field name="parent_class" type="GdkDrawableClass"/>
 		</struct>
+		<struct name="GdkWindowRedirect">
+			<method name="to_drawable" symbol="gdk_window_redirect_to_drawable">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="drawable" type="GdkDrawable*"/>
+					<parameter name="src_x" type="gint"/>
+					<parameter name="src_y" type="gint"/>
+					<parameter name="dest_x" type="gint"/>
+					<parameter name="dest_y" type="gint"/>
+					<parameter name="width" type="gint"/>
+					<parameter name="height" type="gint"/>
+				</parameters>
+			</method>
+		</struct>
 		<struct name="GdkXEvent">
 		</struct>
 		<boxed name="GdkColor" type-name="GdkColor" get-type="gdk_color_get_type">
@@ -1976,6 +2071,50 @@
 			<field name="setting" type="GdkEventSetting"/>
 			<field name="grab_broken" type="GdkEventGrabBroken"/>
 		</boxed>
+		<boxed name="GdkFont" type-name="GdkFont" get-type="gdk_font_get_type">
+			<method name="equal" symbol="gdk_font_equal">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="fonta" type="GdkFont*"/>
+					<parameter name="fontb" type="GdkFont*"/>
+				</parameters>
+			</method>
+			<method name="from_description_for_display" symbol="gdk_font_from_description_for_display">
+				<return-type type="GdkFont*"/>
+				<parameters>
+					<parameter name="display" type="GdkDisplay*"/>
+					<parameter name="font_desc" type="PangoFontDescription*"/>
+				</parameters>
+			</method>
+			<method name="id" symbol="gdk_font_id">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="font" type="GdkFont*"/>
+				</parameters>
+			</method>
+			<method name="load_for_display" symbol="gdk_font_load_for_display">
+				<return-type type="GdkFont*"/>
+				<parameters>
+					<parameter name="display" type="GdkDisplay*"/>
+					<parameter name="font_name" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="ref" symbol="gdk_font_ref">
+				<return-type type="GdkFont*"/>
+				<parameters>
+					<parameter name="font" type="GdkFont*"/>
+				</parameters>
+			</method>
+			<method name="unref" symbol="gdk_font_unref">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="font" type="GdkFont*"/>
+				</parameters>
+			</method>
+			<field name="type" type="GdkFontType"/>
+			<field name="ascent" type="gint"/>
+			<field name="descent" type="gint"/>
+		</boxed>
 		<boxed name="GdkRectangle" type-name="GdkRectangle" get-type="gdk_rectangle_get_type">
 			<method name="intersect" symbol="gdk_rectangle_intersect">
 				<return-type type="gboolean"/>
@@ -1998,7 +2137,7 @@
 			<field name="width" type="gint"/>
 			<field name="height" type="gint"/>
 		</boxed>
-		<enum name="GdkAxisUse">
+		<enum name="GdkAxisUse" type-name="GdkAxisUse" get-type="gdk_axis_use_get_type">
 			<member name="GDK_AXIS_IGNORE" value="0"/>
 			<member name="GDK_AXIS_X" value="1"/>
 			<member name="GDK_AXIS_Y" value="2"/>
@@ -2008,22 +2147,22 @@
 			<member name="GDK_AXIS_WHEEL" value="6"/>
 			<member name="GDK_AXIS_LAST" value="7"/>
 		</enum>
-		<enum name="GdkByteOrder">
+		<enum name="GdkByteOrder" type-name="GdkByteOrder" get-type="gdk_byte_order_get_type">
 			<member name="GDK_LSB_FIRST" value="0"/>
 			<member name="GDK_MSB_FIRST" value="1"/>
 		</enum>
-		<enum name="GdkCapStyle">
+		<enum name="GdkCapStyle" type-name="GdkCapStyle" get-type="gdk_cap_style_get_type">
 			<member name="GDK_CAP_NOT_LAST" value="0"/>
 			<member name="GDK_CAP_BUTT" value="1"/>
 			<member name="GDK_CAP_ROUND" value="2"/>
 			<member name="GDK_CAP_PROJECTING" value="3"/>
 		</enum>
-		<enum name="GdkCrossingMode">
+		<enum name="GdkCrossingMode" type-name="GdkCrossingMode" get-type="gdk_crossing_mode_get_type">
 			<member name="GDK_CROSSING_NORMAL" value="0"/>
 			<member name="GDK_CROSSING_GRAB" value="1"/>
 			<member name="GDK_CROSSING_UNGRAB" value="2"/>
 		</enum>
-		<enum name="GdkCursorType">
+		<enum name="GdkCursorType" type-name="GdkCursorType" get-type="gdk_cursor_type_get_type">
 			<member name="GDK_X_CURSOR" value="0"/>
 			<member name="GDK_ARROW" value="2"/>
 			<member name="GDK_BASED_ARROW_DOWN" value="4"/>
@@ -2104,7 +2243,7 @@
 			<member name="GDK_LAST_CURSOR" value="153"/>
 			<member name="GDK_CURSOR_IS_PIXMAP" value="-1"/>
 		</enum>
-		<enum name="GdkDragProtocol">
+		<enum name="GdkDragProtocol" type-name="GdkDragProtocol" get-type="gdk_drag_protocol_get_type">
 			<member name="GDK_DRAG_PROTO_MOTIF" value="0"/>
 			<member name="GDK_DRAG_PROTO_XDND" value="1"/>
 			<member name="GDK_DRAG_PROTO_ROOTWIN" value="2"/>
@@ -2113,7 +2252,7 @@
 			<member name="GDK_DRAG_PROTO_OLE2" value="5"/>
 			<member name="GDK_DRAG_PROTO_LOCAL" value="6"/>
 		</enum>
-		<enum name="GdkEventType">
+		<enum name="GdkEventType" type-name="GdkEventType" get-type="gdk_event_type_get_type">
 			<member name="GDK_NOTHING" value="-1"/>
 			<member name="GDK_DELETE" value="0"/>
 			<member name="GDK_DESTROY" value="1"/>
@@ -2151,32 +2290,33 @@
 			<member name="GDK_SETTING" value="33"/>
 			<member name="GDK_OWNER_CHANGE" value="34"/>
 			<member name="GDK_GRAB_BROKEN" value="35"/>
+			<member name="GDK_DAMAGE" value="36"/>
 		</enum>
-		<enum name="GdkExtensionMode">
+		<enum name="GdkExtensionMode" type-name="GdkExtensionMode" get-type="gdk_extension_mode_get_type">
 			<member name="GDK_EXTENSION_EVENTS_NONE" value="0"/>
 			<member name="GDK_EXTENSION_EVENTS_ALL" value="1"/>
 			<member name="GDK_EXTENSION_EVENTS_CURSOR" value="2"/>
 		</enum>
-		<enum name="GdkFill">
+		<enum name="GdkFill" type-name="GdkFill" get-type="gdk_fill_get_type">
 			<member name="GDK_SOLID" value="0"/>
 			<member name="GDK_TILED" value="1"/>
 			<member name="GDK_STIPPLED" value="2"/>
 			<member name="GDK_OPAQUE_STIPPLED" value="3"/>
 		</enum>
-		<enum name="GdkFillRule">
+		<enum name="GdkFillRule" type-name="GdkFillRule" get-type="gdk_fill_rule_get_type">
 			<member name="GDK_EVEN_ODD_RULE" value="0"/>
 			<member name="GDK_WINDING_RULE" value="1"/>
 		</enum>
-		<enum name="GdkFilterReturn">
+		<enum name="GdkFilterReturn" type-name="GdkFilterReturn" get-type="gdk_filter_return_get_type">
 			<member name="GDK_FILTER_CONTINUE" value="0"/>
 			<member name="GDK_FILTER_TRANSLATE" value="1"/>
 			<member name="GDK_FILTER_REMOVE" value="2"/>
 		</enum>
-		<enum name="GdkFontType">
+		<enum name="GdkFontType" type-name="GdkFontType" get-type="gdk_font_type_get_type">
 			<member name="GDK_FONT_FONT" value="0"/>
 			<member name="GDK_FONT_FONTSET" value="1"/>
 		</enum>
-		<enum name="GdkFunction">
+		<enum name="GdkFunction" type-name="GdkFunction" get-type="gdk_function_get_type">
 			<member name="GDK_COPY" value="0"/>
 			<member name="GDK_INVERT" value="1"/>
 			<member name="GDK_XOR" value="2"/>
@@ -2194,14 +2334,14 @@
 			<member name="GDK_NOR" value="14"/>
 			<member name="GDK_SET" value="15"/>
 		</enum>
-		<enum name="GdkGrabStatus">
+		<enum name="GdkGrabStatus" type-name="GdkGrabStatus" get-type="gdk_grab_status_get_type">
 			<member name="GDK_GRAB_SUCCESS" value="0"/>
 			<member name="GDK_GRAB_ALREADY_GRABBED" value="1"/>
 			<member name="GDK_GRAB_INVALID_TIME" value="2"/>
 			<member name="GDK_GRAB_NOT_VIEWABLE" value="3"/>
 			<member name="GDK_GRAB_FROZEN" value="4"/>
 		</enum>
-		<enum name="GdkGravity">
+		<enum name="GdkGravity" type-name="GdkGravity" get-type="gdk_gravity_get_type">
 			<member name="GDK_GRAVITY_NORTH_WEST" value="1"/>
 			<member name="GDK_GRAVITY_NORTH" value="2"/>
 			<member name="GDK_GRAVITY_NORTH_EAST" value="3"/>
@@ -2213,33 +2353,33 @@
 			<member name="GDK_GRAVITY_SOUTH_EAST" value="9"/>
 			<member name="GDK_GRAVITY_STATIC" value="10"/>
 		</enum>
-		<enum name="GdkImageType">
+		<enum name="GdkImageType" type-name="GdkImageType" get-type="gdk_image_type_get_type">
 			<member name="GDK_IMAGE_NORMAL" value="0"/>
 			<member name="GDK_IMAGE_SHARED" value="1"/>
 			<member name="GDK_IMAGE_FASTEST" value="2"/>
 		</enum>
-		<enum name="GdkInputMode">
+		<enum name="GdkInputMode" type-name="GdkInputMode" get-type="gdk_input_mode_get_type">
 			<member name="GDK_MODE_DISABLED" value="0"/>
 			<member name="GDK_MODE_SCREEN" value="1"/>
 			<member name="GDK_MODE_WINDOW" value="2"/>
 		</enum>
-		<enum name="GdkInputSource">
+		<enum name="GdkInputSource" type-name="GdkInputSource" get-type="gdk_input_source_get_type">
 			<member name="GDK_SOURCE_MOUSE" value="0"/>
 			<member name="GDK_SOURCE_PEN" value="1"/>
 			<member name="GDK_SOURCE_ERASER" value="2"/>
 			<member name="GDK_SOURCE_CURSOR" value="3"/>
 		</enum>
-		<enum name="GdkJoinStyle">
+		<enum name="GdkJoinStyle" type-name="GdkJoinStyle" get-type="gdk_join_style_get_type">
 			<member name="GDK_JOIN_MITER" value="0"/>
 			<member name="GDK_JOIN_ROUND" value="1"/>
 			<member name="GDK_JOIN_BEVEL" value="2"/>
 		</enum>
-		<enum name="GdkLineStyle">
+		<enum name="GdkLineStyle" type-name="GdkLineStyle" get-type="gdk_line_style_get_type">
 			<member name="GDK_LINE_SOLID" value="0"/>
 			<member name="GDK_LINE_ON_OFF_DASH" value="1"/>
 			<member name="GDK_LINE_DOUBLE_DASH" value="2"/>
 		</enum>
-		<enum name="GdkNotifyType">
+		<enum name="GdkNotifyType" type-name="GdkNotifyType" get-type="gdk_notify_type_get_type">
 			<member name="GDK_NOTIFY_ANCESTOR" value="0"/>
 			<member name="GDK_NOTIFY_VIRTUAL" value="1"/>
 			<member name="GDK_NOTIFY_INFERIOR" value="2"/>
@@ -2247,58 +2387,58 @@
 			<member name="GDK_NOTIFY_NONLINEAR_VIRTUAL" value="4"/>
 			<member name="GDK_NOTIFY_UNKNOWN" value="5"/>
 		</enum>
-		<enum name="GdkOverlapType">
+		<enum name="GdkOverlapType" type-name="GdkOverlapType" get-type="gdk_overlap_type_get_type">
 			<member name="GDK_OVERLAP_RECTANGLE_IN" value="0"/>
 			<member name="GDK_OVERLAP_RECTANGLE_OUT" value="1"/>
 			<member name="GDK_OVERLAP_RECTANGLE_PART" value="2"/>
 		</enum>
-		<enum name="GdkOwnerChange">
+		<enum name="GdkOwnerChange" type-name="GdkOwnerChange" get-type="gdk_owner_change_get_type">
 			<member name="GDK_OWNER_CHANGE_NEW_OWNER" value="0"/>
 			<member name="GDK_OWNER_CHANGE_DESTROY" value="1"/>
 			<member name="GDK_OWNER_CHANGE_CLOSE" value="2"/>
 		</enum>
-		<enum name="GdkPropMode">
+		<enum name="GdkPropMode" type-name="GdkPropMode" get-type="gdk_prop_mode_get_type">
 			<member name="GDK_PROP_MODE_REPLACE" value="0"/>
 			<member name="GDK_PROP_MODE_PREPEND" value="1"/>
 			<member name="GDK_PROP_MODE_APPEND" value="2"/>
 		</enum>
-		<enum name="GdkPropertyState">
+		<enum name="GdkPropertyState" type-name="GdkPropertyState" get-type="gdk_property_state_get_type">
 			<member name="GDK_PROPERTY_NEW_VALUE" value="0"/>
 			<member name="GDK_PROPERTY_DELETE" value="1"/>
 		</enum>
-		<enum name="GdkRgbDither">
+		<enum name="GdkRgbDither" type-name="GdkRgbDither" get-type="gdk_rgb_dither_get_type">
 			<member name="GDK_RGB_DITHER_NONE" value="0"/>
 			<member name="GDK_RGB_DITHER_NORMAL" value="1"/>
 			<member name="GDK_RGB_DITHER_MAX" value="2"/>
 		</enum>
-		<enum name="GdkScrollDirection">
+		<enum name="GdkScrollDirection" type-name="GdkScrollDirection" get-type="gdk_scroll_direction_get_type">
 			<member name="GDK_SCROLL_UP" value="0"/>
 			<member name="GDK_SCROLL_DOWN" value="1"/>
 			<member name="GDK_SCROLL_LEFT" value="2"/>
 			<member name="GDK_SCROLL_RIGHT" value="3"/>
 		</enum>
-		<enum name="GdkSettingAction">
+		<enum name="GdkSettingAction" type-name="GdkSettingAction" get-type="gdk_setting_action_get_type">
 			<member name="GDK_SETTING_ACTION_NEW" value="0"/>
 			<member name="GDK_SETTING_ACTION_CHANGED" value="1"/>
 			<member name="GDK_SETTING_ACTION_DELETED" value="2"/>
 		</enum>
-		<enum name="GdkStatus">
+		<enum name="GdkStatus" type-name="GdkStatus" get-type="gdk_status_get_type">
 			<member name="GDK_OK" value="0"/>
 			<member name="GDK_ERROR" value="-1"/>
 			<member name="GDK_ERROR_PARAM" value="-2"/>
 			<member name="GDK_ERROR_FILE" value="-3"/>
 			<member name="GDK_ERROR_MEM" value="-4"/>
 		</enum>
-		<enum name="GdkSubwindowMode">
+		<enum name="GdkSubwindowMode" type-name="GdkSubwindowMode" get-type="gdk_subwindow_mode_get_type">
 			<member name="GDK_CLIP_BY_CHILDREN" value="0"/>
 			<member name="GDK_INCLUDE_INFERIORS" value="1"/>
 		</enum>
-		<enum name="GdkVisibilityState">
+		<enum name="GdkVisibilityState" type-name="GdkVisibilityState" get-type="gdk_visibility_state_get_type">
 			<member name="GDK_VISIBILITY_UNOBSCURED" value="0"/>
 			<member name="GDK_VISIBILITY_PARTIAL" value="1"/>
 			<member name="GDK_VISIBILITY_FULLY_OBSCURED" value="2"/>
 		</enum>
-		<enum name="GdkVisualType">
+		<enum name="GdkVisualType" type-name="GdkVisualType" get-type="gdk_visual_type_get_type">
 			<member name="GDK_VISUAL_STATIC_GRAY" value="0"/>
 			<member name="GDK_VISUAL_GRAYSCALE" value="1"/>
 			<member name="GDK_VISUAL_STATIC_COLOR" value="2"/>
@@ -2306,11 +2446,11 @@
 			<member name="GDK_VISUAL_TRUE_COLOR" value="4"/>
 			<member name="GDK_VISUAL_DIRECT_COLOR" value="5"/>
 		</enum>
-		<enum name="GdkWindowClass">
+		<enum name="GdkWindowClass" type-name="GdkWindowClass" get-type="gdk_window_class_get_type">
 			<member name="GDK_INPUT_OUTPUT" value="0"/>
 			<member name="GDK_INPUT_ONLY" value="1"/>
 		</enum>
-		<enum name="GdkWindowEdge">
+		<enum name="GdkWindowEdge" type-name="GdkWindowEdge" get-type="gdk_window_edge_get_type">
 			<member name="GDK_WINDOW_EDGE_NORTH_WEST" value="0"/>
 			<member name="GDK_WINDOW_EDGE_NORTH" value="1"/>
 			<member name="GDK_WINDOW_EDGE_NORTH_EAST" value="2"/>
@@ -2320,7 +2460,7 @@
 			<member name="GDK_WINDOW_EDGE_SOUTH" value="6"/>
 			<member name="GDK_WINDOW_EDGE_SOUTH_EAST" value="7"/>
 		</enum>
-		<enum name="GdkWindowType">
+		<enum name="GdkWindowType" type-name="GdkWindowType" get-type="gdk_window_type_get_type">
 			<member name="GDK_WINDOW_ROOT" value="0"/>
 			<member name="GDK_WINDOW_TOPLEVEL" value="1"/>
 			<member name="GDK_WINDOW_CHILD" value="2"/>
@@ -2328,7 +2468,7 @@
 			<member name="GDK_WINDOW_TEMP" value="4"/>
 			<member name="GDK_WINDOW_FOREIGN" value="5"/>
 		</enum>
-		<enum name="GdkWindowTypeHint">
+		<enum name="GdkWindowTypeHint" type-name="GdkWindowTypeHint" get-type="gdk_window_type_hint_get_type">
 			<member name="GDK_WINDOW_TYPE_HINT_NORMAL" value="0"/>
 			<member name="GDK_WINDOW_TYPE_HINT_DIALOG" value="1"/>
 			<member name="GDK_WINDOW_TYPE_HINT_MENU" value="2"/>
@@ -2344,7 +2484,7 @@
 			<member name="GDK_WINDOW_TYPE_HINT_COMBO" value="12"/>
 			<member name="GDK_WINDOW_TYPE_HINT_DND" value="13"/>
 		</enum>
-		<flags name="GdkDragAction">
+		<flags name="GdkDragAction" type-name="GdkDragAction" get-type="gdk_drag_action_get_type">
 			<member name="GDK_ACTION_DEFAULT" value="1"/>
 			<member name="GDK_ACTION_COPY" value="2"/>
 			<member name="GDK_ACTION_MOVE" value="4"/>
@@ -2352,7 +2492,7 @@
 			<member name="GDK_ACTION_PRIVATE" value="16"/>
 			<member name="GDK_ACTION_ASK" value="32"/>
 		</flags>
-		<flags name="GdkEventMask">
+		<flags name="GdkEventMask" type-name="GdkEventMask" get-type="gdk_event_mask_get_type">
 			<member name="GDK_EXPOSURE_MASK" value="2"/>
 			<member name="GDK_POINTER_MOTION_MASK" value="4"/>
 			<member name="GDK_POINTER_MOTION_HINT_MASK" value="8"/>
@@ -2376,7 +2516,7 @@
 			<member name="GDK_SCROLL_MASK" value="2097152"/>
 			<member name="GDK_ALL_EVENTS_MASK" value="4194302"/>
 		</flags>
-		<flags name="GdkGCValuesMask">
+		<flags name="GdkGCValuesMask" type-name="GdkGCValuesMask" get-type="gdk_gc_values_mask_get_type">
 			<member name="GDK_GC_FOREGROUND" value="1"/>
 			<member name="GDK_GC_BACKGROUND" value="2"/>
 			<member name="GDK_GC_FONT" value="4"/>
@@ -2396,12 +2536,12 @@
 			<member name="GDK_GC_CAP_STYLE" value="65536"/>
 			<member name="GDK_GC_JOIN_STYLE" value="131072"/>
 		</flags>
-		<flags name="GdkInputCondition">
+		<flags name="GdkInputCondition" type-name="GdkInputCondition" get-type="gdk_input_condition_get_type">
 			<member name="GDK_INPUT_READ" value="1"/>
 			<member name="GDK_INPUT_WRITE" value="2"/>
 			<member name="GDK_INPUT_EXCEPTION" value="4"/>
 		</flags>
-		<flags name="GdkModifierType">
+		<flags name="GdkModifierType" type-name="GdkModifierType" get-type="gdk_modifier_type_get_type">
 			<member name="GDK_SHIFT_MASK" value="1"/>
 			<member name="GDK_LOCK_MASK" value="2"/>
 			<member name="GDK_CONTROL_MASK" value="4"/>
@@ -2421,7 +2561,7 @@
 			<member name="GDK_RELEASE_MASK" value="1073741824"/>
 			<member name="GDK_MODIFIER_MASK" value="1543512063"/>
 		</flags>
-		<flags name="GdkWMDecoration">
+		<flags name="GdkWMDecoration" type-name="GdkWMDecoration" get-type="gdk_wm_decoration_get_type">
 			<member name="GDK_DECOR_ALL" value="1"/>
 			<member name="GDK_DECOR_BORDER" value="2"/>
 			<member name="GDK_DECOR_RESIZEH" value="4"/>
@@ -2430,7 +2570,7 @@
 			<member name="GDK_DECOR_MINIMIZE" value="32"/>
 			<member name="GDK_DECOR_MAXIMIZE" value="64"/>
 		</flags>
-		<flags name="GdkWMFunction">
+		<flags name="GdkWMFunction" type-name="GdkWMFunction" get-type="gdk_wm_function_get_type">
 			<member name="GDK_FUNC_ALL" value="1"/>
 			<member name="GDK_FUNC_RESIZE" value="2"/>
 			<member name="GDK_FUNC_MOVE" value="4"/>
@@ -2438,7 +2578,7 @@
 			<member name="GDK_FUNC_MAXIMIZE" value="16"/>
 			<member name="GDK_FUNC_CLOSE" value="32"/>
 		</flags>
-		<flags name="GdkWindowAttributesType">
+		<flags name="GdkWindowAttributesType" type-name="GdkWindowAttributesType" get-type="gdk_window_attributes_type_get_type">
 			<member name="GDK_WA_TITLE" value="2"/>
 			<member name="GDK_WA_X" value="4"/>
 			<member name="GDK_WA_Y" value="8"/>
@@ -2449,7 +2589,7 @@
 			<member name="GDK_WA_NOREDIR" value="256"/>
 			<member name="GDK_WA_TYPE_HINT" value="512"/>
 		</flags>
-		<flags name="GdkWindowHints">
+		<flags name="GdkWindowHints" type-name="GdkWindowHints" get-type="gdk_window_hints_get_type">
 			<member name="GDK_HINT_POS" value="1"/>
 			<member name="GDK_HINT_MIN_SIZE" value="2"/>
 			<member name="GDK_HINT_MAX_SIZE" value="4"/>
@@ -2460,7 +2600,7 @@
 			<member name="GDK_HINT_USER_POS" value="128"/>
 			<member name="GDK_HINT_USER_SIZE" value="256"/>
 		</flags>
-		<flags name="GdkWindowState">
+		<flags name="GdkWindowState" type-name="GdkWindowState" get-type="gdk_window_state_get_type">
 			<member name="GDK_WINDOW_STATE_WITHDRAWN" value="1"/>
 			<member name="GDK_WINDOW_STATE_ICONIFIED" value="2"/>
 			<member name="GDK_WINDOW_STATE_MAXIMIZED" value="4"/>
@@ -2469,6 +2609,53 @@
 			<member name="GDK_WINDOW_STATE_ABOVE" value="32"/>
 			<member name="GDK_WINDOW_STATE_BELOW" value="64"/>
 		</flags>
+		<object name="GdkAppLaunchContext" parent="GAppLaunchContext" type-name="GdkAppLaunchContext" get-type="gdk_app_launch_context_get_type">
+			<constructor name="new" symbol="gdk_app_launch_context_new">
+				<return-type type="GdkAppLaunchContext*"/>
+			</constructor>
+			<method name="set_desktop" symbol="gdk_app_launch_context_set_desktop">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GdkAppLaunchContext*"/>
+					<parameter name="desktop" type="gint"/>
+				</parameters>
+			</method>
+			<method name="set_display" symbol="gdk_app_launch_context_set_display">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GdkAppLaunchContext*"/>
+					<parameter name="display" type="GdkDisplay*"/>
+				</parameters>
+			</method>
+			<method name="set_icon" symbol="gdk_app_launch_context_set_icon">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GdkAppLaunchContext*"/>
+					<parameter name="icon" type="GIcon*"/>
+				</parameters>
+			</method>
+			<method name="set_icon_name" symbol="gdk_app_launch_context_set_icon_name">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GdkAppLaunchContext*"/>
+					<parameter name="icon_name" type="char*"/>
+				</parameters>
+			</method>
+			<method name="set_screen" symbol="gdk_app_launch_context_set_screen">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GdkAppLaunchContext*"/>
+					<parameter name="screen" type="GdkScreen*"/>
+				</parameters>
+			</method>
+			<method name="set_timestamp" symbol="gdk_app_launch_context_set_timestamp">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="context" type="GdkAppLaunchContext*"/>
+					<parameter name="timestamp" type="guint32"/>
+				</parameters>
+			</method>
+		</object>
 		<object name="GdkColormap" parent="GObject" type-name="GdkColormap" get-type="gdk_colormap_get_type">
 			<method name="alloc_color" symbol="gdk_colormap_alloc_color">
 				<return-type type="gboolean"/>
@@ -2484,18 +2671,25 @@
 				<parameters>
 					<parameter name="colormap" type="GdkColormap*"/>
 					<parameter name="colors" type="GdkColor*"/>
-					<parameter name="ncolors" type="gint"/>
+					<parameter name="n_colors" type="gint"/>
 					<parameter name="writeable" type="gboolean"/>
 					<parameter name="best_match" type="gboolean"/>
 					<parameter name="success" type="gboolean*"/>
 				</parameters>
 			</method>
+			<method name="change" symbol="gdk_colormap_change">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="colormap" type="GdkColormap*"/>
+					<parameter name="ncolors" type="gint"/>
+				</parameters>
+			</method>
 			<method name="free_colors" symbol="gdk_colormap_free_colors">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="colormap" type="GdkColormap*"/>
 					<parameter name="colors" type="GdkColor*"/>
-					<parameter name="ncolors" type="gint"/>
+					<parameter name="n_colors" type="gint"/>
 				</parameters>
 			</method>
 			<method name="get_screen" symbol="gdk_colormap_get_screen">
@@ -3847,6 +4041,27 @@
 					<parameter name="dest" type="GdkRectangle*"/>
 				</parameters>
 			</method>
+			<method name="get_monitor_height_mm" symbol="gdk_screen_get_monitor_height_mm">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="screen" type="GdkScreen*"/>
+					<parameter name="monitor_num" type="gint"/>
+				</parameters>
+			</method>
+			<method name="get_monitor_plug_name" symbol="gdk_screen_get_monitor_plug_name">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="screen" type="GdkScreen*"/>
+					<parameter name="monitor_num" type="gint"/>
+				</parameters>
+			</method>
+			<method name="get_monitor_width_mm" symbol="gdk_screen_get_monitor_width_mm">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="screen" type="GdkScreen*"/>
+					<parameter name="monitor_num" type="gint"/>
+				</parameters>
+			</method>
 			<method name="get_n_monitors" symbol="gdk_screen_get_n_monitors">
 				<return-type type="gint"/>
 				<parameters>
@@ -3998,6 +4213,12 @@
 					<parameter name="screen" type="GdkScreen*"/>
 				</parameters>
 			</signal>
+			<signal name="monitors-changed" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="screen" type="GdkScreen*"/>
+				</parameters>
+			</signal>
 			<signal name="size-changed" when="LAST">
 				<return-type type="void"/>
 				<parameters>
@@ -4537,6 +4758,12 @@
 					<parameter name="data" type="gpointer"/>
 				</parameters>
 			</method>
+			<method name="remove_redirection" symbol="gdk_window_remove_redirection">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+				</parameters>
+			</method>
 			<method name="reparent" symbol="gdk_window_reparent">
 				<return-type type="void"/>
 				<parameters>

Added: trunk/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.deps
==============================================================================
--- (empty file)
+++ trunk/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.deps	Sun Jun 15 20:14:19 2008
@@ -0,0 +1 @@
+gio-2.0

Modified: trunk/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.files
==============================================================================
--- trunk/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.files	(original)
+++ trunk/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.files	Sun Jun 15 20:14:19 2008
@@ -1,2 +1,3 @@
+include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h
 include/gtk-2.0/gdk-pixbuf
 lib/libgdk_pixbuf-2.0.so

Modified: trunk/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.gi
==============================================================================
--- trunk/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.gi	(original)
+++ trunk/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.gi	Sun Jun 15 20:14:19 2008
@@ -117,20 +117,20 @@
 			<field name="height" type="guint32"/>
 			<field name="pixel_data" type="guint8*"/>
 		</struct>
-		<enum name="GdkColorspace">
+		<enum name="GdkColorspace" type-name="GdkColorspace" get-type="gdk_colorspace_get_type">
 			<member name="GDK_COLORSPACE_RGB" value="0"/>
 		</enum>
-		<enum name="GdkInterpType">
+		<enum name="GdkInterpType" type-name="GdkInterpType" get-type="gdk_interp_type_get_type">
 			<member name="GDK_INTERP_NEAREST" value="0"/>
 			<member name="GDK_INTERP_TILES" value="1"/>
 			<member name="GDK_INTERP_BILINEAR" value="2"/>
 			<member name="GDK_INTERP_HYPER" value="3"/>
 		</enum>
-		<enum name="GdkPixbufAlphaMode">
+		<enum name="GdkPixbufAlphaMode" type-name="GdkPixbufAlphaMode" get-type="gdk_pixbuf_alpha_mode_get_type">
 			<member name="GDK_PIXBUF_ALPHA_BILEVEL" value="0"/>
 			<member name="GDK_PIXBUF_ALPHA_FULL" value="1"/>
 		</enum>
-		<enum name="GdkPixbufError">
+		<enum name="GdkPixbufError" type-name="GdkPixbufError" get-type="gdk_pixbuf_error_get_type">
 			<member name="GDK_PIXBUF_ERROR_CORRUPT_IMAGE" value="0"/>
 			<member name="GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY" value="1"/>
 			<member name="GDK_PIXBUF_ERROR_BAD_OPTION" value="2"/>
@@ -138,7 +138,7 @@
 			<member name="GDK_PIXBUF_ERROR_UNSUPPORTED_OPERATION" value="4"/>
 			<member name="GDK_PIXBUF_ERROR_FAILED" value="5"/>
 		</enum>
-		<enum name="GdkPixbufRotation">
+		<enum name="GdkPixbufRotation" type-name="GdkPixbufRotation" get-type="gdk_pixbuf_rotation_get_type">
 			<member name="GDK_PIXBUF_ROTATE_NONE" value="0"/>
 			<member name="GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE" value="90"/>
 			<member name="GDK_PIXBUF_ROTATE_UPSIDEDOWN" value="180"/>
@@ -402,6 +402,25 @@
 					<parameter name="error" type="GError**"/>
 				</parameters>
 			</constructor>
+			<constructor name="new_from_stream" symbol="gdk_pixbuf_new_from_stream">
+				<return-type type="GdkPixbuf*"/>
+				<parameters>
+					<parameter name="stream" type="GInputStream*"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</constructor>
+			<constructor name="new_from_stream_at_scale" symbol="gdk_pixbuf_new_from_stream_at_scale">
+				<return-type type="GdkPixbuf*"/>
+				<parameters>
+					<parameter name="stream" type="GInputStream*"/>
+					<parameter name="width" type="gint"/>
+					<parameter name="height" type="gint"/>
+					<parameter name="preserve_aspect_ratio" type="gboolean"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</constructor>
 			<constructor name="new_from_xpm_data" symbol="gdk_pixbuf_new_from_xpm_data">
 				<return-type type="GdkPixbuf*"/>
 				<parameters>
@@ -487,6 +506,16 @@
 					<parameter name="error" type="GError**"/>
 				</parameters>
 			</method>
+			<method name="save_to_stream" symbol="gdk_pixbuf_save_to_stream">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="pixbuf" type="GdkPixbuf*"/>
+					<parameter name="stream" type="GOutputStream*"/>
+					<parameter name="type" type="char*"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
 			<method name="savev" symbol="gdk_pixbuf_savev">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -712,9 +741,9 @@
 		<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_PIXBUF_MICRO" type="int" value="3"/>
+		<constant name="GDK_PIXBUF_MINOR" type="int" value="13"/>
+		<constant name="GDK_PIXBUF_VERSION" type="char*" value="2.13.3"/>
 		<constant name="GDK_PIXDATA_HEADER_LENGTH" type="int" value="24"/>
 	</namespace>
 </api>

Modified: trunk/vapi/packages/gio-2.0/gio-2.0.gi
==============================================================================
--- trunk/vapi/packages/gio-2.0/gio-2.0.gi	(original)
+++ trunk/vapi/packages/gio-2.0/gio-2.0.gi	Sun Jun 15 20:14:19 2008
@@ -14,6 +14,12 @@
 				<parameter name="type2" type="char*"/>
 			</parameters>
 		</function>
+		<function name="g_content_type_from_mime_type" symbol="g_content_type_from_mime_type">
+			<return-type type="char*"/>
+			<parameters>
+				<parameter name="mime_type" type="char*"/>
+			</parameters>
+		</function>
 		<function name="g_content_type_get_description" symbol="g_content_type_get_description">
 			<return-type type="char*"/>
 			<parameters>
@@ -2063,6 +2069,12 @@
 					<parameter name="ostream" type="GMemoryOutputStream*"/>
 				</parameters>
 			</method>
+			<method name="get_data_size" symbol="g_memory_output_stream_get_data_size">
+				<return-type type="gsize"/>
+				<parameters>
+					<parameter name="ostream" type="GMemoryOutputStream*"/>
+				</parameters>
+			</method>
 			<method name="get_size" symbol="g_memory_output_stream_get_size">
 				<return-type type="gsize"/>
 				<parameters>
@@ -2648,6 +2660,13 @@
 					<parameter name="iconname" type="char*"/>
 				</parameters>
 			</constructor>
+			<method name="prepend_name" symbol="g_themed_icon_prepend_name">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="icon" type="GThemedIcon*"/>
+					<parameter name="iconname" type="char*"/>
+				</parameters>
+			</method>
 			<property name="name" type="char*" readable="0" writable="1" construct="0" construct-only="1"/>
 			<property name="names" type="GStrv*" readable="1" writable="1" construct="0" construct-only="1"/>
 			<property name="use-default-fallbacks" type="gboolean" readable="0" writable="1" construct="0" construct-only="1"/>
@@ -3758,6 +3777,14 @@
 					<parameter name="error" type="GError**"/>
 				</parameters>
 			</method>
+			<method name="make_directory_with_parents" symbol="g_file_make_directory_with_parents">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="file" type="GFile*"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
 			<method name="make_symbolic_link" symbol="g_file_make_symbolic_link">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -3856,6 +3883,14 @@
 					<parameter name="cancellable" type="GCancellable*"/>
 				</parameters>
 			</method>
+			<method name="query_file_type" symbol="g_file_query_file_type">
+				<return-type type="GFileType"/>
+				<parameters>
+					<parameter name="file" type="GFile*"/>
+					<parameter name="flags" type="GFileQueryInfoFlags"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+				</parameters>
+			</method>
 			<method name="query_filesystem_info" symbol="g_file_query_filesystem_info">
 				<return-type type="GFileInfo*"/>
 				<parameters>

Modified: trunk/vapi/packages/gio-unix-2.0/gio-unix-2.0.gi
==============================================================================
--- trunk/vapi/packages/gio-unix-2.0/gio-unix-2.0.gi	(original)
+++ trunk/vapi/packages/gio-unix-2.0/gio-unix-2.0.gi	Sun Jun 15 20:14:19 2008
@@ -220,6 +220,13 @@
 			<constructor name="new" symbol="g_unix_mount_monitor_new">
 				<return-type type="GUnixMountMonitor*"/>
 			</constructor>
+			<method name="set_rate_limit" symbol="g_unix_mount_monitor_set_rate_limit">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="mount_monitor" type="GUnixMountMonitor*"/>
+					<parameter name="limit_msec" type="int"/>
+				</parameters>
+			</method>
 			<signal name="mountpoints-changed" when="LAST">
 				<return-type type="void"/>
 				<parameters>

Modified: trunk/vapi/packages/gtk+-2.0/gtk+-2.0.defines
==============================================================================
--- trunk/vapi/packages/gtk+-2.0/gtk+-2.0.defines	(original)
+++ trunk/vapi/packages/gtk+-2.0/gtk+-2.0.defines	Sun Jun 15 20:14:19 2008
@@ -1 +1,2 @@
+-DGTK_COMPILATION
 -DGTK_DISABLE_DEPRECATED

Modified: trunk/vapi/packages/gtk+-2.0/gtk+-2.0.deps
==============================================================================
--- trunk/vapi/packages/gtk+-2.0/gtk+-2.0.deps	(original)
+++ trunk/vapi/packages/gtk+-2.0/gtk+-2.0.deps	Sun Jun 15 20:14:19 2008
@@ -1,3 +1,4 @@
+gio-2.0
 atk
 cairo
 gdk-pixbuf-2.0

Modified: trunk/vapi/packages/gtk+-2.0/gtk+-2.0.gi
==============================================================================
--- trunk/vapi/packages/gtk+-2.0/gtk+-2.0.gi	(original)
+++ trunk/vapi/packages/gtk+-2.0/gtk+-2.0.gi	Sun Jun 15 20:14:19 2008
@@ -759,7 +759,7 @@
 				<parameter name="widget" type="GtkWidget*"/>
 				<parameter name="detail" type="gchar*"/>
 				<parameter name="points" type="GdkPoint*"/>
-				<parameter name="npoints" type="gint"/>
+				<parameter name="n_points" type="gint"/>
 				<parameter name="fill" type="gboolean"/>
 			</parameters>
 		</function>
@@ -1067,6 +1067,13 @@
 				<parameter name="ntargets" type="guint"/>
 			</parameters>
 		</function>
+		<function name="selection_clear" symbol="gtk_selection_clear">
+			<return-type type="gboolean"/>
+			<parameters>
+				<parameter name="widget" type="GtkWidget*"/>
+				<parameter name="event" type="GdkEventSelection*"/>
+			</parameters>
+		</function>
 		<function name="selection_clear_targets" symbol="gtk_selection_clear_targets">
 			<return-type type="void"/>
 			<parameters>
@@ -1116,6 +1123,15 @@
 				<parameter name="first_property_name" type="gchar*"/>
 			</parameters>
 		</function>
+		<function name="show_uri" symbol="gtk_show_uri">
+			<return-type type="gboolean"/>
+			<parameters>
+				<parameter name="screen" type="GdkScreen*"/>
+				<parameter name="uri" type="gchar*"/>
+				<parameter name="timestamp" type="guint32"/>
+				<parameter name="error" type="GError**"/>
+			</parameters>
+		</function>
 		<function name="stock_add" symbol="gtk_stock_add">
 			<return-type type="void"/>
 			<parameters>
@@ -1193,6 +1209,115 @@
 				<parameter name="n_targets" type="gint"/>
 			</parameters>
 		</function>
+		<function name="test_create_simple_window" symbol="gtk_test_create_simple_window">
+			<return-type type="GtkWidget*"/>
+			<parameters>
+				<parameter name="window_title" type="gchar*"/>
+				<parameter name="dialog_text" type="gchar*"/>
+			</parameters>
+		</function>
+		<function name="test_create_widget" symbol="gtk_test_create_widget">
+			<return-type type="GtkWidget*"/>
+			<parameters>
+				<parameter name="widget_type" type="GType"/>
+				<parameter name="first_property_name" type="gchar*"/>
+			</parameters>
+		</function>
+		<function name="test_display_button_window" symbol="gtk_test_display_button_window">
+			<return-type type="GtkWidget*"/>
+			<parameters>
+				<parameter name="window_title" type="gchar*"/>
+				<parameter name="dialog_text" type="gchar*"/>
+			</parameters>
+		</function>
+		<function name="test_find_label" symbol="gtk_test_find_label">
+			<return-type type="GtkWidget*"/>
+			<parameters>
+				<parameter name="widget" type="GtkWidget*"/>
+				<parameter name="label_pattern" type="gchar*"/>
+			</parameters>
+		</function>
+		<function name="test_find_sibling" symbol="gtk_test_find_sibling">
+			<return-type type="GtkWidget*"/>
+			<parameters>
+				<parameter name="base_widget" type="GtkWidget*"/>
+				<parameter name="widget_type" type="GType"/>
+			</parameters>
+		</function>
+		<function name="test_find_widget" symbol="gtk_test_find_widget">
+			<return-type type="GtkWidget*"/>
+			<parameters>
+				<parameter name="widget" type="GtkWidget*"/>
+				<parameter name="label_pattern" type="gchar*"/>
+				<parameter name="widget_type" type="GType"/>
+			</parameters>
+		</function>
+		<function name="test_init" symbol="gtk_test_init">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="argcp" type="int*"/>
+				<parameter name="argvp" type="char***"/>
+			</parameters>
+		</function>
+		<function name="test_list_all_types" symbol="gtk_test_list_all_types">
+			<return-type type="GType*"/>
+			<parameters>
+				<parameter name="n_types" type="guint*"/>
+			</parameters>
+		</function>
+		<function name="test_register_all_types" symbol="gtk_test_register_all_types">
+			<return-type type="void"/>
+		</function>
+		<function name="test_slider_get_value" symbol="gtk_test_slider_get_value">
+			<return-type type="double"/>
+			<parameters>
+				<parameter name="widget" type="GtkWidget*"/>
+			</parameters>
+		</function>
+		<function name="test_slider_set_perc" symbol="gtk_test_slider_set_perc">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="widget" type="GtkWidget*"/>
+				<parameter name="percentage" type="double"/>
+			</parameters>
+		</function>
+		<function name="test_spin_button_click" symbol="gtk_test_spin_button_click">
+			<return-type type="gboolean"/>
+			<parameters>
+				<parameter name="spinner" type="GtkSpinButton*"/>
+				<parameter name="button" type="guint"/>
+				<parameter name="upwards" type="gboolean"/>
+			</parameters>
+		</function>
+		<function name="test_text_get" symbol="gtk_test_text_get">
+			<return-type type="gchar*"/>
+			<parameters>
+				<parameter name="widget" type="GtkWidget*"/>
+			</parameters>
+		</function>
+		<function name="test_text_set" symbol="gtk_test_text_set">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="widget" type="GtkWidget*"/>
+				<parameter name="string" type="gchar*"/>
+			</parameters>
+		</function>
+		<function name="test_widget_click" symbol="gtk_test_widget_click">
+			<return-type type="gboolean"/>
+			<parameters>
+				<parameter name="widget" type="GtkWidget*"/>
+				<parameter name="button" type="guint"/>
+				<parameter name="modifiers" type="GdkModifierType"/>
+			</parameters>
+		</function>
+		<function name="test_widget_send_key" symbol="gtk_test_widget_send_key">
+			<return-type type="gboolean"/>
+			<parameters>
+				<parameter name="widget" type="GtkWidget*"/>
+				<parameter name="keyval" type="guint"/>
+				<parameter name="modifiers" type="GdkModifierType"/>
+			</parameters>
+		</function>
 		<function name="tree_get_row_drag_data" symbol="gtk_tree_get_row_drag_data">
 			<return-type type="gboolean"/>
 			<parameters>
@@ -1266,6 +1391,16 @@
 				<parameter name="user_data" type="gpointer"/>
 			</parameters>
 		</callback>
+		<callback name="GtkCalendarDetailFunc">
+			<return-type type="gchar*"/>
+			<parameters>
+				<parameter name="calendar" type="GtkCalendar*"/>
+				<parameter name="year" type="guint"/>
+				<parameter name="month" type="guint"/>
+				<parameter name="day" type="guint"/>
+				<parameter name="user_data" type="gpointer"/>
+			</parameters>
+		</callback>
 		<callback name="GtkCallback">
 			<return-type type="void"/>
 			<parameters>
@@ -1695,6 +1830,9 @@
 		<struct name="GtkAllocation">
 		</struct>
 		<struct name="GtkArg">
+			<field name="type" type="GtkType"/>
+			<field name="name" type="gchar*"/>
+			<field name="d" type="gpointer"/>
 		</struct>
 		<struct name="GtkBindingArg">
 			<field name="arg_type" type="GType"/>
@@ -1821,6 +1959,11 @@
 			<field name="iter" type="GdkPixbufAnimationIter*"/>
 			<field name="frame_timeout" type="guint"/>
 		</struct>
+		<struct name="GtkImageGIconData">
+			<field name="icon" type="GIcon*"/>
+			<field name="pixbuf" type="GdkPixbuf*"/>
+			<field name="theme_change_id" type="guint"/>
+		</struct>
 		<struct name="GtkImageIconNameData">
 			<field name="icon_name" type="gchar*"/>
 			<field name="pixbuf" type="GdkPixbuf*"/>
@@ -1843,6 +1986,8 @@
 		</struct>
 		<struct name="GtkLabelSelectionInfo">
 		</struct>
+		<struct name="GtkMountOperationClass">
+		</struct>
 		<struct name="GtkNotebookPage">
 			<method name="num" symbol="gtk_notebook_page_num">
 				<return-type type="gint"/>
@@ -1856,27 +2001,6 @@
 			<field name="start" type="gint"/>
 			<field name="end" type="gint"/>
 		</struct>
-		<struct name="GtkProgress">
-			<field name="widget" type="GtkWidget"/>
-			<field name="adjustment" type="GtkAdjustment*"/>
-			<field name="offscreen_pixmap" type="GdkPixmap*"/>
-			<field name="format" type="gchar*"/>
-			<field name="x_align" type="gfloat"/>
-			<field name="y_align" type="gfloat"/>
-			<field name="show_text" type="guint"/>
-			<field name="activity_mode" type="guint"/>
-			<field name="use_text_format" type="guint"/>
-		</struct>
-		<struct name="GtkProgressClass">
-			<field name="parent_class" type="GtkWidgetClass"/>
-			<field name="paint" type="GCallback"/>
-			<field name="update" type="GCallback"/>
-			<field name="act_mode_enter" type="GCallback"/>
-			<field name="_gtk_reserved1" type="GCallback"/>
-			<field name="_gtk_reserved2" type="GCallback"/>
-			<field name="_gtk_reserved3" type="GCallback"/>
-			<field name="_gtk_reserved4" type="GCallback"/>
-		</struct>
 		<struct name="GtkRadioActionEntry">
 			<field name="name" type="gchar*"/>
 			<field name="stock_id" type="gchar*"/>
@@ -2065,6 +2189,12 @@
 					<parameter name="type" type="GtkType"/>
 				</parameters>
 			</method>
+			<method name="init" symbol="gtk_type_init">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="debug_flags" type="GTypeDebugFlags"/>
+				</parameters>
+			</method>
 		</struct>
 		<struct name="GtkWidgetAuxInfo">
 			<field name="x" type="gint"/>
@@ -2094,6 +2224,9 @@
 					<parameter name="border_" type="GtkBorder*"/>
 				</parameters>
 			</method>
+			<constructor name="new" symbol="gtk_border_new">
+				<return-type type="GtkBorder*"/>
+			</constructor>
 			<field name="left" type="gint"/>
 			<field name="right" type="gint"/>
 			<field name="top" type="gint"/>
@@ -2158,6 +2291,13 @@
 					<parameter name="error" type="GError**"/>
 				</parameters>
 			</method>
+			<constructor name="new_for_pixbuf" symbol="gtk_icon_info_new_for_pixbuf">
+				<return-type type="GtkIconInfo*"/>
+				<parameters>
+					<parameter name="icon_theme" type="GtkIconTheme*"/>
+					<parameter name="pixbuf" type="GdkPixbuf*"/>
+				</parameters>
+			</constructor>
 			<method name="set_raw_coordinates" symbol="gtk_icon_info_set_raw_coordinates">
 				<return-type type="void"/>
 				<parameters>
@@ -3723,7 +3863,7 @@
 				</parameters>
 			</method>
 		</boxed>
-		<enum name="GtkAnchorType">
+		<enum name="GtkAnchorType" type-name="GtkAnchorType" get-type="gtk_anchor_type_get_type">
 			<member name="GTK_ANCHOR_CENTER" value="0"/>
 			<member name="GTK_ANCHOR_NORTH" value="1"/>
 			<member name="GTK_ANCHOR_NORTH_WEST" value="2"/>
@@ -3742,21 +3882,21 @@
 			<member name="GTK_ANCHOR_W" value="7"/>
 			<member name="GTK_ANCHOR_E" value="8"/>
 		</enum>
-		<enum name="GtkArrowType">
+		<enum name="GtkArrowType" type-name="GtkArrowType" get-type="gtk_arrow_type_get_type">
 			<member name="GTK_ARROW_UP" value="0"/>
 			<member name="GTK_ARROW_DOWN" value="1"/>
 			<member name="GTK_ARROW_LEFT" value="2"/>
 			<member name="GTK_ARROW_RIGHT" value="3"/>
 			<member name="GTK_ARROW_NONE" value="4"/>
 		</enum>
-		<enum name="GtkAssistantPageType">
+		<enum name="GtkAssistantPageType" type-name="GtkAssistantPageType" get-type="gtk_assistant_page_type_get_type">
 			<member name="GTK_ASSISTANT_PAGE_CONTENT" value="0"/>
 			<member name="GTK_ASSISTANT_PAGE_INTRO" value="1"/>
 			<member name="GTK_ASSISTANT_PAGE_CONFIRM" value="2"/>
 			<member name="GTK_ASSISTANT_PAGE_SUMMARY" value="3"/>
 			<member name="GTK_ASSISTANT_PAGE_PROGRESS" value="4"/>
 		</enum>
-		<enum name="GtkBuilderError">
+		<enum name="GtkBuilderError" type-name="GtkBuilderError" get-type="gtk_builder_error_get_type">
 			<member name="GTK_BUILDER_ERROR_INVALID_TYPE_FUNCTION" value="0"/>
 			<member name="GTK_BUILDER_ERROR_UNHANDLED_TAG" value="1"/>
 			<member name="GTK_BUILDER_ERROR_MISSING_ATTRIBUTE" value="2"/>
@@ -3764,8 +3904,9 @@
 			<member name="GTK_BUILDER_ERROR_INVALID_TAG" value="4"/>
 			<member name="GTK_BUILDER_ERROR_MISSING_PROPERTY_VALUE" value="5"/>
 			<member name="GTK_BUILDER_ERROR_INVALID_VALUE" value="6"/>
+			<member name="GTK_BUILDER_ERROR_VERSION_MISMATCH" value="7"/>
 		</enum>
-		<enum name="GtkButtonBoxStyle">
+		<enum name="GtkButtonBoxStyle" type-name="GtkButtonBoxStyle" get-type="gtk_button_box_style_get_type">
 			<member name="GTK_BUTTONBOX_DEFAULT_STYLE" value="0"/>
 			<member name="GTK_BUTTONBOX_SPREAD" value="1"/>
 			<member name="GTK_BUTTONBOX_EDGE" value="2"/>
@@ -3773,7 +3914,7 @@
 			<member name="GTK_BUTTONBOX_END" value="4"/>
 			<member name="GTK_BUTTONBOX_CENTER" value="5"/>
 		</enum>
-		<enum name="GtkButtonsType">
+		<enum name="GtkButtonsType" type-name="GtkButtonsType" get-type="gtk_buttons_type_get_type">
 			<member name="GTK_BUTTONS_NONE" value="0"/>
 			<member name="GTK_BUTTONS_OK" value="1"/>
 			<member name="GTK_BUTTONS_CLOSE" value="2"/>
@@ -3781,19 +3922,19 @@
 			<member name="GTK_BUTTONS_YES_NO" value="4"/>
 			<member name="GTK_BUTTONS_OK_CANCEL" value="5"/>
 		</enum>
-		<enum name="GtkCListDragPos">
+		<enum name="GtkCListDragPos" type-name="GtkCListDragPos" get-type="gtk_clist_drag_pos_get_type">
 			<member name="GTK_CLIST_DRAG_NONE" value="0"/>
 			<member name="GTK_CLIST_DRAG_BEFORE" value="1"/>
 			<member name="GTK_CLIST_DRAG_INTO" value="2"/>
 			<member name="GTK_CLIST_DRAG_AFTER" value="3"/>
 		</enum>
-		<enum name="GtkCTreeExpanderStyle">
+		<enum name="GtkCTreeExpanderStyle" type-name="GtkCTreeExpanderStyle" get-type="gtk_ctree_expander_style_get_type">
 			<member name="GTK_CTREE_EXPANDER_NONE" value="0"/>
 			<member name="GTK_CTREE_EXPANDER_SQUARE" value="1"/>
 			<member name="GTK_CTREE_EXPANDER_TRIANGLE" value="2"/>
 			<member name="GTK_CTREE_EXPANDER_CIRCULAR" value="3"/>
 		</enum>
-		<enum name="GtkCTreeExpansionType">
+		<enum name="GtkCTreeExpansionType" type-name="GtkCTreeExpansionType" get-type="gtk_ctree_expansion_type_get_type">
 			<member name="GTK_CTREE_EXPANSION_EXPAND" value="0"/>
 			<member name="GTK_CTREE_EXPANSION_EXPAND_RECURSIVE" value="1"/>
 			<member name="GTK_CTREE_EXPANSION_COLLAPSE" value="2"/>
@@ -3801,45 +3942,45 @@
 			<member name="GTK_CTREE_EXPANSION_TOGGLE" value="4"/>
 			<member name="GTK_CTREE_EXPANSION_TOGGLE_RECURSIVE" value="5"/>
 		</enum>
-		<enum name="GtkCTreeLineStyle">
+		<enum name="GtkCTreeLineStyle" type-name="GtkCTreeLineStyle" get-type="gtk_ctree_line_style_get_type">
 			<member name="GTK_CTREE_LINES_NONE" value="0"/>
 			<member name="GTK_CTREE_LINES_SOLID" value="1"/>
 			<member name="GTK_CTREE_LINES_DOTTED" value="2"/>
 			<member name="GTK_CTREE_LINES_TABBED" value="3"/>
 		</enum>
-		<enum name="GtkCTreePos">
+		<enum name="GtkCTreePos" type-name="GtkCTreePos" get-type="gtk_ctree_pos_get_type">
 			<member name="GTK_CTREE_POS_BEFORE" value="0"/>
 			<member name="GTK_CTREE_POS_AS_CHILD" value="1"/>
 			<member name="GTK_CTREE_POS_AFTER" value="2"/>
 		</enum>
-		<enum name="GtkCellRendererAccelMode">
+		<enum name="GtkCellRendererAccelMode" type-name="GtkCellRendererAccelMode" get-type="gtk_cell_renderer_accel_mode_get_type">
 			<member name="GTK_CELL_RENDERER_ACCEL_MODE_GTK" value="0"/>
 			<member name="GTK_CELL_RENDERER_ACCEL_MODE_OTHER" value="1"/>
 		</enum>
-		<enum name="GtkCellRendererMode">
+		<enum name="GtkCellRendererMode" type-name="GtkCellRendererMode" get-type="gtk_cell_renderer_mode_get_type">
 			<member name="GTK_CELL_RENDERER_MODE_INERT" value="0"/>
 			<member name="GTK_CELL_RENDERER_MODE_ACTIVATABLE" value="1"/>
 			<member name="GTK_CELL_RENDERER_MODE_EDITABLE" value="2"/>
 		</enum>
-		<enum name="GtkCellType">
+		<enum name="GtkCellType" type-name="GtkCellType" get-type="gtk_cell_type_get_type">
 			<member name="GTK_CELL_EMPTY" value="0"/>
 			<member name="GTK_CELL_TEXT" value="1"/>
 			<member name="GTK_CELL_PIXMAP" value="2"/>
 			<member name="GTK_CELL_PIXTEXT" value="3"/>
 			<member name="GTK_CELL_WIDGET" value="4"/>
 		</enum>
-		<enum name="GtkCornerType">
+		<enum name="GtkCornerType" type-name="GtkCornerType" get-type="gtk_corner_type_get_type">
 			<member name="GTK_CORNER_TOP_LEFT" value="0"/>
 			<member name="GTK_CORNER_BOTTOM_LEFT" value="1"/>
 			<member name="GTK_CORNER_TOP_RIGHT" value="2"/>
 			<member name="GTK_CORNER_BOTTOM_RIGHT" value="3"/>
 		</enum>
-		<enum name="GtkCurveType">
+		<enum name="GtkCurveType" type-name="GtkCurveType" get-type="gtk_curve_type_get_type">
 			<member name="GTK_CURVE_TYPE_LINEAR" value="0"/>
 			<member name="GTK_CURVE_TYPE_SPLINE" value="1"/>
 			<member name="GTK_CURVE_TYPE_FREE" value="2"/>
 		</enum>
-		<enum name="GtkDeleteType">
+		<enum name="GtkDeleteType" type-name="GtkDeleteType" get-type="gtk_delete_type_get_type">
 			<member name="GTK_DELETE_CHARS" value="0"/>
 			<member name="GTK_DELETE_WORD_ENDS" value="1"/>
 			<member name="GTK_DELETE_WORDS" value="2"/>
@@ -3849,7 +3990,7 @@
 			<member name="GTK_DELETE_PARAGRAPHS" value="6"/>
 			<member name="GTK_DELETE_WHITESPACE" value="7"/>
 		</enum>
-		<enum name="GtkDirectionType">
+		<enum name="GtkDirectionType" type-name="GtkDirectionType" get-type="gtk_direction_type_get_type">
 			<member name="GTK_DIR_TAB_FORWARD" value="0"/>
 			<member name="GTK_DIR_TAB_BACKWARD" value="1"/>
 			<member name="GTK_DIR_UP" value="2"/>
@@ -3857,7 +3998,7 @@
 			<member name="GTK_DIR_LEFT" value="4"/>
 			<member name="GTK_DIR_RIGHT" value="5"/>
 		</enum>
-		<enum name="GtkDragResult">
+		<enum name="GtkDragResult" type-name="GtkDragResult" get-type="gtk_drag_result_get_type">
 			<member name="GTK_DRAG_RESULT_SUCCESS" value="0"/>
 			<member name="GTK_DRAG_RESULT_NO_TARGET" value="1"/>
 			<member name="GTK_DRAG_RESULT_USER_CANCELLED" value="2"/>
@@ -3865,39 +4006,39 @@
 			<member name="GTK_DRAG_RESULT_GRAB_BROKEN" value="4"/>
 			<member name="GTK_DRAG_RESULT_ERROR" value="5"/>
 		</enum>
-		<enum name="GtkExpanderStyle">
+		<enum name="GtkExpanderStyle" type-name="GtkExpanderStyle" get-type="gtk_expander_style_get_type">
 			<member name="GTK_EXPANDER_COLLAPSED" value="0"/>
 			<member name="GTK_EXPANDER_SEMI_COLLAPSED" value="1"/>
 			<member name="GTK_EXPANDER_SEMI_EXPANDED" value="2"/>
 			<member name="GTK_EXPANDER_EXPANDED" value="3"/>
 		</enum>
-		<enum name="GtkFileChooserAction">
+		<enum name="GtkFileChooserAction" type-name="GtkFileChooserAction" get-type="gtk_file_chooser_action_get_type">
 			<member name="GTK_FILE_CHOOSER_ACTION_OPEN" value="0"/>
 			<member name="GTK_FILE_CHOOSER_ACTION_SAVE" value="1"/>
 			<member name="GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER" value="2"/>
 			<member name="GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER" value="3"/>
 		</enum>
-		<enum name="GtkFileChooserConfirmation">
+		<enum name="GtkFileChooserConfirmation" type-name="GtkFileChooserConfirmation" get-type="gtk_file_chooser_confirmation_get_type">
 			<member name="GTK_FILE_CHOOSER_CONFIRMATION_CONFIRM" value="0"/>
 			<member name="GTK_FILE_CHOOSER_CONFIRMATION_ACCEPT_FILENAME" value="1"/>
 			<member name="GTK_FILE_CHOOSER_CONFIRMATION_SELECT_AGAIN" value="2"/>
 		</enum>
-		<enum name="GtkFileChooserError">
+		<enum name="GtkFileChooserError" type-name="GtkFileChooserError" get-type="gtk_file_chooser_error_get_type">
 			<member name="GTK_FILE_CHOOSER_ERROR_NONEXISTENT" value="0"/>
 			<member name="GTK_FILE_CHOOSER_ERROR_BAD_FILENAME" value="1"/>
 			<member name="GTK_FILE_CHOOSER_ERROR_ALREADY_EXISTS" value="2"/>
 		</enum>
-		<enum name="GtkIMPreeditStyle">
+		<enum name="GtkIMPreeditStyle" type-name="GtkIMPreeditStyle" get-type="gtk_im_preedit_style_get_type">
 			<member name="GTK_IM_PREEDIT_NOTHING" value="0"/>
 			<member name="GTK_IM_PREEDIT_CALLBACK" value="1"/>
 			<member name="GTK_IM_PREEDIT_NONE" value="2"/>
 		</enum>
-		<enum name="GtkIMStatusStyle">
+		<enum name="GtkIMStatusStyle" type-name="GtkIMStatusStyle" get-type="gtk_im_status_style_get_type">
 			<member name="GTK_IM_STATUS_NOTHING" value="0"/>
 			<member name="GTK_IM_STATUS_CALLBACK" value="1"/>
 			<member name="GTK_IM_STATUS_NONE" value="2"/>
 		</enum>
-		<enum name="GtkIconSize">
+		<enum name="GtkIconSize" type-name="GtkIconSize" get-type="gtk_icon_size_get_type">
 			<member name="GTK_ICON_SIZE_INVALID" value="0"/>
 			<member name="GTK_ICON_SIZE_MENU" value="1"/>
 			<member name="GTK_ICON_SIZE_SMALL_TOOLBAR" value="2"/>
@@ -3906,11 +4047,11 @@
 			<member name="GTK_ICON_SIZE_DND" value="5"/>
 			<member name="GTK_ICON_SIZE_DIALOG" value="6"/>
 		</enum>
-		<enum name="GtkIconThemeError">
+		<enum name="GtkIconThemeError" type-name="GtkIconThemeError" get-type="gtk_icon_theme_error_get_type">
 			<member name="GTK_ICON_THEME_NOT_FOUND" value="0"/>
 			<member name="GTK_ICON_THEME_FAILED" value="1"/>
 		</enum>
-		<enum name="GtkIconViewDropPosition">
+		<enum name="GtkIconViewDropPosition" type-name="GtkIconViewDropPosition" get-type="gtk_icon_view_drop_position_get_type">
 			<member name="GTK_ICON_VIEW_NO_DROP" value="0"/>
 			<member name="GTK_ICON_VIEW_DROP_INTO" value="1"/>
 			<member name="GTK_ICON_VIEW_DROP_LEFT" value="2"/>
@@ -3918,7 +4059,7 @@
 			<member name="GTK_ICON_VIEW_DROP_ABOVE" value="4"/>
 			<member name="GTK_ICON_VIEW_DROP_BELOW" value="5"/>
 		</enum>
-		<enum name="GtkImageType">
+		<enum name="GtkImageType" type-name="GtkImageType" get-type="gtk_image_type_get_type">
 			<member name="GTK_IMAGE_EMPTY" value="0"/>
 			<member name="GTK_IMAGE_PIXMAP" value="1"/>
 			<member name="GTK_IMAGE_IMAGE" value="2"/>
@@ -3927,14 +4068,15 @@
 			<member name="GTK_IMAGE_ICON_SET" value="5"/>
 			<member name="GTK_IMAGE_ANIMATION" value="6"/>
 			<member name="GTK_IMAGE_ICON_NAME" value="7"/>
+			<member name="GTK_IMAGE_GICON" value="8"/>
 		</enum>
-		<enum name="GtkJustification">
+		<enum name="GtkJustification" type-name="GtkJustification" get-type="gtk_justification_get_type">
 			<member name="GTK_JUSTIFY_LEFT" value="0"/>
 			<member name="GTK_JUSTIFY_RIGHT" value="1"/>
 			<member name="GTK_JUSTIFY_CENTER" value="2"/>
 			<member name="GTK_JUSTIFY_FILL" value="3"/>
 		</enum>
-		<enum name="GtkMatchType">
+		<enum name="GtkMatchType" type-name="GtkMatchType" get-type="gtk_match_type_get_type">
 			<member name="GTK_MATCH_ALL" value="0"/>
 			<member name="GTK_MATCH_ALL_TAIL" value="1"/>
 			<member name="GTK_MATCH_HEAD" value="2"/>
@@ -3942,25 +4084,25 @@
 			<member name="GTK_MATCH_EXACT" value="4"/>
 			<member name="GTK_MATCH_LAST" value="5"/>
 		</enum>
-		<enum name="GtkMenuDirectionType">
+		<enum name="GtkMenuDirectionType" type-name="GtkMenuDirectionType" get-type="gtk_menu_direction_type_get_type">
 			<member name="GTK_MENU_DIR_PARENT" value="0"/>
 			<member name="GTK_MENU_DIR_CHILD" value="1"/>
 			<member name="GTK_MENU_DIR_NEXT" value="2"/>
 			<member name="GTK_MENU_DIR_PREV" value="3"/>
 		</enum>
-		<enum name="GtkMessageType">
+		<enum name="GtkMessageType" type-name="GtkMessageType" get-type="gtk_message_type_get_type">
 			<member name="GTK_MESSAGE_INFO" value="0"/>
 			<member name="GTK_MESSAGE_WARNING" value="1"/>
 			<member name="GTK_MESSAGE_QUESTION" value="2"/>
 			<member name="GTK_MESSAGE_ERROR" value="3"/>
 			<member name="GTK_MESSAGE_OTHER" value="4"/>
 		</enum>
-		<enum name="GtkMetricType">
+		<enum name="GtkMetricType" type-name="GtkMetricType" get-type="gtk_metric_type_get_type">
 			<member name="GTK_PIXELS" value="0"/>
 			<member name="GTK_INCHES" value="1"/>
 			<member name="GTK_CENTIMETERS" value="2"/>
 		</enum>
-		<enum name="GtkMovementStep">
+		<enum name="GtkMovementStep" type-name="GtkMovementStep" get-type="gtk_movement_step_get_type">
 			<member name="GTK_MOVEMENT_LOGICAL_POSITIONS" value="0"/>
 			<member name="GTK_MOVEMENT_VISUAL_POSITIONS" value="1"/>
 			<member name="GTK_MOVEMENT_WORDS" value="2"/>
@@ -3972,36 +4114,36 @@
 			<member name="GTK_MOVEMENT_BUFFER_ENDS" value="8"/>
 			<member name="GTK_MOVEMENT_HORIZONTAL_PAGES" value="9"/>
 		</enum>
-		<enum name="GtkNotebookTab">
+		<enum name="GtkNotebookTab" type-name="GtkNotebookTab" get-type="gtk_notebook_tab_get_type">
 			<member name="GTK_NOTEBOOK_TAB_FIRST" value="0"/>
 			<member name="GTK_NOTEBOOK_TAB_LAST" value="1"/>
 		</enum>
-		<enum name="GtkOrientation">
+		<enum name="GtkOrientation" type-name="GtkOrientation" get-type="gtk_orientation_get_type">
 			<member name="GTK_ORIENTATION_HORIZONTAL" value="0"/>
 			<member name="GTK_ORIENTATION_VERTICAL" value="1"/>
 		</enum>
-		<enum name="GtkPackDirection">
+		<enum name="GtkPackDirection" type-name="GtkPackDirection" get-type="gtk_pack_direction_get_type">
 			<member name="GTK_PACK_DIRECTION_LTR" value="0"/>
 			<member name="GTK_PACK_DIRECTION_RTL" value="1"/>
 			<member name="GTK_PACK_DIRECTION_TTB" value="2"/>
 			<member name="GTK_PACK_DIRECTION_BTT" value="3"/>
 		</enum>
-		<enum name="GtkPackType">
+		<enum name="GtkPackType" type-name="GtkPackType" get-type="gtk_pack_type_get_type">
 			<member name="GTK_PACK_START" value="0"/>
 			<member name="GTK_PACK_END" value="1"/>
 		</enum>
-		<enum name="GtkPageOrientation">
+		<enum name="GtkPageOrientation" type-name="GtkPageOrientation" get-type="gtk_page_orientation_get_type">
 			<member name="GTK_PAGE_ORIENTATION_PORTRAIT" value="0"/>
 			<member name="GTK_PAGE_ORIENTATION_LANDSCAPE" value="1"/>
 			<member name="GTK_PAGE_ORIENTATION_REVERSE_PORTRAIT" value="2"/>
 			<member name="GTK_PAGE_ORIENTATION_REVERSE_LANDSCAPE" value="3"/>
 		</enum>
-		<enum name="GtkPageSet">
+		<enum name="GtkPageSet" type-name="GtkPageSet" get-type="gtk_page_set_get_type">
 			<member name="GTK_PAGE_SET_ALL" value="0"/>
 			<member name="GTK_PAGE_SET_EVEN" value="1"/>
 			<member name="GTK_PAGE_SET_ODD" value="2"/>
 		</enum>
-		<enum name="GtkPathPriorityType">
+		<enum name="GtkPathPriorityType" type-name="GtkPathPriorityType" get-type="gtk_path_priority_type_get_type">
 			<member name="GTK_PATH_PRIO_LOWEST" value="0"/>
 			<member name="GTK_PATH_PRIO_GTK" value="4"/>
 			<member name="GTK_PATH_PRIO_APPLICATION" value="8"/>
@@ -4009,61 +4151,61 @@
 			<member name="GTK_PATH_PRIO_RC" value="12"/>
 			<member name="GTK_PATH_PRIO_HIGHEST" value="15"/>
 		</enum>
-		<enum name="GtkPathType">
+		<enum name="GtkPathType" type-name="GtkPathType" get-type="gtk_path_type_get_type">
 			<member name="GTK_PATH_WIDGET" value="0"/>
 			<member name="GTK_PATH_WIDGET_CLASS" value="1"/>
 			<member name="GTK_PATH_CLASS" value="2"/>
 		</enum>
-		<enum name="GtkPolicyType">
+		<enum name="GtkPolicyType" type-name="GtkPolicyType" get-type="gtk_policy_type_get_type">
 			<member name="GTK_POLICY_ALWAYS" value="0"/>
 			<member name="GTK_POLICY_AUTOMATIC" value="1"/>
 			<member name="GTK_POLICY_NEVER" value="2"/>
 		</enum>
-		<enum name="GtkPositionType">
+		<enum name="GtkPositionType" type-name="GtkPositionType" get-type="gtk_position_type_get_type">
 			<member name="GTK_POS_LEFT" value="0"/>
 			<member name="GTK_POS_RIGHT" value="1"/>
 			<member name="GTK_POS_TOP" value="2"/>
 			<member name="GTK_POS_BOTTOM" value="3"/>
 		</enum>
-		<enum name="GtkPreviewType">
+		<enum name="GtkPreviewType" type-name="GtkPreviewType" get-type="gtk_preview_type_get_type">
 			<member name="GTK_PREVIEW_COLOR" value="0"/>
 			<member name="GTK_PREVIEW_GRAYSCALE" value="1"/>
 		</enum>
-		<enum name="GtkPrintDuplex">
+		<enum name="GtkPrintDuplex" type-name="GtkPrintDuplex" get-type="gtk_print_duplex_get_type">
 			<member name="GTK_PRINT_DUPLEX_SIMPLEX" value="0"/>
 			<member name="GTK_PRINT_DUPLEX_HORIZONTAL" value="1"/>
 			<member name="GTK_PRINT_DUPLEX_VERTICAL" value="2"/>
 		</enum>
-		<enum name="GtkPrintError">
+		<enum name="GtkPrintError" type-name="GtkPrintError" get-type="gtk_print_error_get_type">
 			<member name="GTK_PRINT_ERROR_GENERAL" value="0"/>
 			<member name="GTK_PRINT_ERROR_INTERNAL_ERROR" value="1"/>
 			<member name="GTK_PRINT_ERROR_NOMEM" value="2"/>
 			<member name="GTK_PRINT_ERROR_INVALID_FILE" value="3"/>
 		</enum>
-		<enum name="GtkPrintOperationAction">
+		<enum name="GtkPrintOperationAction" type-name="GtkPrintOperationAction" get-type="gtk_print_operation_action_get_type">
 			<member name="GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG" value="0"/>
 			<member name="GTK_PRINT_OPERATION_ACTION_PRINT" value="1"/>
 			<member name="GTK_PRINT_OPERATION_ACTION_PREVIEW" value="2"/>
 			<member name="GTK_PRINT_OPERATION_ACTION_EXPORT" value="3"/>
 		</enum>
-		<enum name="GtkPrintOperationResult">
+		<enum name="GtkPrintOperationResult" type-name="GtkPrintOperationResult" get-type="gtk_print_operation_result_get_type">
 			<member name="GTK_PRINT_OPERATION_RESULT_ERROR" value="0"/>
 			<member name="GTK_PRINT_OPERATION_RESULT_APPLY" value="1"/>
 			<member name="GTK_PRINT_OPERATION_RESULT_CANCEL" value="2"/>
 			<member name="GTK_PRINT_OPERATION_RESULT_IN_PROGRESS" value="3"/>
 		</enum>
-		<enum name="GtkPrintPages">
+		<enum name="GtkPrintPages" type-name="GtkPrintPages" get-type="gtk_print_pages_get_type">
 			<member name="GTK_PRINT_PAGES_ALL" value="0"/>
 			<member name="GTK_PRINT_PAGES_CURRENT" value="1"/>
 			<member name="GTK_PRINT_PAGES_RANGES" value="2"/>
 		</enum>
-		<enum name="GtkPrintQuality">
+		<enum name="GtkPrintQuality" type-name="GtkPrintQuality" get-type="gtk_print_quality_get_type">
 			<member name="GTK_PRINT_QUALITY_LOW" value="0"/>
 			<member name="GTK_PRINT_QUALITY_NORMAL" value="1"/>
 			<member name="GTK_PRINT_QUALITY_HIGH" value="2"/>
 			<member name="GTK_PRINT_QUALITY_DRAFT" value="3"/>
 		</enum>
-		<enum name="GtkPrintStatus">
+		<enum name="GtkPrintStatus" type-name="GtkPrintStatus" get-type="gtk_print_status_get_type">
 			<member name="GTK_PRINT_STATUS_INITIAL" value="0"/>
 			<member name="GTK_PRINT_STATUS_PREPARING" value="1"/>
 			<member name="GTK_PRINT_STATUS_GENERATING_DATA" value="2"/>
@@ -4074,17 +4216,17 @@
 			<member name="GTK_PRINT_STATUS_FINISHED" value="7"/>
 			<member name="GTK_PRINT_STATUS_FINISHED_ABORTED" value="8"/>
 		</enum>
-		<enum name="GtkProgressBarOrientation">
+		<enum name="GtkProgressBarOrientation" type-name="GtkProgressBarOrientation" get-type="gtk_progress_bar_orientation_get_type">
 			<member name="GTK_PROGRESS_LEFT_TO_RIGHT" value="0"/>
 			<member name="GTK_PROGRESS_RIGHT_TO_LEFT" value="1"/>
 			<member name="GTK_PROGRESS_BOTTOM_TO_TOP" value="2"/>
 			<member name="GTK_PROGRESS_TOP_TO_BOTTOM" value="3"/>
 		</enum>
-		<enum name="GtkProgressBarStyle">
+		<enum name="GtkProgressBarStyle" type-name="GtkProgressBarStyle" get-type="gtk_progress_bar_style_get_type">
 			<member name="GTK_PROGRESS_CONTINUOUS" value="0"/>
 			<member name="GTK_PROGRESS_DISCRETE" value="1"/>
 		</enum>
-		<enum name="GtkRcTokenType">
+		<enum name="GtkRcTokenType" type-name="GtkRcTokenType" get-type="gtk_rc_token_type_get_type">
 			<member name="GTK_RC_TOKEN_INVALID" value="270"/>
 			<member name="GTK_RC_TOKEN_INCLUDE" value="271"/>
 			<member name="GTK_RC_TOKEN_NORMAL" value="272"/>
@@ -4126,11 +4268,11 @@
 			<member name="GTK_RC_TOKEN_UNBIND" value="308"/>
 			<member name="GTK_RC_TOKEN_LAST" value="309"/>
 		</enum>
-		<enum name="GtkRecentChooserError">
+		<enum name="GtkRecentChooserError" type-name="GtkRecentChooserError" get-type="gtk_recent_chooser_error_get_type">
 			<member name="GTK_RECENT_CHOOSER_ERROR_NOT_FOUND" value="0"/>
 			<member name="GTK_RECENT_CHOOSER_ERROR_INVALID_URI" value="1"/>
 		</enum>
-		<enum name="GtkRecentManagerError">
+		<enum name="GtkRecentManagerError" type-name="GtkRecentManagerError" get-type="gtk_recent_manager_error_get_type">
 			<member name="GTK_RECENT_MANAGER_ERROR_NOT_FOUND" value="0"/>
 			<member name="GTK_RECENT_MANAGER_ERROR_INVALID_URI" value="1"/>
 			<member name="GTK_RECENT_MANAGER_ERROR_INVALID_ENCODING" value="2"/>
@@ -4139,23 +4281,23 @@
 			<member name="GTK_RECENT_MANAGER_ERROR_WRITE" value="5"/>
 			<member name="GTK_RECENT_MANAGER_ERROR_UNKNOWN" value="6"/>
 		</enum>
-		<enum name="GtkRecentSortType">
+		<enum name="GtkRecentSortType" type-name="GtkRecentSortType" get-type="gtk_recent_sort_type_get_type">
 			<member name="GTK_RECENT_SORT_NONE" value="0"/>
 			<member name="GTK_RECENT_SORT_MRU" value="1"/>
 			<member name="GTK_RECENT_SORT_LRU" value="2"/>
 			<member name="GTK_RECENT_SORT_CUSTOM" value="3"/>
 		</enum>
-		<enum name="GtkReliefStyle">
+		<enum name="GtkReliefStyle" type-name="GtkReliefStyle" get-type="gtk_relief_style_get_type">
 			<member name="GTK_RELIEF_NORMAL" value="0"/>
 			<member name="GTK_RELIEF_HALF" value="1"/>
 			<member name="GTK_RELIEF_NONE" value="2"/>
 		</enum>
-		<enum name="GtkResizeMode">
+		<enum name="GtkResizeMode" type-name="GtkResizeMode" get-type="gtk_resize_mode_get_type">
 			<member name="GTK_RESIZE_PARENT" value="0"/>
 			<member name="GTK_RESIZE_QUEUE" value="1"/>
 			<member name="GTK_RESIZE_IMMEDIATE" value="2"/>
 		</enum>
-		<enum name="GtkResponseType">
+		<enum name="GtkResponseType" type-name="GtkResponseType" get-type="gtk_response_type_get_type">
 			<member name="GTK_RESPONSE_NONE" value="-1"/>
 			<member name="GTK_RESPONSE_REJECT" value="-2"/>
 			<member name="GTK_RESPONSE_ACCEPT" value="-3"/>
@@ -4168,7 +4310,7 @@
 			<member name="GTK_RESPONSE_APPLY" value="-10"/>
 			<member name="GTK_RESPONSE_HELP" value="-11"/>
 		</enum>
-		<enum name="GtkScrollStep">
+		<enum name="GtkScrollStep" type-name="GtkScrollStep" get-type="gtk_scroll_step_get_type">
 			<member name="GTK_SCROLL_STEPS" value="0"/>
 			<member name="GTK_SCROLL_PAGES" value="1"/>
 			<member name="GTK_SCROLL_ENDS" value="2"/>
@@ -4176,7 +4318,7 @@
 			<member name="GTK_SCROLL_HORIZONTAL_PAGES" value="4"/>
 			<member name="GTK_SCROLL_HORIZONTAL_ENDS" value="5"/>
 		</enum>
-		<enum name="GtkScrollType">
+		<enum name="GtkScrollType" type-name="GtkScrollType" get-type="gtk_scroll_type_get_type">
 			<member name="GTK_SCROLL_NONE" value="0"/>
 			<member name="GTK_SCROLL_JUMP" value="1"/>
 			<member name="GTK_SCROLL_STEP_BACKWARD" value="2"/>
@@ -4194,46 +4336,46 @@
 			<member name="GTK_SCROLL_START" value="14"/>
 			<member name="GTK_SCROLL_END" value="15"/>
 		</enum>
-		<enum name="GtkSelectionMode">
+		<enum name="GtkSelectionMode" type-name="GtkSelectionMode" get-type="gtk_selection_mode_get_type">
 			<member name="GTK_SELECTION_NONE" value="0"/>
 			<member name="GTK_SELECTION_SINGLE" value="1"/>
 			<member name="GTK_SELECTION_BROWSE" value="2"/>
 			<member name="GTK_SELECTION_MULTIPLE" value="3"/>
 			<member name="GTK_SELECTION_EXTENDED" value="3"/>
 		</enum>
-		<enum name="GtkSensitivityType">
+		<enum name="GtkSensitivityType" type-name="GtkSensitivityType" get-type="gtk_sensitivity_type_get_type">
 			<member name="GTK_SENSITIVITY_AUTO" value="0"/>
 			<member name="GTK_SENSITIVITY_ON" value="1"/>
 			<member name="GTK_SENSITIVITY_OFF" value="2"/>
 		</enum>
-		<enum name="GtkShadowType">
+		<enum name="GtkShadowType" type-name="GtkShadowType" get-type="gtk_shadow_type_get_type">
 			<member name="GTK_SHADOW_NONE" value="0"/>
 			<member name="GTK_SHADOW_IN" value="1"/>
 			<member name="GTK_SHADOW_OUT" value="2"/>
 			<member name="GTK_SHADOW_ETCHED_IN" value="3"/>
 			<member name="GTK_SHADOW_ETCHED_OUT" value="4"/>
 		</enum>
-		<enum name="GtkSideType">
+		<enum name="GtkSideType" type-name="GtkSideType" get-type="gtk_side_type_get_type">
 			<member name="GTK_SIDE_TOP" value="0"/>
 			<member name="GTK_SIDE_BOTTOM" value="1"/>
 			<member name="GTK_SIDE_LEFT" value="2"/>
 			<member name="GTK_SIDE_RIGHT" value="3"/>
 		</enum>
-		<enum name="GtkSizeGroupMode">
+		<enum name="GtkSizeGroupMode" type-name="GtkSizeGroupMode" get-type="gtk_size_group_mode_get_type">
 			<member name="GTK_SIZE_GROUP_NONE" value="0"/>
 			<member name="GTK_SIZE_GROUP_HORIZONTAL" value="1"/>
 			<member name="GTK_SIZE_GROUP_VERTICAL" value="2"/>
 			<member name="GTK_SIZE_GROUP_BOTH" value="3"/>
 		</enum>
-		<enum name="GtkSortType">
+		<enum name="GtkSortType" type-name="GtkSortType" get-type="gtk_sort_type_get_type">
 			<member name="GTK_SORT_ASCENDING" value="0"/>
 			<member name="GTK_SORT_DESCENDING" value="1"/>
 		</enum>
-		<enum name="GtkSpinButtonUpdatePolicy">
+		<enum name="GtkSpinButtonUpdatePolicy" type-name="GtkSpinButtonUpdatePolicy" get-type="gtk_spin_button_update_policy_get_type">
 			<member name="GTK_UPDATE_ALWAYS" value="0"/>
 			<member name="GTK_UPDATE_IF_VALID" value="1"/>
 		</enum>
-		<enum name="GtkSpinType">
+		<enum name="GtkSpinType" type-name="GtkSpinType" get-type="gtk_spin_type_get_type">
 			<member name="GTK_SPIN_STEP_FORWARD" value="0"/>
 			<member name="GTK_SPIN_STEP_BACKWARD" value="1"/>
 			<member name="GTK_SPIN_PAGE_FORWARD" value="2"/>
@@ -4242,32 +4384,32 @@
 			<member name="GTK_SPIN_END" value="5"/>
 			<member name="GTK_SPIN_USER_DEFINED" value="6"/>
 		</enum>
-		<enum name="GtkStateType">
+		<enum name="GtkStateType" type-name="GtkStateType" get-type="gtk_state_type_get_type">
 			<member name="GTK_STATE_NORMAL" value="0"/>
 			<member name="GTK_STATE_ACTIVE" value="1"/>
 			<member name="GTK_STATE_PRELIGHT" value="2"/>
 			<member name="GTK_STATE_SELECTED" value="3"/>
 			<member name="GTK_STATE_INSENSITIVE" value="4"/>
 		</enum>
-		<enum name="GtkSubmenuDirection">
+		<enum name="GtkSubmenuDirection" type-name="GtkSubmenuDirection" get-type="gtk_submenu_direction_get_type">
 			<member name="GTK_DIRECTION_LEFT" value="0"/>
 			<member name="GTK_DIRECTION_RIGHT" value="1"/>
 		</enum>
-		<enum name="GtkSubmenuPlacement">
+		<enum name="GtkSubmenuPlacement" type-name="GtkSubmenuPlacement" get-type="gtk_submenu_placement_get_type">
 			<member name="GTK_TOP_BOTTOM" value="0"/>
 			<member name="GTK_LEFT_RIGHT" value="1"/>
 		</enum>
-		<enum name="GtkTextBufferTargetInfo">
+		<enum name="GtkTextBufferTargetInfo" type-name="GtkTextBufferTargetInfo" get-type="gtk_text_buffer_target_info_get_type">
 			<member name="GTK_TEXT_BUFFER_TARGET_INFO_BUFFER_CONTENTS" value="-1"/>
 			<member name="GTK_TEXT_BUFFER_TARGET_INFO_RICH_TEXT" value="-2"/>
 			<member name="GTK_TEXT_BUFFER_TARGET_INFO_TEXT" value="-3"/>
 		</enum>
-		<enum name="GtkTextDirection">
+		<enum name="GtkTextDirection" type-name="GtkTextDirection" get-type="gtk_text_direction_get_type">
 			<member name="GTK_TEXT_DIR_NONE" value="0"/>
 			<member name="GTK_TEXT_DIR_LTR" value="1"/>
 			<member name="GTK_TEXT_DIR_RTL" value="2"/>
 		</enum>
-		<enum name="GtkTextWindowType">
+		<enum name="GtkTextWindowType" type-name="GtkTextWindowType" get-type="gtk_text_window_type_get_type">
 			<member name="GTK_TEXT_WINDOW_PRIVATE" value="0"/>
 			<member name="GTK_TEXT_WINDOW_WIDGET" value="1"/>
 			<member name="GTK_TEXT_WINDOW_TEXT" value="2"/>
@@ -4276,119 +4418,120 @@
 			<member name="GTK_TEXT_WINDOW_TOP" value="5"/>
 			<member name="GTK_TEXT_WINDOW_BOTTOM" value="6"/>
 		</enum>
-		<enum name="GtkToolbarChildType">
+		<enum name="GtkToolbarChildType" type-name="GtkToolbarChildType" get-type="gtk_toolbar_child_type_get_type">
 			<member name="GTK_TOOLBAR_CHILD_SPACE" value="0"/>
 			<member name="GTK_TOOLBAR_CHILD_BUTTON" value="1"/>
 			<member name="GTK_TOOLBAR_CHILD_TOGGLEBUTTON" value="2"/>
 			<member name="GTK_TOOLBAR_CHILD_RADIOBUTTON" value="3"/>
 			<member name="GTK_TOOLBAR_CHILD_WIDGET" value="4"/>
 		</enum>
-		<enum name="GtkToolbarSpaceStyle">
+		<enum name="GtkToolbarSpaceStyle" type-name="GtkToolbarSpaceStyle" get-type="gtk_toolbar_space_style_get_type">
 			<member name="GTK_TOOLBAR_SPACE_EMPTY" value="0"/>
 			<member name="GTK_TOOLBAR_SPACE_LINE" value="1"/>
 		</enum>
-		<enum name="GtkToolbarStyle">
+		<enum name="GtkToolbarStyle" type-name="GtkToolbarStyle" get-type="gtk_toolbar_style_get_type">
 			<member name="GTK_TOOLBAR_ICONS" value="0"/>
 			<member name="GTK_TOOLBAR_TEXT" value="1"/>
 			<member name="GTK_TOOLBAR_BOTH" value="2"/>
 			<member name="GTK_TOOLBAR_BOTH_HORIZ" value="3"/>
 		</enum>
-		<enum name="GtkTreeViewColumnSizing">
+		<enum name="GtkTreeViewColumnSizing" type-name="GtkTreeViewColumnSizing" get-type="gtk_tree_view_column_sizing_get_type">
 			<member name="GTK_TREE_VIEW_COLUMN_GROW_ONLY" value="0"/>
 			<member name="GTK_TREE_VIEW_COLUMN_AUTOSIZE" value="1"/>
 			<member name="GTK_TREE_VIEW_COLUMN_FIXED" value="2"/>
 		</enum>
-		<enum name="GtkTreeViewDropPosition">
+		<enum name="GtkTreeViewDropPosition" type-name="GtkTreeViewDropPosition" get-type="gtk_tree_view_drop_position_get_type">
 			<member name="GTK_TREE_VIEW_DROP_BEFORE" value="0"/>
 			<member name="GTK_TREE_VIEW_DROP_AFTER" value="1"/>
 			<member name="GTK_TREE_VIEW_DROP_INTO_OR_BEFORE" value="2"/>
 			<member name="GTK_TREE_VIEW_DROP_INTO_OR_AFTER" value="3"/>
 		</enum>
-		<enum name="GtkTreeViewGridLines">
+		<enum name="GtkTreeViewGridLines" type-name="GtkTreeViewGridLines" get-type="gtk_tree_view_grid_lines_get_type">
 			<member name="GTK_TREE_VIEW_GRID_LINES_NONE" value="0"/>
 			<member name="GTK_TREE_VIEW_GRID_LINES_HORIZONTAL" value="1"/>
 			<member name="GTK_TREE_VIEW_GRID_LINES_VERTICAL" value="2"/>
 			<member name="GTK_TREE_VIEW_GRID_LINES_BOTH" value="3"/>
 		</enum>
-		<enum name="GtkTreeViewMode">
+		<enum name="GtkTreeViewMode" type-name="GtkTreeViewMode" get-type="gtk_tree_view_mode_get_type">
 			<member name="GTK_TREE_VIEW_LINE" value="0"/>
 			<member name="GTK_TREE_VIEW_ITEM" value="1"/>
 		</enum>
-		<enum name="GtkUnit">
+		<enum name="GtkUnit" type-name="GtkUnit" get-type="gtk_unit_get_type">
 			<member name="GTK_UNIT_PIXEL" value="0"/>
 			<member name="GTK_UNIT_POINTS" value="1"/>
 			<member name="GTK_UNIT_INCH" value="2"/>
 			<member name="GTK_UNIT_MM" value="3"/>
 		</enum>
-		<enum name="GtkUpdateType">
+		<enum name="GtkUpdateType" type-name="GtkUpdateType" get-type="gtk_update_type_get_type">
 			<member name="GTK_UPDATE_CONTINUOUS" value="0"/>
 			<member name="GTK_UPDATE_DISCONTINUOUS" value="1"/>
 			<member name="GTK_UPDATE_DELAYED" value="2"/>
 		</enum>
-		<enum name="GtkVisibility">
+		<enum name="GtkVisibility" type-name="GtkVisibility" get-type="gtk_visibility_get_type">
 			<member name="GTK_VISIBILITY_NONE" value="0"/>
 			<member name="GTK_VISIBILITY_PARTIAL" value="1"/>
 			<member name="GTK_VISIBILITY_FULL" value="2"/>
 		</enum>
-		<enum name="GtkWidgetHelpType">
+		<enum name="GtkWidgetHelpType" type-name="GtkWidgetHelpType" get-type="gtk_widget_help_type_get_type">
 			<member name="GTK_WIDGET_HELP_TOOLTIP" value="0"/>
 			<member name="GTK_WIDGET_HELP_WHATS_THIS" value="1"/>
 		</enum>
-		<enum name="GtkWindowPosition">
+		<enum name="GtkWindowPosition" type-name="GtkWindowPosition" get-type="gtk_window_position_get_type">
 			<member name="GTK_WIN_POS_NONE" value="0"/>
 			<member name="GTK_WIN_POS_CENTER" value="1"/>
 			<member name="GTK_WIN_POS_MOUSE" value="2"/>
 			<member name="GTK_WIN_POS_CENTER_ALWAYS" value="3"/>
 			<member name="GTK_WIN_POS_CENTER_ON_PARENT" value="4"/>
 		</enum>
-		<enum name="GtkWindowType">
+		<enum name="GtkWindowType" type-name="GtkWindowType" get-type="gtk_window_type_get_type">
 			<member name="GTK_WINDOW_TOPLEVEL" value="0"/>
 			<member name="GTK_WINDOW_POPUP" value="1"/>
 		</enum>
-		<enum name="GtkWrapMode">
+		<enum name="GtkWrapMode" type-name="GtkWrapMode" get-type="gtk_wrap_mode_get_type">
 			<member name="GTK_WRAP_NONE" value="0"/>
 			<member name="GTK_WRAP_CHAR" value="1"/>
 			<member name="GTK_WRAP_WORD" value="2"/>
 			<member name="GTK_WRAP_WORD_CHAR" value="3"/>
 		</enum>
-		<flags name="GtkAccelFlags">
+		<flags name="GtkAccelFlags" type-name="GtkAccelFlags" get-type="gtk_accel_flags_get_type">
 			<member name="GTK_ACCEL_VISIBLE" value="1"/>
 			<member name="GTK_ACCEL_LOCKED" value="2"/>
 			<member name="GTK_ACCEL_MASK" value="7"/>
 		</flags>
-		<flags name="GtkArgFlags">
+		<flags name="GtkArgFlags" type-name="GtkArgFlags" get-type="gtk_arg_flags_get_type">
 			<member name="GTK_ARG_READABLE" value="1"/>
 			<member name="GTK_ARG_WRITABLE" value="2"/>
 			<member name="GTK_ARG_CONSTRUCT" value="4"/>
 			<member name="GTK_ARG_CONSTRUCT_ONLY" value="8"/>
 			<member name="GTK_ARG_CHILD_ARG" value="16"/>
 		</flags>
-		<flags name="GtkAttachOptions">
+		<flags name="GtkAttachOptions" type-name="GtkAttachOptions" get-type="gtk_attach_options_get_type">
 			<member name="GTK_EXPAND" value="1"/>
 			<member name="GTK_SHRINK" value="2"/>
 			<member name="GTK_FILL" value="4"/>
 		</flags>
-		<flags name="GtkButtonAction">
+		<flags name="GtkButtonAction" type-name="GtkButtonAction" get-type="gtk_button_action_get_type">
 			<member name="GTK_BUTTON_IGNORED" value="0"/>
 			<member name="GTK_BUTTON_SELECTS" value="1"/>
 			<member name="GTK_BUTTON_DRAGS" value="2"/>
 			<member name="GTK_BUTTON_EXPANDS" value="4"/>
 		</flags>
-		<flags name="GtkCalendarDisplayOptions">
+		<flags name="GtkCalendarDisplayOptions" type-name="GtkCalendarDisplayOptions" get-type="gtk_calendar_display_options_get_type">
 			<member name="GTK_CALENDAR_SHOW_HEADING" value="1"/>
 			<member name="GTK_CALENDAR_SHOW_DAY_NAMES" value="2"/>
 			<member name="GTK_CALENDAR_NO_MONTH_CHANGE" value="4"/>
 			<member name="GTK_CALENDAR_SHOW_WEEK_NUMBERS" value="8"/>
 			<member name="GTK_CALENDAR_WEEK_START_MONDAY" value="16"/>
+			<member name="GTK_CALENDAR_SHOW_DETAILS" value="32"/>
 		</flags>
-		<flags name="GtkCellRendererState">
+		<flags name="GtkCellRendererState" type-name="GtkCellRendererState" get-type="gtk_cell_renderer_state_get_type">
 			<member name="GTK_CELL_RENDERER_SELECTED" value="1"/>
 			<member name="GTK_CELL_RENDERER_PRELIT" value="2"/>
 			<member name="GTK_CELL_RENDERER_INSENSITIVE" value="4"/>
 			<member name="GTK_CELL_RENDERER_SORTED" value="8"/>
 			<member name="GTK_CELL_RENDERER_FOCUSED" value="16"/>
 		</flags>
-		<flags name="GtkDebugFlag">
+		<flags name="GtkDebugFlag" type-name="GtkDebugFlag" get-type="gtk_debug_flag_get_type">
 			<member name="GTK_DEBUG_MISC" value="1"/>
 			<member name="GTK_DEBUG_PLUGSOCKET" value="2"/>
 			<member name="GTK_DEBUG_TEXT" value="4"/>
@@ -4402,36 +4545,37 @@
 			<member name="GTK_DEBUG_PRINTING" value="1024"/>
 			<member name="GTK_DEBUG_BUILDER" value="2048"/>
 		</flags>
-		<flags name="GtkDestDefaults">
+		<flags name="GtkDestDefaults" type-name="GtkDestDefaults" get-type="gtk_dest_defaults_get_type">
 			<member name="GTK_DEST_DEFAULT_MOTION" value="1"/>
 			<member name="GTK_DEST_DEFAULT_HIGHLIGHT" value="2"/>
 			<member name="GTK_DEST_DEFAULT_DROP" value="4"/>
 			<member name="GTK_DEST_DEFAULT_ALL" value="7"/>
 		</flags>
-		<flags name="GtkDialogFlags">
+		<flags name="GtkDialogFlags" type-name="GtkDialogFlags" get-type="gtk_dialog_flags_get_type">
 			<member name="GTK_DIALOG_MODAL" value="1"/>
 			<member name="GTK_DIALOG_DESTROY_WITH_PARENT" value="2"/>
 			<member name="GTK_DIALOG_NO_SEPARATOR" value="4"/>
 		</flags>
-		<flags name="GtkFileFilterFlags">
+		<flags name="GtkFileFilterFlags" type-name="GtkFileFilterFlags" get-type="gtk_file_filter_flags_get_type">
 			<member name="GTK_FILE_FILTER_FILENAME" value="1"/>
 			<member name="GTK_FILE_FILTER_URI" value="2"/>
 			<member name="GTK_FILE_FILTER_DISPLAY_NAME" value="4"/>
 			<member name="GTK_FILE_FILTER_MIME_TYPE" value="8"/>
 		</flags>
-		<flags name="GtkIconLookupFlags">
+		<flags name="GtkIconLookupFlags" type-name="GtkIconLookupFlags" get-type="gtk_icon_lookup_flags_get_type">
 			<member name="GTK_ICON_LOOKUP_NO_SVG" value="1"/>
 			<member name="GTK_ICON_LOOKUP_FORCE_SVG" value="2"/>
 			<member name="GTK_ICON_LOOKUP_USE_BUILTIN" value="4"/>
 			<member name="GTK_ICON_LOOKUP_GENERIC_FALLBACK" value="8"/>
+			<member name="GTK_ICON_LOOKUP_FORCE_SIZE" value="16"/>
 		</flags>
-		<flags name="GtkObjectFlags">
+		<flags name="GtkObjectFlags" type-name="GtkObjectFlags" get-type="gtk_object_flags_get_type">
 			<member name="GTK_IN_DESTRUCTION" value="1"/>
 			<member name="GTK_FLOATING" value="2"/>
 			<member name="GTK_RESERVED_1" value="4"/>
 			<member name="GTK_RESERVED_2" value="8"/>
 		</flags>
-		<flags name="GtkPrivateFlags">
+		<flags name="GtkPrivateFlags" type-name="GtkPrivateFlags" get-type="gtk_private_flags_get_type">
 			<member name="PRIVATE_GTK_USER_STYLE" value="1"/>
 			<member name="PRIVATE_GTK_RESIZE_PENDING" value="4"/>
 			<member name="PRIVATE_GTK_LEAVE_PENDING" value="16"/>
@@ -4445,13 +4589,13 @@
 			<member name="PRIVATE_GTK_ALLOC_NEEDED" value="4096"/>
 			<member name="PRIVATE_GTK_REQUEST_NEEDED" value="8192"/>
 		</flags>
-		<flags name="GtkRcFlags">
+		<flags name="GtkRcFlags" type-name="GtkRcFlags" get-type="gtk_rc_flags_get_type">
 			<member name="GTK_RC_FG" value="1"/>
 			<member name="GTK_RC_BG" value="2"/>
 			<member name="GTK_RC_TEXT" value="4"/>
 			<member name="GTK_RC_BASE" value="8"/>
 		</flags>
-		<flags name="GtkRecentFilterFlags">
+		<flags name="GtkRecentFilterFlags" type-name="GtkRecentFilterFlags" get-type="gtk_recent_filter_flags_get_type">
 			<member name="GTK_RECENT_FILTER_URI" value="1"/>
 			<member name="GTK_RECENT_FILTER_DISPLAY_NAME" value="2"/>
 			<member name="GTK_RECENT_FILTER_MIME_TYPE" value="4"/>
@@ -4459,7 +4603,7 @@
 			<member name="GTK_RECENT_FILTER_GROUP" value="16"/>
 			<member name="GTK_RECENT_FILTER_AGE" value="32"/>
 		</flags>
-		<flags name="GtkSignalRunType">
+		<flags name="GtkSignalRunType" type-name="GtkSignalRunType" get-type="gtk_signal_run_type_get_type">
 			<member name="GTK_RUN_FIRST" value="1"/>
 			<member name="GTK_RUN_LAST" value="2"/>
 			<member name="GTK_RUN_BOTH" value="3"/>
@@ -4467,21 +4611,21 @@
 			<member name="GTK_RUN_ACTION" value="32"/>
 			<member name="GTK_RUN_NO_HOOKS" value="64"/>
 		</flags>
-		<flags name="GtkTargetFlags">
+		<flags name="GtkTargetFlags" type-name="GtkTargetFlags" get-type="gtk_target_flags_get_type">
 			<member name="GTK_TARGET_SAME_APP" value="1"/>
 			<member name="GTK_TARGET_SAME_WIDGET" value="2"/>
 			<member name="GTK_TARGET_OTHER_APP" value="4"/>
 			<member name="GTK_TARGET_OTHER_WIDGET" value="8"/>
 		</flags>
-		<flags name="GtkTextSearchFlags">
+		<flags name="GtkTextSearchFlags" type-name="GtkTextSearchFlags" get-type="gtk_text_search_flags_get_type">
 			<member name="GTK_TEXT_SEARCH_VISIBLE_ONLY" value="1"/>
 			<member name="GTK_TEXT_SEARCH_TEXT_ONLY" value="2"/>
 		</flags>
-		<flags name="GtkTreeModelFlags">
+		<flags name="GtkTreeModelFlags" type-name="GtkTreeModelFlags" get-type="gtk_tree_model_flags_get_type">
 			<member name="GTK_TREE_MODEL_ITERS_PERSIST" value="1"/>
 			<member name="GTK_TREE_MODEL_LIST_ONLY" value="2"/>
 		</flags>
-		<flags name="GtkUIManagerItemType">
+		<flags name="GtkUIManagerItemType" type-name="GtkUIManagerItemType" get-type="gtk_ui_manager_item_type_get_type">
 			<member name="GTK_UI_MANAGER_AUTO" value="0"/>
 			<member name="GTK_UI_MANAGER_MENUBAR" value="1"/>
 			<member name="GTK_UI_MANAGER_MENU" value="2"/>
@@ -4493,7 +4637,7 @@
 			<member name="GTK_UI_MANAGER_SEPARATOR" value="128"/>
 			<member name="GTK_UI_MANAGER_ACCELERATOR" value="256"/>
 		</flags>
-		<flags name="GtkWidgetFlags">
+		<flags name="GtkWidgetFlags" type-name="GtkWidgetFlags" get-type="gtk_widget_flags_get_type">
 			<member name="GTK_TOPLEVEL" value="16"/>
 			<member name="GTK_NO_WINDOW" value="32"/>
 			<member name="GTK_REALIZED" value="64"/>
@@ -4720,11 +4864,11 @@
 					<parameter name="wrap_license" type="gboolean"/>
 				</parameters>
 			</method>
-			<property name="artists" type="char*[]" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="authors" type="char*[]" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="artists" type="GStrv*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="authors" type="GStrv*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="comments" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="copyright" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="documenters" type="char*[]" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="documenters" type="GStrv*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="license" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="logo" type="GdkPixbuf*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="logo-icon-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -6298,6 +6442,18 @@
 					<parameter name="day" type="guint*"/>
 				</parameters>
 			</method>
+			<method name="get_detail_height_rows" symbol="gtk_calendar_get_detail_height_rows">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="calendar" type="GtkCalendar*"/>
+				</parameters>
+			</method>
+			<method name="get_detail_width_chars" symbol="gtk_calendar_get_detail_width_chars">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="calendar" type="GtkCalendar*"/>
+				</parameters>
+			</method>
 			<method name="get_display_options" symbol="gtk_calendar_get_display_options">
 				<return-type type="GtkCalendarDisplayOptions"/>
 				<parameters>
@@ -6329,6 +6485,29 @@
 					<parameter name="year" type="guint"/>
 				</parameters>
 			</method>
+			<method name="set_detail_func" symbol="gtk_calendar_set_detail_func">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="calendar" type="GtkCalendar*"/>
+					<parameter name="func" type="GtkCalendarDetailFunc"/>
+					<parameter name="data" type="gpointer"/>
+					<parameter name="destroy" type="GDestroyNotify"/>
+				</parameters>
+			</method>
+			<method name="set_detail_height_rows" symbol="gtk_calendar_set_detail_height_rows">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="calendar" type="GtkCalendar*"/>
+					<parameter name="rows" type="gint"/>
+				</parameters>
+			</method>
+			<method name="set_detail_width_chars" symbol="gtk_calendar_set_detail_width_chars">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="calendar" type="GtkCalendar*"/>
+					<parameter name="chars" type="gint"/>
+				</parameters>
+			</method>
 			<method name="set_display_options" symbol="gtk_calendar_set_display_options">
 				<return-type type="void"/>
 				<parameters>
@@ -6344,9 +6523,12 @@
 				</parameters>
 			</method>
 			<property name="day" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="detail-height-rows" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="detail-width-chars" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="month" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="no-month-change" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="show-day-names" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="show-details" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="show-heading" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="show-week-numbers" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="year" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -6613,6 +6795,14 @@
 			<property name="has-entry" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="model" type="GtkTreeModel*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="text-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<signal name="changed" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="object" type="GtkCellRendererCombo*"/>
+					<parameter name="p0" type="char*"/>
+					<parameter name="p1" type="GtkTreeIter*"/>
+				</parameters>
+			</signal>
 			<field name="model" type="GtkTreeModel*"/>
 			<field name="text_column" type="gint"/>
 			<field name="has_entry" type="gboolean"/>
@@ -8454,6 +8644,16 @@
 					<parameter name="entry" type="GtkEntry*"/>
 				</parameters>
 			</signal>
+			<vfunc name="get_text_area_size">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="entry" type="GtkEntry*"/>
+					<parameter name="x" type="gint*"/>
+					<parameter name="y" type="gint*"/>
+					<parameter name="width" type="gint*"/>
+					<parameter name="height" type="gint*"/>
+				</parameters>
+			</vfunc>
 			<field name="text" type="gchar*"/>
 			<field name="editable" type="guint"/>
 			<field name="visible" type="guint"/>
@@ -9766,6 +9966,9 @@
 			<field name="context_id" type="gchar*"/>
 		</object>
 		<object name="GtkIconFactory" parent="GObject" type-name="GtkIconFactory" get-type="gtk_icon_factory_get_type">
+			<implements>
+				<interface name="GtkBuildable"/>
+			</implements>
 			<method name="add" symbol="gtk_icon_factory_add">
 				<return-type type="void"/>
 				<parameters>
@@ -9892,6 +10095,15 @@
 					<parameter name="error" type="GError**"/>
 				</parameters>
 			</method>
+			<method name="lookup_by_gicon" symbol="gtk_icon_theme_lookup_by_gicon">
+				<return-type type="GtkIconInfo*"/>
+				<parameters>
+					<parameter name="icon_theme" type="GtkIconTheme*"/>
+					<parameter name="icon" type="GIcon*"/>
+					<parameter name="size" type="gint"/>
+					<parameter name="flags" type="GtkIconLookupFlags"/>
+				</parameters>
+			</method>
 			<method name="lookup_icon" symbol="gtk_icon_theme_lookup_icon">
 				<return-type type="GtkIconInfo*"/>
 				<parameters>
@@ -10444,6 +10656,14 @@
 					<parameter name="image" type="GtkImage*"/>
 				</parameters>
 			</method>
+			<method name="get_gicon" symbol="gtk_image_get_gicon">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="image" type="GtkImage*"/>
+					<parameter name="gicon" type="GIcon**"/>
+					<parameter name="size" type="GtkIconSize*"/>
+				</parameters>
+			</method>
 			<method name="get_icon_name" symbol="gtk_image_get_icon_name">
 				<return-type type="void"/>
 				<parameters>
@@ -10517,6 +10737,13 @@
 					<parameter name="filename" type="gchar*"/>
 				</parameters>
 			</constructor>
+			<constructor name="new_from_gicon" symbol="gtk_image_new_from_gicon">
+				<return-type type="GtkWidget*"/>
+				<parameters>
+					<parameter name="icon" type="GIcon*"/>
+					<parameter name="size" type="GtkIconSize"/>
+				</parameters>
+			</constructor>
 			<constructor name="new_from_icon_name" symbol="gtk_image_new_from_icon_name">
 				<return-type type="GtkWidget*"/>
 				<parameters>
@@ -10572,6 +10799,14 @@
 					<parameter name="filename" type="gchar*"/>
 				</parameters>
 			</method>
+			<method name="set_from_gicon" symbol="gtk_image_set_from_gicon">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="image" type="GtkImage*"/>
+					<parameter name="icon" type="GIcon*"/>
+					<parameter name="size" type="GtkIconSize"/>
+				</parameters>
+			</method>
 			<method name="set_from_icon_name" symbol="gtk_image_set_from_icon_name">
 				<return-type type="void"/>
 				<parameters>
@@ -10627,6 +10862,7 @@
 				</parameters>
 			</method>
 			<property name="file" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="gicon" type="GIcon*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="icon-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="icon-set" type="GtkIconSet*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="icon-size" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -12119,6 +12355,49 @@
 			<field name="xpad" type="guint16"/>
 			<field name="ypad" type="guint16"/>
 		</object>
+		<object name="GtkMountOperation" parent="GMountOperation" type-name="GtkMountOperation" get-type="gtk_mount_operation_get_type">
+			<method name="get_parent" symbol="gtk_mount_operation_get_parent">
+				<return-type type="GtkWindow*"/>
+				<parameters>
+					<parameter name="op" type="GtkMountOperation*"/>
+				</parameters>
+			</method>
+			<method name="get_screen" symbol="gtk_mount_operation_get_screen">
+				<return-type type="GdkScreen*"/>
+				<parameters>
+					<parameter name="op" type="GtkMountOperation*"/>
+				</parameters>
+			</method>
+			<method name="is_showing" symbol="gtk_mount_operation_is_showing">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="op" type="GtkMountOperation*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="gtk_mount_operation_new">
+				<return-type type="GMountOperation*"/>
+				<parameters>
+					<parameter name="parent" type="GtkWindow*"/>
+				</parameters>
+			</constructor>
+			<method name="set_parent" symbol="gtk_mount_operation_set_parent">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="op" type="GtkMountOperation*"/>
+					<parameter name="parent" type="GtkWindow*"/>
+				</parameters>
+			</method>
+			<method name="set_screen" symbol="gtk_mount_operation_set_screen">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="op" type="GtkMountOperation*"/>
+					<parameter name="screen" type="GdkScreen*"/>
+				</parameters>
+			</method>
+			<property name="is-showing" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
+			<property name="parent" type="GtkWindow*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="screen" type="GtkWindow*" readable="1" writable="1" construct="0" construct-only="0"/>
+		</object>
 		<object name="GtkNotebook" parent="GtkContainer" type-name="GtkNotebook" get-type="gtk_notebook_get_type">
 			<implements>
 				<interface name="AtkImplementor"/>
@@ -12660,6 +12939,23 @@
 					<parameter name="unit" type="GtkUnit"/>
 				</parameters>
 			</method>
+			<method name="load_file" symbol="gtk_page_setup_load_file">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="setup" type="GtkPageSetup*"/>
+					<parameter name="file_name" type="char*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
+			<method name="load_key_file" symbol="gtk_page_setup_load_key_file">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="setup" type="GtkPageSetup*"/>
+					<parameter name="key_file" type="GKeyFile*"/>
+					<parameter name="group_name" type="gchar*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
 			<constructor name="new" symbol="gtk_page_setup_new">
 				<return-type type="GtkPageSetup*"/>
 			</constructor>
@@ -12767,6 +13063,15 @@
 					<parameter name="child" type="GtkWidget*"/>
 				</parameters>
 			</method>
+			<method name="compute_position" symbol="gtk_paned_compute_position">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="paned" type="GtkPaned*"/>
+					<parameter name="allocation" type="gint"/>
+					<parameter name="child1_req" type="gint"/>
+					<parameter name="child2_req" type="gint"/>
+				</parameters>
+			</method>
 			<method name="get_child1" symbol="gtk_paned_get_child1">
 				<return-type type="GtkWidget*"/>
 				<parameters>
@@ -13434,6 +13739,23 @@
 					<parameter name="key" type="gchar*"/>
 				</parameters>
 			</method>
+			<method name="load_file" symbol="gtk_print_settings_load_file">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="settings" type="GtkPrintSettings*"/>
+					<parameter name="file_name" type="gchar*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
+			<method name="load_key_file" symbol="gtk_print_settings_load_key_file">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="settings" type="GtkPrintSettings*"/>
+					<parameter name="key_file" type="GKeyFile*"/>
+					<parameter name="group_name" type="gchar*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
 			<constructor name="new" symbol="gtk_print_settings_new">
 				<return-type type="GtkPrintSettings*"/>
 			</constructor>
@@ -13674,6 +13996,133 @@
 				</parameters>
 			</method>
 		</object>
+		<object name="GtkProgress" parent="GtkWidget" type-name="GtkProgress" get-type="gtk_progress_get_type">
+			<implements>
+				<interface name="AtkImplementor"/>
+				<interface name="GtkBuildable"/>
+			</implements>
+			<method name="configure" symbol="gtk_progress_configure">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="progress" type="GtkProgress*"/>
+					<parameter name="value" type="gdouble"/>
+					<parameter name="hmin" type="gdouble"/>
+					<parameter name="max" type="gdouble"/>
+				</parameters>
+			</method>
+			<method name="get_current_percentage" symbol="gtk_progress_get_current_percentage">
+				<return-type type="gdouble"/>
+				<parameters>
+					<parameter name="progress" type="GtkProgress*"/>
+				</parameters>
+			</method>
+			<method name="get_current_text" symbol="gtk_progress_get_current_text">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="progress" type="GtkProgress*"/>
+				</parameters>
+			</method>
+			<method name="get_percentage_from_value" symbol="gtk_progress_get_percentage_from_value">
+				<return-type type="gdouble"/>
+				<parameters>
+					<parameter name="progress" type="GtkProgress*"/>
+					<parameter name="value" type="gdouble"/>
+				</parameters>
+			</method>
+			<method name="get_text_from_value" symbol="gtk_progress_get_text_from_value">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="progress" type="GtkProgress*"/>
+					<parameter name="value" type="gdouble"/>
+				</parameters>
+			</method>
+			<method name="get_value" symbol="gtk_progress_get_value">
+				<return-type type="gdouble"/>
+				<parameters>
+					<parameter name="progress" type="GtkProgress*"/>
+				</parameters>
+			</method>
+			<method name="set_activity_mode" symbol="gtk_progress_set_activity_mode">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="progress" type="GtkProgress*"/>
+					<parameter name="activity_mode" type="gboolean"/>
+				</parameters>
+			</method>
+			<method name="set_adjustment" symbol="gtk_progress_set_adjustment">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="progress" type="GtkProgress*"/>
+					<parameter name="adjustment" type="GtkAdjustment*"/>
+				</parameters>
+			</method>
+			<method name="set_format_string" symbol="gtk_progress_set_format_string">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="progress" type="GtkProgress*"/>
+					<parameter name="format" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="set_percentage" symbol="gtk_progress_set_percentage">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="progress" type="GtkProgress*"/>
+					<parameter name="percentage" type="gdouble"/>
+				</parameters>
+			</method>
+			<method name="set_show_text" symbol="gtk_progress_set_show_text">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="progress" type="GtkProgress*"/>
+					<parameter name="show_text" type="gboolean"/>
+				</parameters>
+			</method>
+			<method name="set_text_alignment" symbol="gtk_progress_set_text_alignment">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="progress" type="GtkProgress*"/>
+					<parameter name="x_align" type="gfloat"/>
+					<parameter name="y_align" type="gfloat"/>
+				</parameters>
+			</method>
+			<method name="set_value" symbol="gtk_progress_set_value">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="progress" type="GtkProgress*"/>
+					<parameter name="value" type="gdouble"/>
+				</parameters>
+			</method>
+			<property name="activity-mode" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="show-text" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="text-xalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="text-yalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
+			<vfunc name="act_mode_enter">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="progress" type="GtkProgress*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="paint">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="progress" type="GtkProgress*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="update">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="progress" type="GtkProgress*"/>
+				</parameters>
+			</vfunc>
+			<field name="adjustment" type="GtkAdjustment*"/>
+			<field name="offscreen_pixmap" type="GdkPixmap*"/>
+			<field name="format" type="gchar*"/>
+			<field name="x_align" type="gfloat"/>
+			<field name="y_align" type="gfloat"/>
+			<field name="show_text" type="guint"/>
+			<field name="activity_mode" type="guint"/>
+			<field name="use_text_format" type="guint"/>
+		</object>
 		<object name="GtkProgressBar" parent="GtkProgress" type-name="GtkProgressBar" get-type="gtk_progress_bar_get_type">
 			<implements>
 				<interface name="AtkImplementor"/>
@@ -14773,7 +15222,7 @@
 				</parameters>
 			</method>
 			<property name="adjustment" type="GtkAdjustment*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="icons" type="char*[]" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="icons" type="GStrv*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="size" type="GtkIconSize" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="value" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
 			<signal name="popdown" when="LAST">
@@ -15056,8 +15505,10 @@
 			<property name="gtk-fallback-icon-theme" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-file-chooser-backend" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-font-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="gtk-fontconfig-timestamp" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-icon-sizes" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-icon-theme-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="gtk-im-module" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-key-theme-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-keynav-cursor-only" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-keynav-wrap-around" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -15066,6 +15517,7 @@
 			<property name="gtk-print-backends" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-print-preview-command" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-recent-files-limit" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="gtk-recent-files-max-age" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-show-input-method-menu" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-show-unicode-menu" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="gtk-split-cursor" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -15490,6 +15942,12 @@
 					<parameter name="status_icon" type="GtkStatusIcon*"/>
 				</parameters>
 			</method>
+			<method name="get_x11_window_id" symbol="gtk_status_icon_get_x11_window_id">
+				<return-type type="guint32"/>
+				<parameters>
+					<parameter name="status_icon" type="GtkStatusIcon*"/>
+				</parameters>
+			</method>
 			<method name="is_embedded" symbol="gtk_status_icon_is_embedded">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -18295,6 +18753,12 @@
 					<parameter name="visible_vertical" type="gboolean"/>
 				</parameters>
 			</method>
+			<method name="toolbar_reconfigured" symbol="gtk_tool_item_toolbar_reconfigured">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="tool_item" type="GtkToolItem*"/>
+				</parameters>
+			</method>
 			<property name="is-important" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="visible-horizontal" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="visible-vertical" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -18324,6 +18788,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkToolShell"/>
 			</implements>
 			<method name="get_drop_index" symbol="gtk_toolbar_get_drop_index">
 				<return-type type="gint"/>
@@ -18516,6 +18981,14 @@
 					<parameter name="pixbuf" type="GdkPixbuf*"/>
 				</parameters>
 			</method>
+			<method name="set_icon_from_icon_name" symbol="gtk_tooltip_set_icon_from_icon_name">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="tooltip" type="GtkTooltip*"/>
+					<parameter name="icon_name" type="gchar*"/>
+					<parameter name="size" type="GtkIconSize"/>
+				</parameters>
+			</method>
 			<method name="set_icon_from_stock" symbol="gtk_tooltip_set_icon_from_stock">
 				<return-type type="void"/>
 				<parameters>
@@ -18655,7 +19128,7 @@
 				</parameters>
 			</method>
 			<method name="convert_child_iter_to_iter" symbol="gtk_tree_model_sort_convert_child_iter_to_iter">
-				<return-type type="void"/>
+				<return-type type="gboolean"/>
 				<parameters>
 					<parameter name="tree_model_sort" type="GtkTreeModelSort*"/>
 					<parameter name="sort_iter" type="GtkTreeIter*"/>
@@ -20999,6 +21472,13 @@
 					<parameter name="height" type="gint*"/>
 				</parameters>
 			</method>
+			<method name="get_snapshot" symbol="gtk_widget_get_snapshot">
+				<return-type type="GdkPixmap*"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="clip_rect" type="GdkRectangle*"/>
+				</parameters>
+			</method>
 			<method name="get_style" symbol="gtk_widget_get_style">
 				<return-type type="GtkStyle*"/>
 				<parameters>
@@ -21672,6 +22152,13 @@
 					<parameter name="event" type="GdkEvent*"/>
 				</parameters>
 			</signal>
+			<signal name="damage-event" when="LAST">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="object" type="GtkWidget*"/>
+					<parameter name="p0" type="GdkEvent*"/>
+				</parameters>
+			</signal>
 			<signal name="delete-event" when="LAST">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -24191,6 +24678,71 @@
 				</parameters>
 			</vfunc>
 		</interface>
+		<interface name="GtkToolShell" type-name="GtkToolShell" get-type="gtk_tool_shell_get_type">
+			<requires>
+				<interface name="GtkWidget"/>
+			</requires>
+			<method name="get_icon_size" symbol="gtk_tool_shell_get_icon_size">
+				<return-type type="GtkIconSize"/>
+				<parameters>
+					<parameter name="shell" type="GtkToolShell*"/>
+				</parameters>
+			</method>
+			<method name="get_orientation" symbol="gtk_tool_shell_get_orientation">
+				<return-type type="GtkOrientation"/>
+				<parameters>
+					<parameter name="shell" type="GtkToolShell*"/>
+				</parameters>
+			</method>
+			<method name="get_relief_style" symbol="gtk_tool_shell_get_relief_style">
+				<return-type type="GtkReliefStyle"/>
+				<parameters>
+					<parameter name="shell" type="GtkToolShell*"/>
+				</parameters>
+			</method>
+			<method name="get_style" symbol="gtk_tool_shell_get_style">
+				<return-type type="GtkToolbarStyle"/>
+				<parameters>
+					<parameter name="shell" type="GtkToolShell*"/>
+				</parameters>
+			</method>
+			<method name="rebuild_menu" symbol="gtk_tool_shell_rebuild_menu">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="shell" type="GtkToolShell*"/>
+				</parameters>
+			</method>
+			<vfunc name="get_icon_size">
+				<return-type type="GtkIconSize"/>
+				<parameters>
+					<parameter name="shell" type="GtkToolShell*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_orientation">
+				<return-type type="GtkOrientation"/>
+				<parameters>
+					<parameter name="shell" type="GtkToolShell*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_relief_style">
+				<return-type type="GtkReliefStyle"/>
+				<parameters>
+					<parameter name="shell" type="GtkToolShell*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_style">
+				<return-type type="GtkToolbarStyle"/>
+				<parameters>
+					<parameter name="shell" type="GtkToolShell*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="rebuild_menu">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="shell" type="GtkToolShell*"/>
+				</parameters>
+			</vfunc>
+		</interface>
 		<interface name="GtkTreeDragDest" type-name="GtkTreeDragDest" get-type="gtk_tree_drag_dest_get_type">
 			<method name="drag_data_received" symbol="gtk_tree_drag_dest_drag_data_received">
 				<return-type type="gboolean"/>
@@ -24708,14 +25260,14 @@
 			</vfunc>
 		</interface>
 		<constant name="GTK_ARG_READWRITE" type="int" value="0"/>
-		<constant name="GTK_BINARY_AGE" type="int" value="1205"/>
+		<constant name="GTK_BINARY_AGE" type="int" value="1303"/>
 		<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="5"/>
+		<constant name="GTK_INTERFACE_AGE" type="int" value="0"/>
 		<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="5"/>
-		<constant name="GTK_MINOR_VERSION" type="int" value="12"/>
+		<constant name="GTK_MICRO_VERSION" type="int" value="3"/>
+		<constant name="GTK_MINOR_VERSION" type="int" value="13"/>
 		<constant name="GTK_PAPER_NAME_A3" type="char*" value="iso_a3"/>
 		<constant name="GTK_PAPER_NAME_A4" type="char*" value="iso_a4"/>
 		<constant name="GTK_PAPER_NAME_A5" type="char*" value="iso_a5"/>
@@ -24825,10 +25377,14 @@
 		<constant name="GTK_STOCK_ORIENTATION_PORTRAIT" type="char*" value="gtk-orientation-portrait"/>
 		<constant name="GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE" type="char*" value="gtk-orientation-reverse-landscape"/>
 		<constant name="GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT" type="char*" value="gtk-orientation-reverse-portrait"/>
+		<constant name="GTK_STOCK_PAGE_SETUP" type="char*" value="gtk-page-setup"/>
 		<constant name="GTK_STOCK_PASTE" type="char*" value="gtk-paste"/>
 		<constant name="GTK_STOCK_PREFERENCES" type="char*" value="gtk-preferences"/>
 		<constant name="GTK_STOCK_PRINT" type="char*" value="gtk-print"/>
+		<constant name="GTK_STOCK_PRINT_ERROR" type="char*" value="gtk-print-error"/>
 		<constant name="GTK_STOCK_PRINT_PREVIEW" type="char*" value="gtk-print-preview"/>
+		<constant name="GTK_STOCK_PRINT_REPORT" type="char*" value="gtk-print-report"/>
+		<constant name="GTK_STOCK_PRINT_WARNING" type="char*" value="gtk-print-warning"/>
 		<constant name="GTK_STOCK_PROPERTIES" type="char*" value="gtk-properties"/>
 		<constant name="GTK_STOCK_QUIT" type="char*" value="gtk-quit"/>
 		<constant name="GTK_STOCK_REDO" type="char*" value="gtk-redo"/>

Modified: trunk/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
==============================================================================
--- trunk/vapi/packages/gtk+-2.0/gtk+-2.0.metadata	(original)
+++ trunk/vapi/packages/gtk+-2.0/gtk+-2.0.metadata	Sun Jun 15 20:14:19 2008
@@ -168,6 +168,7 @@
 gtk_message_dialog_new.parent nullable="1"
 gtk_message_dialog_new_with_markup ellipsis="1"
 gtk_message_dialog_new_with_markup.parent nullable="1"
+gtk_mount_operation_is_showing hidden="1"
 GtkNotebook.focus_tab hidden="1"
 gtk_notebook_append_page.tab_label nullable="1"
 GtkObject::destroy has_emitter="1"
@@ -274,6 +275,7 @@
 GtkToggleButton::toggled has_emitter="1"
 GtkToolbar.GtkTooltips hidden="1"
 GtkToolbar.gpointer hidden="1"
+gtk_tool_item_toolbar_reconfigured hidden="1"
 GtkToolItem::set_tooltip hidden="1"
 GtkTreeIter is_value_type="1"
 gtk_tree_model_filter_new.root nullable="1"

Modified: trunk/vapi/packages/pango/pango.gi
==============================================================================
--- trunk/vapi/packages/pango/pango.gi	(original)
+++ trunk/vapi/packages/pango/pango.gi	Sun Jun 15 20:14:19 2008
@@ -85,6 +85,12 @@
 				<parameter name="style" type="PangoStyle"/>
 			</parameters>
 		</function>
+		<function name="attr_type_get_name" symbol="pango_attr_type_get_name">
+			<return-type type="char*"/>
+			<parameters>
+				<parameter name="type" type="PangoAttrType"/>
+			</parameters>
+		</function>
 		<function name="attr_type_register" symbol="pango_attr_type_register">
 			<return-type type="PangoAttrType"/>
 			<parameters>
@@ -117,6 +123,12 @@
 				<parameter name="weight" type="PangoWeight"/>
 			</parameters>
 		</function>
+		<function name="bidi_type_for_unichar" symbol="pango_bidi_type_for_unichar">
+			<return-type type="PangoBidiType"/>
+			<parameters>
+				<parameter name="ch" type="gunichar"/>
+			</parameters>
+		</function>
 		<function name="break" symbol="pango_break">
 			<return-type type="void"/>
 			<parameters>
@@ -681,6 +693,7 @@
 			<field name="is_sentence_end" type="guint"/>
 			<field name="backspace_deletes_character" type="guint"/>
 			<field name="is_expandable_space" type="guint"/>
+			<field name="is_word_boundary" type="guint"/>
 		</struct>
 		<struct name="PangoRectangle">
 			<field name="x" type="int"/>
@@ -1626,12 +1639,12 @@
 				</parameters>
 			</method>
 		</boxed>
-		<enum name="PangoAlignment">
+		<enum name="PangoAlignment" type-name="PangoAlignment" get-type="pango_alignment_get_type">
 			<member name="PANGO_ALIGN_LEFT" value="0"/>
 			<member name="PANGO_ALIGN_CENTER" value="1"/>
 			<member name="PANGO_ALIGN_RIGHT" value="2"/>
 		</enum>
-		<enum name="PangoAttrType">
+		<enum name="PangoAttrType" type-name="PangoAttrType" get-type="pango_attr_type_get_type">
 			<member name="PANGO_ATTR_INVALID" value="0"/>
 			<member name="PANGO_ATTR_LANGUAGE" value="1"/>
 			<member name="PANGO_ATTR_FAMILY" value="2"/>
@@ -1656,13 +1669,34 @@
 			<member name="PANGO_ATTR_GRAVITY" value="21"/>
 			<member name="PANGO_ATTR_GRAVITY_HINT" value="22"/>
 		</enum>
-		<enum name="PangoCoverageLevel">
+		<enum name="PangoBidiType" type-name="PangoBidiType" get-type="pango_bidi_type_get_type">
+			<member name="PANGO_BIDI_TYPE_L" value="0"/>
+			<member name="PANGO_BIDI_TYPE_LRE" value="1"/>
+			<member name="PANGO_BIDI_TYPE_LRO" value="2"/>
+			<member name="PANGO_BIDI_TYPE_R" value="3"/>
+			<member name="PANGO_BIDI_TYPE_AL" value="4"/>
+			<member name="PANGO_BIDI_TYPE_RLE" value="5"/>
+			<member name="PANGO_BIDI_TYPE_RLO" value="6"/>
+			<member name="PANGO_BIDI_TYPE_PDF" value="7"/>
+			<member name="PANGO_BIDI_TYPE_EN" value="8"/>
+			<member name="PANGO_BIDI_TYPE_ES" value="9"/>
+			<member name="PANGO_BIDI_TYPE_ET" value="10"/>
+			<member name="PANGO_BIDI_TYPE_AN" value="11"/>
+			<member name="PANGO_BIDI_TYPE_CS" value="12"/>
+			<member name="PANGO_BIDI_TYPE_NSM" value="13"/>
+			<member name="PANGO_BIDI_TYPE_BN" value="14"/>
+			<member name="PANGO_BIDI_TYPE_B" value="15"/>
+			<member name="PANGO_BIDI_TYPE_S" value="16"/>
+			<member name="PANGO_BIDI_TYPE_WS" value="17"/>
+			<member name="PANGO_BIDI_TYPE_ON" value="18"/>
+		</enum>
+		<enum name="PangoCoverageLevel" type-name="PangoCoverageLevel" get-type="pango_coverage_level_get_type">
 			<member name="PANGO_COVERAGE_NONE" value="0"/>
 			<member name="PANGO_COVERAGE_FALLBACK" value="1"/>
 			<member name="PANGO_COVERAGE_APPROXIMATE" value="2"/>
 			<member name="PANGO_COVERAGE_EXACT" value="3"/>
 		</enum>
-		<enum name="PangoDirection">
+		<enum name="PangoDirection" type-name="PangoDirection" get-type="pango_direction_get_type">
 			<member name="PANGO_DIRECTION_LTR" value="0"/>
 			<member name="PANGO_DIRECTION_RTL" value="1"/>
 			<member name="PANGO_DIRECTION_TTB_LTR" value="2"/>
@@ -1671,31 +1705,31 @@
 			<member name="PANGO_DIRECTION_WEAK_RTL" value="5"/>
 			<member name="PANGO_DIRECTION_NEUTRAL" value="6"/>
 		</enum>
-		<enum name="PangoEllipsizeMode">
+		<enum name="PangoEllipsizeMode" type-name="PangoEllipsizeMode" get-type="pango_ellipsize_mode_get_type">
 			<member name="PANGO_ELLIPSIZE_NONE" value="0"/>
 			<member name="PANGO_ELLIPSIZE_START" value="1"/>
 			<member name="PANGO_ELLIPSIZE_MIDDLE" value="2"/>
 			<member name="PANGO_ELLIPSIZE_END" value="3"/>
 		</enum>
-		<enum name="PangoGravity">
+		<enum name="PangoGravity" type-name="PangoGravity" get-type="pango_gravity_get_type">
 			<member name="PANGO_GRAVITY_SOUTH" value="0"/>
 			<member name="PANGO_GRAVITY_EAST" value="1"/>
 			<member name="PANGO_GRAVITY_NORTH" value="2"/>
 			<member name="PANGO_GRAVITY_WEST" value="3"/>
 			<member name="PANGO_GRAVITY_AUTO" value="4"/>
 		</enum>
-		<enum name="PangoGravityHint">
+		<enum name="PangoGravityHint" type-name="PangoGravityHint" get-type="pango_gravity_hint_get_type">
 			<member name="PANGO_GRAVITY_HINT_NATURAL" value="0"/>
 			<member name="PANGO_GRAVITY_HINT_STRONG" value="1"/>
 			<member name="PANGO_GRAVITY_HINT_LINE" value="2"/>
 		</enum>
-		<enum name="PangoRenderPart">
+		<enum name="PangoRenderPart" type-name="PangoRenderPart" get-type="pango_render_part_get_type">
 			<member name="PANGO_RENDER_PART_FOREGROUND" value="0"/>
 			<member name="PANGO_RENDER_PART_BACKGROUND" value="1"/>
 			<member name="PANGO_RENDER_PART_UNDERLINE" value="2"/>
 			<member name="PANGO_RENDER_PART_STRIKETHROUGH" value="3"/>
 		</enum>
-		<enum name="PangoScript">
+		<enum name="PangoScript" type-name="PangoScript" get-type="pango_script_get_type">
 			<member name="PANGO_SCRIPT_INVALID_CODE" value="-1"/>
 			<member name="PANGO_SCRIPT_COMMON" value="0"/>
 			<member name="PANGO_SCRIPT_INHERITED" value="1"/>
@@ -1764,8 +1798,19 @@
 			<member name="PANGO_SCRIPT_PHOENICIAN" value="64"/>
 			<member name="PANGO_SCRIPT_PHAGS_PA" value="65"/>
 			<member name="PANGO_SCRIPT_NKO" value="66"/>
+			<member name="PANGO_SCRIPT_KAYAH_LI" value="67"/>
+			<member name="PANGO_SCRIPT_LEPCHA" value="68"/>
+			<member name="PANGO_SCRIPT_REJANG" value="69"/>
+			<member name="PANGO_SCRIPT_SUNDANESE" value="70"/>
+			<member name="PANGO_SCRIPT_SAURASHTRA" value="71"/>
+			<member name="PANGO_SCRIPT_CHAM" value="72"/>
+			<member name="PANGO_SCRIPT_OL_CHIKI" value="73"/>
+			<member name="PANGO_SCRIPT_VAI" value="74"/>
+			<member name="PANGO_SCRIPT_CARIAN" value="75"/>
+			<member name="PANGO_SCRIPT_LYCIAN" value="76"/>
+			<member name="PANGO_SCRIPT_LYDIAN" value="77"/>
 		</enum>
-		<enum name="PangoStretch">
+		<enum name="PangoStretch" type-name="PangoStretch" get-type="pango_stretch_get_type">
 			<member name="PANGO_STRETCH_ULTRA_CONDENSED" value="0"/>
 			<member name="PANGO_STRETCH_EXTRA_CONDENSED" value="1"/>
 			<member name="PANGO_STRETCH_CONDENSED" value="2"/>
@@ -1776,26 +1821,26 @@
 			<member name="PANGO_STRETCH_EXTRA_EXPANDED" value="7"/>
 			<member name="PANGO_STRETCH_ULTRA_EXPANDED" value="8"/>
 		</enum>
-		<enum name="PangoStyle">
+		<enum name="PangoStyle" type-name="PangoStyle" get-type="pango_style_get_type">
 			<member name="PANGO_STYLE_NORMAL" value="0"/>
 			<member name="PANGO_STYLE_OBLIQUE" value="1"/>
 			<member name="PANGO_STYLE_ITALIC" value="2"/>
 		</enum>
-		<enum name="PangoTabAlign">
+		<enum name="PangoTabAlign" type-name="PangoTabAlign" get-type="pango_tab_align_get_type">
 			<member name="PANGO_TAB_LEFT" value="0"/>
 		</enum>
-		<enum name="PangoUnderline">
+		<enum name="PangoUnderline" type-name="PangoUnderline" get-type="pango_underline_get_type">
 			<member name="PANGO_UNDERLINE_NONE" value="0"/>
 			<member name="PANGO_UNDERLINE_SINGLE" value="1"/>
 			<member name="PANGO_UNDERLINE_DOUBLE" value="2"/>
 			<member name="PANGO_UNDERLINE_LOW" value="3"/>
 			<member name="PANGO_UNDERLINE_ERROR" value="4"/>
 		</enum>
-		<enum name="PangoVariant">
+		<enum name="PangoVariant" type-name="PangoVariant" get-type="pango_variant_get_type">
 			<member name="PANGO_VARIANT_NORMAL" value="0"/>
 			<member name="PANGO_VARIANT_SMALL_CAPS" value="1"/>
 		</enum>
-		<enum name="PangoWeight">
+		<enum name="PangoWeight" type-name="PangoWeight" get-type="pango_weight_get_type">
 			<member name="PANGO_WEIGHT_ULTRALIGHT" value="200"/>
 			<member name="PANGO_WEIGHT_LIGHT" value="300"/>
 			<member name="PANGO_WEIGHT_NORMAL" value="400"/>
@@ -1804,12 +1849,12 @@
 			<member name="PANGO_WEIGHT_ULTRABOLD" value="800"/>
 			<member name="PANGO_WEIGHT_HEAVY" value="900"/>
 		</enum>
-		<enum name="PangoWrapMode">
+		<enum name="PangoWrapMode" type-name="PangoWrapMode" get-type="pango_wrap_mode_get_type">
 			<member name="PANGO_WRAP_WORD" value="0"/>
 			<member name="PANGO_WRAP_CHAR" value="1"/>
 			<member name="PANGO_WRAP_WORD_CHAR" value="2"/>
 		</enum>
-		<flags name="PangoFontMask">
+		<flags name="PangoFontMask" type-name="PangoFontMask" get-type="pango_font_mask_get_type">
 			<member name="PANGO_FONT_MASK_FAMILY" value="1"/>
 			<member name="PANGO_FONT_MASK_STYLE" value="2"/>
 			<member name="PANGO_FONT_MASK_VARIANT" value="4"/>
@@ -2130,6 +2175,12 @@
 					<parameter name="layout" type="PangoLayout*"/>
 				</parameters>
 			</method>
+			<method name="get_baseline" symbol="pango_layout_get_baseline">
+				<return-type type="int"/>
+				<parameters>
+					<parameter name="layout" type="PangoLayout*"/>
+				</parameters>
+			</method>
 			<method name="get_context" symbol="pango_layout_get_context">
 				<return-type type="PangoContext*"/>
 				<parameters>
@@ -2705,8 +2756,8 @@
 		<constant name="PANGO_UNKNOWN_GLYPH_HEIGHT" type="int" value="14"/>
 		<constant name="PANGO_UNKNOWN_GLYPH_WIDTH" type="int" value="10"/>
 		<constant name="PANGO_VERSION_MAJOR" type="int" value="1"/>
-		<constant name="PANGO_VERSION_MICRO" type="int" value="3"/>
-		<constant name="PANGO_VERSION_MINOR" type="int" value="19"/>
-		<constant name="PANGO_VERSION_STRING" type="char*" value="1.19.3"/>
+		<constant name="PANGO_VERSION_MICRO" type="int" value="2"/>
+		<constant name="PANGO_VERSION_MINOR" type="int" value="21"/>
+		<constant name="PANGO_VERSION_STRING" type="char*" value="1.21.2"/>
 	</namespace>
 </api>

Modified: trunk/vapi/packages/pangocairo/pangocairo.gi
==============================================================================
--- trunk/vapi/packages/pangocairo/pangocairo.gi	(original)
+++ trunk/vapi/packages/pangocairo/pangocairo.gi	Sun Jun 15 20:14:19 2008
@@ -43,6 +43,12 @@
 				<parameter name="dnotify" type="GDestroyNotify"/>
 			</parameters>
 		</function>
+		<function name="cairo_create_context" symbol="pango_cairo_create_context">
+			<return-type type="PangoContext*"/>
+			<parameters>
+				<parameter name="cr" type="cairo_t*"/>
+			</parameters>
+		</function>
 		<function name="cairo_create_layout" symbol="pango_cairo_create_layout">
 			<return-type type="PangoLayout*"/>
 			<parameters>
@@ -181,6 +187,12 @@
 					<parameter name="fonttype" type="cairo_font_type_t"/>
 				</parameters>
 			</method>
+			<method name="set_default" symbol="pango_cairo_font_map_set_default">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="fontmap" type="PangoCairoFontMap*"/>
+				</parameters>
+			</method>
 			<method name="set_resolution" symbol="pango_cairo_font_map_set_resolution">
 				<return-type type="void"/>
 				<parameters>

Modified: trunk/vapi/pango.vapi
==============================================================================
--- trunk/vapi/pango.vapi	(original)
+++ trunk/vapi/pango.vapi	Sun Jun 15 20:14:19 2008
@@ -2,13 +2,13 @@
 
 [CCode (cprefix = "Pango", lower_case_cprefix = "pango_")]
 namespace Pango {
-	[CCode (cprefix = "PANGO_ALIGN_", has_type_id = "0", cheader_filename = "pango/pango.h")]
+	[CCode (cprefix = "PANGO_ALIGN_", cheader_filename = "pango/pango.h")]
 	public enum Alignment {
 		LEFT,
 		CENTER,
 		RIGHT
 	}
-	[CCode (cprefix = "PANGO_ATTR_", has_type_id = "0", cheader_filename = "pango/pango.h")]
+	[CCode (cprefix = "PANGO_ATTR_", cheader_filename = "pango/pango.h")]
 	public enum AttrType {
 		INVALID,
 		LANGUAGE,
@@ -34,14 +34,36 @@
 		GRAVITY,
 		GRAVITY_HINT
 	}
-	[CCode (cprefix = "PANGO_COVERAGE_", has_type_id = "0", cheader_filename = "pango/pango.h")]
+	[CCode (cprefix = "PANGO_BIDI_TYPE_", cheader_filename = "pango/pango.h")]
+	public enum BidiType {
+		L,
+		LRE,
+		LRO,
+		R,
+		AL,
+		RLE,
+		RLO,
+		PDF,
+		EN,
+		ES,
+		ET,
+		AN,
+		CS,
+		NSM,
+		BN,
+		B,
+		S,
+		WS,
+		ON
+	}
+	[CCode (cprefix = "PANGO_COVERAGE_", cheader_filename = "pango/pango.h")]
 	public enum CoverageLevel {
 		NONE,
 		FALLBACK,
 		APPROXIMATE,
 		EXACT
 	}
-	[CCode (cprefix = "PANGO_DIRECTION_", has_type_id = "0", cheader_filename = "pango/pango.h")]
+	[CCode (cprefix = "PANGO_DIRECTION_", cheader_filename = "pango/pango.h")]
 	public enum Direction {
 		LTR,
 		RTL,
@@ -51,14 +73,14 @@
 		WEAK_RTL,
 		NEUTRAL
 	}
-	[CCode (cprefix = "PANGO_ELLIPSIZE_", has_type_id = "0", cheader_filename = "pango/pango.h")]
+	[CCode (cprefix = "PANGO_ELLIPSIZE_", cheader_filename = "pango/pango.h")]
 	public enum EllipsizeMode {
 		NONE,
 		START,
 		MIDDLE,
 		END
 	}
-	[CCode (cprefix = "PANGO_GRAVITY_", has_type_id = "0", cheader_filename = "pango/pango.h")]
+	[CCode (cprefix = "PANGO_GRAVITY_", cheader_filename = "pango/pango.h")]
 	public enum Gravity {
 		SOUTH,
 		EAST,
@@ -66,20 +88,20 @@
 		WEST,
 		AUTO
 	}
-	[CCode (cprefix = "PANGO_GRAVITY_HINT_", has_type_id = "0", cheader_filename = "pango/pango.h")]
+	[CCode (cprefix = "PANGO_GRAVITY_HINT_", cheader_filename = "pango/pango.h")]
 	public enum GravityHint {
 		NATURAL,
 		STRONG,
 		LINE
 	}
-	[CCode (cprefix = "PANGO_RENDER_PART_", has_type_id = "0", cheader_filename = "pango/pango.h")]
+	[CCode (cprefix = "PANGO_RENDER_PART_", cheader_filename = "pango/pango.h")]
 	public enum RenderPart {
 		FOREGROUND,
 		BACKGROUND,
 		UNDERLINE,
 		STRIKETHROUGH
 	}
-	[CCode (cprefix = "PANGO_SCRIPT_", has_type_id = "0", cheader_filename = "pango/pango.h")]
+	[CCode (cprefix = "PANGO_SCRIPT_", cheader_filename = "pango/pango.h")]
 	public enum Script {
 		INVALID_CODE,
 		COMMON,
@@ -148,9 +170,20 @@
 		CUNEIFORM,
 		PHOENICIAN,
 		PHAGS_PA,
-		NKO
+		NKO,
+		KAYAH_LI,
+		LEPCHA,
+		REJANG,
+		SUNDANESE,
+		SAURASHTRA,
+		CHAM,
+		OL_CHIKI,
+		VAI,
+		CARIAN,
+		LYCIAN,
+		LYDIAN
 	}
-	[CCode (cprefix = "PANGO_STRETCH_", has_type_id = "0", cheader_filename = "pango/pango.h")]
+	[CCode (cprefix = "PANGO_STRETCH_", cheader_filename = "pango/pango.h")]
 	public enum Stretch {
 		ULTRA_CONDENSED,
 		EXTRA_CONDENSED,
@@ -162,17 +195,17 @@
 		EXTRA_EXPANDED,
 		ULTRA_EXPANDED
 	}
-	[CCode (cprefix = "PANGO_STYLE_", has_type_id = "0", cheader_filename = "pango/pango.h")]
+	[CCode (cprefix = "PANGO_STYLE_", cheader_filename = "pango/pango.h")]
 	public enum Style {
 		NORMAL,
 		OBLIQUE,
 		ITALIC
 	}
-	[CCode (cprefix = "PANGO_TAB_", has_type_id = "0", cheader_filename = "pango/pango.h")]
+	[CCode (cprefix = "PANGO_TAB_", cheader_filename = "pango/pango.h")]
 	public enum TabAlign {
 		LEFT
 	}
-	[CCode (cprefix = "PANGO_UNDERLINE_", has_type_id = "0", cheader_filename = "pango/pango.h")]
+	[CCode (cprefix = "PANGO_UNDERLINE_", cheader_filename = "pango/pango.h")]
 	public enum Underline {
 		NONE,
 		SINGLE,
@@ -180,12 +213,12 @@
 		LOW,
 		ERROR
 	}
-	[CCode (cprefix = "PANGO_VARIANT_", has_type_id = "0", cheader_filename = "pango/pango.h")]
+	[CCode (cprefix = "PANGO_VARIANT_", cheader_filename = "pango/pango.h")]
 	public enum Variant {
 		NORMAL,
 		SMALL_CAPS
 	}
-	[CCode (cprefix = "PANGO_WEIGHT_", has_type_id = "0", cheader_filename = "pango/pango.h")]
+	[CCode (cprefix = "PANGO_WEIGHT_", cheader_filename = "pango/pango.h")]
 	public enum Weight {
 		ULTRALIGHT,
 		LIGHT,
@@ -195,13 +228,13 @@
 		ULTRABOLD,
 		HEAVY
 	}
-	[CCode (cprefix = "PANGO_WRAP_", has_type_id = "0", cheader_filename = "pango/pango.h")]
+	[CCode (cprefix = "PANGO_WRAP_", cheader_filename = "pango/pango.h")]
 	public enum WrapMode {
 		WORD,
 		CHAR,
 		WORD_CHAR
 	}
-	[CCode (cprefix = "PANGO_FONT_MASK_", has_type_id = "0", cheader_filename = "pango/pango.h")]
+	[CCode (cprefix = "PANGO_FONT_MASK_", cheader_filename = "pango/pango.h")]
 	[Flags]
 	public enum FontMask {
 		FAMILY,
@@ -212,9 +245,8 @@
 		SIZE,
 		GRAVITY
 	}
-	[Compact]
-	[CCode (cheader_filename = "pango/pango.h")]
-	public class Language : GLib.Boxed {
+	[CCode (ref_function = "pango_language_ref", unref_function = "pango_language_unref", cheader_filename = "pango/pango.h")]
+	public class Language {
 		public weak string to_string ();
 		public Language ();
 		public static weak Pango.Language from_string (string language);
@@ -389,7 +421,7 @@
 	}
 	[Compact]
 	[CCode (ref_function = "pango_attr_list_ref", unref_function = "pango_attr_list_unref", cheader_filename = "pango/pango.h")]
-	public class AttrList : GLib.Boxed {
+	public class AttrList {
 		public void change (Pango.Attribute attr);
 		public weak Pango.AttrList copy ();
 		public weak Pango.AttrList filter (Pango.AttrFilterFunc func, void* data);
@@ -401,7 +433,7 @@
 	}
 	[Compact]
 	[CCode (copy_function = "pango_font_description_copy", cheader_filename = "pango/pango.h")]
-	public class FontDescription : GLib.Boxed {
+	public class FontDescription {
 		public bool better_match (Pango.FontDescription old_match, Pango.FontDescription new_match);
 		public weak Pango.FontDescription copy ();
 		public weak Pango.FontDescription copy_static ();
@@ -435,7 +467,7 @@
 	}
 	[Compact]
 	[CCode (ref_function = "pango_font_metrics_ref", unref_function = "pango_font_metrics_unref", cheader_filename = "pango/pango.h")]
-	public class FontMetrics : GLib.Boxed {
+	public class FontMetrics {
 		public int get_approximate_char_width ();
 		public int get_approximate_digit_width ();
 		public int get_ascent ();
@@ -447,7 +479,7 @@
 	}
 	[Compact]
 	[CCode (copy_function = "pango_glyph_item_copy", cheader_filename = "pango/pango.h")]
-	public class GlyphItem : GLib.Boxed {
+	public class GlyphItem {
 		public weak Pango.Item item;
 		public weak Pango.GlyphString glyphs;
 		public weak GLib.SList apply_attrs (string text, Pango.AttrList list);
@@ -457,7 +489,7 @@
 	}
 	[Compact]
 	[CCode (copy_function = "pango_glyph_string_copy", cheader_filename = "pango/pango.h")]
-	public class GlyphString : GLib.Boxed {
+	public class GlyphString {
 		public int num_glyphs;
 		public weak Pango.GlyphInfo glyphs;
 		public int log_clusters;
@@ -474,7 +506,7 @@
 	}
 	[Compact]
 	[CCode (copy_function = "pango_item_copy", cheader_filename = "pango/pango.h")]
-	public class Item : GLib.Boxed {
+	public class Item {
 		public int offset;
 		public int length;
 		public int num_chars;
@@ -485,7 +517,7 @@
 	}
 	[Compact]
 	[CCode (copy_function = "pango_layout_iter_copy", cheader_filename = "pango/pango.h")]
-	public class LayoutIter : GLib.Boxed {
+	public class LayoutIter {
 		public bool at_last_line ();
 		public weak Pango.LayoutIter copy ();
 		public int get_baseline ();
@@ -508,7 +540,7 @@
 	}
 	[Compact]
 	[CCode (ref_function = "pango_layout_line_ref", unref_function = "pango_layout_line_unref", cheader_filename = "pango/pango.h")]
-	public class LayoutLine : GLib.Boxed {
+	public class LayoutLine {
 		public weak Pango.Layout layout;
 		public int start_index;
 		public int length;
@@ -523,7 +555,7 @@
 	}
 	[Compact]
 	[CCode (copy_function = "pango_tab_array_copy", cheader_filename = "pango/pango.h")]
-	public class TabArray : GLib.Boxed {
+	public class TabArray {
 		public weak Pango.TabArray copy ();
 		public bool get_positions_in_pixels ();
 		public int get_size ();
@@ -598,6 +630,7 @@
 		public Pango.Alignment get_alignment ();
 		public weak Pango.AttrList get_attributes ();
 		public bool get_auto_dir ();
+		public int get_baseline ();
 		public weak Pango.Context get_context ();
 		public void get_cursor_pos (int index_, out Pango.Rectangle strong_pos, out Pango.Rectangle weak_pos);
 		public Pango.EllipsizeMode get_ellipsize ();
@@ -692,6 +725,7 @@
 		public uint is_sentence_end;
 		public uint backspace_deletes_character;
 		public uint is_expandable_space;
+		public uint is_word_boundary;
 	}
 	[CCode (cheader_filename = "pango/pango.h")]
 	public struct Rectangle {
@@ -700,7 +734,7 @@
 		public int width;
 		public int height;
 	}
-	[CCode (cheader_filename = "pango/pango.h")]
+	[CCode (type_id = "PANGO_TYPE_COLOR", cheader_filename = "pango/pango.h")]
 	public struct Color {
 		public ushort red;
 		public ushort green;
@@ -710,7 +744,7 @@
 		public bool parse (string spec);
 		public weak string to_string ();
 	}
-	[CCode (cheader_filename = "pango/pango.h")]
+	[CCode (type_id = "PANGO_TYPE_MATRIX", cheader_filename = "pango/pango.h")]
 	public struct Matrix {
 		public double xx;
 		public double xy;
@@ -785,6 +819,8 @@
 	[CCode (cheader_filename = "pango/pango.h")]
 	public static weak Pango.Attribute attr_style_new (Pango.Style style);
 	[CCode (cheader_filename = "pango/pango.h")]
+	public static weak string attr_type_get_name (Pango.AttrType type);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static Pango.AttrType attr_type_register (string name);
 	[CCode (cheader_filename = "pango/pango.h")]
 	public static weak Pango.Attribute attr_underline_color_new (ushort red, ushort green, ushort blue);
@@ -795,6 +831,8 @@
 	[CCode (cheader_filename = "pango/pango.h")]
 	public static weak Pango.Attribute attr_weight_new (Pango.Weight weight);
 	[CCode (cheader_filename = "pango/pango.h")]
+	public static Pango.BidiType bidi_type_for_unichar (unichar ch);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static void @break (string text, int length, Pango.Analysis analysis, Pango.LogAttr[] attrs, int attrs_len);
 	[CCode (cheader_filename = "pango/pango.h")]
 	public static void extents_to_pixels (ref Pango.Rectangle inclusive, ref Pango.Rectangle nearest);

Modified: trunk/vapi/pangocairo.vapi
==============================================================================
--- trunk/vapi/pangocairo.vapi	(original)
+++ trunk/vapi/pangocairo.vapi	Sun Jun 15 20:14:19 2008
@@ -14,6 +14,7 @@
 		public double get_resolution ();
 		public static weak Pango.FontMap @new ();
 		public static weak Pango.FontMap new_for_font_type (Cairo.FontType fonttype);
+		public void set_default ();
 		public void set_resolution (double dpi);
 	}
 	[CCode (cheader_filename = "pango/pangocairo.h")]
@@ -31,6 +32,8 @@
 	[CCode (cheader_filename = "pango/pangocairo.h")]
 	public static void cairo_context_set_shape_renderer (Pango.Context context, Pango.CairoShapeRendererFunc func, void* data, GLib.DestroyNotify dnotify);
 	[CCode (cheader_filename = "pango/pangocairo.h")]
+	public static weak Pango.Context cairo_create_context (Cairo.Context cr);
+	[CCode (cheader_filename = "pango/pangocairo.h")]
 	public static weak Pango.Layout cairo_create_layout (Cairo.Context cr);
 	[CCode (cheader_filename = "pango/pangocairo.h")]
 	public static void cairo_error_underline_path (Cairo.Context cr, double x, double y, double width, double height);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]