vala r1904 - in trunk: . vapi vapi/packages/gdk-x11-2.0 vapi/packages/gnome-desktop-2.0 vapi/packages/gtksourceview-2.0 vapi/packages/hildon-1 vapi/packages/hildon-fm-2 vapi/packages/libglade-2.0 vapi/packages/libgnomeui-2.0 vapi/packages/libnotify vapi/packages/libsexy vapi/packages/libwnck-1.0 vapi/packages/webkit-1.0



Author: juergbi
Date: Fri Oct 24 16:50:22 2008
New Revision: 1904
URL: http://svn.gnome.org/viewvc/vala?rev=1904&view=rev

Log:
2008-10-24  JÃrg Billeter  <j bitron ch>

	* vapi/*.vapi:

	Regenerate bindings


Modified:
   trunk/ChangeLog
   trunk/vapi/atk.vapi
   trunk/vapi/gconf-2.0.vapi
   trunk/vapi/gdk-2.0.vapi
   trunk/vapi/gdk-pixbuf-2.0.vapi
   trunk/vapi/gdk-x11-2.0.vapi
   trunk/vapi/gio-2.0.vapi
   trunk/vapi/gio-unix-2.0.vapi
   trunk/vapi/gnet-2.0.vapi
   trunk/vapi/gnome-desktop-2.0.vapi
   trunk/vapi/gnome-keyring-1.vapi
   trunk/vapi/gnome-vfs-2.0.vapi
   trunk/vapi/goocanvas.vapi
   trunk/vapi/gstreamer-0.10.vapi
   trunk/vapi/gstreamer-audio-0.10.vapi
   trunk/vapi/gstreamer-base-0.10.vapi
   trunk/vapi/gstreamer-check-0.10.vapi
   trunk/vapi/gstreamer-controller-0.10.vapi
   trunk/vapi/gstreamer-dataprotocol-0.10.vapi
   trunk/vapi/gstreamer-fft-0.10.vapi
   trunk/vapi/gstreamer-interfaces-0.10.vapi
   trunk/vapi/gstreamer-net-0.10.vapi
   trunk/vapi/gstreamer-netbuffer-0.10.vapi
   trunk/vapi/gstreamer-pbutils-0.10.vapi
   trunk/vapi/gstreamer-riff-0.10.vapi
   trunk/vapi/gstreamer-rtp-0.10.vapi
   trunk/vapi/gstreamer-sdp-0.10.vapi
   trunk/vapi/gstreamer-tag-0.10.vapi
   trunk/vapi/gstreamer-video-0.10.vapi
   trunk/vapi/gtk+-2.0.vapi
   trunk/vapi/gtksourceview-2.0.vapi
   trunk/vapi/hildon-1.vapi
   trunk/vapi/hildon-fm-2.vapi
   trunk/vapi/json-glib-1.0.vapi
   trunk/vapi/libglade-2.0.vapi
   trunk/vapi/libgnome-2.0.vapi
   trunk/vapi/libgnome-menu.vapi
   trunk/vapi/libgnomeui-2.0.vapi
   trunk/vapi/libgsf-1.vapi
   trunk/vapi/libnotify.vapi
   trunk/vapi/liboobs-1.vapi
   trunk/vapi/libsexy.vapi
   trunk/vapi/libsoup-2.2.vapi
   trunk/vapi/libsoup-2.4.vapi
   trunk/vapi/libwnck-1.0.vapi
   trunk/vapi/packages/gdk-x11-2.0/gdk-x11-2.0.deps
   trunk/vapi/packages/gnome-desktop-2.0/gnome-desktop-2.0.deps
   trunk/vapi/packages/gtksourceview-2.0/gtksourceview-2.0.deps
   trunk/vapi/packages/hildon-1/hildon-1.deps
   trunk/vapi/packages/hildon-fm-2/hildon-fm-2.deps
   trunk/vapi/packages/libglade-2.0/libglade-2.0.deps
   trunk/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.deps
   trunk/vapi/packages/libnotify/libnotify.deps
   trunk/vapi/packages/libsexy/libsexy.deps
   trunk/vapi/packages/libwnck-1.0/libwnck-1.0.deps
   trunk/vapi/packages/webkit-1.0/webkit-1.0.deps
   trunk/vapi/pango.vapi
   trunk/vapi/poppler-glib.vapi
   trunk/vapi/vte.vapi
   trunk/vapi/webkit-1.0.vapi

Modified: trunk/vapi/atk.vapi
==============================================================================
--- trunk/vapi/atk.vapi	(original)
+++ trunk/vapi/atk.vapi	Fri Oct 24 16:50:22 2008
@@ -2,237 +2,6 @@
 
 [CCode (cprefix = "Atk", lower_case_cprefix = "atk_")]
 namespace Atk {
-	[CCode (cprefix = "ATK_XY_", cheader_filename = "atk/atk.h")]
-	public enum CoordType {
-		SCREEN,
-		WINDOW
-	}
-	[CCode (cprefix = "ATK_KEY_EVENT_", cheader_filename = "atk/atk.h")]
-	public enum KeyEventType {
-		PRESS,
-		RELEASE,
-		LAST_DEFINED
-	}
-	[CCode (cprefix = "ATK_LAYER_", cheader_filename = "atk/atk.h")]
-	public enum Layer {
-		INVALID,
-		BACKGROUND,
-		CANVAS,
-		WIDGET,
-		MDI,
-		POPUP,
-		OVERLAY,
-		WINDOW
-	}
-	[CCode (cprefix = "ATK_RELATION_", cheader_filename = "atk/atk.h")]
-	public enum RelationType {
-		NULL,
-		CONTROLLED_BY,
-		CONTROLLER_FOR,
-		LABEL_FOR,
-		LABELLED_BY,
-		MEMBER_OF,
-		NODE_CHILD_OF,
-		FLOWS_TO,
-		FLOWS_FROM,
-		SUBWINDOW_OF,
-		EMBEDS,
-		EMBEDDED_BY,
-		POPUP_FOR,
-		PARENT_WINDOW_OF,
-		DESCRIBED_BY,
-		DESCRIPTION_FOR,
-		LAST_DEFINED
-	}
-	[CCode (cprefix = "ATK_ROLE_", cheader_filename = "atk/atk.h")]
-	public enum Role {
-		INVALID,
-		ACCEL_LABEL,
-		ALERT,
-		ANIMATION,
-		ARROW,
-		CALENDAR,
-		CANVAS,
-		CHECK_BOX,
-		CHECK_MENU_ITEM,
-		COLOR_CHOOSER,
-		COLUMN_HEADER,
-		COMBO_BOX,
-		DATE_EDITOR,
-		DESKTOP_ICON,
-		DESKTOP_FRAME,
-		DIAL,
-		DIALOG,
-		DIRECTORY_PANE,
-		DRAWING_AREA,
-		FILE_CHOOSER,
-		FILLER,
-		FONT_CHOOSER,
-		FRAME,
-		GLASS_PANE,
-		HTML_CONTAINER,
-		ICON,
-		IMAGE,
-		INTERNAL_FRAME,
-		LABEL,
-		LAYERED_PANE,
-		LIST,
-		LIST_ITEM,
-		MENU,
-		MENU_BAR,
-		MENU_ITEM,
-		OPTION_PANE,
-		PAGE_TAB,
-		PAGE_TAB_LIST,
-		PANEL,
-		PASSWORD_TEXT,
-		POPUP_MENU,
-		PROGRESS_BAR,
-		PUSH_BUTTON,
-		RADIO_BUTTON,
-		RADIO_MENU_ITEM,
-		ROOT_PANE,
-		ROW_HEADER,
-		SCROLL_BAR,
-		SCROLL_PANE,
-		SEPARATOR,
-		SLIDER,
-		SPLIT_PANE,
-		SPIN_BUTTON,
-		STATUSBAR,
-		TABLE,
-		TABLE_CELL,
-		TABLE_COLUMN_HEADER,
-		TABLE_ROW_HEADER,
-		TEAR_OFF_MENU_ITEM,
-		TERMINAL,
-		TEXT,
-		TOGGLE_BUTTON,
-		TOOL_BAR,
-		TOOL_TIP,
-		TREE,
-		TREE_TABLE,
-		UNKNOWN,
-		VIEWPORT,
-		WINDOW,
-		HEADER,
-		FOOTER,
-		PARAGRAPH,
-		RULER,
-		APPLICATION,
-		AUTOCOMPLETE,
-		EDITBAR,
-		EMBEDDED,
-		ENTRY,
-		CHART,
-		CAPTION,
-		DOCUMENT_FRAME,
-		HEADING,
-		PAGE,
-		SECTION,
-		REDUNDANT_OBJECT,
-		FORM,
-		LINK,
-		INPUT_METHOD_WINDOW,
-		LAST_DEFINED
-	}
-	[CCode (cprefix = "ATK_STATE_", cheader_filename = "atk/atk.h")]
-	public enum StateType {
-		INVALID,
-		ACTIVE,
-		ARMED,
-		BUSY,
-		CHECKED,
-		DEFUNCT,
-		EDITABLE,
-		ENABLED,
-		EXPANDABLE,
-		EXPANDED,
-		FOCUSABLE,
-		FOCUSED,
-		HORIZONTAL,
-		ICONIFIED,
-		MODAL,
-		MULTI_LINE,
-		MULTISELECTABLE,
-		OPAQUE,
-		PRESSED,
-		RESIZABLE,
-		SELECTABLE,
-		SELECTED,
-		SENSITIVE,
-		SHOWING,
-		SINGLE_LINE,
-		STALE,
-		TRANSIENT,
-		VERTICAL,
-		VISIBLE,
-		MANAGES_DESCENDANTS,
-		INDETERMINATE,
-		TRUNCATED,
-		REQUIRED,
-		INVALID_ENTRY,
-		SUPPORTS_AUTOCOMPLETION,
-		SELECTABLE_TEXT,
-		DEFAULT,
-		ANIMATED,
-		VISITED,
-		LAST_DEFINED
-	}
-	[CCode (cprefix = "ATK_TEXT_ATTR_", cheader_filename = "atk/atk.h")]
-	public enum TextAttribute {
-		INVALID,
-		LEFT_MARGIN,
-		RIGHT_MARGIN,
-		INDENT,
-		INVISIBLE,
-		EDITABLE,
-		PIXELS_ABOVE_LINES,
-		PIXELS_BELOW_LINES,
-		PIXELS_INSIDE_WRAP,
-		BG_FULL_HEIGHT,
-		RISE,
-		UNDERLINE,
-		STRIKETHROUGH,
-		SIZE,
-		SCALE,
-		WEIGHT,
-		LANGUAGE,
-		FAMILY_NAME,
-		BG_COLOR,
-		FG_COLOR,
-		BG_STIPPLE,
-		FG_STIPPLE,
-		WRAP_MODE,
-		DIRECTION,
-		JUSTIFICATION,
-		STRETCH,
-		VARIANT,
-		STYLE,
-		LAST_DEFINED
-	}
-	[CCode (cprefix = "ATK_TEXT_BOUNDARY_", cheader_filename = "atk/atk.h")]
-	public enum TextBoundary {
-		CHAR,
-		WORD_START,
-		WORD_END,
-		SENTENCE_START,
-		SENTENCE_END,
-		LINE_START,
-		LINE_END
-	}
-	[CCode (cprefix = "ATK_TEXT_CLIP_", cheader_filename = "atk/atk.h")]
-	public enum TextClipType {
-		NONE,
-		MIN,
-		MAX,
-		BOTH
-	}
-	[CCode (cprefix = "ATK_HYPERLINK_IS_", cheader_filename = "atk/atk.h")]
-	[Flags]
-	public enum HyperlinkStateFlags {
-		INLINE
-	}
 	[Compact]
 	[CCode (cheader_filename = "atk/atk.h")]
 	public class Attribute {
@@ -243,48 +12,6 @@
 	[CCode (cheader_filename = "atk/atk.h")]
 	public class AttributeSet {
 	}
-	[Compact]
-	[CCode (cheader_filename = "atk/atk.h")]
-	public class KeyEventStruct {
-		public int type;
-		public uint state;
-		public uint keyval;
-		public int length;
-		[CCode (cname = "string")]
-		public weak string str;
-		public ushort keycode;
-		public uint timestamp;
-	}
-	[Compact]
-	[CCode (cheader_filename = "atk/atk.h")]
-	public class PropertyValues {
-		public weak string property_name;
-		public GLib.Value old_value;
-		public GLib.Value new_value;
-	}
-	[Compact]
-	[CCode (cheader_filename = "atk/atk.h")]
-	public class State {
-		public static Atk.StateType type_for_name (string name);
-		public static weak string type_get_name (Atk.StateType type);
-		public static Atk.StateType type_register (string name);
-	}
-	[Compact]
-	[CCode (cheader_filename = "atk/atk.h")]
-	public class TextRange {
-		public weak Atk.TextRectangle bounds;
-		public int start_offset;
-		public int end_offset;
-		public weak string content;
-	}
-	[Compact]
-	[CCode (cheader_filename = "atk/atk.h")]
-	public class TextRectangle {
-		public int x;
-		public int y;
-		public int width;
-		public int height;
-	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public class GObjectAccessible : Atk.Object {
 		public static weak Atk.Object for_object (GLib.Object obj);
@@ -292,12 +19,12 @@
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public class Hyperlink : GLib.Object, Atk.Action {
-		public bool is_inline ();
 		public virtual int get_end_index ();
 		public virtual int get_n_anchors ();
 		public virtual weak Atk.Object get_object (int i);
 		public virtual int get_start_index ();
 		public virtual weak string get_uri (int i);
+		public bool is_inline ();
 		public virtual bool is_selected_link ();
 		public virtual bool is_valid ();
 		[NoWrapper]
@@ -310,6 +37,18 @@
 		public int start_index { get; }
 		public virtual signal void link_activated ();
 	}
+	[Compact]
+	[CCode (cheader_filename = "atk/atk.h")]
+	public class KeyEventStruct {
+		public ushort keycode;
+		public uint keyval;
+		public int length;
+		public uint state;
+		[CCode (cname = "string")]
+		public weak string str;
+		public uint timestamp;
+		public int type;
+	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public class Misc : GLib.Object {
 		public static weak Atk.Misc get_instance ();
@@ -329,32 +68,32 @@
 	[CCode (cheader_filename = "atk/atk.h")]
 	public class Object : GLib.Object {
 		public weak string description;
+		public Atk.Layer layer;
 		public weak string name;
-		public Atk.Role role;
 		public weak Atk.RelationSet relation_set;
-		public Atk.Layer layer;
+		public Atk.Role role;
 		public bool add_relationship (Atk.RelationType relationship, Atk.Object target);
-		public int get_n_accessible_children ();
-		public void notify_state_change (Atk.State state, bool value);
-		public weak Atk.Object ref_accessible_child (int i);
-		public bool remove_relationship (Atk.RelationType relationship, Atk.Object target);
 		public virtual uint connect_property_change_handler (Atk.PropertyChangeHandler handler);
 		public virtual weak Atk.AttributeSet get_attributes ();
 		public virtual weak string get_description ();
 		public virtual int get_index_in_parent ();
 		public virtual Atk.Layer get_layer ();
 		public virtual int get_mdi_zorder ();
+		public int get_n_accessible_children ();
 		[NoWrapper]
 		public virtual int get_n_children ();
 		public virtual weak string get_name ();
 		public virtual weak Atk.Object get_parent ();
 		public virtual Atk.Role get_role ();
 		public virtual void initialize (void* data);
+		public void notify_state_change (Atk.State state, bool value);
+		public weak Atk.Object ref_accessible_child (int i);
 		[NoWrapper]
 		public virtual weak Atk.Object ref_child (int i);
 		public virtual weak Atk.RelationSet ref_relation_set ();
 		public virtual weak Atk.StateSet ref_state_set ();
 		public virtual void remove_property_change_handler (uint handler_id);
+		public bool remove_relationship (Atk.RelationType relationship, Atk.Object target);
 		public virtual void set_description (string description);
 		public virtual void set_name (string name);
 		public virtual void set_parent (Atk.Object parent);
@@ -402,10 +141,17 @@
 		public virtual GLib.Type get_accessible_type ();
 		public virtual void invalidate ();
 	}
+	[Compact]
+	[CCode (cheader_filename = "atk/atk.h")]
+	public class PropertyValues {
+		public GLib.Value new_value;
+		public GLib.Value old_value;
+		public weak string property_name;
+	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public class Registry : GLib.Object {
-		public weak GLib.HashTable factory_type_registry;
 		public weak GLib.HashTable factory_singleton_cache;
+		public weak GLib.HashTable factory_type_registry;
 		public weak Atk.ObjectFactory get_factory (GLib.Type type);
 		public GLib.Type get_factory_type (GLib.Type type);
 		public void set_factory_type (GLib.Type type, GLib.Type factory_type);
@@ -439,6 +185,13 @@
 		public RelationSet ();
 		public void remove (Atk.Relation relation);
 	}
+	[Compact]
+	[CCode (cheader_filename = "atk/atk.h")]
+	public class State {
+		public static Atk.StateType type_for_name (string name);
+		public static weak string type_get_name (Atk.StateType type);
+		public static Atk.StateType type_register (string name);
+	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public class StateSet : GLib.Object {
 		public bool add_state (Atk.StateType type);
@@ -454,6 +207,22 @@
 		public bool remove_state (Atk.StateType type);
 		public weak Atk.StateSet xor_sets (Atk.StateSet compare_set);
 	}
+	[Compact]
+	[CCode (cheader_filename = "atk/atk.h")]
+	public class TextRange {
+		public weak Atk.TextRectangle bounds;
+		public weak string content;
+		public int end_offset;
+		public int start_offset;
+	}
+	[Compact]
+	[CCode (cheader_filename = "atk/atk.h")]
+	public class TextRectangle {
+		public int height;
+		public int width;
+		public int x;
+		public int y;
+	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public class Util : GLib.Object {
 		[NoWrapper]
@@ -503,8 +272,6 @@
 	public interface Document {
 		public weak string get_attribute_value (string attribute_name);
 		public weak Atk.AttributeSet get_attributes ();
-		public weak string get_locale ();
-		public bool set_attribute_value (string attribute_name, string attribute_value);
 		public abstract void* get_document ();
 		[NoWrapper]
 		public abstract weak string get_document_attribute_value (string attribute_name);
@@ -513,6 +280,8 @@
 		[NoWrapper]
 		public abstract weak string get_document_locale ();
 		public abstract weak string get_document_type ();
+		public weak string get_locale ();
+		public bool set_attribute_value (string attribute_name, string attribute_value);
 		[NoWrapper]
 		public abstract bool set_document_attribute (string attribute_name, string attribute_value);
 		public virtual signal void load_complete ();
@@ -611,12 +380,12 @@
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public interface Text {
+		public abstract bool add_selection (int start_offset, int end_offset);
 		public static Atk.TextAttribute attribute_for_name (string name);
 		public static weak string attribute_get_name (Atk.TextAttribute attr);
 		public static weak string attribute_get_value (Atk.TextAttribute attr, int index_);
 		public static Atk.TextAttribute attribute_register (string name);
 		public static void free_ranges (out weak Atk.TextRange ranges);
-		public abstract bool add_selection (int start_offset, int end_offset);
 		public abstract weak Atk.TextRange get_bounded_ranges (Atk.TextRectangle rect, Atk.CoordType coord_type, Atk.TextClipType x_clip_type, Atk.TextClipType y_clip_type);
 		public abstract int get_caret_offset ();
 		public abstract unichar get_character_at_offset (int offset);
@@ -650,10 +419,241 @@
 	}
 	[CCode (type_id = "ATK_TYPE_RECTANGLE", cheader_filename = "atk/atk.h")]
 	public struct Rectangle {
+		public int height;
+		public int width;
 		public int x;
 		public int y;
-		public int width;
-		public int height;
+	}
+	[CCode (cprefix = "ATK_XY_", cheader_filename = "atk/atk.h")]
+	public enum CoordType {
+		SCREEN,
+		WINDOW
+	}
+	[CCode (cprefix = "ATK_HYPERLINK_IS_", cheader_filename = "atk/atk.h")]
+	[Flags]
+	public enum HyperlinkStateFlags {
+		INLINE
+	}
+	[CCode (cprefix = "ATK_KEY_EVENT_", cheader_filename = "atk/atk.h")]
+	public enum KeyEventType {
+		PRESS,
+		RELEASE,
+		LAST_DEFINED
+	}
+	[CCode (cprefix = "ATK_LAYER_", cheader_filename = "atk/atk.h")]
+	public enum Layer {
+		INVALID,
+		BACKGROUND,
+		CANVAS,
+		WIDGET,
+		MDI,
+		POPUP,
+		OVERLAY,
+		WINDOW
+	}
+	[CCode (cprefix = "ATK_RELATION_", cheader_filename = "atk/atk.h")]
+	public enum RelationType {
+		NULL,
+		CONTROLLED_BY,
+		CONTROLLER_FOR,
+		LABEL_FOR,
+		LABELLED_BY,
+		MEMBER_OF,
+		NODE_CHILD_OF,
+		FLOWS_TO,
+		FLOWS_FROM,
+		SUBWINDOW_OF,
+		EMBEDS,
+		EMBEDDED_BY,
+		POPUP_FOR,
+		PARENT_WINDOW_OF,
+		DESCRIBED_BY,
+		DESCRIPTION_FOR,
+		LAST_DEFINED
+	}
+	[CCode (cprefix = "ATK_ROLE_", cheader_filename = "atk/atk.h")]
+	public enum Role {
+		INVALID,
+		ACCEL_LABEL,
+		ALERT,
+		ANIMATION,
+		ARROW,
+		CALENDAR,
+		CANVAS,
+		CHECK_BOX,
+		CHECK_MENU_ITEM,
+		COLOR_CHOOSER,
+		COLUMN_HEADER,
+		COMBO_BOX,
+		DATE_EDITOR,
+		DESKTOP_ICON,
+		DESKTOP_FRAME,
+		DIAL,
+		DIALOG,
+		DIRECTORY_PANE,
+		DRAWING_AREA,
+		FILE_CHOOSER,
+		FILLER,
+		FONT_CHOOSER,
+		FRAME,
+		GLASS_PANE,
+		HTML_CONTAINER,
+		ICON,
+		IMAGE,
+		INTERNAL_FRAME,
+		LABEL,
+		LAYERED_PANE,
+		LIST,
+		LIST_ITEM,
+		MENU,
+		MENU_BAR,
+		MENU_ITEM,
+		OPTION_PANE,
+		PAGE_TAB,
+		PAGE_TAB_LIST,
+		PANEL,
+		PASSWORD_TEXT,
+		POPUP_MENU,
+		PROGRESS_BAR,
+		PUSH_BUTTON,
+		RADIO_BUTTON,
+		RADIO_MENU_ITEM,
+		ROOT_PANE,
+		ROW_HEADER,
+		SCROLL_BAR,
+		SCROLL_PANE,
+		SEPARATOR,
+		SLIDER,
+		SPLIT_PANE,
+		SPIN_BUTTON,
+		STATUSBAR,
+		TABLE,
+		TABLE_CELL,
+		TABLE_COLUMN_HEADER,
+		TABLE_ROW_HEADER,
+		TEAR_OFF_MENU_ITEM,
+		TERMINAL,
+		TEXT,
+		TOGGLE_BUTTON,
+		TOOL_BAR,
+		TOOL_TIP,
+		TREE,
+		TREE_TABLE,
+		UNKNOWN,
+		VIEWPORT,
+		WINDOW,
+		HEADER,
+		FOOTER,
+		PARAGRAPH,
+		RULER,
+		APPLICATION,
+		AUTOCOMPLETE,
+		EDITBAR,
+		EMBEDDED,
+		ENTRY,
+		CHART,
+		CAPTION,
+		DOCUMENT_FRAME,
+		HEADING,
+		PAGE,
+		SECTION,
+		REDUNDANT_OBJECT,
+		FORM,
+		LINK,
+		INPUT_METHOD_WINDOW,
+		LAST_DEFINED
+	}
+	[CCode (cprefix = "ATK_STATE_", cheader_filename = "atk/atk.h")]
+	public enum StateType {
+		INVALID,
+		ACTIVE,
+		ARMED,
+		BUSY,
+		CHECKED,
+		DEFUNCT,
+		EDITABLE,
+		ENABLED,
+		EXPANDABLE,
+		EXPANDED,
+		FOCUSABLE,
+		FOCUSED,
+		HORIZONTAL,
+		ICONIFIED,
+		MODAL,
+		MULTI_LINE,
+		MULTISELECTABLE,
+		OPAQUE,
+		PRESSED,
+		RESIZABLE,
+		SELECTABLE,
+		SELECTED,
+		SENSITIVE,
+		SHOWING,
+		SINGLE_LINE,
+		STALE,
+		TRANSIENT,
+		VERTICAL,
+		VISIBLE,
+		MANAGES_DESCENDANTS,
+		INDETERMINATE,
+		TRUNCATED,
+		REQUIRED,
+		INVALID_ENTRY,
+		SUPPORTS_AUTOCOMPLETION,
+		SELECTABLE_TEXT,
+		DEFAULT,
+		ANIMATED,
+		VISITED,
+		LAST_DEFINED
+	}
+	[CCode (cprefix = "ATK_TEXT_ATTR_", cheader_filename = "atk/atk.h")]
+	public enum TextAttribute {
+		INVALID,
+		LEFT_MARGIN,
+		RIGHT_MARGIN,
+		INDENT,
+		INVISIBLE,
+		EDITABLE,
+		PIXELS_ABOVE_LINES,
+		PIXELS_BELOW_LINES,
+		PIXELS_INSIDE_WRAP,
+		BG_FULL_HEIGHT,
+		RISE,
+		UNDERLINE,
+		STRIKETHROUGH,
+		SIZE,
+		SCALE,
+		WEIGHT,
+		LANGUAGE,
+		FAMILY_NAME,
+		BG_COLOR,
+		FG_COLOR,
+		BG_STIPPLE,
+		FG_STIPPLE,
+		WRAP_MODE,
+		DIRECTION,
+		JUSTIFICATION,
+		STRETCH,
+		VARIANT,
+		STYLE,
+		LAST_DEFINED
+	}
+	[CCode (cprefix = "ATK_TEXT_BOUNDARY_", cheader_filename = "atk/atk.h")]
+	public enum TextBoundary {
+		CHAR,
+		WORD_START,
+		WORD_END,
+		SENTENCE_START,
+		SENTENCE_END,
+		LINE_START,
+		LINE_END
+	}
+	[CCode (cprefix = "ATK_TEXT_CLIP_", cheader_filename = "atk/atk.h")]
+	public enum TextClipType {
+		NONE,
+		MIN,
+		MAX,
+		BOTH
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public static delegate void EventListener (Atk.Object obj);

Modified: trunk/vapi/gconf-2.0.vapi
==============================================================================
--- trunk/vapi/gconf-2.0.vapi	(original)
+++ trunk/vapi/gconf-2.0.vapi	Fri Oct 24 16:50:22 2008
@@ -2,53 +2,88 @@
 
 [CCode (cprefix = "GConf", lower_case_cprefix = "gconf_")]
 namespace GConf {
-	[CCode (cprefix = "GCONF_CLIENT_HANDLE_", has_type_id = "0", cheader_filename = "gconf/gconf.h")]
-	public enum ClientErrorHandlingMode {
-		NONE,
-		UNRETURNED,
-		ALL
-	}
-	[CCode (cprefix = "GCONF_CLIENT_PRELOAD_", has_type_id = "0", cheader_filename = "gconf/gconf.h")]
-	public enum ClientPreloadType {
-		NONE,
-		ONELEVEL,
-		RECURSIVE
-	}
-	[CCode (cprefix = "GCONF_ERROR_", has_type_id = "0", cheader_filename = "gconf/gconf.h")]
-	public enum Error {
-		SUCCESS,
-		FAILED,
-		NO_SERVER,
-		NO_PERMISSION,
-		BAD_ADDRESS,
-		BAD_KEY,
-		PARSE_ERROR,
-		CORRUPT,
-		TYPE_MISMATCH,
-		IS_DIR,
-		IS_KEY,
-		OVERRIDDEN,
-		OAF_ERROR,
-		LOCAL_ENGINE,
-		LOCK_FAILED,
-		NO_WRITABLE_DATABASE,
-		IN_SHUTDOWN
-	}
-	[CCode (cprefix = "GCONF_VALUE_", has_type_id = "0", cheader_filename = "gconf/gconf.h")]
-	public enum ValueType {
-		INVALID,
-		STRING,
-		INT,
-		FLOAT,
-		BOOL,
-		SCHEMA,
-		LIST,
-		PAIR
+	[Compact]
+	[CCode (ref_function = "gconf_change_set_ref", unref_function = "gconf_change_set_unref", cheader_filename = "gconf/gconf.h")]
+	public class ChangeSet {
+		public bool check_value (string key, out weak GConf.Value value_retloc);
+		public void clear ();
+		public void @foreach (GConf.ChangeSetForeachFunc func);
+		public void* get_user_data ();
+		[CCode (has_construct_function = false)]
+		public ChangeSet ();
+		public void remove (string key);
+		public void set (string key, GConf.Value value);
+		public void set_bool (string key, bool val);
+		public void set_float (string key, double val);
+		public void set_int (string key, int val);
+		public void set_list (string key, GConf.ValueType list_type, GLib.SList list);
+		public void set_nocopy (string key, GConf.Value value);
+		public void set_pair (string key, GConf.ValueType car_type, GConf.ValueType cdr_type, void* address_of_car, void* address_of_cdr);
+		public void set_schema (string key, GConf.Schema val);
+		public void set_string (string key, string val);
+		public void set_user_data (void* data, GLib.DestroyNotify dnotify);
+		public uint size ();
+		public void unset (string key);
 	}
-	[CCode (cprefix = "GCONF_UNSET_INCLUDING_SCHEMA_", has_type_id = "0", cheader_filename = "gconf/gconf.h")]
-	[Flags]
-	public enum UnsetFlags {
-		NAMES
+	[CCode (cheader_filename = "gconf/gconf-client.h")]
+	public class Client : GLib.Object {
+		public weak GLib.HashTable cache_hash;
+		public weak GLib.HashTable dir_hash;
+		public weak GConf.Engine engine;
+		public GConf.ClientErrorHandlingMode error_mode;
+		public weak GConf.Listeners listeners;
+		public uint notify_handler;
+		public weak GLib.SList notify_list;
+		public void* pad1;
+		public int pad2;
+		public int pending_notify_count;
+		public void add_dir (string dir, GConf.ClientPreloadType preload) throws GLib.Error;
+		public weak GLib.SList all_dirs (string dir) throws GLib.Error;
+		public weak GLib.SList all_entries (string dir) throws GLib.Error;
+		public weak GConf.ChangeSet change_set_from_current (...) throws GLib.Error;
+		public weak GConf.ChangeSet change_set_from_currentv (string keys) throws GLib.Error;
+		public void clear_cache ();
+		public bool commit_change_set (GConf.ChangeSet cs, bool remove_committed) throws GLib.Error;
+		public bool dir_exists (string dir) throws GLib.Error;
+		public weak GConf.Value get (string key) throws GLib.Error;
+		public bool get_bool (string key) throws GLib.Error;
+		public static weak GConf.Client get_default ();
+		public weak GConf.Value get_default_from_schema (string key) throws GLib.Error;
+		public weak GConf.Entry get_entry (string key, string locale, bool use_schema_default) throws GLib.Error;
+		public double get_float (string key) throws GLib.Error;
+		public static weak GConf.Client get_for_engine (GConf.Engine engine);
+		public int get_int (string key) throws GLib.Error;
+		public weak GLib.SList get_list (string key, GConf.ValueType list_type) throws GLib.Error;
+		public bool get_pair (string key, GConf.ValueType car_type, GConf.ValueType cdr_type, void* car_retloc, void* cdr_retloc) throws GLib.Error;
+		public weak GConf.Schema get_schema (string key) throws GLib.Error;
+		public weak string get_string (string key) throws GLib.Error;
+		public weak GConf.Value get_without_default (string key) throws GLib.Error;
+		public bool key_is_writable (string key) throws GLib.Error;
+		public void notify (string key);
+		public uint notify_add (string namespace_section, GConf.ClientNotifyFunc func, GLib.FreeFunc destroy_notify) throws GLib.Error;
+		public void notify_remove (uint cnxn);
+		public void preload (string dirname, GConf.ClientPreloadType type) throws GLib.Error;
+		public bool recursive_unset (string key, GConf.UnsetFlags flags) throws GLib.Error;
+		public void remove_dir (string dir) throws GLib.Error;
+		public weak GConf.ChangeSet reverse_change_set (GConf.ChangeSet cs) throws GLib.Error;
+		public void set (string key, GConf.Value val) throws GLib.Error;
+		public bool set_bool (string key, bool val) throws GLib.Error;
+		public void set_error_handling (GConf.ClientErrorHandlingMode mode);
+		public bool set_float (string key, double val) throws GLib.Error;
+		public static void set_global_default_error_handler (GConf.ClientErrorHandlerFunc func);
+		public bool set_int (string key, int val) throws GLib.Error;
+		public bool set_list (string key, GConf.ValueType list_type, GLib.SList list) throws GLib.Error;
+		public bool set_pair (string key, GConf.ValueType car_type, GConf.ValueType cdr_type, void* address_of_car, void* address_of_cdr) throws GLib.Error;
+		public bool set_schema (string key, GConf.Schema val) throws GLib.Error;
+		public bool set_string (string key, string val) throws GLib.Error;
+		public void suggest_sync () throws GLib.Error;
+		public bool unset (string key) throws GLib.Error;
+		[HasEmitter]
+		public virtual signal void error (void* error);
+		[HasEmitter]
+		public virtual signal void unreturned_error (void* error);
+		[HasEmitter]
+		public virtual signal void value_changed (string key, void* value);
 	}
 	[Compact]
 	[CCode (ref_function = "gconf_engine_ref", unref_function = "gconf_engine_unref", cheader_filename = "gconf/gconf.h")]
@@ -105,7 +140,9 @@
 		public weak string get_key ();
 		public weak string get_schema_name ();
 		public weak GConf.Value get_value ();
+		[CCode (has_construct_function = false)]
 		public Entry (string key, GConf.Value val);
+		[CCode (has_construct_function = false)]
 		public Entry.nocopy (string key, GConf.Value val);
 		public void set_is_default (bool is_default);
 		public void set_is_writable (bool is_writable);
@@ -127,6 +164,7 @@
 		public uint count ();
 		public void @foreach (GConf.ListenersForeach callback);
 		public bool get_data (uint cnxn_id, void* listener_data_p, string location_p);
+		[CCode (has_construct_function = false)]
 		public Listeners ();
 		public void notify (string all_above, GConf.ListenersCallback callback);
 		public void remove (uint cnxn_id);
@@ -135,13 +173,14 @@
 	[Compact]
 	[CCode (cheader_filename = "gconf/gconf.h")]
 	public class MetaInfo {
-		public weak string schema;
-		public weak string mod_user;
 		public GLib.Time mod_time;
-		public weak string get_mod_user ();
-		public weak string get_schema ();
+		public weak string mod_user;
+		public weak string schema;
 		[CCode (cname = "gconf_meta_info_mod_time")]
 		public GLib.Time get_mod_time ();
+		public weak string get_mod_user ();
+		public weak string get_schema ();
+		[CCode (has_construct_function = false)]
 		public MetaInfo ();
 		public void set_mod_time (GLib.Time mod_time);
 		public void set_mod_user (string mod_user);
@@ -159,6 +198,7 @@
 		public weak string get_long_desc ();
 		public weak string get_owner ();
 		public weak string get_short_desc ();
+		[CCode (has_construct_function = false)]
 		public Schema ();
 		public void set_car_type (GConf.ValueType type);
 		public void set_cdr_type (GConf.ValueType type);
@@ -177,6 +217,8 @@
 		public GConf.ValueType type;
 		public int compare (GConf.Value value_b);
 		public weak GConf.Value copy ();
+		[CCode (has_construct_function = false)]
+		public Value.from_string (GConf.ValueType type, string str) throws GLib.Error;
 		public bool get_bool ();
 		public weak GConf.Value get_car ();
 		public weak GConf.Value get_cdr ();
@@ -186,8 +228,8 @@
 		public GConf.ValueType get_list_type ();
 		public weak GConf.Schema get_schema ();
 		public weak string get_string ();
+		[CCode (has_construct_function = false)]
 		public Value (GConf.ValueType type);
-		public Value.from_string (GConf.ValueType type, string str) throws GLib.Error;
 		public void set_bool (bool the_bool);
 		public void set_car (GConf.Value car);
 		public void set_car_nocopy (GConf.Value car);
@@ -203,87 +245,53 @@
 		public void set_string (string the_str);
 		public weak string to_string ();
 	}
-	[Compact]
-	[CCode (ref_function = "gconf_change_set_ref", unref_function = "gconf_change_set_unref", cheader_filename = "gconf/gconf.h")]
-	public class ChangeSet : GLib.Boxed {
-		public bool check_value (string key, out weak GConf.Value value_retloc);
-		public void clear ();
-		public void @foreach (GConf.ChangeSetForeachFunc func);
-		public void* get_user_data ();
-		public ChangeSet ();
-		public void remove (string key);
-		public void set (string key, GConf.Value value);
-		public void set_bool (string key, bool val);
-		public void set_float (string key, double val);
-		public void set_int (string key, int val);
-		public void set_list (string key, GConf.ValueType list_type, GLib.SList list);
-		public void set_nocopy (string key, GConf.Value value);
-		public void set_pair (string key, GConf.ValueType car_type, GConf.ValueType cdr_type, void* address_of_car, void* address_of_cdr);
-		public void set_schema (string key, GConf.Schema val);
-		public void set_string (string key, string val);
-		public void set_user_data (void* data, GLib.DestroyNotify dnotify);
-		public uint size ();
-		public void unset (string key);
+	[CCode (cprefix = "GCONF_CLIENT_HANDLE_", has_type_id = "0", cheader_filename = "gconf/gconf.h")]
+	public enum ClientErrorHandlingMode {
+		NONE,
+		UNRETURNED,
+		ALL
 	}
-	[CCode (cheader_filename = "gconf/gconf-client.h")]
-	public class Client : GLib.Object {
-		public weak GConf.Engine engine;
-		public GConf.ClientErrorHandlingMode error_mode;
-		public weak GLib.HashTable dir_hash;
-		public weak GLib.HashTable cache_hash;
-		public weak GConf.Listeners listeners;
-		public weak GLib.SList notify_list;
-		public uint notify_handler;
-		public int pending_notify_count;
-		public void* pad1;
-		public int pad2;
-		public void add_dir (string dir, GConf.ClientPreloadType preload) throws GLib.Error;
-		public weak GLib.SList all_dirs (string dir) throws GLib.Error;
-		public weak GLib.SList all_entries (string dir) throws GLib.Error;
-		public weak GConf.ChangeSet change_set_from_current (...) throws GLib.Error;
-		public weak GConf.ChangeSet change_set_from_currentv (string keys) throws GLib.Error;
-		public void clear_cache ();
-		public bool commit_change_set (GConf.ChangeSet cs, bool remove_committed) throws GLib.Error;
-		public bool dir_exists (string dir) throws GLib.Error;
-		public weak GConf.Value get (string key) throws GLib.Error;
-		public bool get_bool (string key) throws GLib.Error;
-		public static weak GConf.Client get_default ();
-		public weak GConf.Value get_default_from_schema (string key) throws GLib.Error;
-		public weak GConf.Entry get_entry (string key, string locale, bool use_schema_default) throws GLib.Error;
-		public double get_float (string key) throws GLib.Error;
-		public static weak GConf.Client get_for_engine (GConf.Engine engine);
-		public int get_int (string key) throws GLib.Error;
-		public weak GLib.SList get_list (string key, GConf.ValueType list_type) throws GLib.Error;
-		public bool get_pair (string key, GConf.ValueType car_type, GConf.ValueType cdr_type, void* car_retloc, void* cdr_retloc) throws GLib.Error;
-		public weak GConf.Schema get_schema (string key) throws GLib.Error;
-		public weak string get_string (string key) throws GLib.Error;
-		public weak GConf.Value get_without_default (string key) throws GLib.Error;
-		public bool key_is_writable (string key) throws GLib.Error;
-		public void notify (string key);
-		public uint notify_add (string namespace_section, GConf.ClientNotifyFunc func, GLib.FreeFunc destroy_notify) throws GLib.Error;
-		public void notify_remove (uint cnxn);
-		public void preload (string dirname, GConf.ClientPreloadType type) throws GLib.Error;
-		public bool recursive_unset (string key, GConf.UnsetFlags flags) throws GLib.Error;
-		public void remove_dir (string dir) throws GLib.Error;
-		public weak GConf.ChangeSet reverse_change_set (GConf.ChangeSet cs) throws GLib.Error;
-		public void set (string key, GConf.Value val) throws GLib.Error;
-		public bool set_bool (string key, bool val) throws GLib.Error;
-		public void set_error_handling (GConf.ClientErrorHandlingMode mode);
-		public bool set_float (string key, double val) throws GLib.Error;
-		public static void set_global_default_error_handler (GConf.ClientErrorHandlerFunc func);
-		public bool set_int (string key, int val) throws GLib.Error;
-		public bool set_list (string key, GConf.ValueType list_type, GLib.SList list) throws GLib.Error;
-		public bool set_pair (string key, GConf.ValueType car_type, GConf.ValueType cdr_type, void* address_of_car, void* address_of_cdr) throws GLib.Error;
-		public bool set_schema (string key, GConf.Schema val) throws GLib.Error;
-		public bool set_string (string key, string val) throws GLib.Error;
-		public void suggest_sync () throws GLib.Error;
-		public bool unset (string key) throws GLib.Error;
-		[HasEmitter]
-		public virtual signal void error (void* error);
-		[HasEmitter]
-		public virtual signal void unreturned_error (void* error);
-		[HasEmitter]
-		public virtual signal void value_changed (string key, void* value);
+	[CCode (cprefix = "GCONF_CLIENT_PRELOAD_", has_type_id = "0", cheader_filename = "gconf/gconf.h")]
+	public enum ClientPreloadType {
+		NONE,
+		ONELEVEL,
+		RECURSIVE
+	}
+	[CCode (cprefix = "GCONF_ERROR_", has_type_id = "0", cheader_filename = "gconf/gconf.h")]
+	public enum Error {
+		SUCCESS,
+		FAILED,
+		NO_SERVER,
+		NO_PERMISSION,
+		BAD_ADDRESS,
+		BAD_KEY,
+		PARSE_ERROR,
+		CORRUPT,
+		TYPE_MISMATCH,
+		IS_DIR,
+		IS_KEY,
+		OVERRIDDEN,
+		OAF_ERROR,
+		LOCAL_ENGINE,
+		LOCK_FAILED,
+		NO_WRITABLE_DATABASE,
+		IN_SHUTDOWN
+	}
+	[CCode (cprefix = "GCONF_UNSET_INCLUDING_SCHEMA_", has_type_id = "0", cheader_filename = "gconf/gconf.h")]
+	[Flags]
+	public enum UnsetFlags {
+		NAMES
+	}
+	[CCode (cprefix = "GCONF_VALUE_", has_type_id = "0", cheader_filename = "gconf/gconf.h")]
+	public enum ValueType {
+		INVALID,
+		STRING,
+		INT,
+		FLOAT,
+		BOOL,
+		SCHEMA,
+		LIST,
+		PAIR
 	}
 	[CCode (cheader_filename = "gconf/gconf.h")]
 	public delegate void ChangeSetForeachFunc (GConf.ChangeSet cs, string key, GConf.Value value);

Modified: trunk/vapi/gdk-2.0.vapi
==============================================================================
--- trunk/vapi/gdk-2.0.vapi	(original)
+++ trunk/vapi/gdk-2.0.vapi	Fri Oct 24 16:50:22 2008
@@ -2,1502 +2,1502 @@
 
 [CCode (cprefix = "Gdk", lower_case_cprefix = "gdk_")]
 namespace Gdk {
-	[CCode (cprefix = "GDK_AXIS_", cheader_filename = "gdk/gdk.h")]
-	public enum AxisUse {
-		IGNORE,
-		X,
-		Y,
-		PRESSURE,
-		XTILT,
-		YTILT,
-		WHEEL,
-		LAST
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public class AppLaunchContext : GLib.AppLaunchContext {
+		[CCode (has_construct_function = false)]
+		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 (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
-	public enum ByteOrder {
-		LSB_FIRST,
-		MSB_FIRST
+	[CCode (ref_function = "g_object_ref", unref_function = "g_object_unref", cheader_filename = "gdk/gdk.h")]
+	public class Bitmap {
+		public weak GLib.Object parent_instance;
+		public static Gdk.Bitmap create_from_data (Gdk.Drawable drawable, string data, int width, int height);
+		public Bitmap ();
 	}
-	[CCode (cprefix = "GDK_CAP_", cheader_filename = "gdk/gdk.h")]
-	public enum CapStyle {
-		NOT_LAST,
-		BUTT,
-		ROUND,
-		PROJECTING
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public class Colormap : GLib.Object {
+		public Gdk.Color colors;
+		public int size;
+		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, 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 ();
+		[CCode (has_construct_function = false)]
+		public Colormap (Gdk.Visual visual, bool allocate);
+		public void query_color (ulong pixel, out Gdk.Color _result);
 	}
-	[CCode (cprefix = "GDK_CROSSING_", cheader_filename = "gdk/gdk.h")]
-	public enum CrossingMode {
-		NORMAL,
-		GRAB,
-		UNGRAB
+	[Compact]
+	[CCode (ref_function = "gdk_cursor_ref", unref_function = "gdk_cursor_unref", cheader_filename = "gdk/gdk.h")]
+	public class Cursor {
+		public uint ref_count;
+		public Gdk.CursorType type;
+		[CCode (has_construct_function = false)]
+		public Cursor.for_display (Gdk.Display display, Gdk.CursorType cursor_type);
+		[CCode (has_construct_function = false)]
+		public Cursor.from_name (Gdk.Display display, string name);
+		[CCode (has_construct_function = false)]
+		public Cursor.from_pixbuf (Gdk.Display display, Gdk.Pixbuf pixbuf, int x, int y);
+		[CCode (has_construct_function = false)]
+		public Cursor.from_pixmap (Gdk.Pixmap source, Gdk.Pixmap mask, Gdk.Color fg, Gdk.Color bg, int x, int y);
+		public weak Gdk.Display get_display ();
+		public weak Gdk.Pixbuf get_image ();
+		[CCode (has_construct_function = false)]
+		public Cursor (Gdk.CursorType cursor_type);
 	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
-	public enum CursorType {
-		X_CURSOR,
-		ARROW,
-		BASED_ARROW_DOWN,
-		BASED_ARROW_UP,
-		BOAT,
-		BOGOSITY,
-		BOTTOM_LEFT_CORNER,
-		BOTTOM_RIGHT_CORNER,
-		BOTTOM_SIDE,
-		BOTTOM_TEE,
-		BOX_SPIRAL,
-		CENTER_PTR,
-		CIRCLE,
-		CLOCK,
-		COFFEE_MUG,
-		CROSS,
-		CROSS_REVERSE,
-		CROSSHAIR,
-		DIAMOND_CROSS,
-		DOT,
-		DOTBOX,
-		DOUBLE_ARROW,
-		DRAFT_LARGE,
-		DRAFT_SMALL,
-		DRAPED_BOX,
-		EXCHANGE,
-		FLEUR,
-		GOBBLER,
-		GUMBY,
-		HAND1,
-		HAND2,
-		HEART,
-		ICON,
-		IRON_CROSS,
-		LEFT_PTR,
-		LEFT_SIDE,
-		LEFT_TEE,
-		LEFTBUTTON,
-		LL_ANGLE,
-		LR_ANGLE,
-		MAN,
-		MIDDLEBUTTON,
-		MOUSE,
-		PENCIL,
-		PIRATE,
-		PLUS,
-		QUESTION_ARROW,
-		RIGHT_PTR,
-		RIGHT_SIDE,
-		RIGHT_TEE,
-		RIGHTBUTTON,
-		RTL_LOGO,
-		SAILBOAT,
-		SB_DOWN_ARROW,
-		SB_H_DOUBLE_ARROW,
-		SB_LEFT_ARROW,
-		SB_RIGHT_ARROW,
-		SB_UP_ARROW,
-		SB_V_DOUBLE_ARROW,
-		SHUTTLE,
-		SIZING,
-		SPIDER,
-		SPRAYCAN,
-		STAR,
-		TARGET,
-		TCROSS,
-		TOP_LEFT_ARROW,
-		TOP_LEFT_CORNER,
-		TOP_RIGHT_CORNER,
-		TOP_SIDE,
-		TOP_TEE,
-		TREK,
-		UL_ANGLE,
-		UMBRELLA,
-		UR_ANGLE,
-		WATCH,
-		XTERM,
-		LAST_CURSOR,
-		CURSOR_IS_PIXMAP
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public class Device : GLib.Object {
+		[NoArrayLength]
+		public weak Gdk.DeviceAxis[] axes;
+		public bool has_cursor;
+		[NoArrayLength]
+		public weak Gdk.DeviceKey[] keys;
+		public Gdk.InputMode mode;
+		public weak string name;
+		public int num_axes;
+		public int num_keys;
+		public Gdk.InputSource source;
+		public static void free_history (Gdk.TimeCoord[] events);
+		public bool get_axis (double axes, Gdk.AxisUse use, double value);
+		public static weak Gdk.Device get_core_pointer ();
+		public bool get_history (Gdk.Window window, uint start, uint stop, Gdk.TimeCoord[] events);
+		public void get_state (Gdk.Window window, double axes, Gdk.ModifierType mask);
+		public void set_axis_use (uint index_, Gdk.AxisUse use);
+		public void set_key (uint index_, uint keyval, Gdk.ModifierType modifiers);
+		public bool set_mode (Gdk.InputMode mode);
+		public void set_source (Gdk.InputSource source);
 	}
-	[CCode (cprefix = "GDK_DRAG_PROTO_", cheader_filename = "gdk/gdk.h")]
-	public enum DragProtocol {
-		MOTIF,
-		XDND,
-		ROOTWIN,
-		NONE,
-		WIN32_DROPFILES,
-		OLE2,
-		LOCAL
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public class Display : GLib.Object {
+		[NoArrayLength]
+		public weak uint[] button_click_time;
+		[NoArrayLength]
+		public weak int[] button_number;
+		[NoArrayLength]
+		public weak Gdk.Window[] button_window;
+		[NoArrayLength]
+		public weak int[] button_x;
+		[NoArrayLength]
+		public weak int[] button_y;
+		public weak Gdk.Device core_pointer;
+		public uint double_click_distance;
+		public uint double_click_time;
+		public weak Gdk.DisplayPointerHooks pointer_hooks;
+		public weak GLib.List queued_events;
+		public weak GLib.List queued_tail;
+		public void add_client_message_filter (Gdk.Atom message_type, Gdk.FilterFunc func, void* data);
+		public void beep ();
+		public void close ();
+		public void flush ();
+		public weak Gdk.Device get_core_pointer ();
+		public static weak Gdk.Display get_default ();
+		public uint get_default_cursor_size ();
+		public weak Gdk.Window get_default_group ();
+		public virtual weak Gdk.Screen get_default_screen ();
+		[NoWrapper]
+		public virtual weak string get_display_name ();
+		public Gdk.Event get_event ();
+		public void get_maximal_cursor_size (out uint width, out uint height);
+		public virtual int get_n_screens ();
+		public weak string get_name ();
+		public void get_pointer (out weak Gdk.Screen screen, int x, int y, Gdk.ModifierType mask);
+		public virtual weak Gdk.Screen get_screen (int screen_num);
+		public weak Gdk.Window get_window_at_pointer (int win_x, int win_y);
+		public void keyboard_ungrab (uint time_);
+		public weak GLib.List list_devices ();
+		public static weak Gdk.Display open (string display_name);
+		public static weak Gdk.Display open_default_libgtk_only ();
+		public Gdk.Event peek_event ();
+		public bool pointer_is_grabbed ();
+		public void pointer_ungrab (uint time_);
+		public void put_event (Gdk.Event event);
+		public bool request_selection_notification (Gdk.Atom selection);
+		public void set_double_click_distance (uint distance);
+		public void set_double_click_time (uint msec);
+		public weak Gdk.DisplayPointerHooks set_pointer_hooks (Gdk.DisplayPointerHooks new_hooks);
+		public void store_clipboard (Gdk.Window clipboard_window, uint time_, Gdk.Atom[] targets);
+		public bool supports_clipboard_persistence ();
+		public bool supports_composite ();
+		public bool supports_cursor_alpha ();
+		public bool supports_cursor_color ();
+		public bool supports_input_shapes ();
+		public bool supports_selection_notification ();
+		public bool supports_shapes ();
+		public void sync ();
+		public void warp_pointer (Gdk.Screen screen, int x, int y);
+		public virtual signal void closed (bool is_error);
 	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
-	public enum EventType {
-		NOTHING,
-		DELETE,
-		DESTROY,
-		EXPOSE,
-		MOTION_NOTIFY,
-		BUTTON_PRESS,
-		2BUTTON_PRESS,
-		3BUTTON_PRESS,
-		BUTTON_RELEASE,
-		KEY_PRESS,
-		KEY_RELEASE,
-		ENTER_NOTIFY,
-		LEAVE_NOTIFY,
-		FOCUS_CHANGE,
-		CONFIGURE,
-		MAP,
-		UNMAP,
-		PROPERTY_NOTIFY,
-		SELECTION_CLEAR,
-		SELECTION_REQUEST,
-		SELECTION_NOTIFY,
-		PROXIMITY_IN,
-		PROXIMITY_OUT,
-		DRAG_ENTER,
-		DRAG_LEAVE,
-		DRAG_MOTION,
-		DRAG_STATUS,
-		DROP_START,
-		DROP_FINISHED,
-		CLIENT_EVENT,
-		VISIBILITY_NOTIFY,
-		NO_EXPOSE,
-		SCROLL,
-		WINDOW_STATE,
-		SETTING,
-		OWNER_CHANGE,
-		GRAB_BROKEN,
-		DAMAGE
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public class DisplayManager : GLib.Object {
+		public static weak Gdk.DisplayManager get ();
+		public weak Gdk.Display get_default_display ();
+		public weak GLib.SList list_displays ();
+		public void set_default_display (Gdk.Display display);
+		public Gdk.Display default_display { get; set; }
+		public virtual signal void display_opened (Gdk.Display display);
 	}
-	[CCode (cprefix = "GDK_EXTENSION_EVENTS_", cheader_filename = "gdk/gdk.h")]
-	public enum ExtensionMode {
-		NONE,
-		ALL,
-		CURSOR
+	[Compact]
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public class DisplayPointerHooks {
+		public weak GLib.Callback get_pointer;
+		public weak GLib.Callback window_at_pointer;
+		public weak GLib.Callback window_get_pointer;
 	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
-	public enum Fill {
-		SOLID,
-		TILED,
-		STIPPLED,
-		OPAQUE_STIPPLED
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public class DragContext : GLib.Object {
+		public Gdk.DragAction action;
+		public Gdk.DragAction actions;
+		public weak Gdk.Window dest_window;
+		public bool is_source;
+		public Gdk.DragProtocol protocol;
+		public weak Gdk.Window source_window;
+		public uint start_time;
+		public Gdk.DragAction suggested_action;
+		public weak GLib.List targets;
+		public void* windowing_data;
+		[CCode (has_construct_function = false)]
+		public DragContext ();
 	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
-	public enum FillRule {
-		EVEN_ODD_RULE,
-		WINDING_RULE
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public class Drawable : GLib.Object {
+		public weak Gdk.Image copy_to_image (Gdk.Image image, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
+		[NoWrapper]
+		public virtual weak Gdk.GC create_gc (Gdk.GCValues values, Gdk.GCValuesMask mask);
+		[NoWrapper]
+		public virtual void draw_arc (Gdk.GC gc, bool filled, int x, int y, int width, int height, int angle1, int angle2);
+		[NoWrapper]
+		public virtual void draw_drawable (Gdk.GC gc, Gdk.Drawable src, int xsrc, int ysrc, int xdest, int ydest, int width, int height);
+		[NoWrapper]
+		public virtual void draw_glyphs (Gdk.GC gc, Pango.Font font, int x, int y, Pango.GlyphString glyphs);
+		[NoWrapper]
+		public virtual void draw_glyphs_transformed (Gdk.GC gc, Pango.Matrix matrix, Pango.Font font, int x, int y, Pango.GlyphString glyphs);
+		[NoWrapper]
+		public virtual void draw_image (Gdk.GC gc, Gdk.Image image, int xsrc, int ysrc, int xdest, int ydest, int width, int height);
+		[NoWrapper]
+		public virtual void draw_lines (Gdk.GC gc, Gdk.Point points, int npoints);
+		[NoWrapper]
+		public virtual void draw_pixbuf (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);
+		[NoWrapper]
+		public virtual void draw_points (Gdk.GC gc, Gdk.Point points, int npoints);
+		[NoWrapper]
+		public virtual void draw_polygon (Gdk.GC gc, bool filled, Gdk.Point points, int npoints);
+		[NoWrapper]
+		public virtual void draw_rectangle (Gdk.GC gc, bool filled, int x, int y, int width, int height);
+		[NoWrapper]
+		public virtual void draw_segments (Gdk.GC gc, Gdk.Segment segs, int nsegs);
+		[NoWrapper]
+		public virtual void draw_text (Gdk.Font font, Gdk.GC gc, int x, int y, string text, int text_length);
+		[NoWrapper]
+		public virtual void draw_text_wc (Gdk.Font font, Gdk.GC gc, int x, int y, Gdk.WChar text, int text_length);
+		[NoWrapper]
+		public virtual void draw_trapezoids (Gdk.GC gc, Gdk.Trapezoid[] trapezoids);
+		public virtual weak Gdk.Region get_clip_region ();
+		public virtual weak Gdk.Colormap get_colormap ();
+		[NoWrapper]
+		public virtual weak Gdk.Drawable get_composite_drawable (int x, int y, int width, int height, int composite_x_offset, int composite_y_offset);
+		public virtual int get_depth ();
+		public weak Gdk.Display get_display ();
+		public virtual weak Gdk.Image get_image (int x, int y, int width, int height);
+		public virtual weak Gdk.Screen get_screen ();
+		public virtual void get_size (out int width, out int height);
+		public virtual weak Gdk.Region get_visible_region ();
+		public virtual weak Gdk.Visual get_visual ();
+		[NoWrapper]
+		public virtual weak Cairo.Surface ref_cairo_surface ();
+		public virtual void set_colormap (Gdk.Colormap colormap);
 	}
-	[CCode (cprefix = "GDK_FILTER_", cheader_filename = "gdk/gdk.h")]
-	public enum FilterReturn {
-		CONTINUE,
-		TRANSLATE,
-		REMOVE
+	[Compact]
+	[CCode (ref_function = "gdk_font_ref", unref_function = "gdk_font_unref", cheader_filename = "gdk/gdk.h")]
+	public class Font {
+		public int ascent;
+		public int descent;
+		public Gdk.FontType type;
+		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 (cprefix = "GDK_FONT_", cheader_filename = "gdk/gdk.h")]
-	public enum FontType {
-		FONT,
-		FONTSET
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public class GC : GLib.Object {
+		public int clip_x_origin;
+		public int clip_y_origin;
+		public weak Gdk.Colormap colormap;
+		public int ts_x_origin;
+		public int ts_y_origin;
+		public void copy (Gdk.GC src_gc);
+		public weak Gdk.Colormap get_colormap ();
+		public weak Gdk.Screen get_screen ();
+		public virtual void get_values (Gdk.GCValues values);
+		[CCode (has_construct_function = false)]
+		public GC (Gdk.Drawable drawable);
+		public void offset (int x_offset, int y_offset);
+		public void set_background (Gdk.Color color);
+		public void set_clip_mask (Gdk.Bitmap mask);
+		public void set_clip_origin (int x, int y);
+		public void set_clip_rectangle (Gdk.Rectangle rectangle);
+		public void set_clip_region (Gdk.Region region);
+		public void set_colormap (Gdk.Colormap colormap);
+		public virtual void set_dashes (int dash_offset, char[] dash_list, int n);
+		public void set_exposures (bool exposures);
+		public void set_fill (Gdk.Fill fill);
+		public void set_foreground (Gdk.Color color);
+		public void set_function (Gdk.Function function);
+		public void set_line_attributes (int line_width, Gdk.LineStyle line_style, Gdk.CapStyle cap_style, Gdk.JoinStyle join_style);
+		public void set_rgb_bg_color (Gdk.Color color);
+		public void set_rgb_fg_color (Gdk.Color color);
+		public void set_stipple (Gdk.Pixmap stipple);
+		public void set_subwindow (Gdk.SubwindowMode mode);
+		public void set_tile (Gdk.Pixmap tile);
+		public void set_ts_origin (int x, int y);
+		public virtual void set_values (Gdk.GCValues values, Gdk.GCValuesMask values_mask);
+		[CCode (has_construct_function = false)]
+		public GC.with_values (Gdk.Drawable drawable, Gdk.GCValues values, Gdk.GCValuesMask values_mask);
 	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
-	public enum Function {
-		COPY,
-		INVERT,
-		XOR,
-		CLEAR,
-		AND,
-		AND_REVERSE,
-		AND_INVERT,
-		NOOP,
-		OR,
-		EQUIV,
-		OR_REVERSE,
-		COPY_INVERT,
-		OR_INVERT,
-		NAND,
-		NOR,
-		SET
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public class Image : GLib.Object {
+		public ushort bits_per_pixel;
+		public ushort bpl;
+		public ushort bpp;
+		public Gdk.ByteOrder byte_order;
+		public weak Gdk.Colormap colormap;
+		public ushort depth;
+		public int height;
+		public void* mem;
+		public Gdk.ImageType type;
+		public weak Gdk.Visual visual;
+		public int width;
+		public void* windowing_data;
+		public weak Gdk.Colormap get_colormap ();
+		public uint get_pixel (int x, int y);
+		[CCode (has_construct_function = false)]
+		public Image (Gdk.ImageType type, Gdk.Visual visual, int width, int height);
+		public void put_pixel (int x, int y, uint pixel);
+		public void set_colormap (Gdk.Colormap colormap);
 	}
-	[CCode (cprefix = "GDK_GRAB_", cheader_filename = "gdk/gdk.h")]
-	public enum GrabStatus {
-		SUCCESS,
-		ALREADY_GRABBED,
-		INVALID_TIME,
-		NOT_VIEWABLE,
-		FROZEN
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public class Keymap : GLib.Object {
+		public weak Gdk.Display display;
+		public static weak Gdk.Keymap get_default ();
+		public Pango.Direction get_direction ();
+		public bool get_entries_for_keycode (uint hardware_keycode, out weak Gdk.KeymapKey[]? keys, out weak uint[]? keyvals, int n_entries);
+		public bool get_entries_for_keyval (uint keyval, Gdk.KeymapKey[] keys);
+		public static weak Gdk.Keymap get_for_display (Gdk.Display display);
+		public bool have_bidi_layouts ();
+		public uint lookup_key (Gdk.KeymapKey key);
+		public bool translate_keyboard_state (uint hardware_keycode, Gdk.ModifierType state, int group, uint keyval, int effective_group, int level, Gdk.ModifierType consumed_modifiers);
+		public virtual signal void direction_changed ();
+		public virtual signal void keys_changed ();
 	}
-	[CCode (cprefix = "GDK_GRAVITY_", cheader_filename = "gdk/gdk.h")]
-	public enum Gravity {
-		NORTH_WEST,
-		NORTH,
-		NORTH_EAST,
-		WEST,
-		CENTER,
-		EAST,
-		SOUTH_WEST,
-		SOUTH,
-		SOUTH_EAST,
-		STATIC
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public class PangoRenderer : Pango.Renderer {
+		public static weak Pango.Renderer get_default (Gdk.Screen screen);
+		[CCode (type = "PangoRenderer*", has_construct_function = false)]
+		public PangoRenderer (Gdk.Screen screen);
+		public void set_drawable (Gdk.Drawable drawable);
+		public void set_gc (Gdk.GC gc);
+		public void set_override_color (Pango.RenderPart part, Gdk.Color color);
+		public void set_stipple (Pango.RenderPart part, Gdk.Bitmap stipple);
+		[NoAccessorMethod]
+		public Gdk.Screen screen { get; construct; }
 	}
-	[CCode (cprefix = "GDK_IMAGE_", cheader_filename = "gdk/gdk.h")]
-	public enum ImageType {
-		NORMAL,
-		SHARED,
-		FASTEST
-	}
-	[CCode (cprefix = "GDK_MODE_", cheader_filename = "gdk/gdk.h")]
-	public enum InputMode {
-		DISABLED,
-		SCREEN,
-		WINDOW
-	}
-	[CCode (cprefix = "GDK_SOURCE_", cheader_filename = "gdk/gdk.h")]
-	public enum InputSource {
-		MOUSE,
-		PEN,
-		ERASER,
-		CURSOR
-	}
-	[CCode (cprefix = "GDK_JOIN_", cheader_filename = "gdk/gdk.h")]
-	public enum JoinStyle {
-		MITER,
-		ROUND,
-		BEVEL
-	}
-	[CCode (cprefix = "GDK_LINE_", cheader_filename = "gdk/gdk.h")]
-	public enum LineStyle {
-		SOLID,
-		ON_OFF_DASH,
-		DOUBLE_DASH
-	}
-	[CCode (cprefix = "GDK_NOTIFY_", cheader_filename = "gdk/gdk.h")]
-	public enum NotifyType {
-		ANCESTOR,
-		VIRTUAL,
-		INFERIOR,
-		NONLINEAR,
-		NONLINEAR_VIRTUAL,
-		UNKNOWN
-	}
-	[CCode (cprefix = "GDK_OVERLAP_RECTANGLE_", cheader_filename = "gdk/gdk.h")]
-	public enum OverlapType {
-		IN,
-		OUT,
-		PART
-	}
-	[CCode (cprefix = "GDK_OWNER_CHANGE_", cheader_filename = "gdk/gdk.h")]
-	public enum OwnerChange {
-		NEW_OWNER,
-		DESTROY,
-		CLOSE
-	}
-	[CCode (cprefix = "GDK_PROP_MODE_", cheader_filename = "gdk/gdk.h")]
-	public enum PropMode {
-		REPLACE,
-		PREPEND,
-		APPEND
-	}
-	[CCode (cprefix = "GDK_PROPERTY_", cheader_filename = "gdk/gdk.h")]
-	public enum PropertyState {
-		NEW_VALUE,
-		DELETE
-	}
-	[CCode (cprefix = "GDK_RGB_DITHER_", cheader_filename = "gdk/gdk.h")]
-	public enum RgbDither {
-		NONE,
-		NORMAL,
-		MAX
-	}
-	[CCode (cprefix = "GDK_SCROLL_", cheader_filename = "gdk/gdk.h")]
-	public enum ScrollDirection {
-		UP,
-		DOWN,
-		LEFT,
-		RIGHT
-	}
-	[CCode (cprefix = "GDK_SETTING_ACTION_", cheader_filename = "gdk/gdk.h")]
-	public enum SettingAction {
-		NEW,
-		CHANGED,
-		DELETED
-	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
-	public enum Status {
-		OK,
-		ERROR,
-		ERROR_PARAM,
-		ERROR_FILE,
-		ERROR_MEM
-	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
-	public enum SubwindowMode {
-		CLIP_BY_CHILDREN,
-		INCLUDE_INFERIORS
-	}
-	[CCode (cprefix = "GDK_VISIBILITY_", cheader_filename = "gdk/gdk.h")]
-	public enum VisibilityState {
-		UNOBSCURED,
-		PARTIAL,
-		FULLY_OBSCURED
-	}
-	[CCode (cprefix = "GDK_VISUAL_", cheader_filename = "gdk/gdk.h")]
-	public enum VisualType {
-		STATIC_GRAY,
-		GRAYSCALE,
-		STATIC_COLOR,
-		PSEUDO_COLOR,
-		TRUE_COLOR,
-		DIRECT_COLOR
-	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
-	public enum WindowClass {
-		INPUT_OUTPUT,
-		INPUT_ONLY
-	}
-	[CCode (cprefix = "GDK_WINDOW_EDGE_", cheader_filename = "gdk/gdk.h")]
-	public enum WindowEdge {
-		NORTH_WEST,
-		NORTH,
-		NORTH_EAST,
-		WEST,
-		EAST,
-		SOUTH_WEST,
-		SOUTH,
-		SOUTH_EAST
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public class Pixmap : Gdk.Drawable {
+		public static weak Gdk.Pixmap colormap_create_from_xpm (Gdk.Drawable drawable, Gdk.Colormap colormap, out weak Gdk.Bitmap mask, Gdk.Color transparent_color, string filename);
+		public static weak Gdk.Pixmap colormap_create_from_xpm_d (Gdk.Drawable drawable, Gdk.Colormap colormap, out weak Gdk.Bitmap mask, Gdk.Color transparent_color, string data);
+		public static weak Gdk.Pixmap create_from_data (Gdk.Drawable drawable, string data, int width, int height, int depth, Gdk.Color fg, Gdk.Color bg);
+		public static weak Gdk.Pixmap create_from_xpm (Gdk.Drawable drawable, out weak Gdk.Bitmap mask, Gdk.Color transparent_color, string filename);
+		public static weak Gdk.Pixmap create_from_xpm_d (Gdk.Drawable drawable, out weak Gdk.Bitmap mask, Gdk.Color transparent_color, string data);
+		public static weak Gdk.Pixmap foreign_new (Gdk.NativeWindow anid);
+		public static weak Gdk.Pixmap foreign_new_for_display (Gdk.Display display, Gdk.NativeWindow anid);
+		public static weak Gdk.Pixmap foreign_new_for_screen (Gdk.Screen screen, Gdk.NativeWindow anid, int width, int height, int depth);
+		public static weak Gdk.Pixmap lookup (Gdk.NativeWindow anid);
+		public static weak Gdk.Pixmap lookup_for_display (Gdk.Display display, Gdk.NativeWindow anid);
+		[CCode (has_construct_function = false)]
+		public Pixmap (Gdk.Drawable drawable, int width, int height, int depth);
 	}
-	[CCode (cprefix = "GDK_WINDOW_", cheader_filename = "gdk/gdk.h")]
-	public enum WindowType {
-		ROOT,
-		TOPLEVEL,
-		CHILD,
-		DIALOG,
-		TEMP,
-		FOREIGN
+	[Compact]
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public class PointerHooks {
+		public weak GLib.Callback get_pointer;
+		public weak GLib.Callback window_at_pointer;
 	}
-	[CCode (cprefix = "GDK_WINDOW_TYPE_HINT_", cheader_filename = "gdk/gdk.h")]
-	public enum WindowTypeHint {
-		NORMAL,
-		DIALOG,
-		MENU,
-		TOOLBAR,
-		SPLASHSCREEN,
-		UTILITY,
-		DOCK,
-		DESKTOP,
-		DROPDOWN_MENU,
-		POPUP_MENU,
-		TOOLTIP,
-		NOTIFICATION,
-		COMBO,
-		DND
+	[Compact]
+	[CCode (copy_function = "gdk_region_copy", free_function = "gdk_region_destroy", cheader_filename = "gdk/gdk.h")]
+	public class Region {
+		public weak Gdk.Region copy ();
+		public bool empty ();
+		public bool equal (Gdk.Region region2);
+		public void get_clipbox (out Gdk.Rectangle rectangle);
+		public void get_rectangles (Gdk.Rectangle[] rectangles);
+		public void intersect (Gdk.Region source2);
+		[CCode (has_construct_function = false)]
+		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, 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);
+		public void spans_intersect_foreach (Gdk.Span[] spans, bool sorted, Gdk.SpanFunc function, void* data);
+		public void subtract (Gdk.Region source2);
+		public void union (Gdk.Region source2);
+		public void union_with_rect (Gdk.Rectangle rect);
+		public void xor (Gdk.Region source2);
 	}
-	[CCode (cprefix = "GDK_ACTION_", cheader_filename = "gdk/gdk.h")]
-	[Flags]
-	public enum DragAction {
-		DEFAULT,
-		COPY,
-		MOVE,
-		LINK,
-		PRIVATE,
-		ASK
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public class Screen : GLib.Object {
+		public uint closed;
+		[NoArrayLength]
+		public weak Gdk.GC[] exposure_gcs;
+		[NoArrayLength]
+		public weak Gdk.GC[] normal_gcs;
+		public void broadcast_client_message (Gdk.Event event);
+		public weak Gdk.Window get_active_window ();
+		public static weak Gdk.Screen get_default ();
+		public weak Gdk.Colormap get_default_colormap ();
+		public weak Gdk.Display get_display ();
+		public weak Cairo.FontOptions get_font_options ();
+		public int get_height ();
+		public int get_height_mm ();
+		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 ();
+		public weak Gdk.Colormap get_rgb_colormap ();
+		public weak Gdk.Visual get_rgb_visual ();
+		public weak Gdk.Colormap get_rgba_colormap ();
+		public weak Gdk.Visual get_rgba_visual ();
+		public weak Gdk.Window get_root_window ();
+		public bool get_setting (string name, GLib.Value value);
+		public weak Gdk.Colormap get_system_colormap ();
+		public weak Gdk.Visual get_system_visual ();
+		public weak GLib.List get_toplevel_windows ();
+		public int get_width ();
+		public int get_width_mm ();
+		public weak GLib.List get_window_stack ();
+		public static int height ();
+		public static int height_mm ();
+		public bool is_composited ();
+		public weak GLib.List list_visuals ();
+		public weak string make_display_name ();
+		public void set_default_colormap (Gdk.Colormap colormap);
+		public void set_font_options (Cairo.FontOptions options);
+		public void set_resolution (double dpi);
+		public static int width ();
+		public static int width_mm ();
+		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 (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
-	[Flags]
-	public enum EventMask {
-		EXPOSURE_MASK,
-		POINTER_MOTION_MASK,
-		POINTER_MOTION_HINT_MASK,
-		BUTTON_MOTION_MASK,
-		BUTTON1_MOTION_MASK,
-		BUTTON2_MOTION_MASK,
-		BUTTON3_MOTION_MASK,
-		BUTTON_PRESS_MASK,
-		BUTTON_RELEASE_MASK,
-		KEY_PRESS_MASK,
-		KEY_RELEASE_MASK,
-		ENTER_NOTIFY_MASK,
-		LEAVE_NOTIFY_MASK,
-		FOCUS_CHANGE_MASK,
-		STRUCTURE_MASK,
-		PROPERTY_CHANGE_MASK,
-		VISIBILITY_NOTIFY_MASK,
-		PROXIMITY_IN_MASK,
-		PROXIMITY_OUT_MASK,
-		SUBSTRUCTURE_MASK,
-		SCROLL_MASK,
-		ALL_EVENTS_MASK
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public class Visual : GLib.Object {
+		public int bits_per_rgb;
+		public uint blue_mask;
+		public int blue_prec;
+		public int blue_shift;
+		public Gdk.ByteOrder byte_order;
+		public int colormap_size;
+		public int depth;
+		public uint green_mask;
+		public int green_prec;
+		public int green_shift;
+		public uint red_mask;
+		public int red_prec;
+		public int red_shift;
+		public Gdk.VisualType type;
+		public static weak Gdk.Visual get_best ();
+		public static int get_best_depth ();
+		public static Gdk.VisualType get_best_type ();
+		public static weak Gdk.Visual get_best_with_both (int depth, Gdk.VisualType visual_type);
+		public static weak Gdk.Visual get_best_with_depth (int depth);
+		public static weak Gdk.Visual get_best_with_type (Gdk.VisualType visual_type);
+		public weak Gdk.Screen get_screen ();
+		public static weak Gdk.Visual get_system ();
 	}
-	[CCode (cprefix = "GDK_GC_", cheader_filename = "gdk/gdk.h")]
-	[Flags]
-	public enum GCValuesMask {
-		FOREGROUND,
-		BACKGROUND,
-		FONT,
-		FUNCTION,
-		FILL,
-		TILE,
-		STIPPLE,
-		CLIP_MASK,
-		SUBWINDOW,
-		TS_X_ORIGIN,
-		TS_Y_ORIGIN,
-		CLIP_X_ORIGIN,
-		CLIP_Y_ORIGIN,
-		EXPOSURES,
-		LINE_WIDTH,
-		LINE_STYLE,
-		CAP_STYLE,
-		JOIN_STYLE
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public class Window : Gdk.Drawable {
+		public void add_filter (Gdk.FilterFunc function, void* data);
+		public static weak Gdk.Window at_pointer (out int win_x, out int win_y);
+		public void beep ();
+		public void begin_move_drag (int button, int root_x, int root_y, uint timestamp);
+		public void begin_paint_rect (Gdk.Rectangle rectangle);
+		public void begin_paint_region (Gdk.Region region);
+		public void begin_resize_drag (Gdk.WindowEdge edge, int button, int root_x, int root_y, uint timestamp);
+		public void clear ();
+		public void clear_area (int x, int y, int width, int height);
+		public void clear_area_e (int x, int y, int width, int height);
+		public void configure_finished ();
+		public static void constrain_size (Gdk.Geometry geometry, uint flags, int width, int height, out int new_width, out int new_height);
+		public void deiconify ();
+		public void destroy ();
+		public void destroy_notify ();
+		public void enable_synchronized_configure ();
+		public void end_paint ();
+		public void focus (uint timestamp);
+		public static weak Gdk.Window foreign_new (Gdk.NativeWindow anid);
+		public static weak Gdk.Window foreign_new_for_display (Gdk.Display display, Gdk.NativeWindow anid);
+		public void freeze_toplevel_updates_libgtk_only ();
+		public void freeze_updates ();
+		public void fullscreen ();
+		public weak GLib.List get_children ();
+		public bool get_decorations (out Gdk.WMDecoration decorations);
+		public Gdk.EventMask get_events ();
+		public void get_frame_extents (out Gdk.Rectangle rect);
+		public void get_geometry (out int x, out int y, out int width, out int height, out int depth);
+		public weak Gdk.Window get_group ();
+		public void get_internal_paint_info (out weak Gdk.Drawable real_drawable, out int x_offset, out int y_offset);
+		public int get_origin (out int x, out int y);
+		public weak Gdk.Window get_parent ();
+		public weak Gdk.Window get_pointer (out int x, out int y, out Gdk.ModifierType mask);
+		public void get_position (out int x, out int y);
+		public void get_root_origin (out int x, out int y);
+		public Gdk.WindowState get_state ();
+		public weak Gdk.Window get_toplevel ();
+		public static weak GLib.List get_toplevels ();
+		public Gdk.WindowTypeHint get_type_hint ();
+		public weak Gdk.Region get_update_area ();
+		public void get_user_data (void* data);
+		public Gdk.WindowType get_window_type ();
+		public void hide ();
+		public void iconify ();
+		public void input_shape_combine_mask (Gdk.Bitmap mask, int x, int y);
+		public void input_shape_combine_region (Gdk.Region shape_region, int offset_x, int offset_y);
+		public void invalidate_maybe_recurse (Gdk.Region region, GLib.Callback child_func);
+		public void invalidate_rect (Gdk.Rectangle? rect, bool invalidate_children);
+		public void invalidate_region (Gdk.Region region, bool invalidate_children);
+		public bool is_viewable ();
+		public bool is_visible ();
+		public static weak Gdk.Window lookup (Gdk.NativeWindow anid);
+		public static weak Gdk.Window lookup_for_display (Gdk.Display display, Gdk.NativeWindow anid);
+		public void lower ();
+		public void maximize ();
+		public void merge_child_input_shapes ();
+		public void merge_child_shapes ();
+		public void move (int x, int y);
+		public void move_region (Gdk.Region region, int dx, int dy);
+		public void move_resize (int x, int y, int width, int height);
+		[CCode (has_construct_function = false)]
+		public Window (Gdk.Window parent, Gdk.WindowAttr attributes, int attributes_mask);
+		public weak GLib.List peek_children ();
+		public static void process_all_updates ();
+		public void process_updates (bool update_children);
+		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);
+		public void set_accept_focus (bool accept_focus);
+		public void set_back_pixmap (Gdk.Pixmap pixmap, bool parent_relative);
+		public void set_background (Gdk.Color color);
+		public void set_child_input_shapes ();
+		public void set_child_shapes ();
+		public void set_composited (bool composited);
+		public void set_cursor (Gdk.Cursor? cursor);
+		public static void set_debug_updates (bool setting);
+		public void set_decorations (Gdk.WMDecoration decorations);
+		public void set_events (Gdk.EventMask event_mask);
+		public void set_focus_on_map (bool focus_on_map);
+		public void set_functions (Gdk.WMFunction functions);
+		public void set_geometry_hints (Gdk.Geometry geometry, Gdk.WindowHints geom_mask);
+		public void set_group (Gdk.Window leader);
+		public void set_icon (Gdk.Window icon_window, Gdk.Pixmap pixmap, Gdk.Bitmap mask);
+		public void set_icon_list (GLib.List pixbufs);
+		public void set_icon_name (string name);
+		public void set_keep_above (bool setting);
+		public void set_keep_below (bool setting);
+		public void set_modal_hint (bool modal);
+		public void set_opacity (double opacity);
+		public void set_override_redirect (bool override_redirect);
+		public void set_role (string role);
+		public void set_skip_pager_hint (bool skips_pager);
+		public void set_skip_taskbar_hint (bool skips_taskbar);
+		public void set_startup_id (string startup_id);
+		public bool set_static_gravities (bool use_static);
+		public void set_title (string title);
+		public void set_transient_for (Gdk.Window parent);
+		public void set_type_hint (Gdk.WindowTypeHint hint);
+		public void set_urgency_hint (bool urgent);
+		public void set_user_data (void* user_data);
+		public void shape_combine_mask (Gdk.Bitmap mask, int x, int y);
+		public void shape_combine_region (Gdk.Region shape_region, int offset_x, int offset_y);
+		public void show ();
+		public void show_unraised ();
+		public void stick ();
+		public void thaw_toplevel_updates_libgtk_only ();
+		public void thaw_updates ();
+		public void unfullscreen ();
+		public void unmaximize ();
+		public void unstick ();
+		public void withdraw ();
 	}
-	[CCode (cprefix = "GDK_INPUT_", cheader_filename = "gdk/gdk.h")]
-	[Flags]
-	public enum InputCondition {
-		READ,
-		WRITE,
-		EXCEPTION
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	[SimpleType]
+	public struct Atom {
+		public static Gdk.Atom intern (string atom_name, bool only_if_exists);
+		public static Gdk.Atom intern_static_string (string atom_name);
+		public weak string name ();
 	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
-	[Flags]
-	public enum ModifierType {
-		SHIFT_MASK,
-		LOCK_MASK,
-		CONTROL_MASK,
-		MOD1_MASK,
-		MOD2_MASK,
-		MOD3_MASK,
-		MOD4_MASK,
-		MOD5_MASK,
-		BUTTON1_MASK,
-		BUTTON2_MASK,
-		BUTTON3_MASK,
-		BUTTON4_MASK,
-		BUTTON5_MASK,
-		SUPER_MASK,
-		HYPER_MASK,
-		META_MASK,
-		RELEASE_MASK,
-		MODIFIER_MASK
+	[CCode (type_id = "GDK_TYPE_COLOR", cheader_filename = "gdk/gdk.h")]
+	public struct Color {
+		public ushort blue;
+		public ushort green;
+		public uint pixel;
+		public ushort red;
+		public Gdk.Color copy ();
+		public bool equal (Gdk.Color colorb);
+		public void free ();
+		public uint hash ();
+		public static bool parse (string spec, out Gdk.Color color);
+		public weak string to_string ();
 	}
-	[CCode (cprefix = "GDK_DECOR_", cheader_filename = "gdk/gdk.h")]
-	[Flags]
-	public enum WMDecoration {
-		ALL,
-		BORDER,
-		RESIZEH,
-		TITLE,
-		MENU,
-		MINIMIZE,
-		MAXIMIZE
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public struct DeviceAxis {
+		public double max;
+		public double min;
+		public Gdk.AxisUse use;
 	}
-	[CCode (cprefix = "GDK_FUNC_", cheader_filename = "gdk/gdk.h")]
-	[Flags]
-	public enum WMFunction {
-		ALL,
-		RESIZE,
-		MOVE,
-		MINIMIZE,
-		MAXIMIZE,
-		CLOSE
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public struct DeviceKey {
+		public uint keyval;
+		public Gdk.ModifierType modifiers;
 	}
-	[CCode (cprefix = "GDK_WA_", cheader_filename = "gdk/gdk.h")]
-	[Flags]
-	public enum WindowAttributesType {
-		TITLE,
-		X,
-		Y,
-		CURSOR,
-		COLORMAP,
-		VISUAL,
-		WMCLASS,
-		NOREDIR,
-		TYPE_HINT
+	[CCode (type_id = "GDK_TYPE_EVENT", cheader_filename = "gdk/gdk.h")]
+	public struct Event {
+		public Gdk.EventAny any;
+		public Gdk.EventButton button;
+		public Gdk.EventClient client;
+		public Gdk.EventConfigure configure;
+		public Gdk.EventCrossing crossing;
+		public Gdk.EventDND dnd;
+		public Gdk.EventExpose expose;
+		public Gdk.EventFocus focus_change;
+		public Gdk.EventGrabBroken grab_broken;
+		public Gdk.EventKey key;
+		public Gdk.EventMotion motion;
+		public Gdk.EventNoExpose no_expose;
+		public Gdk.EventOwnerChange owner_change;
+		public Gdk.EventProperty property;
+		public Gdk.EventProximity proximity;
+		public Gdk.EventScroll scroll;
+		public Gdk.EventSelection selection;
+		public Gdk.EventSetting setting;
+		public Gdk.EventType type;
+		public Gdk.EventVisibility visibility;
+		public Gdk.EventWindowState window_state;
+		public Gdk.Event copy ();
+		public void free ();
+		public static Gdk.Event get ();
+		public bool get_axis (Gdk.AxisUse axis_use, out double value);
+		public bool get_coords (out double x_win, out double y_win);
+		public static Gdk.Event get_graphics_expose (Gdk.Window window);
+		public bool get_root_coords (out double x_root, out double y_root);
+		public weak Gdk.Screen get_screen ();
+		public bool get_state (out Gdk.ModifierType state);
+		public uint get_time ();
+		public static void handler_set (Gdk.EventFunc func, void* data, GLib.DestroyNotify notify);
+		[CCode (cname = "gdk_event_new", has_construct_function = false)]
+		public Event (Gdk.EventType type);
+		public static Gdk.Event peek ();
+		public void put ();
+		public static void request_motions (Gdk.EventMotion event);
+		public bool send_client_message (Gdk.NativeWindow winid);
+		public static bool send_client_message_for_display (Gdk.Display display, Gdk.Event event, Gdk.NativeWindow winid);
+		public void send_clientmessage_toall ();
+		public void set_screen (Gdk.Screen screen);
 	}
-	[CCode (cprefix = "GDK_HINT_", cheader_filename = "gdk/gdk.h")]
-	[Flags]
-	public enum WindowHints {
-		POS,
-		MIN_SIZE,
-		MAX_SIZE,
-		BASE_SIZE,
-		ASPECT,
-		RESIZE_INC,
-		WIN_GRAVITY,
-		USER_POS,
-		USER_SIZE
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public struct EventAny {
+		public char send_event;
+		public Gdk.EventType type;
+		public weak Gdk.Window window;
 	}
-	[CCode (cprefix = "GDK_WINDOW_STATE_", cheader_filename = "gdk/gdk.h")]
-	[Flags]
-	public enum WindowState {
-		WITHDRAWN,
-		ICONIFIED,
-		MAXIMIZED,
-		STICKY,
-		FULLSCREEN,
-		ABOVE,
-		BELOW
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public struct EventButton {
+		public double axes;
+		public uint button;
+		public weak Gdk.Device device;
+		public char send_event;
+		public uint state;
+		public uint time;
+		public Gdk.EventType type;
+		public weak Gdk.Window window;
+		public double x;
+		public double x_root;
+		public double y;
+		public double y_root;
 	}
-	[CCode (ref_function = "g_object_ref", unref_function = "g_object_unref", cheader_filename = "gdk/gdk.h")]
-	public class Bitmap {
-		public weak GLib.Object parent_instance;
-		public Bitmap ();
-		public static Gdk.Bitmap create_from_data (Gdk.Drawable drawable, string data, int width, int height);
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public struct EventClient {
+		public void* data;
+		public ushort data_format;
+		public Gdk.Atom message_type;
+		public char send_event;
+		public Gdk.EventType type;
+		public weak Gdk.Window window;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class DisplayPointerHooks {
-		public weak GLib.Callback get_pointer;
-		public weak GLib.Callback window_get_pointer;
-		public weak GLib.Callback window_at_pointer;
+	public struct EventConfigure {
+		public int height;
+		public char send_event;
+		public Gdk.EventType type;
+		public int width;
+		public weak Gdk.Window window;
+		public int x;
+		public int y;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class PointerHooks {
-		public weak GLib.Callback get_pointer;
-		public weak GLib.Callback window_at_pointer;
+	public struct EventCrossing {
+		public Gdk.NotifyType detail;
+		public bool focus;
+		public Gdk.CrossingMode mode;
+		public char send_event;
+		public uint state;
+		public weak Gdk.Window subwindow;
+		public uint time;
+		public Gdk.EventType type;
+		public weak Gdk.Window window;
+		public double x;
+		public double x_root;
+		public double y;
+		public double y_root;
 	}
-	[Compact]
-	[CCode (copy_function = "gdk_region_copy", free_function = "gdk_region_destroy", cheader_filename = "gdk/gdk.h")]
-	public class Region {
-		public weak Gdk.Region copy ();
-		public bool empty ();
-		public bool equal (Gdk.Region region2);
-		public void get_clipbox (out Gdk.Rectangle rectangle);
-		public void get_rectangles (Gdk.Rectangle[] rectangles);
-		public void intersect (Gdk.Region source2);
-		[CCode (has_construct_function = false)]
-		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, 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);
-		public void spans_intersect_foreach (Gdk.Span[] spans, bool sorted, Gdk.SpanFunc function, void* data);
-		public void subtract (Gdk.Region source2);
-		public void union (Gdk.Region source2);
-		public void union_with_rect (Gdk.Rectangle rect);
-		public void xor (Gdk.Region source2);
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public struct EventDND {
+		public weak Gdk.DragContext context;
+		public char send_event;
+		public uint time;
+		public Gdk.EventType type;
+		public weak Gdk.Window window;
+		public short x_root;
+		public short y_root;
 	}
-	[Compact]
-	[CCode (ref_function = "gdk_cursor_ref", unref_function = "gdk_cursor_unref", cheader_filename = "gdk/gdk.h")]
-	public class Cursor {
-		public Gdk.CursorType type;
-		public uint ref_count;
-		public weak Gdk.Display get_display ();
-		public weak Gdk.Pixbuf get_image ();
-		[CCode (has_construct_function = false)]
-		public Cursor (Gdk.CursorType cursor_type);
-		[CCode (has_construct_function = false)]
-		public Cursor.for_display (Gdk.Display display, Gdk.CursorType cursor_type);
-		[CCode (has_construct_function = false)]
-		public Cursor.from_name (Gdk.Display display, string name);
-		[CCode (has_construct_function = false)]
-		public Cursor.from_pixbuf (Gdk.Display display, Gdk.Pixbuf pixbuf, int x, int y);
-		[CCode (has_construct_function = false)]
-		public Cursor.from_pixmap (Gdk.Pixmap source, Gdk.Pixmap mask, Gdk.Color fg, Gdk.Color bg, int x, int y);
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public struct EventExpose {
+		public Gdk.Rectangle area;
+		public int count;
+		public weak Gdk.Region region;
+		public char send_event;
+		public Gdk.EventType type;
+		public weak Gdk.Window window;
+	}
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public struct EventFocus {
+		public short @in;
+		public char send_event;
+		public Gdk.EventType type;
+		public weak Gdk.Window window;
+	}
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public struct EventGrabBroken {
+		public weak Gdk.Window grab_window;
+		public bool implicit;
+		public bool keyboard;
+		public char send_event;
+		public Gdk.EventType type;
+		public weak Gdk.Window window;
+	}
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public struct EventKey {
+		public uchar group;
+		public ushort hardware_keycode;
+		public uint is_modifier;
+		public uint keyval;
+		public int length;
+		public char send_event;
+		public uint state;
+		[CCode (cname = "string")]
+		public weak string str;
+		public uint time;
+		public Gdk.EventType type;
+		public weak Gdk.Window window;
 	}
-	[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 struct EventMotion {
+		public double axes;
+		public weak Gdk.Device device;
+		public bool is_hint;
+		public char send_event;
+		public Gdk.ModifierType state;
+		public uint time;
+		public Gdk.EventType type;
+		public weak Gdk.Window window;
+		public double x;
+		public double x_root;
+		public double y;
+		public double y_root;
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class AppLaunchContext : GLib.AppLaunchContext {
-		[CCode (has_construct_function = false)]
-		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);
+	public struct EventNoExpose {
+		public char send_event;
+		public Gdk.EventType type;
+		public weak Gdk.Window window;
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class Colormap : GLib.Object {
-		public int size;
-		public Gdk.Color colors;
-		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, 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 ();
-		[CCode (has_construct_function = false)]
-		public Colormap (Gdk.Visual visual, bool allocate);
-		public void query_color (ulong pixel, out Gdk.Color _result);
+	public struct EventOwnerChange {
+		public Gdk.NativeWindow owner;
+		public Gdk.OwnerChange reason;
+		public Gdk.Atom selection;
+		public uint selection_time;
+		public char send_event;
+		public uint time;
+		public Gdk.EventType type;
+		public weak Gdk.Window window;
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class Device : GLib.Object {
-		public weak string name;
-		public Gdk.InputSource source;
-		public Gdk.InputMode mode;
-		public bool has_cursor;
-		public int num_axes;
-		[NoArrayLength]
-		public weak Gdk.DeviceAxis[] axes;
-		public int num_keys;
-		[NoArrayLength]
-		public weak Gdk.DeviceKey[] keys;
-		public static void free_history (Gdk.TimeCoord[] events);
-		public bool get_axis (double axes, Gdk.AxisUse use, double value);
-		public static weak Gdk.Device get_core_pointer ();
-		public bool get_history (Gdk.Window window, uint start, uint stop, Gdk.TimeCoord[] events);
-		public void get_state (Gdk.Window window, double axes, Gdk.ModifierType mask);
-		public void set_axis_use (uint index_, Gdk.AxisUse use);
-		public void set_key (uint index_, uint keyval, Gdk.ModifierType modifiers);
-		public bool set_mode (Gdk.InputMode mode);
-		public void set_source (Gdk.InputSource source);
+	public struct EventProperty {
+		public Gdk.Atom atom;
+		public char send_event;
+		public uint state;
+		public uint time;
+		public Gdk.EventType type;
+		public weak Gdk.Window window;
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class Display : GLib.Object {
-		public weak GLib.List queued_events;
-		public weak GLib.List queued_tail;
-		[NoArrayLength]
-		public weak uint[] button_click_time;
-		[NoArrayLength]
-		public weak Gdk.Window[] button_window;
-		[NoArrayLength]
-		public weak int[] button_number;
-		public uint double_click_time;
-		public weak Gdk.Device core_pointer;
-		public weak Gdk.DisplayPointerHooks pointer_hooks;
-		public uint double_click_distance;
-		[NoArrayLength]
-		public weak int[] button_x;
-		[NoArrayLength]
-		public weak int[] button_y;
-		public void add_client_message_filter (Gdk.Atom message_type, Gdk.FilterFunc func, void* data);
-		public void beep ();
-		public void close ();
-		public void flush ();
-		public weak Gdk.Device get_core_pointer ();
-		public static weak Gdk.Display get_default ();
-		public uint get_default_cursor_size ();
-		public weak Gdk.Window get_default_group ();
-		public Gdk.Event get_event ();
-		public void get_maximal_cursor_size (out uint width, out uint height);
-		public weak string get_name ();
-		public void get_pointer (out weak Gdk.Screen screen, int x, int y, Gdk.ModifierType mask);
-		public weak Gdk.Window get_window_at_pointer (int win_x, int win_y);
-		public void keyboard_ungrab (uint time_);
-		public weak GLib.List list_devices ();
-		public static weak Gdk.Display open (string display_name);
-		public static weak Gdk.Display open_default_libgtk_only ();
-		public Gdk.Event peek_event ();
-		public bool pointer_is_grabbed ();
-		public void pointer_ungrab (uint time_);
-		public void put_event (Gdk.Event event);
-		public bool request_selection_notification (Gdk.Atom selection);
-		public void set_double_click_distance (uint distance);
-		public void set_double_click_time (uint msec);
-		public weak Gdk.DisplayPointerHooks set_pointer_hooks (Gdk.DisplayPointerHooks new_hooks);
-		public void store_clipboard (Gdk.Window clipboard_window, uint time_, Gdk.Atom[] targets);
-		public bool supports_clipboard_persistence ();
-		public bool supports_composite ();
-		public bool supports_cursor_alpha ();
-		public bool supports_cursor_color ();
-		public bool supports_input_shapes ();
-		public bool supports_selection_notification ();
-		public bool supports_shapes ();
-		public void sync ();
-		public void warp_pointer (Gdk.Screen screen, int x, int y);
-		public virtual weak Gdk.Screen get_default_screen ();
-		[NoWrapper]
-		public virtual weak string get_display_name ();
-		public virtual int get_n_screens ();
-		public virtual weak Gdk.Screen get_screen (int screen_num);
-		public virtual signal void closed (bool is_error);
+	public struct EventProximity {
+		public weak Gdk.Device device;
+		public char send_event;
+		public uint time;
+		public Gdk.EventType type;
+		public weak Gdk.Window window;
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class DisplayManager : GLib.Object {
-		public static weak Gdk.DisplayManager get ();
-		public weak Gdk.Display get_default_display ();
-		public weak GLib.SList list_displays ();
-		public void set_default_display (Gdk.Display display);
-		public Gdk.Display default_display { get; set; }
-		public virtual signal void display_opened (Gdk.Display display);
+	public struct EventScroll {
+		public weak Gdk.Device device;
+		public Gdk.ScrollDirection direction;
+		public char send_event;
+		public uint state;
+		public uint time;
+		public Gdk.EventType type;
+		public weak Gdk.Window window;
+		public double x;
+		public double x_root;
+		public double y;
+		public double y_root;
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class DragContext : GLib.Object {
-		public Gdk.DragProtocol protocol;
-		public bool is_source;
-		public weak Gdk.Window source_window;
-		public weak Gdk.Window dest_window;
-		public weak GLib.List targets;
-		public Gdk.DragAction actions;
-		public Gdk.DragAction suggested_action;
-		public Gdk.DragAction action;
-		public uint start_time;
-		public void* windowing_data;
-		[CCode (has_construct_function = false)]
-		public DragContext ();
+	public struct EventSelection {
+		public Gdk.Atom property;
+		public Gdk.NativeWindow requestor;
+		public Gdk.Atom selection;
+		public char send_event;
+		public Gdk.Atom target;
+		public uint time;
+		public Gdk.EventType type;
+		public weak Gdk.Window window;
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class Drawable : GLib.Object {
-		public weak Gdk.Image copy_to_image (Gdk.Image image, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
-		public weak Gdk.Display get_display ();
-		[NoWrapper]
-		public virtual weak Gdk.GC create_gc (Gdk.GCValues values, Gdk.GCValuesMask mask);
-		[NoWrapper]
-		public virtual void draw_arc (Gdk.GC gc, bool filled, int x, int y, int width, int height, int angle1, int angle2);
-		[NoWrapper]
-		public virtual void draw_drawable (Gdk.GC gc, Gdk.Drawable src, int xsrc, int ysrc, int xdest, int ydest, int width, int height);
-		[NoWrapper]
-		public virtual void draw_glyphs (Gdk.GC gc, Pango.Font font, int x, int y, Pango.GlyphString glyphs);
-		[NoWrapper]
-		public virtual void draw_glyphs_transformed (Gdk.GC gc, Pango.Matrix matrix, Pango.Font font, int x, int y, Pango.GlyphString glyphs);
-		[NoWrapper]
-		public virtual void draw_image (Gdk.GC gc, Gdk.Image image, int xsrc, int ysrc, int xdest, int ydest, int width, int height);
-		[NoWrapper]
-		public virtual void draw_lines (Gdk.GC gc, Gdk.Point points, int npoints);
-		[NoWrapper]
-		public virtual void draw_pixbuf (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);
-		[NoWrapper]
-		public virtual void draw_points (Gdk.GC gc, Gdk.Point points, int npoints);
-		[NoWrapper]
-		public virtual void draw_polygon (Gdk.GC gc, bool filled, Gdk.Point points, int npoints);
-		[NoWrapper]
-		public virtual void draw_rectangle (Gdk.GC gc, bool filled, int x, int y, int width, int height);
-		[NoWrapper]
-		public virtual void draw_segments (Gdk.GC gc, Gdk.Segment segs, int nsegs);
-		[NoWrapper]
-		public virtual void draw_text (Gdk.Font font, Gdk.GC gc, int x, int y, string text, int text_length);
-		[NoWrapper]
-		public virtual void draw_text_wc (Gdk.Font font, Gdk.GC gc, int x, int y, Gdk.WChar text, int text_length);
-		[NoWrapper]
-		public virtual void draw_trapezoids (Gdk.GC gc, Gdk.Trapezoid[] trapezoids);
-		public virtual weak Gdk.Region get_clip_region ();
-		public virtual weak Gdk.Colormap get_colormap ();
-		[NoWrapper]
-		public virtual weak Gdk.Drawable get_composite_drawable (int x, int y, int width, int height, int composite_x_offset, int composite_y_offset);
-		public virtual int get_depth ();
-		public virtual weak Gdk.Image get_image (int x, int y, int width, int height);
-		public virtual weak Gdk.Screen get_screen ();
-		public virtual void get_size (out int width, out int height);
-		public virtual weak Gdk.Region get_visible_region ();
-		public virtual weak Gdk.Visual get_visual ();
-		[NoWrapper]
-		public virtual weak Cairo.Surface ref_cairo_surface ();
-		public virtual void set_colormap (Gdk.Colormap colormap);
+	public struct EventSetting {
+		public Gdk.SettingAction action;
+		public weak string name;
+		public char send_event;
+		public Gdk.EventType type;
+		public weak Gdk.Window window;
+	}
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public struct EventVisibility {
+		public char send_event;
+		public Gdk.VisibilityState state;
+		public Gdk.EventType type;
+		public weak Gdk.Window window;
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class GC : GLib.Object {
+	public struct EventWindowState {
+		public Gdk.WindowState changed_mask;
+		public Gdk.WindowState new_window_state;
+		public char send_event;
+		public Gdk.EventType type;
+		public weak Gdk.Window window;
+	}
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public struct GCValues {
+		public Gdk.Color background;
+		public Gdk.CapStyle cap_style;
+		public weak Gdk.Pixmap clip_mask;
 		public int clip_x_origin;
 		public int clip_y_origin;
+		public Gdk.Fill fill;
+		public weak Gdk.Font font;
+		public Gdk.Color foreground;
+		public Gdk.Function function;
+		public int graphics_exposures;
+		public Gdk.JoinStyle join_style;
+		public Gdk.LineStyle line_style;
+		public int line_width;
+		public weak Gdk.Pixmap stipple;
+		public Gdk.SubwindowMode subwindow_mode;
+		public weak Gdk.Pixmap tile;
 		public int ts_x_origin;
 		public int ts_y_origin;
-		public weak Gdk.Colormap colormap;
-		public void copy (Gdk.GC src_gc);
-		public weak Gdk.Colormap get_colormap ();
-		public weak Gdk.Screen get_screen ();
-		[CCode (has_construct_function = false)]
-		public GC (Gdk.Drawable drawable);
-		[CCode (has_construct_function = false)]
-		public GC.with_values (Gdk.Drawable drawable, Gdk.GCValues values, Gdk.GCValuesMask values_mask);
-		public void offset (int x_offset, int y_offset);
-		public void set_background (Gdk.Color color);
-		public void set_clip_mask (Gdk.Bitmap mask);
-		public void set_clip_origin (int x, int y);
-		public void set_clip_rectangle (Gdk.Rectangle rectangle);
-		public void set_clip_region (Gdk.Region region);
-		public void set_colormap (Gdk.Colormap colormap);
-		public void set_exposures (bool exposures);
-		public void set_fill (Gdk.Fill fill);
-		public void set_foreground (Gdk.Color color);
-		public void set_function (Gdk.Function function);
-		public void set_line_attributes (int line_width, Gdk.LineStyle line_style, Gdk.CapStyle cap_style, Gdk.JoinStyle join_style);
-		public void set_rgb_bg_color (Gdk.Color color);
-		public void set_rgb_fg_color (Gdk.Color color);
-		public void set_stipple (Gdk.Pixmap stipple);
-		public void set_subwindow (Gdk.SubwindowMode mode);
-		public void set_tile (Gdk.Pixmap tile);
-		public void set_ts_origin (int x, int y);
-		public virtual void get_values (Gdk.GCValues values);
-		public virtual void set_dashes (int dash_offset, char[] dash_list, int n);
-		public virtual void set_values (Gdk.GCValues values, Gdk.GCValuesMask values_mask);
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class Image : GLib.Object {
-		public Gdk.ImageType type;
-		public weak Gdk.Visual visual;
-		public Gdk.ByteOrder byte_order;
-		public int width;
-		public int height;
-		public ushort depth;
-		public ushort bpp;
-		public ushort bpl;
-		public ushort bits_per_pixel;
-		public void* mem;
-		public weak Gdk.Colormap colormap;
-		public void* windowing_data;
-		public weak Gdk.Colormap get_colormap ();
-		public uint get_pixel (int x, int y);
-		[CCode (has_construct_function = false)]
-		public Image (Gdk.ImageType type, Gdk.Visual visual, int width, int height);
-		public void put_pixel (int x, int y, uint pixel);
-		public void set_colormap (Gdk.Colormap colormap);
+	public struct Geometry {
+		public int base_height;
+		public int base_width;
+		public int height_inc;
+		public double max_aspect;
+		public int max_height;
+		public int max_width;
+		public double min_aspect;
+		public int min_height;
+		public int min_width;
+		public int width_inc;
+		public Gdk.Gravity win_gravity;
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class Keymap : GLib.Object {
-		public weak Gdk.Display display;
-		public static weak Gdk.Keymap get_default ();
-		public Pango.Direction get_direction ();
-		public bool get_entries_for_keycode (uint hardware_keycode, out weak Gdk.KeymapKey[]? keys, out weak uint[]? keyvals, int n_entries);
-		public bool get_entries_for_keyval (uint keyval, Gdk.KeymapKey[] keys);
-		public static weak Gdk.Keymap get_for_display (Gdk.Display display);
-		public bool have_bidi_layouts ();
-		public uint lookup_key (Gdk.KeymapKey key);
-		public bool translate_keyboard_state (uint hardware_keycode, Gdk.ModifierType state, int group, uint keyval, int effective_group, int level, Gdk.ModifierType consumed_modifiers);
-		public virtual signal void direction_changed ();
-		public virtual signal void keys_changed ();
+	public struct KeymapKey {
+		public int group;
+		public uint keycode;
+		public int level;
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class PangoRenderer : Pango.Renderer {
-		public static weak Pango.Renderer get_default (Gdk.Screen screen);
-		[CCode (type = "PangoRenderer*", has_construct_function = false)]
-		public PangoRenderer (Gdk.Screen screen);
-		public void set_drawable (Gdk.Drawable drawable);
-		public void set_gc (Gdk.GC gc);
-		public void set_override_color (Pango.RenderPart part, Gdk.Color color);
-		public void set_stipple (Pango.RenderPart part, Gdk.Bitmap stipple);
-		[NoAccessorMethod]
-		public Gdk.Screen screen { get; construct; }
+	public struct NativeWindow {
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class Pixmap : Gdk.Drawable {
-		public static weak Gdk.Pixmap colormap_create_from_xpm (Gdk.Drawable drawable, Gdk.Colormap colormap, out weak Gdk.Bitmap mask, Gdk.Color transparent_color, string filename);
-		public static weak Gdk.Pixmap colormap_create_from_xpm_d (Gdk.Drawable drawable, Gdk.Colormap colormap, out weak Gdk.Bitmap mask, Gdk.Color transparent_color, string data);
-		public static weak Gdk.Pixmap create_from_data (Gdk.Drawable drawable, string data, int width, int height, int depth, Gdk.Color fg, Gdk.Color bg);
-		public static weak Gdk.Pixmap create_from_xpm (Gdk.Drawable drawable, out weak Gdk.Bitmap mask, Gdk.Color transparent_color, string filename);
-		public static weak Gdk.Pixmap create_from_xpm_d (Gdk.Drawable drawable, out weak Gdk.Bitmap mask, Gdk.Color transparent_color, string data);
-		public static weak Gdk.Pixmap foreign_new (Gdk.NativeWindow anid);
-		public static weak Gdk.Pixmap foreign_new_for_display (Gdk.Display display, Gdk.NativeWindow anid);
-		public static weak Gdk.Pixmap foreign_new_for_screen (Gdk.Screen screen, Gdk.NativeWindow anid, int width, int height, int depth);
-		public static weak Gdk.Pixmap lookup (Gdk.NativeWindow anid);
-		public static weak Gdk.Pixmap lookup_for_display (Gdk.Display display, Gdk.NativeWindow anid);
-		[CCode (has_construct_function = false)]
-		public Pixmap (Gdk.Drawable drawable, int width, int height, int depth);
+	public struct PangoAttrEmbossColor {
+		public weak Pango.Attribute attr;
+		public Pango.Color color;
+		[CCode (cname = "gdk_pango_attr_emboss_color_new", has_construct_function = false)]
+		public PangoAttrEmbossColor (Gdk.Color color);
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class Screen : GLib.Object {
-		public uint closed;
-		[NoArrayLength]
-		public weak Gdk.GC[] normal_gcs;
+	public struct PangoAttrEmbossed {
+		public weak Pango.Attribute attr;
+		public bool embossed;
+		[CCode (cname = "gdk_pango_attr_embossed_new", has_construct_function = false)]
+		public PangoAttrEmbossed (bool embossed);
+	}
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public struct PangoAttrStipple {
+		public weak Pango.Attribute attr;
+		public weak Gdk.Bitmap stipple;
+		[CCode (cname = "gdk_pango_attr_stipple_new", has_construct_function = false)]
+		public PangoAttrStipple (Gdk.Bitmap stipple);
+	}
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public struct Point {
+		public int x;
+		public int y;
+	}
+	[CCode (type_id = "GDK_TYPE_RECTANGLE", cheader_filename = "gdk/gdk.h")]
+	public struct Rectangle {
+		public int height;
+		public int width;
+		public int x;
+		public int y;
+		public bool intersect (Gdk.Rectangle src2, Gdk.Rectangle dest);
+		public void union (Gdk.Rectangle src2, out Gdk.Rectangle dest);
+	}
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public struct RgbCmap {
 		[NoArrayLength]
-		public weak Gdk.GC[] exposure_gcs;
-		public void broadcast_client_message (Gdk.Event event);
-		public weak Gdk.Window get_active_window ();
-		public static weak Gdk.Screen get_default ();
-		public weak Gdk.Colormap get_default_colormap ();
-		public weak Gdk.Display get_display ();
-		public weak Cairo.FontOptions get_font_options ();
-		public int get_height ();
-		public int get_height_mm ();
-		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 ();
-		public weak Gdk.Colormap get_rgb_colormap ();
-		public weak Gdk.Visual get_rgb_visual ();
-		public weak Gdk.Colormap get_rgba_colormap ();
-		public weak Gdk.Visual get_rgba_visual ();
-		public weak Gdk.Window get_root_window ();
-		public bool get_setting (string name, GLib.Value value);
-		public weak Gdk.Colormap get_system_colormap ();
-		public weak Gdk.Visual get_system_visual ();
-		public weak GLib.List get_toplevel_windows ();
-		public int get_width ();
-		public int get_width_mm ();
-		public weak GLib.List get_window_stack ();
-		public static int height ();
-		public static int height_mm ();
-		public bool is_composited ();
-		public weak GLib.List list_visuals ();
-		public weak string make_display_name ();
-		public void set_default_colormap (Gdk.Colormap colormap);
-		public void set_font_options (Cairo.FontOptions options);
-		public void set_resolution (double dpi);
-		public static int width ();
-		public static int width_mm ();
-		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 ();
+		public weak uint[] colors;
+		public weak GLib.SList info_list;
+		public int n_colors;
+		public void free ();
+		[CCode (cname = "gdk_rgb_cmap_new", has_construct_function = false)]
+		public RgbCmap (uint[] colors);
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class Visual : GLib.Object {
-		public Gdk.VisualType type;
-		public int depth;
-		public Gdk.ByteOrder byte_order;
-		public int colormap_size;
-		public int bits_per_rgb;
-		public uint red_mask;
-		public int red_shift;
-		public int red_prec;
-		public uint green_mask;
-		public int green_shift;
-		public int green_prec;
-		public uint blue_mask;
-		public int blue_shift;
-		public int blue_prec;
-		public static weak Gdk.Visual get_best ();
-		public static int get_best_depth ();
-		public static Gdk.VisualType get_best_type ();
-		public static weak Gdk.Visual get_best_with_both (int depth, Gdk.VisualType visual_type);
-		public static weak Gdk.Visual get_best_with_depth (int depth);
-		public static weak Gdk.Visual get_best_with_type (Gdk.VisualType visual_type);
-		public weak Gdk.Screen get_screen ();
-		public static weak Gdk.Visual get_system ();
+	public struct Segment {
+		public int x1;
+		public int x2;
+		public int y1;
+		public int y2;
+	}
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public struct Span {
+		public int width;
+		public int x;
+		public int y;
+	}
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public struct TimeCoord {
+		[NoArrayLength]
+		public weak double[] axes;
+		public uint time;
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public class Window : Gdk.Drawable {
-		public void add_filter (Gdk.FilterFunc function, void* data);
-		public static weak Gdk.Window at_pointer (out int win_x, out int win_y);
-		public void beep ();
-		public void begin_move_drag (int button, int root_x, int root_y, uint timestamp);
-		public void begin_paint_rect (Gdk.Rectangle rectangle);
-		public void begin_paint_region (Gdk.Region region);
-		public void begin_resize_drag (Gdk.WindowEdge edge, int button, int root_x, int root_y, uint timestamp);
-		public void clear ();
-		public void clear_area (int x, int y, int width, int height);
-		public void clear_area_e (int x, int y, int width, int height);
-		public void configure_finished ();
-		public static void constrain_size (Gdk.Geometry geometry, uint flags, int width, int height, out int new_width, out int new_height);
-		public void deiconify ();
-		public void destroy ();
-		public void destroy_notify ();
-		public void enable_synchronized_configure ();
-		public void end_paint ();
-		public void focus (uint timestamp);
-		public static weak Gdk.Window foreign_new (Gdk.NativeWindow anid);
-		public static weak Gdk.Window foreign_new_for_display (Gdk.Display display, Gdk.NativeWindow anid);
-		public void freeze_toplevel_updates_libgtk_only ();
-		public void freeze_updates ();
-		public void fullscreen ();
-		public weak GLib.List get_children ();
-		public bool get_decorations (out Gdk.WMDecoration decorations);
-		public Gdk.EventMask get_events ();
-		public void get_frame_extents (out Gdk.Rectangle rect);
-		public void get_geometry (out int x, out int y, out int width, out int height, out int depth);
-		public weak Gdk.Window get_group ();
-		public void get_internal_paint_info (out weak Gdk.Drawable real_drawable, out int x_offset, out int y_offset);
-		public int get_origin (out int x, out int y);
-		public weak Gdk.Window get_parent ();
-		public weak Gdk.Window get_pointer (out int x, out int y, out Gdk.ModifierType mask);
-		public void get_position (out int x, out int y);
-		public void get_root_origin (out int x, out int y);
-		public Gdk.WindowState get_state ();
-		public weak Gdk.Window get_toplevel ();
-		public static weak GLib.List get_toplevels ();
-		public Gdk.WindowTypeHint get_type_hint ();
-		public weak Gdk.Region get_update_area ();
-		public void get_user_data (void* data);
-		public Gdk.WindowType get_window_type ();
-		public void hide ();
-		public void iconify ();
-		public void input_shape_combine_mask (Gdk.Bitmap mask, int x, int y);
-		public void input_shape_combine_region (Gdk.Region shape_region, int offset_x, int offset_y);
-		public void invalidate_maybe_recurse (Gdk.Region region, GLib.Callback child_func);
-		public void invalidate_rect (Gdk.Rectangle? rect, bool invalidate_children);
-		public void invalidate_region (Gdk.Region region, bool invalidate_children);
-		public bool is_viewable ();
-		public bool is_visible ();
-		public static weak Gdk.Window lookup (Gdk.NativeWindow anid);
-		public static weak Gdk.Window lookup_for_display (Gdk.Display display, Gdk.NativeWindow anid);
-		public void lower ();
-		public void maximize ();
-		public void merge_child_input_shapes ();
-		public void merge_child_shapes ();
-		public void move (int x, int y);
-		public void move_region (Gdk.Region region, int dx, int dy);
-		public void move_resize (int x, int y, int width, int height);
-		[CCode (has_construct_function = false)]
-		public Window (Gdk.Window parent, Gdk.WindowAttr attributes, int attributes_mask);
-		public weak GLib.List peek_children ();
-		public static void process_all_updates ();
-		public void process_updates (bool update_children);
-		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);
-		public void set_accept_focus (bool accept_focus);
-		public void set_back_pixmap (Gdk.Pixmap pixmap, bool parent_relative);
-		public void set_background (Gdk.Color color);
-		public void set_child_input_shapes ();
-		public void set_child_shapes ();
-		public void set_composited (bool composited);
-		public void set_cursor (Gdk.Cursor? cursor);
-		public static void set_debug_updates (bool setting);
-		public void set_decorations (Gdk.WMDecoration decorations);
-		public void set_events (Gdk.EventMask event_mask);
-		public void set_focus_on_map (bool focus_on_map);
-		public void set_functions (Gdk.WMFunction functions);
-		public void set_geometry_hints (Gdk.Geometry geometry, Gdk.WindowHints geom_mask);
-		public void set_group (Gdk.Window leader);
-		public void set_icon (Gdk.Window icon_window, Gdk.Pixmap pixmap, Gdk.Bitmap mask);
-		public void set_icon_list (GLib.List pixbufs);
-		public void set_icon_name (string name);
-		public void set_keep_above (bool setting);
-		public void set_keep_below (bool setting);
-		public void set_modal_hint (bool modal);
-		public void set_opacity (double opacity);
-		public void set_override_redirect (bool override_redirect);
-		public void set_role (string role);
-		public void set_skip_pager_hint (bool skips_pager);
-		public void set_skip_taskbar_hint (bool skips_taskbar);
-		public void set_startup_id (string startup_id);
-		public bool set_static_gravities (bool use_static);
-		public void set_title (string title);
-		public void set_transient_for (Gdk.Window parent);
-		public void set_type_hint (Gdk.WindowTypeHint hint);
-		public void set_urgency_hint (bool urgent);
-		public void set_user_data (void* user_data);
-		public void shape_combine_mask (Gdk.Bitmap mask, int x, int y);
-		public void shape_combine_region (Gdk.Region shape_region, int offset_x, int offset_y);
-		public void show ();
-		public void show_unraised ();
-		public void stick ();
-		public void thaw_toplevel_updates_libgtk_only ();
-		public void thaw_updates ();
-		public void unfullscreen ();
-		public void unmaximize ();
-		public void unstick ();
-		public void withdraw ();
+	public struct Trapezoid {
+		public double x11;
+		public double x12;
+		public double x21;
+		public double x22;
+		public double y1;
+		public double y2;
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	[SimpleType]
-	public struct Atom {
-		public static Gdk.Atom intern (string atom_name, bool only_if_exists);
-		public static Gdk.Atom intern_static_string (string atom_name);
-		public weak string name ();
+	public struct WChar {
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct DeviceAxis {
-		public Gdk.AxisUse use;
-		public double min;
-		public double max;
+	public struct WindowAttr {
+		public weak Gdk.Colormap colormap;
+		public weak Gdk.Cursor cursor;
+		public int event_mask;
+		public int height;
+		public bool override_redirect;
+		public weak string title;
+		public Gdk.WindowTypeHint type_hint;
+		public weak Gdk.Visual visual;
+		public Gdk.WindowClass wclass;
+		public int width;
+		public Gdk.WindowType window_type;
+		public weak string wmclass_class;
+		public weak string wmclass_name;
+		public int x;
+		public int y;
+	}
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public struct 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);
+	}
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public struct XEvent {
+	}
+	[CCode (cprefix = "GDK_AXIS_", cheader_filename = "gdk/gdk.h")]
+	public enum AxisUse {
+		IGNORE,
+		X,
+		Y,
+		PRESSURE,
+		XTILT,
+		YTILT,
+		WHEEL,
+		LAST
+	}
+	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
+	public enum ByteOrder {
+		LSB_FIRST,
+		MSB_FIRST
+	}
+	[CCode (cprefix = "GDK_CAP_", cheader_filename = "gdk/gdk.h")]
+	public enum CapStyle {
+		NOT_LAST,
+		BUTT,
+		ROUND,
+		PROJECTING
+	}
+	[CCode (cprefix = "GDK_CROSSING_", cheader_filename = "gdk/gdk.h")]
+	public enum CrossingMode {
+		NORMAL,
+		GRAB,
+		UNGRAB
+	}
+	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
+	public enum CursorType {
+		X_CURSOR,
+		ARROW,
+		BASED_ARROW_DOWN,
+		BASED_ARROW_UP,
+		BOAT,
+		BOGOSITY,
+		BOTTOM_LEFT_CORNER,
+		BOTTOM_RIGHT_CORNER,
+		BOTTOM_SIDE,
+		BOTTOM_TEE,
+		BOX_SPIRAL,
+		CENTER_PTR,
+		CIRCLE,
+		CLOCK,
+		COFFEE_MUG,
+		CROSS,
+		CROSS_REVERSE,
+		CROSSHAIR,
+		DIAMOND_CROSS,
+		DOT,
+		DOTBOX,
+		DOUBLE_ARROW,
+		DRAFT_LARGE,
+		DRAFT_SMALL,
+		DRAPED_BOX,
+		EXCHANGE,
+		FLEUR,
+		GOBBLER,
+		GUMBY,
+		HAND1,
+		HAND2,
+		HEART,
+		ICON,
+		IRON_CROSS,
+		LEFT_PTR,
+		LEFT_SIDE,
+		LEFT_TEE,
+		LEFTBUTTON,
+		LL_ANGLE,
+		LR_ANGLE,
+		MAN,
+		MIDDLEBUTTON,
+		MOUSE,
+		PENCIL,
+		PIRATE,
+		PLUS,
+		QUESTION_ARROW,
+		RIGHT_PTR,
+		RIGHT_SIDE,
+		RIGHT_TEE,
+		RIGHTBUTTON,
+		RTL_LOGO,
+		SAILBOAT,
+		SB_DOWN_ARROW,
+		SB_H_DOUBLE_ARROW,
+		SB_LEFT_ARROW,
+		SB_RIGHT_ARROW,
+		SB_UP_ARROW,
+		SB_V_DOUBLE_ARROW,
+		SHUTTLE,
+		SIZING,
+		SPIDER,
+		SPRAYCAN,
+		STAR,
+		TARGET,
+		TCROSS,
+		TOP_LEFT_ARROW,
+		TOP_LEFT_CORNER,
+		TOP_RIGHT_CORNER,
+		TOP_SIDE,
+		TOP_TEE,
+		TREK,
+		UL_ANGLE,
+		UMBRELLA,
+		UR_ANGLE,
+		WATCH,
+		XTERM,
+		LAST_CURSOR,
+		CURSOR_IS_PIXMAP
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct DeviceKey {
-		public uint keyval;
-		public Gdk.ModifierType modifiers;
+	[CCode (cprefix = "GDK_ACTION_", cheader_filename = "gdk/gdk.h")]
+	[Flags]
+	public enum DragAction {
+		DEFAULT,
+		COPY,
+		MOVE,
+		LINK,
+		PRIVATE,
+		ASK
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct EventAny {
-		public Gdk.EventType type;
-		public weak Gdk.Window window;
-		public char send_event;
+	[CCode (cprefix = "GDK_DRAG_PROTO_", cheader_filename = "gdk/gdk.h")]
+	public enum DragProtocol {
+		MOTIF,
+		XDND,
+		ROOTWIN,
+		NONE,
+		WIN32_DROPFILES,
+		OLE2,
+		LOCAL
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct EventButton {
-		public Gdk.EventType type;
-		public weak Gdk.Window window;
-		public char send_event;
-		public uint time;
-		public double x;
-		public double y;
-		public double axes;
-		public uint state;
-		public uint button;
-		public weak Gdk.Device device;
-		public double x_root;
-		public double y_root;
+	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
+	[Flags]
+	public enum EventMask {
+		EXPOSURE_MASK,
+		POINTER_MOTION_MASK,
+		POINTER_MOTION_HINT_MASK,
+		BUTTON_MOTION_MASK,
+		BUTTON1_MOTION_MASK,
+		BUTTON2_MOTION_MASK,
+		BUTTON3_MOTION_MASK,
+		BUTTON_PRESS_MASK,
+		BUTTON_RELEASE_MASK,
+		KEY_PRESS_MASK,
+		KEY_RELEASE_MASK,
+		ENTER_NOTIFY_MASK,
+		LEAVE_NOTIFY_MASK,
+		FOCUS_CHANGE_MASK,
+		STRUCTURE_MASK,
+		PROPERTY_CHANGE_MASK,
+		VISIBILITY_NOTIFY_MASK,
+		PROXIMITY_IN_MASK,
+		PROXIMITY_OUT_MASK,
+		SUBSTRUCTURE_MASK,
+		SCROLL_MASK,
+		ALL_EVENTS_MASK
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct EventClient {
-		public Gdk.EventType type;
-		public weak Gdk.Window window;
-		public char send_event;
-		public Gdk.Atom message_type;
-		public ushort data_format;
-		public void* data;
+	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
+	public enum EventType {
+		NOTHING,
+		DELETE,
+		DESTROY,
+		EXPOSE,
+		MOTION_NOTIFY,
+		BUTTON_PRESS,
+		2BUTTON_PRESS,
+		3BUTTON_PRESS,
+		BUTTON_RELEASE,
+		KEY_PRESS,
+		KEY_RELEASE,
+		ENTER_NOTIFY,
+		LEAVE_NOTIFY,
+		FOCUS_CHANGE,
+		CONFIGURE,
+		MAP,
+		UNMAP,
+		PROPERTY_NOTIFY,
+		SELECTION_CLEAR,
+		SELECTION_REQUEST,
+		SELECTION_NOTIFY,
+		PROXIMITY_IN,
+		PROXIMITY_OUT,
+		DRAG_ENTER,
+		DRAG_LEAVE,
+		DRAG_MOTION,
+		DRAG_STATUS,
+		DROP_START,
+		DROP_FINISHED,
+		CLIENT_EVENT,
+		VISIBILITY_NOTIFY,
+		NO_EXPOSE,
+		SCROLL,
+		WINDOW_STATE,
+		SETTING,
+		OWNER_CHANGE,
+		GRAB_BROKEN,
+		DAMAGE
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct EventConfigure {
-		public Gdk.EventType type;
-		public weak Gdk.Window window;
-		public char send_event;
-		public int x;
-		public int y;
-		public int width;
-		public int height;
+	[CCode (cprefix = "GDK_EXTENSION_EVENTS_", cheader_filename = "gdk/gdk.h")]
+	public enum ExtensionMode {
+		NONE,
+		ALL,
+		CURSOR
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct EventCrossing {
-		public Gdk.EventType type;
-		public weak Gdk.Window window;
-		public char send_event;
-		public weak Gdk.Window subwindow;
-		public uint time;
-		public double x;
-		public double y;
-		public double x_root;
-		public double y_root;
-		public Gdk.CrossingMode mode;
-		public Gdk.NotifyType detail;
-		public bool focus;
-		public uint state;
+	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
+	public enum Fill {
+		SOLID,
+		TILED,
+		STIPPLED,
+		OPAQUE_STIPPLED
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct EventDND {
-		public Gdk.EventType type;
-		public weak Gdk.Window window;
-		public char send_event;
-		public weak Gdk.DragContext context;
-		public uint time;
-		public short x_root;
-		public short y_root;
+	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
+	public enum FillRule {
+		EVEN_ODD_RULE,
+		WINDING_RULE
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct EventExpose {
-		public Gdk.EventType type;
-		public weak Gdk.Window window;
-		public char send_event;
-		public Gdk.Rectangle area;
-		public weak Gdk.Region region;
-		public int count;
+	[CCode (cprefix = "GDK_FILTER_", cheader_filename = "gdk/gdk.h")]
+	public enum FilterReturn {
+		CONTINUE,
+		TRANSLATE,
+		REMOVE
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct EventFocus {
-		public Gdk.EventType type;
-		public weak Gdk.Window window;
-		public char send_event;
-		public short @in;
+	[CCode (cprefix = "GDK_FONT_", cheader_filename = "gdk/gdk.h")]
+	public enum FontType {
+		FONT,
+		FONTSET
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct EventGrabBroken {
-		public Gdk.EventType type;
-		public weak Gdk.Window window;
-		public char send_event;
-		public bool keyboard;
-		public bool implicit;
-		public weak Gdk.Window grab_window;
+	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
+	public enum Function {
+		COPY,
+		INVERT,
+		XOR,
+		CLEAR,
+		AND,
+		AND_REVERSE,
+		AND_INVERT,
+		NOOP,
+		OR,
+		EQUIV,
+		OR_REVERSE,
+		COPY_INVERT,
+		OR_INVERT,
+		NAND,
+		NOR,
+		SET
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct EventKey {
-		public Gdk.EventType type;
-		public weak Gdk.Window window;
-		public char send_event;
-		public uint time;
-		public uint state;
-		public uint keyval;
-		public int length;
-		[CCode (cname = "string")]
-		public weak string str;
-		public ushort hardware_keycode;
-		public uchar group;
-		public uint is_modifier;
+	[CCode (cprefix = "GDK_GC_", cheader_filename = "gdk/gdk.h")]
+	[Flags]
+	public enum GCValuesMask {
+		FOREGROUND,
+		BACKGROUND,
+		FONT,
+		FUNCTION,
+		FILL,
+		TILE,
+		STIPPLE,
+		CLIP_MASK,
+		SUBWINDOW,
+		TS_X_ORIGIN,
+		TS_Y_ORIGIN,
+		CLIP_X_ORIGIN,
+		CLIP_Y_ORIGIN,
+		EXPOSURES,
+		LINE_WIDTH,
+		LINE_STYLE,
+		CAP_STYLE,
+		JOIN_STYLE
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct EventMotion {
-		public Gdk.EventType type;
-		public weak Gdk.Window window;
-		public char send_event;
-		public uint time;
-		public double x;
-		public double y;
-		public double axes;
-		public Gdk.ModifierType state;
-		public bool is_hint;
-		public weak Gdk.Device device;
-		public double x_root;
-		public double y_root;
+	[CCode (cprefix = "GDK_GRAB_", cheader_filename = "gdk/gdk.h")]
+	public enum GrabStatus {
+		SUCCESS,
+		ALREADY_GRABBED,
+		INVALID_TIME,
+		NOT_VIEWABLE,
+		FROZEN
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct EventNoExpose {
-		public Gdk.EventType type;
-		public weak Gdk.Window window;
-		public char send_event;
+	[CCode (cprefix = "GDK_GRAVITY_", cheader_filename = "gdk/gdk.h")]
+	public enum Gravity {
+		NORTH_WEST,
+		NORTH,
+		NORTH_EAST,
+		WEST,
+		CENTER,
+		EAST,
+		SOUTH_WEST,
+		SOUTH,
+		SOUTH_EAST,
+		STATIC
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct EventOwnerChange {
-		public Gdk.EventType type;
-		public weak Gdk.Window window;
-		public char send_event;
-		public Gdk.NativeWindow owner;
-		public Gdk.OwnerChange reason;
-		public Gdk.Atom selection;
-		public uint time;
-		public uint selection_time;
+	[CCode (cprefix = "GDK_IMAGE_", cheader_filename = "gdk/gdk.h")]
+	public enum ImageType {
+		NORMAL,
+		SHARED,
+		FASTEST
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct EventProperty {
-		public Gdk.EventType type;
-		public weak Gdk.Window window;
-		public char send_event;
-		public Gdk.Atom atom;
-		public uint time;
-		public uint state;
+	[CCode (cprefix = "GDK_INPUT_", cheader_filename = "gdk/gdk.h")]
+	[Flags]
+	public enum InputCondition {
+		READ,
+		WRITE,
+		EXCEPTION
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct EventProximity {
-		public Gdk.EventType type;
-		public weak Gdk.Window window;
-		public char send_event;
-		public uint time;
-		public weak Gdk.Device device;
+	[CCode (cprefix = "GDK_MODE_", cheader_filename = "gdk/gdk.h")]
+	public enum InputMode {
+		DISABLED,
+		SCREEN,
+		WINDOW
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct EventScroll {
-		public Gdk.EventType type;
-		public weak Gdk.Window window;
-		public char send_event;
-		public uint time;
-		public double x;
-		public double y;
-		public uint state;
-		public Gdk.ScrollDirection direction;
-		public weak Gdk.Device device;
-		public double x_root;
-		public double y_root;
+	[CCode (cprefix = "GDK_SOURCE_", cheader_filename = "gdk/gdk.h")]
+	public enum InputSource {
+		MOUSE,
+		PEN,
+		ERASER,
+		CURSOR
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct EventSelection {
-		public Gdk.EventType type;
-		public weak Gdk.Window window;
-		public char send_event;
-		public Gdk.Atom selection;
-		public Gdk.Atom target;
-		public Gdk.Atom property;
-		public uint time;
-		public Gdk.NativeWindow requestor;
+	[CCode (cprefix = "GDK_JOIN_", cheader_filename = "gdk/gdk.h")]
+	public enum JoinStyle {
+		MITER,
+		ROUND,
+		BEVEL
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct EventSetting {
-		public Gdk.EventType type;
-		public weak Gdk.Window window;
-		public char send_event;
-		public Gdk.SettingAction action;
-		public weak string name;
+	[CCode (cprefix = "GDK_LINE_", cheader_filename = "gdk/gdk.h")]
+	public enum LineStyle {
+		SOLID,
+		ON_OFF_DASH,
+		DOUBLE_DASH
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct EventVisibility {
-		public Gdk.EventType type;
-		public weak Gdk.Window window;
-		public char send_event;
-		public Gdk.VisibilityState state;
+	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
+	[Flags]
+	public enum ModifierType {
+		SHIFT_MASK,
+		LOCK_MASK,
+		CONTROL_MASK,
+		MOD1_MASK,
+		MOD2_MASK,
+		MOD3_MASK,
+		MOD4_MASK,
+		MOD5_MASK,
+		BUTTON1_MASK,
+		BUTTON2_MASK,
+		BUTTON3_MASK,
+		BUTTON4_MASK,
+		BUTTON5_MASK,
+		SUPER_MASK,
+		HYPER_MASK,
+		META_MASK,
+		RELEASE_MASK,
+		MODIFIER_MASK
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct EventWindowState {
-		public Gdk.EventType type;
-		public weak Gdk.Window window;
-		public char send_event;
-		public Gdk.WindowState changed_mask;
-		public Gdk.WindowState new_window_state;
+	[CCode (cprefix = "GDK_NOTIFY_", cheader_filename = "gdk/gdk.h")]
+	public enum NotifyType {
+		ANCESTOR,
+		VIRTUAL,
+		INFERIOR,
+		NONLINEAR,
+		NONLINEAR_VIRTUAL,
+		UNKNOWN
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct GCValues {
-		public Gdk.Color foreground;
-		public Gdk.Color background;
-		public weak Gdk.Font font;
-		public Gdk.Function function;
-		public Gdk.Fill fill;
-		public weak Gdk.Pixmap tile;
-		public weak Gdk.Pixmap stipple;
-		public weak Gdk.Pixmap clip_mask;
-		public Gdk.SubwindowMode subwindow_mode;
-		public int ts_x_origin;
-		public int ts_y_origin;
-		public int clip_x_origin;
-		public int clip_y_origin;
-		public int graphics_exposures;
-		public int line_width;
-		public Gdk.LineStyle line_style;
-		public Gdk.CapStyle cap_style;
-		public Gdk.JoinStyle join_style;
+	[CCode (cprefix = "GDK_OVERLAP_RECTANGLE_", cheader_filename = "gdk/gdk.h")]
+	public enum OverlapType {
+		IN,
+		OUT,
+		PART
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct Geometry {
-		public int min_width;
-		public int min_height;
-		public int max_width;
-		public int max_height;
-		public int base_width;
-		public int base_height;
-		public int width_inc;
-		public int height_inc;
-		public double min_aspect;
-		public double max_aspect;
-		public Gdk.Gravity win_gravity;
+	[CCode (cprefix = "GDK_OWNER_CHANGE_", cheader_filename = "gdk/gdk.h")]
+	public enum OwnerChange {
+		NEW_OWNER,
+		DESTROY,
+		CLOSE
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct KeymapKey {
-		public uint keycode;
-		public int group;
-		public int level;
+	[CCode (cprefix = "GDK_PROP_MODE_", cheader_filename = "gdk/gdk.h")]
+	public enum PropMode {
+		REPLACE,
+		PREPEND,
+		APPEND
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct NativeWindow {
+	[CCode (cprefix = "GDK_PROPERTY_", cheader_filename = "gdk/gdk.h")]
+	public enum PropertyState {
+		NEW_VALUE,
+		DELETE
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct PangoAttrEmbossColor {
-		public weak Pango.Attribute attr;
-		public Pango.Color color;
-		[CCode (cname = "gdk_pango_attr_emboss_color_new", has_construct_function = false)]
-		public PangoAttrEmbossColor (Gdk.Color color);
+	[CCode (cprefix = "GDK_RGB_DITHER_", cheader_filename = "gdk/gdk.h")]
+	public enum RgbDither {
+		NONE,
+		NORMAL,
+		MAX
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct PangoAttrEmbossed {
-		public weak Pango.Attribute attr;
-		public bool embossed;
-		[CCode (cname = "gdk_pango_attr_embossed_new", has_construct_function = false)]
-		public PangoAttrEmbossed (bool embossed);
+	[CCode (cprefix = "GDK_SCROLL_", cheader_filename = "gdk/gdk.h")]
+	public enum ScrollDirection {
+		UP,
+		DOWN,
+		LEFT,
+		RIGHT
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct PangoAttrStipple {
-		public weak Pango.Attribute attr;
-		public weak Gdk.Bitmap stipple;
-		[CCode (cname = "gdk_pango_attr_stipple_new", has_construct_function = false)]
-		public PangoAttrStipple (Gdk.Bitmap stipple);
+	[CCode (cprefix = "GDK_SETTING_ACTION_", cheader_filename = "gdk/gdk.h")]
+	public enum SettingAction {
+		NEW,
+		CHANGED,
+		DELETED
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct Point {
-		public int x;
-		public int y;
+	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
+	public enum Status {
+		OK,
+		ERROR,
+		ERROR_PARAM,
+		ERROR_FILE,
+		ERROR_MEM
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct RgbCmap {
-		[NoArrayLength]
-		public weak uint[] colors;
-		public int n_colors;
-		public weak GLib.SList info_list;
-		public void free ();
-		[CCode (cname = "gdk_rgb_cmap_new", has_construct_function = false)]
-		public RgbCmap (uint[] colors);
+	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
+	public enum SubwindowMode {
+		CLIP_BY_CHILDREN,
+		INCLUDE_INFERIORS
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct Segment {
-		public int x1;
-		public int y1;
-		public int x2;
-		public int y2;
+	[CCode (cprefix = "GDK_VISIBILITY_", cheader_filename = "gdk/gdk.h")]
+	public enum VisibilityState {
+		UNOBSCURED,
+		PARTIAL,
+		FULLY_OBSCURED
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct Span {
-		public int x;
-		public int y;
-		public int width;
+	[CCode (cprefix = "GDK_VISUAL_", cheader_filename = "gdk/gdk.h")]
+	public enum VisualType {
+		STATIC_GRAY,
+		GRAYSCALE,
+		STATIC_COLOR,
+		PSEUDO_COLOR,
+		TRUE_COLOR,
+		DIRECT_COLOR
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct TimeCoord {
-		public uint time;
-		[NoArrayLength]
-		public weak double[] axes;
+	[CCode (cprefix = "GDK_DECOR_", cheader_filename = "gdk/gdk.h")]
+	[Flags]
+	public enum WMDecoration {
+		ALL,
+		BORDER,
+		RESIZEH,
+		TITLE,
+		MENU,
+		MINIMIZE,
+		MAXIMIZE
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct Trapezoid {
-		public double y1;
-		public double x11;
-		public double x21;
-		public double y2;
-		public double x12;
-		public double x22;
+	[CCode (cprefix = "GDK_FUNC_", cheader_filename = "gdk/gdk.h")]
+	[Flags]
+	public enum WMFunction {
+		ALL,
+		RESIZE,
+		MOVE,
+		MINIMIZE,
+		MAXIMIZE,
+		CLOSE
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct WChar {
+	[CCode (cprefix = "GDK_WA_", cheader_filename = "gdk/gdk.h")]
+	[Flags]
+	public enum WindowAttributesType {
+		TITLE,
+		X,
+		Y,
+		CURSOR,
+		COLORMAP,
+		VISUAL,
+		WMCLASS,
+		NOREDIR,
+		TYPE_HINT
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct WindowAttr {
-		public weak string title;
-		public int event_mask;
-		public int x;
-		public int y;
-		public int width;
-		public int height;
-		public Gdk.WindowClass wclass;
-		public weak Gdk.Visual visual;
-		public weak Gdk.Colormap colormap;
-		public Gdk.WindowType window_type;
-		public weak Gdk.Cursor cursor;
-		public weak string wmclass_name;
-		public weak string wmclass_class;
-		public bool override_redirect;
-		public Gdk.WindowTypeHint type_hint;
+	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
+	public enum WindowClass {
+		INPUT_OUTPUT,
+		INPUT_ONLY
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct 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);
+	[CCode (cprefix = "GDK_WINDOW_EDGE_", cheader_filename = "gdk/gdk.h")]
+	public enum WindowEdge {
+		NORTH_WEST,
+		NORTH,
+		NORTH_EAST,
+		WEST,
+		EAST,
+		SOUTH_WEST,
+		SOUTH,
+		SOUTH_EAST
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public struct XEvent {
+	[CCode (cprefix = "GDK_HINT_", cheader_filename = "gdk/gdk.h")]
+	[Flags]
+	public enum WindowHints {
+		POS,
+		MIN_SIZE,
+		MAX_SIZE,
+		BASE_SIZE,
+		ASPECT,
+		RESIZE_INC,
+		WIN_GRAVITY,
+		USER_POS,
+		USER_SIZE
 	}
-	[CCode (type_id = "GDK_TYPE_COLOR", cheader_filename = "gdk/gdk.h")]
-	public struct Color {
-		public uint pixel;
-		public ushort red;
-		public ushort green;
-		public ushort blue;
-		public Gdk.Color copy ();
-		public bool equal (Gdk.Color colorb);
-		public void free ();
-		public uint hash ();
-		public static bool parse (string spec, out Gdk.Color color);
-		public weak string to_string ();
+	[CCode (cprefix = "GDK_WINDOW_STATE_", cheader_filename = "gdk/gdk.h")]
+	[Flags]
+	public enum WindowState {
+		WITHDRAWN,
+		ICONIFIED,
+		MAXIMIZED,
+		STICKY,
+		FULLSCREEN,
+		ABOVE,
+		BELOW
 	}
-	[CCode (type_id = "GDK_TYPE_EVENT", cheader_filename = "gdk/gdk.h")]
-	public struct Event {
-		public Gdk.EventType type;
-		public Gdk.EventAny any;
-		public Gdk.EventExpose expose;
-		public Gdk.EventNoExpose no_expose;
-		public Gdk.EventVisibility visibility;
-		public Gdk.EventMotion motion;
-		public Gdk.EventButton button;
-		public Gdk.EventScroll scroll;
-		public Gdk.EventKey key;
-		public Gdk.EventCrossing crossing;
-		public Gdk.EventFocus focus_change;
-		public Gdk.EventConfigure configure;
-		public Gdk.EventProperty property;
-		public Gdk.EventSelection selection;
-		public Gdk.EventOwnerChange owner_change;
-		public Gdk.EventProximity proximity;
-		public Gdk.EventClient client;
-		public Gdk.EventDND dnd;
-		public Gdk.EventWindowState window_state;
-		public Gdk.EventSetting setting;
-		public Gdk.EventGrabBroken grab_broken;
-		public Gdk.Event copy ();
-		public void free ();
-		public static Gdk.Event get ();
-		public bool get_axis (Gdk.AxisUse axis_use, out double value);
-		public bool get_coords (out double x_win, out double y_win);
-		public static Gdk.Event get_graphics_expose (Gdk.Window window);
-		public bool get_root_coords (out double x_root, out double y_root);
-		public weak Gdk.Screen get_screen ();
-		public bool get_state (out Gdk.ModifierType state);
-		public uint get_time ();
-		public static void handler_set (Gdk.EventFunc func, void* data, GLib.DestroyNotify notify);
-		[CCode (cname = "gdk_event_new", has_construct_function = false)]
-		public Event (Gdk.EventType type);
-		public static Gdk.Event peek ();
-		public void put ();
-		public static void request_motions (Gdk.EventMotion event);
-		public bool send_client_message (Gdk.NativeWindow winid);
-		public static bool send_client_message_for_display (Gdk.Display display, Gdk.Event event, Gdk.NativeWindow winid);
-		public void send_clientmessage_toall ();
-		public void set_screen (Gdk.Screen screen);
+	[CCode (cprefix = "GDK_WINDOW_", cheader_filename = "gdk/gdk.h")]
+	public enum WindowType {
+		ROOT,
+		TOPLEVEL,
+		CHILD,
+		DIALOG,
+		TEMP,
+		FOREIGN
 	}
-	[CCode (type_id = "GDK_TYPE_RECTANGLE", cheader_filename = "gdk/gdk.h")]
-	public struct Rectangle {
-		public int x;
-		public int y;
-		public int width;
-		public int height;
-		public bool intersect (Gdk.Rectangle src2, Gdk.Rectangle dest);
-		public void union (Gdk.Rectangle src2, out Gdk.Rectangle dest);
+	[CCode (cprefix = "GDK_WINDOW_TYPE_HINT_", cheader_filename = "gdk/gdk.h")]
+	public enum WindowTypeHint {
+		NORMAL,
+		DIALOG,
+		MENU,
+		TOOLBAR,
+		SPLASHSCREEN,
+		UTILITY,
+		DOCK,
+		DESKTOP,
+		DROPDOWN_MENU,
+		POPUP_MENU,
+		TOOLTIP,
+		NOTIFICATION,
+		COMBO,
+		DND
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static delegate void DestroyNotify (void* data);
@@ -1510,12 +1510,6 @@
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public delegate void SpanFunc (Gdk.Span span);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public const Gdk.Atom SELECTION_PRIMARY;
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public const Gdk.Atom SELECTION_SECONDARY;
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public const Gdk.Atom SELECTION_CLIPBOARD;
-	[CCode (cheader_filename = "gdk/gdk.h")]
 	public const int CURRENT_TIME;
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public const int MAX_TIMECOORD_AXES;
@@ -1524,6 +1518,12 @@
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public const int PRIORITY_REDRAW;
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	public const Gdk.Atom SELECTION_CLIPBOARD;
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public const Gdk.Atom SELECTION_PRIMARY;
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public const Gdk.Atom SELECTION_SECONDARY;
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void add_client_message_filter (Gdk.Atom message_type, Gdk.FilterFunc func, void* data);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void add_option_entries_libgtk_only (GLib.OptionGroup group);

Modified: trunk/vapi/gdk-pixbuf-2.0.vapi
==============================================================================
--- trunk/vapi/gdk-pixbuf-2.0.vapi	(original)
+++ trunk/vapi/gdk-pixbuf-2.0.vapi	Fri Oct 24 16:50:22 2008
@@ -2,77 +2,6 @@
 
 [CCode (cprefix = "Gdk", lower_case_cprefix = "gdk_")]
 namespace Gdk {
-	[CCode (cprefix = "GDK_COLORSPACE_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public enum Colorspace {
-		RGB
-	}
-	[CCode (cprefix = "GDK_INTERP_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public enum InterpType {
-		NEAREST,
-		TILES,
-		BILINEAR,
-		HYPER
-	}
-	[CCode (cprefix = "GDK_PIXBUF_ALPHA_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public enum PixbufAlphaMode {
-		BILEVEL,
-		FULL
-	}
-	[CCode (cprefix = "GDK_PIXBUF_ERROR_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public enum PixbufError {
-		CORRUPT_IMAGE,
-		INSUFFICIENT_MEMORY,
-		BAD_OPTION,
-		UNKNOWN_TYPE,
-		UNSUPPORTED_OPERATION,
-		FAILED
-	}
-	[CCode (cprefix = "GDK_PIXBUF_ROTATE_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public enum PixbufRotation {
-		NONE,
-		COUNTERCLOCKWISE,
-		UPSIDEDOWN,
-		CLOCKWISE
-	}
-	[CCode (cprefix = "GDK_PIXDATA_DUMP_", has_type_id = "0", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public enum PixdataDumpType {
-		PIXDATA_STREAM,
-		PIXDATA_STRUCT,
-		MACROS,
-		GTYPES,
-		CTYPES,
-		STATIC,
-		CONST,
-		RLE_DECODER
-	}
-	[CCode (cprefix = "GDK_PIXDATA_", has_type_id = "0", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public enum PixdataType {
-		COLOR_TYPE_RGB,
-		COLOR_TYPE_RGBA,
-		COLOR_TYPE_MASK,
-		SAMPLE_WIDTH_8,
-		SAMPLE_WIDTH_MASK,
-		ENCODING_RAW,
-		ENCODING_RLE,
-		ENCODING_MASK
-	}
-	[Compact]
-	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public class PixbufFormat {
-		public weak string get_description ();
-		public weak string get_extensions ();
-		public weak string get_license ();
-		public weak string get_mime_types ();
-		public weak string get_name ();
-		public bool is_disabled ();
-		public bool is_scalable ();
-		public bool is_writable ();
-		public void set_disabled (bool disabled);
-	}
-	[Compact]
-	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-	public class PixbufSimpleAnimClass {
-	}
 	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public class Pixbuf : GLib.Object {
 		public weak Gdk.Pixbuf add_alpha (bool substitute_color, uchar r, uchar g, uchar b);
@@ -85,21 +14,6 @@
 		public static GLib.Quark error_quark ();
 		public void fill (uint pixel);
 		public weak Gdk.Pixbuf flip (bool horizontal);
-		public static weak Gdk.Pixbuf from_pixdata (Gdk.Pixdata pixdata, bool copy_pixels) throws GLib.Error;
-		public int get_bits_per_sample ();
-		public Gdk.Colorspace get_colorspace ();
-		public static weak Gdk.PixbufFormat get_file_info (string filename, int width, int height);
-		public static weak GLib.SList get_formats ();
-		public bool get_has_alpha ();
-		public int get_height ();
-		public int get_n_channels ();
-		public weak string get_option (string key);
-		[NoArrayLength]
-		public weak uchar[] get_pixels ();
-		public int get_rowstride ();
-		public int get_width ();
-		[CCode (has_construct_function = false)]
-		public Pixbuf (Gdk.Colorspace colorspace, bool has_alpha, int bits_per_sample, int width, int height);
 		[NoArrayLength]
 		[CCode (has_construct_function = false)]
 		public Pixbuf.from_data (uchar[] data, Gdk.Colorspace colorspace, bool has_alpha, int bits_per_sample, int width, int height, int rowstride, Gdk.PixbufDestroyNotify? destroy_fn);
@@ -111,6 +25,7 @@
 		public Pixbuf.from_file_at_size (string filename, int width, int height) throws GLib.Error;
 		[CCode (has_construct_function = false)]
 		public Pixbuf.from_inline (int data_length, uchar data, bool copy_pixels) throws GLib.Error;
+		public static weak Gdk.Pixbuf from_pixdata (Gdk.Pixdata pixdata, bool copy_pixels) throws GLib.Error;
 		[CCode (has_construct_function = false)]
 		public Pixbuf.from_stream (GLib.InputStream stream, GLib.Cancellable cancellable) throws GLib.Error;
 		[CCode (has_construct_function = false)]
@@ -118,8 +33,20 @@
 		[NoArrayLength]
 		[CCode (has_construct_function = false)]
 		public Pixbuf.from_xpm_data (string[] data);
+		public int get_bits_per_sample ();
+		public Gdk.Colorspace get_colorspace ();
+		public static weak Gdk.PixbufFormat get_file_info (string filename, int width, int height);
+		public static weak GLib.SList get_formats ();
+		public bool get_has_alpha ();
+		public int get_height ();
+		public int get_n_channels ();
+		public weak string get_option (string key);
+		[NoArrayLength]
+		public weak uchar[] get_pixels ();
+		public int get_rowstride ();
+		public int get_width ();
 		[CCode (has_construct_function = false)]
-		public Pixbuf.subpixbuf (Gdk.Pixbuf src_pixbuf, int src_x, int src_y, int width, int height);
+		public Pixbuf (Gdk.Colorspace colorspace, bool has_alpha, int bits_per_sample, int width, int height);
 		public weak Gdk.Pixbuf rotate_simple (Gdk.PixbufRotation angle);
 		public void saturate_and_pixelate (Gdk.Pixbuf dest, float saturation, bool pixelate);
 		public bool save (string filename, string type, ...) throws GLib.Error;
@@ -131,6 +58,8 @@
 		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);
+		[CCode (has_construct_function = false)]
+		public Pixbuf.subpixbuf (Gdk.Pixbuf src_pixbuf, int src_x, int src_y, int width, int height);
 		[NoAccessorMethod]
 		public int bits_per_sample { get; construct; }
 		[NoAccessorMethod]
@@ -150,13 +79,13 @@
 	}
 	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public class PixbufAnimation : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public PixbufAnimation.from_file (string filename) throws GLib.Error;
 		public int get_height ();
 		public weak Gdk.PixbufAnimationIter get_iter (GLib.TimeVal start_time);
 		public weak Gdk.Pixbuf get_static_image ();
 		public int get_width ();
 		public bool is_static_image ();
-		[CCode (has_construct_function = false)]
-		public PixbufAnimation.from_file (string filename) throws GLib.Error;
 	}
 	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public class PixbufAnimationIter : GLib.Object {
@@ -165,6 +94,19 @@
 		public weak Gdk.Pixbuf get_pixbuf ();
 		public bool on_currently_loading_frame ();
 	}
+	[Compact]
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+	public class PixbufFormat {
+		public weak string get_description ();
+		public weak string get_extensions ();
+		public weak string get_license ();
+		public weak string get_mime_types ();
+		public weak string get_name ();
+		public bool is_disabled ();
+		public bool is_scalable ();
+		public bool is_writable ();
+		public void set_disabled (bool disabled);
+	}
 	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public class PixbufLoader : GLib.Object {
 		public bool close () throws GLib.Error;
@@ -173,11 +115,11 @@
 		public weak Gdk.Pixbuf get_pixbuf ();
 		[CCode (has_construct_function = false)]
 		public PixbufLoader ();
+		public void set_size (int width, int height);
 		[CCode (has_construct_function = false)]
 		public PixbufLoader.with_mime_type (string mime_type) throws GLib.Error;
 		[CCode (has_construct_function = false)]
 		public PixbufLoader.with_type (string image_type) throws GLib.Error;
-		public void set_size (int width, int height);
 		public bool write (uchar[] buf) throws GLib.Error;
 		public virtual signal void area_prepared ();
 		public virtual signal void area_updated (int x, int y, int width, int height);
@@ -190,24 +132,82 @@
 		[CCode (has_construct_function = false)]
 		public PixbufSimpleAnim (int width, int height, float rate);
 	}
+	[Compact]
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+	public class PixbufSimpleAnimClass {
+	}
 	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public class PixbufSimpleAnimIter : Gdk.PixbufAnimationIter {
 	}
 	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public struct Pixdata {
-		public uint magic;
+		public uint height;
 		public int length;
+		public uint magic;
 		public uint pixdata_type;
-		public uint rowstride;
-		public uint width;
-		public uint height;
 		[NoArrayLength]
 		public weak uchar[] pixel_data;
+		public uint rowstride;
+		public uint width;
 		public bool deserialize ([CCode (array_length_pos = 0.9)] uchar[] stream) throws GLib.Error;
 		public void* from_pixbuf (Gdk.Pixbuf pixbuf, bool use_rle);
 		public weak uchar[] serialize ();
 		public weak GLib.StringBuilder to_csource (string name, Gdk.PixdataDumpType dump_type);
 	}
+	[CCode (cprefix = "GDK_COLORSPACE_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+	public enum Colorspace {
+		RGB
+	}
+	[CCode (cprefix = "GDK_INTERP_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+	public enum InterpType {
+		NEAREST,
+		TILES,
+		BILINEAR,
+		HYPER
+	}
+	[CCode (cprefix = "GDK_PIXBUF_ALPHA_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+	public enum PixbufAlphaMode {
+		BILEVEL,
+		FULL
+	}
+	[CCode (cprefix = "GDK_PIXBUF_ERROR_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+	public enum PixbufError {
+		CORRUPT_IMAGE,
+		INSUFFICIENT_MEMORY,
+		BAD_OPTION,
+		UNKNOWN_TYPE,
+		UNSUPPORTED_OPERATION,
+		FAILED
+	}
+	[CCode (cprefix = "GDK_PIXBUF_ROTATE_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+	public enum PixbufRotation {
+		NONE,
+		COUNTERCLOCKWISE,
+		UPSIDEDOWN,
+		CLOCKWISE
+	}
+	[CCode (cprefix = "GDK_PIXDATA_DUMP_", has_type_id = "0", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+	public enum PixdataDumpType {
+		PIXDATA_STREAM,
+		PIXDATA_STRUCT,
+		MACROS,
+		GTYPES,
+		CTYPES,
+		STATIC,
+		CONST,
+		RLE_DECODER
+	}
+	[CCode (cprefix = "GDK_PIXDATA_", has_type_id = "0", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+	public enum PixdataType {
+		COLOR_TYPE_RGB,
+		COLOR_TYPE_RGBA,
+		COLOR_TYPE_MASK,
+		SAMPLE_WIDTH_8,
+		SAMPLE_WIDTH_MASK,
+		ENCODING_RAW,
+		ENCODING_RLE,
+		ENCODING_MASK
+	}
 	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public delegate void PixbufDestroyNotify (uchar[] pixels);
 	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]

Modified: trunk/vapi/gdk-x11-2.0.vapi
==============================================================================
--- trunk/vapi/gdk-x11-2.0.vapi	(original)
+++ trunk/vapi/gdk-x11-2.0.vapi	Fri Oct 24 16:50:22 2008
@@ -2,10 +2,6 @@
 
 [CCode (cprefix = "Gdk", lower_case_cprefix = "gdk_")]
 namespace Gdk {
-	[CCode (cname = "gdkx_visual_get", cheader_filename = "gdk/gdkx.h")]
-	public static weak Gdk.Visual x11_visual_get (uint32 xvisualid);
-	[CCode (cname = "gdk_net_wm_supports", cheader_filename = "gdk/gdkx.h")]
-	public static bool x11_net_wm_supports (Gdk.Atom property);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static Gdk.Atom x11_atom_to_xatom (Gdk.Atom atom);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
@@ -66,6 +62,8 @@
 	public static void* x11_image_get_ximage (Gdk.Image image);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static weak Gdk.Display x11_lookup_xdisplay (void* xdisplay);
+	[CCode (cname = "gdk_net_wm_supports", cheader_filename = "gdk/gdkx.h")]
+	public static bool x11_net_wm_supports (Gdk.Atom property);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static void x11_register_standard_event_type (Gdk.Display display, int event_base, int n_events);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
@@ -80,6 +78,8 @@
 	public static bool x11_screen_supports_net_wm_hint (Gdk.Screen screen, Gdk.Atom property);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static void x11_ungrab_server ();
+	[CCode (cname = "gdkx_visual_get", cheader_filename = "gdk/gdkx.h")]
+	public static weak Gdk.Visual x11_visual_get (uint32 xvisualid);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static weak Gdk.Visual x11_visual_get_xvisual (Gdk.Visual visual);
 	[CCode (cheader_filename = "gdk/gdkx.h")]

Modified: trunk/vapi/gio-2.0.vapi
==============================================================================
--- trunk/vapi/gio-2.0.vapi	(original)
+++ trunk/vapi/gio-2.0.vapi	Fri Oct 24 16:50:22 2008
@@ -2,272 +2,29 @@
 
 [CCode (cprefix = "G", lower_case_cprefix = "g_")]
 namespace GLib {
-	[CCode (cprefix = "G_DATA_STREAM_BYTE_ORDER_", cheader_filename = "gio/gio.h")]
-	public enum DataStreamByteOrder {
-		BIG_ENDIAN,
-		LITTLE_ENDIAN,
-		HOST_ENDIAN
-	}
-	[CCode (cprefix = "G_DATA_STREAM_NEWLINE_TYPE_", cheader_filename = "gio/gio.h")]
-	public enum DataStreamNewlineType {
-		LF,
-		CR,
-		CR_LF,
-		ANY
-	}
-	[CCode (cprefix = "G_FILE_ATTRIBUTE_STATUS_", cheader_filename = "gio/gio.h")]
-	public enum FileAttributeStatus {
-		UNSET,
-		SET,
-		ERROR_SETTING
-	}
-	[CCode (cprefix = "G_FILE_ATTRIBUTE_TYPE_", cheader_filename = "gio/gio.h")]
-	public enum FileAttributeType {
-		INVALID,
-		STRING,
-		BYTE_STRING,
-		BOOLEAN,
-		UINT32,
-		INT32,
-		UINT64,
-		INT64,
-		OBJECT
-	}
-	[CCode (cprefix = "G_FILE_MONITOR_EVENT_", cheader_filename = "gio/gio.h")]
-	public enum FileMonitorEvent {
-		CHANGED,
-		CHANGES_DONE_HINT,
-		DELETED,
-		CREATED,
-		ATTRIBUTE_CHANGED,
-		PRE_UNMOUNT,
-		UNMOUNTED
-	}
-	[CCode (cprefix = "G_FILE_TYPE_", cheader_filename = "gio/gio.h")]
-	public enum FileType {
-		UNKNOWN,
-		REGULAR,
-		DIRECTORY,
-		SYMBOLIC_LINK,
-		SPECIAL,
-		SHORTCUT,
-		MOUNTABLE
-	}
-	[CCode (cprefix = "G_FILESYSTEM_PREVIEW_TYPE_", cheader_filename = "gio/gio.h")]
-	public enum FilesystemPreviewType {
-		IF_ALWAYS,
-		IF_LOCAL,
-		NEVER
-	}
-	[CCode (cprefix = "G_MOUNT_MOUNT_", cheader_filename = "gio/gio.h")]
-	public enum MountMountFlags {
-		NONE
-	}
-	[CCode (cprefix = "G_MOUNT_OPERATION_", cheader_filename = "gio/gio.h")]
-	public enum MountOperationResult {
-		HANDLED,
-		ABORTED,
-		UNHANDLED
-	}
-	[CCode (cprefix = "G_PASSWORD_SAVE_", cheader_filename = "gio/gio.h")]
-	public enum PasswordSave {
-		NEVER,
-		FOR_SESSION,
-		PERMANENTLY
-	}
-	[CCode (cprefix = "G_APP_INFO_CREATE_", cheader_filename = "gio/gio.h")]
-	[Flags]
-	public enum AppInfoCreateFlags {
-		NONE,
-		NEEDS_TERMINAL,
-		SUPPORTS_URIS
-	}
-	[CCode (cprefix = "G_ASK_PASSWORD_", cheader_filename = "gio/gio.h")]
-	[Flags]
-	public enum AskPasswordFlags {
-		NEED_PASSWORD,
-		NEED_USERNAME,
-		NEED_DOMAIN,
-		SAVING_SUPPORTED,
-		ANONYMOUS_SUPPORTED
-	}
-	[CCode (cprefix = "G_FILE_ATTRIBUTE_INFO_", cheader_filename = "gio/gio.h")]
-	[Flags]
-	public enum FileAttributeInfoFlags {
-		NONE,
-		COPY_WITH_FILE,
-		COPY_WHEN_MOVED
-	}
-	[CCode (cprefix = "G_FILE_COPY_", cheader_filename = "gio/gio.h")]
-	[Flags]
-	public enum FileCopyFlags {
-		NONE,
-		OVERWRITE,
-		BACKUP,
-		NOFOLLOW_SYMLINKS,
-		ALL_METADATA,
-		NO_FALLBACK_FOR_MOVE
-	}
-	[CCode (cprefix = "G_FILE_CREATE_", cheader_filename = "gio/gio.h")]
-	[Flags]
-	public enum FileCreateFlags {
-		NONE,
-		PRIVATE
-	}
-	[CCode (cprefix = "G_FILE_MONITOR_", cheader_filename = "gio/gio.h")]
-	[Flags]
-	public enum FileMonitorFlags {
-		NONE,
-		WATCH_MOUNTS
-	}
-	[CCode (cprefix = "G_FILE_QUERY_INFO_", cheader_filename = "gio/gio.h")]
-	[Flags]
-	public enum FileQueryInfoFlags {
-		NONE,
-		NOFOLLOW_SYMLINKS
-	}
-	[CCode (cprefix = "G_MOUNT_UNMOUNT_", cheader_filename = "gio/gio.h")]
-	[Flags]
-	public enum MountUnmountFlags {
-		NONE,
-		FORCE
-	}
-	[CCode (cprefix = "G_OUTPUT_STREAM_SPLICE_", cheader_filename = "gio/gio.h")]
-	[Flags]
-	public enum OutputStreamSpliceFlags {
-		NONE,
-		CLOSE_SOURCE,
-		CLOSE_TARGET
-	}
-	[CCode (cprefix = "G_IO_ERROR_", cheader_filename = "gio/gio.h")]
-	public errordomain IOError {
-		FAILED,
-		NOT_FOUND,
-		EXISTS,
-		IS_DIRECTORY,
-		NOT_DIRECTORY,
-		NOT_EMPTY,
-		NOT_REGULAR_FILE,
-		NOT_SYMBOLIC_LINK,
-		NOT_MOUNTABLE_FILE,
-		FILENAME_TOO_LONG,
-		INVALID_FILENAME,
-		TOO_MANY_LINKS,
-		NO_SPACE,
-		INVALID_ARGUMENT,
-		PERMISSION_DENIED,
-		NOT_SUPPORTED,
-		NOT_MOUNTED,
-		ALREADY_MOUNTED,
-		CLOSED,
-		CANCELLED,
-		PENDING,
-		READ_ONLY,
-		CANT_CREATE_BACKUP,
-		WRONG_ETAG,
-		TIMED_OUT,
-		WOULD_RECURSE,
-		BUSY,
-		WOULD_BLOCK,
-		HOST_NOT_FOUND,
-		WOULD_MERGE,
-		FAILED_HANDLED,
-	}
-	[Compact]
-	[CCode (cheader_filename = "gio/gio.h")]
-	public class FileAttributeInfo {
-		public weak string name;
-		public GLib.FileAttributeType type;
-		public GLib.FileAttributeInfoFlags flags;
-	}
-	[Compact]
-	[CCode (ref_function = "g_file_attribute_info_list_ref", unref_function = "g_file_attribute_info_list_unref", cheader_filename = "gio/gio.h")]
-	public class FileAttributeInfoList {
-		public weak GLib.FileAttributeInfo infos;
-		public int n_infos;
-		public void add (string name, GLib.FileAttributeType type, GLib.FileAttributeInfoFlags flags);
-		public weak GLib.FileAttributeInfoList dup ();
-		public weak GLib.FileAttributeInfo lookup (string name);
-		[CCode (has_construct_function = false)]
-		public FileAttributeInfoList ();
-	}
-	[Compact]
-	[CCode (ref_function = "g_file_attribute_matcher_ref", unref_function = "g_file_attribute_matcher_unref", cheader_filename = "gio/gio.h")]
-	public class FileAttributeMatcher {
-		public bool enumerate_namespace (string ns);
-		public weak string enumerate_next ();
-		public bool matches (string attribute);
-		public bool matches_only (string attribute);
-		[CCode (has_construct_function = false)]
-		public FileAttributeMatcher (string attributes);
-	}
-	[Compact]
-	[CCode (cheader_filename = "gio/gio.h")]
-	public class FileIconClass {
-	}
-	[Compact]
-	[CCode (cheader_filename = "gio/gio.h")]
-	public class FileInfoClass {
-	}
-	[Compact]
-	[CCode (cheader_filename = "gio/gio.h")]
-	public class IOExtension {
-		public weak string get_name ();
-		public int get_priority ();
-		public weak GLib.TypeClass ref_class ();
-	}
-	[Compact]
-	[CCode (cheader_filename = "gio/gio.h")]
-	public class IOExtensionPoint {
-		public weak GLib.IOExtension get_extension_by_name (string name);
-		public weak GLib.List get_extensions ();
-		public GLib.Type get_required_type ();
-		public static weak GLib.IOExtension implement (string extension_point_name, GLib.Type type, string extension_name, int priority);
-		public static weak GLib.IOExtensionPoint lookup (string name);
-		public static weak GLib.IOExtensionPoint register (string name);
-		public void set_required_type (GLib.Type type);
-	}
-	[Compact]
-	[CCode (cheader_filename = "gio/gio.h")]
-	public class IOModuleClass {
-	}
-	[Compact]
-	[CCode (cheader_filename = "gio/gio.h")]
-	public class IOSchedulerJob {
-		public bool send_to_mainloop (GLib.SourceFunc func, GLib.DestroyNotify? notify);
-		public void send_to_mainloop_async (GLib.SourceFunc func, GLib.DestroyNotify? notify);
-	}
-	[Compact]
-	[CCode (cheader_filename = "gio/gio.h")]
-	public class SimpleAsyncResultClass {
-	}
-	[Compact]
-	[CCode (cheader_filename = "gio/gio.h")]
-	public class ThemedIconClass {
-	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class AppLaunchContext : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public AppLaunchContext ();
 		public virtual weak string get_display (GLib.AppInfo info, GLib.List files);
 		public virtual weak string get_startup_notify_id (GLib.AppInfo info, GLib.List files);
 		public virtual void launch_failed (string startup_notify_id);
+		[CCode (has_construct_function = false)]
+		public AppLaunchContext ();
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class BufferedInputStream : GLib.FilterInputStream {
+		public virtual long fill (long count, GLib.Cancellable? cancellable) throws GLib.Error;
+		public virtual void fill_async (long count, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
+		public virtual long fill_finish (GLib.AsyncResult _result) throws GLib.Error;
 		public ulong get_available ();
 		public ulong get_buffer_size ();
 		[CCode (type = "GInputStream*", has_construct_function = false)]
 		public BufferedInputStream (GLib.InputStream base_stream);
-		[CCode (type = "GInputStream*", has_construct_function = false)]
-		public BufferedInputStream.sized (GLib.InputStream base_stream, ulong size);
 		public ulong peek (void* buffer, ulong offset, ulong count);
 		public void* peek_buffer (ulong count);
 		public int read_byte (GLib.Cancellable? cancellable) throws GLib.Error;
 		public void set_buffer_size (ulong size);
-		public virtual long fill (long count, GLib.Cancellable? cancellable) throws GLib.Error;
-		public virtual void fill_async (long count, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
-		public virtual long fill_finish (GLib.AsyncResult _result) throws GLib.Error;
+		[CCode (type = "GInputStream*", has_construct_function = false)]
+		public BufferedInputStream.sized (GLib.InputStream base_stream, ulong size);
 		public uint buffer_size { get; set construct; }
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
@@ -276,10 +33,10 @@
 		public ulong get_buffer_size ();
 		[CCode (type = "GOutputStream*", has_construct_function = false)]
 		public BufferedOutputStream (GLib.OutputStream base_stream);
-		[CCode (type = "GOutputStream*", has_construct_function = false)]
-		public BufferedOutputStream.sized (GLib.OutputStream base_stream, ulong size);
 		public void set_auto_grow (bool auto_grow);
 		public void set_buffer_size (ulong size);
+		[CCode (type = "GOutputStream*", has_construct_function = false)]
+		public BufferedOutputStream.sized (GLib.OutputStream base_stream, ulong size);
 		public bool auto_grow { get; set; }
 		public uint buffer_size { get; set construct; }
 	}
@@ -333,19 +90,47 @@
 		public void set_byte_order (GLib.DataStreamByteOrder order);
 		public GLib.DataStreamByteOrder byte_order { get; set; }
 	}
+	[Compact]
+	[CCode (cheader_filename = "gio/gio.h")]
+	public class FileAttributeInfo {
+		public GLib.FileAttributeInfoFlags flags;
+		public weak string name;
+		public GLib.FileAttributeType type;
+	}
+	[Compact]
+	[CCode (ref_function = "g_file_attribute_info_list_ref", unref_function = "g_file_attribute_info_list_unref", cheader_filename = "gio/gio.h")]
+	public class FileAttributeInfoList {
+		public weak GLib.FileAttributeInfo infos;
+		public int n_infos;
+		public void add (string name, GLib.FileAttributeType type, GLib.FileAttributeInfoFlags flags);
+		public weak GLib.FileAttributeInfoList dup ();
+		public weak GLib.FileAttributeInfo lookup (string name);
+		[CCode (has_construct_function = false)]
+		public FileAttributeInfoList ();
+	}
+	[Compact]
+	[CCode (ref_function = "g_file_attribute_matcher_ref", unref_function = "g_file_attribute_matcher_unref", cheader_filename = "gio/gio.h")]
+	public class FileAttributeMatcher {
+		public bool enumerate_namespace (string ns);
+		public weak string enumerate_next ();
+		public bool matches (string attribute);
+		public bool matches_only (string attribute);
+		[CCode (has_construct_function = false)]
+		public FileAttributeMatcher (string attributes);
+	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class FileEnumerator : GLib.Object {
 		public bool close (GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool has_pending ();
-		public bool is_closed ();
-		public void set_pending (bool pending);
 		public virtual void close_async (int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
 		public virtual bool close_finish (GLib.AsyncResult _result) throws GLib.Error;
 		[NoWrapper]
 		public virtual bool close_fn (GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool has_pending ();
+		public bool is_closed ();
 		public virtual GLib.FileInfo next_file (GLib.Cancellable? cancellable) throws GLib.Error;
 		public virtual void next_files_async (int num_files, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
 		public virtual GLib.List<GLib.FileInfo> next_files_finish (GLib.AsyncResult _result) throws GLib.Error;
+		public void set_pending (bool pending);
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class FileIcon : GLib.Object, GLib.Icon, GLib.LoadableIcon {
@@ -353,6 +138,10 @@
 		[CCode (type = "GIcon*", has_construct_function = false)]
 		public FileIcon (GLib.File file);
 	}
+	[Compact]
+	[CCode (cheader_filename = "gio/gio.h")]
+	public class FileIconClass {
+	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class FileInfo : GLib.Object {
 		public void clear_status ();
@@ -413,6 +202,10 @@
 		public void set_symlink_target (string symlink_target);
 		public void unset_attribute_mask ();
 	}
+	[Compact]
+	[CCode (cheader_filename = "gio/gio.h")]
+	public class FileInfoClass {
+	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class FileInputStream : GLib.InputStream, GLib.Seekable {
 		[NoWrapper]
@@ -427,12 +220,12 @@
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class FileMonitor : GLib.Object {
+		public virtual bool cancel ();
 		public static weak GLib.FileMonitor directory (GLib.File file, GLib.FileMonitorFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
 		public void emit_event (GLib.File child, GLib.File other_file, GLib.FileMonitorEvent event_type);
 		public static weak GLib.FileMonitor file (GLib.File file, GLib.FileMonitorFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
 		public bool is_cancelled ();
 		public void set_rate_limit (int limit_msecs);
-		public virtual bool cancel ();
 		[NoAccessorMethod]
 		public bool cancelled { get; }
 		[NoAccessorMethod]
@@ -477,6 +270,24 @@
 		[NoAccessorMethod]
 		public GLib.OutputStream base_stream { get; construct; }
 	}
+	[Compact]
+	[CCode (cheader_filename = "gio/gio.h")]
+	public class IOExtension {
+		public weak string get_name ();
+		public int get_priority ();
+		public weak GLib.TypeClass ref_class ();
+	}
+	[Compact]
+	[CCode (cheader_filename = "gio/gio.h")]
+	public class IOExtensionPoint {
+		public weak GLib.IOExtension get_extension_by_name (string name);
+		public weak GLib.List get_extensions ();
+		public GLib.Type get_required_type ();
+		public static weak GLib.IOExtension implement (string extension_point_name, GLib.Type type, string extension_name, int priority);
+		public static weak GLib.IOExtensionPoint lookup (string name);
+		public static weak GLib.IOExtensionPoint register (string name);
+		public void set_required_type (GLib.Type type);
+	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class IOModule : GLib.TypeModule, GLib.TypePlugin {
 		public void load ();
@@ -484,23 +295,33 @@
 		public IOModule (string filename);
 		public void unload ();
 	}
+	[Compact]
+	[CCode (cheader_filename = "gio/gio.h")]
+	public class IOModuleClass {
+	}
+	[Compact]
+	[CCode (cheader_filename = "gio/gio.h")]
+	public class IOSchedulerJob {
+		public bool send_to_mainloop (GLib.SourceFunc func, GLib.DestroyNotify? notify);
+		public void send_to_mainloop_async (GLib.SourceFunc func, GLib.DestroyNotify? notify);
+	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class InputStream : GLib.Object {
 		public void clear_pending ();
 		public bool close (GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool has_pending ();
-		public bool is_closed ();
-		public long read (void* buffer, ulong count, GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool read_all (void* buffer, ulong count, out ulong bytes_read, GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool set_pending () throws GLib.Error;
 		public virtual void close_async (int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
 		public virtual bool close_finish (GLib.AsyncResult _result) throws GLib.Error;
 		[NoWrapper]
 		public virtual bool close_fn (GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool has_pending ();
+		public bool is_closed ();
+		public long read (void* buffer, ulong count, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool read_all (void* buffer, ulong count, out ulong bytes_read, GLib.Cancellable? cancellable) throws GLib.Error;
 		public virtual void read_async (void* buffer, ulong count, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
 		public virtual long read_finish (GLib.AsyncResult _result) throws GLib.Error;
 		[NoWrapper]
 		public virtual long read_fn (void* buffer, ulong count, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool set_pending () throws GLib.Error;
 		public virtual long skip (ulong count, GLib.Cancellable? cancellable) throws GLib.Error;
 		public virtual void skip_async (ulong count, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
 		public virtual long skip_finish (GLib.AsyncResult _result) throws GLib.Error;
@@ -509,9 +330,9 @@
 	public class MemoryInputStream : GLib.InputStream, GLib.Seekable {
 		public void add_data (void* data, long len, GLib.DestroyNotify? destroy);
 		[CCode (type = "GInputStream*", has_construct_function = false)]
-		public MemoryInputStream ();
-		[CCode (type = "GInputStream*", has_construct_function = false)]
 		public MemoryInputStream.from_data (void* data, long len, GLib.DestroyNotify? destroy);
+		[CCode (type = "GInputStream*", has_construct_function = false)]
+		public MemoryInputStream ();
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class MemoryOutputStream : GLib.OutputStream, GLib.Seekable {
@@ -557,11 +378,6 @@
 	public class OutputStream : GLib.Object {
 		public void clear_pending ();
 		public bool close (GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool has_pending ();
-		public bool is_closed ();
-		public bool set_pending () throws GLib.Error;
-		public long write (void* buffer, ulong count, GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool write_all (void* buffer, ulong count, out ulong bytes_written, GLib.Cancellable? cancellable) throws GLib.Error;
 		public virtual void close_async (int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
 		public virtual bool close_finish (GLib.AsyncResult _result) throws GLib.Error;
 		[NoWrapper]
@@ -569,9 +385,14 @@
 		public virtual bool flush (GLib.Cancellable? cancellable) throws GLib.Error;
 		public virtual void flush_async (int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
 		public virtual bool flush_finish (GLib.AsyncResult _result) throws GLib.Error;
+		public bool has_pending ();
+		public bool is_closed ();
+		public bool set_pending () throws GLib.Error;
 		public virtual long splice (GLib.InputStream source, GLib.OutputStreamSpliceFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
 		public virtual void splice_async (GLib.InputStream source, GLib.OutputStreamSpliceFlags flags, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
 		public virtual long splice_finish (GLib.AsyncResult _result) throws GLib.Error;
+		public long write (void* buffer, ulong count, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool write_all (void* buffer, ulong count, out ulong bytes_written, GLib.Cancellable? cancellable) throws GLib.Error;
 		public virtual void write_async (void* buffer, ulong count, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
 		public virtual long write_finish (GLib.AsyncResult _result) throws GLib.Error;
 		[NoWrapper]
@@ -581,16 +402,16 @@
 	public class SimpleAsyncResult : GLib.Object, GLib.AsyncResult {
 		public void complete ();
 		public void complete_in_idle ();
+		[CCode (has_construct_function = false)]
+		public SimpleAsyncResult.error (GLib.Object source_object, GLib.AsyncReadyCallback callback, GLib.Quark domain, int code, string format);
+		[CCode (has_construct_function = false)]
+		public SimpleAsyncResult.from_error (GLib.Object source_object, GLib.AsyncReadyCallback callback, GLib.Error error);
 		public bool get_op_res_gboolean ();
 		public void* get_op_res_gpointer ();
 		public long get_op_res_gssize ();
 		public void* get_source_tag ();
 		[CCode (has_construct_function = false)]
 		public SimpleAsyncResult (GLib.Object source_object, GLib.AsyncReadyCallback callback, void* source_tag);
-		[CCode (has_construct_function = false)]
-		public SimpleAsyncResult.error (GLib.Object source_object, GLib.AsyncReadyCallback callback, GLib.Quark domain, int code, string format);
-		[CCode (has_construct_function = false)]
-		public SimpleAsyncResult.from_error (GLib.Object source_object, GLib.AsyncReadyCallback callback, GLib.Error error);
 		public bool propagate_error () throws GLib.Error;
 		public void run_in_thread (GLib.SimpleAsyncThreadFunc func, int io_priority, GLib.Cancellable? cancellable);
 		public void set_error (GLib.Quark domain, int code, string format);
@@ -601,18 +422,22 @@
 		public void set_op_res_gpointer (void* op_res, GLib.DestroyNotify destroy_op_res);
 		public void set_op_res_gssize (long op_res);
 	}
+	[Compact]
+	[CCode (cheader_filename = "gio/gio.h")]
+	public class SimpleAsyncResultClass {
+	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class ThemedIcon : GLib.Object, GLib.Icon {
 		public void append_name (string iconname);
+		[CCode (type = "GIcon*", has_construct_function = false)]
+		public ThemedIcon.from_names (string[] iconnames, int len);
 		[NoArrayLength]
 		public weak string[] get_names ();
 		[CCode (type = "GIcon*", has_construct_function = false)]
 		public ThemedIcon (string iconname);
-		[CCode (type = "GIcon*", has_construct_function = false)]
-		public ThemedIcon.from_names (string[] iconnames, int len);
+		public void prepend_name (string iconname);
 		[CCode (type = "GIcon*", has_construct_function = false)]
 		public ThemedIcon.with_default_fallbacks (string iconname);
-		public void prepend_name (string iconname);
 		[NoAccessorMethod]
 		public string name { construct; }
 		[NoAccessorMethod]
@@ -620,20 +445,24 @@
 		[NoAccessorMethod]
 		public bool use_default_fallbacks { construct; }
 	}
+	[Compact]
+	[CCode (cheader_filename = "gio/gio.h")]
+	public class ThemedIconClass {
+	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class Vfs : GLib.Object {
 		public static weak GLib.Vfs get_default ();
-		public static weak GLib.Vfs get_local ();
 		public virtual weak GLib.File get_file_for_path (string path);
 		public virtual weak GLib.File get_file_for_uri (string uri);
+		public static weak GLib.Vfs get_local ();
 		public virtual weak string get_supported_uri_schemes ();
 		public virtual bool is_active ();
 		public virtual weak GLib.File parse_name (string parse_name);
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class VolumeMonitor : GLib.Object {
-		public static weak GLib.VolumeMonitor get ();
 		public virtual weak GLib.Volume adopt_orphan_mount (GLib.Mount mount);
+		public static weak GLib.VolumeMonitor get ();
 		public virtual weak GLib.List get_connected_drives ();
 		public virtual weak GLib.Mount get_mount_for_uuid (string uuid);
 		public virtual weak GLib.List get_mounts ();
@@ -654,22 +483,22 @@
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public interface AppInfo : GLib.Object {
+		public abstract bool add_supports_type (string content_type) throws GLib.Error;
+		public abstract bool can_remove_supports_type ();
 		public static weak GLib.AppInfo create_from_commandline (string commandline, string application_name, GLib.AppInfoCreateFlags flags) throws GLib.Error;
+		public abstract weak GLib.AppInfo dup ();
+		public abstract bool equal (GLib.AppInfo appinfo2);
 		public static weak GLib.List get_all ();
 		public static weak GLib.List get_all_for_type (string content_type);
 		public static weak GLib.AppInfo get_default_for_type (string content_type, bool must_support_uris);
 		public static weak GLib.AppInfo get_default_for_uri_scheme (string uri_scheme);
-		public static bool launch_default_for_uri (string uri, GLib.AppLaunchContext? launch_context) throws GLib.Error;
-		public abstract bool add_supports_type (string content_type) throws GLib.Error;
-		public abstract bool can_remove_supports_type ();
-		public abstract weak GLib.AppInfo dup ();
-		public abstract bool equal (GLib.AppInfo appinfo2);
 		public abstract weak string get_description ();
 		public abstract weak string get_executable ();
 		public abstract weak GLib.Icon get_icon ();
 		public abstract weak string get_id ();
 		public abstract weak string get_name ();
 		public abstract bool launch (GLib.List? files, GLib.AppLaunchContext launch_context) throws GLib.Error;
+		public static bool launch_default_for_uri (string uri, GLib.AppLaunchContext? launch_context) throws GLib.Error;
 		public abstract bool launch_uris (GLib.List? uris, GLib.AppLaunchContext launch_context) throws GLib.Error;
 		public abstract bool remove_supports_type (string content_type) throws GLib.Error;
 		public abstract bool set_as_default_for_extension (string extension) throws GLib.Error;
@@ -706,42 +535,17 @@
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public interface File : GLib.Object {
-		public bool copy_attributes (GLib.File destination, GLib.FileCopyFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool @delete (GLib.Cancellable? cancellable) throws GLib.Error;
-		public GLib.File get_child (string name);
-		public bool has_prefix (GLib.File prefix);
-		public bool load_contents (GLib.Cancellable? cancellable, out weak string contents, out ulong length, out weak string etag_out) throws GLib.Error;
-		public void load_contents_async (GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
-		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 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 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);
-		public bool replace_contents_finish (GLib.AsyncResult res, out weak string new_etag) throws GLib.Error;
-		public bool set_attribute_byte_string (string attribute, string value, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool set_attribute_int32 (string attribute, int value, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool set_attribute_int64 (string attribute, int64 value, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool set_attribute_string (string attribute, string value, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool set_attribute_uint32 (string attribute, uint value, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool set_attribute_uint64 (string attribute, uint64 value, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
 		public abstract GLib.FileOutputStream append_to (GLib.FileCreateFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
 		public abstract void append_to_async (GLib.FileCreateFlags flags, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
 		public abstract GLib.FileOutputStream append_to_finish (GLib.AsyncResult res) throws GLib.Error;
 		public abstract bool copy (GLib.File destination, GLib.FileCopyFlags flags, GLib.Cancellable? cancellable, GLib.FileProgressCallback? progress_callback) throws GLib.Error;
 		public abstract void copy_async (GLib.File destination, GLib.FileCopyFlags flags, int io_priority, GLib.Cancellable? cancellable, GLib.FileProgressCallback? progress_callback, GLib.AsyncReadyCallback callback);
+		public bool copy_attributes (GLib.File destination, GLib.FileCopyFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
 		public abstract bool copy_finish (GLib.AsyncResult res) throws GLib.Error;
 		public abstract GLib.FileOutputStream create (GLib.FileCreateFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
 		public abstract void create_async (GLib.FileCreateFlags flags, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
 		public abstract GLib.FileOutputStream create_finish (GLib.AsyncResult res) throws GLib.Error;
+		public bool @delete (GLib.Cancellable? cancellable) throws GLib.Error;
 		[NoWrapper]
 		public abstract bool delete_file (GLib.Cancellable? cancellable) throws GLib.Error;
 		public abstract weak GLib.File dup ();
@@ -755,6 +559,7 @@
 		public abstract void find_enclosing_mount_async (int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
 		public abstract GLib.Mount find_enclosing_mount_finish (GLib.AsyncResult res) throws GLib.Error;
 		public abstract string? get_basename ();
+		public GLib.File get_child (string name);
 		public abstract GLib.File get_child_for_display_name (string display_name) throws GLib.Error;
 		public abstract GLib.File? get_parent ();
 		public abstract string get_parse_name ();
@@ -762,10 +567,17 @@
 		public abstract string? get_relative_path (GLib.File descendant);
 		public abstract string get_uri ();
 		public abstract string get_uri_scheme ();
+		public bool has_prefix (GLib.File prefix);
 		public abstract bool has_uri_scheme (string uri_scheme);
 		public abstract uint hash (void* file);
 		public abstract bool is_native ();
+		public bool load_contents (GLib.Cancellable? cancellable, out weak string contents, out ulong length, out weak string etag_out) throws GLib.Error;
+		public void load_contents_async (GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
+		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 abstract bool make_directory (GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool make_directory_with_parents (GLib.Cancellable? cancellable) throws GLib.Error;
 		public abstract bool make_symbolic_link (string symlink_value, GLib.Cancellable? cancellable) throws GLib.Error;
 		[NoWrapper]
 		public abstract weak GLib.FileMonitor monitor_dir (GLib.FileMonitorFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
@@ -776,8 +588,15 @@
 		public abstract void mount_mountable (GLib.MountMountFlags flags, GLib.MountOperation? mount_operation, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback? callback);
 		public abstract weak GLib.File mount_mountable_finish (GLib.AsyncResult _result) throws GLib.Error;
 		public abstract bool move (GLib.File destination, GLib.FileCopyFlags flags, GLib.Cancellable? cancellable, GLib.FileProgressCallback? progress_callback) 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);
 		[NoWrapper]
 		public abstract bool prefix_matches (GLib.File file);
+		public 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 abstract weak GLib.FileInfo query_filesystem_info (string attributes, GLib.Cancellable? cancellable) throws GLib.Error;
 		public abstract void query_filesystem_info_async (string attributes, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
 		public abstract weak GLib.FileInfo query_filesystem_info_finish (GLib.AsyncResult res) throws GLib.Error;
@@ -786,15 +605,25 @@
 		public abstract GLib.FileInfo query_info_finish (GLib.AsyncResult res) throws GLib.Error;
 		public abstract weak GLib.FileAttributeInfoList query_settable_attributes (GLib.Cancellable? cancellable) throws GLib.Error;
 		public abstract weak GLib.FileAttributeInfoList query_writable_namespaces (GLib.Cancellable? cancellable) throws GLib.Error;
+		public GLib.FileInputStream read (GLib.Cancellable? cancellable) throws GLib.Error;
 		public abstract void read_async (int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
 		public abstract GLib.FileInputStream read_finish (GLib.AsyncResult res) throws GLib.Error;
 		[NoWrapper]
 		public abstract weak GLib.FileInputStream read_fn (GLib.Cancellable? cancellable) throws GLib.Error;
 		public abstract GLib.FileOutputStream replace (string? etag, bool make_backup, GLib.FileCreateFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
 		public abstract void replace_async (string? etag, bool make_backup, GLib.FileCreateFlags flags, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
+		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);
+		public bool replace_contents_finish (GLib.AsyncResult res, out weak string new_etag) throws GLib.Error;
 		public abstract GLib.FileOutputStream replace_finish (GLib.AsyncResult res) throws GLib.Error;
 		public abstract GLib.File resolve_relative_path (string relative_path);
 		public abstract bool set_attribute (string attribute, GLib.FileAttributeType type, void* value_p, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool set_attribute_byte_string (string attribute, string value, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool set_attribute_int32 (string attribute, int value, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool set_attribute_int64 (string attribute, int64 value, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool set_attribute_string (string attribute, string value, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool set_attribute_uint32 (string attribute, uint value, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool set_attribute_uint64 (string attribute, uint64 value, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
 		public abstract void set_attributes_async (GLib.FileInfo info, GLib.FileQueryInfoFlags flags, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
 		public abstract bool set_attributes_finish (GLib.AsyncResult _result, out weak GLib.FileInfo info) throws GLib.Error;
 		public abstract bool set_attributes_from_info (GLib.FileInfo info, GLib.FileQueryInfoFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
@@ -837,17 +666,16 @@
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public interface Seekable : GLib.Object {
-		public bool truncate (int64 offset, GLib.Cancellable? cancellable) throws GLib.Error;
 		public abstract bool can_seek ();
 		public abstract bool can_truncate ();
 		public abstract bool seek (int64 offset, GLib.SeekType type, GLib.Cancellable? cancellable) throws GLib.Error;
 		public abstract int64 tell ();
+		public bool truncate (int64 offset, GLib.Cancellable? cancellable) throws GLib.Error;
 		[NoWrapper]
 		public abstract bool truncate_fn (int64 offset, GLib.Cancellable? cancellable) throws GLib.Error;
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public interface Volume : GLib.Object {
-		public void mount (GLib.MountMountFlags flags, GLib.MountOperation? mount_operation, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback? callback);
 		public abstract bool can_eject ();
 		public abstract bool can_mount ();
 		public abstract void eject (GLib.MountUnmountFlags flags, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback? callback);
@@ -859,6 +687,7 @@
 		public abstract weak GLib.Mount get_mount ();
 		public abstract weak string get_name ();
 		public abstract weak string get_uuid ();
+		public void mount (GLib.MountMountFlags flags, GLib.MountOperation? mount_operation, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback? callback);
 		public abstract bool mount_finish (GLib.AsyncResult _result) throws GLib.Error;
 		[NoWrapper]
 		public abstract void mount_fn (GLib.MountMountFlags flags, GLib.MountOperation? mount_operation, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
@@ -866,6 +695,177 @@
 		public virtual signal void changed ();
 		public virtual signal void removed ();
 	}
+	[CCode (cprefix = "G_APP_INFO_CREATE_", cheader_filename = "gio/gio.h")]
+	[Flags]
+	public enum AppInfoCreateFlags {
+		NONE,
+		NEEDS_TERMINAL,
+		SUPPORTS_URIS
+	}
+	[CCode (cprefix = "G_ASK_PASSWORD_", cheader_filename = "gio/gio.h")]
+	[Flags]
+	public enum AskPasswordFlags {
+		NEED_PASSWORD,
+		NEED_USERNAME,
+		NEED_DOMAIN,
+		SAVING_SUPPORTED,
+		ANONYMOUS_SUPPORTED
+	}
+	[CCode (cprefix = "G_DATA_STREAM_BYTE_ORDER_", cheader_filename = "gio/gio.h")]
+	public enum DataStreamByteOrder {
+		BIG_ENDIAN,
+		LITTLE_ENDIAN,
+		HOST_ENDIAN
+	}
+	[CCode (cprefix = "G_DATA_STREAM_NEWLINE_TYPE_", cheader_filename = "gio/gio.h")]
+	public enum DataStreamNewlineType {
+		LF,
+		CR,
+		CR_LF,
+		ANY
+	}
+	[CCode (cprefix = "G_FILE_ATTRIBUTE_INFO_", cheader_filename = "gio/gio.h")]
+	[Flags]
+	public enum FileAttributeInfoFlags {
+		NONE,
+		COPY_WITH_FILE,
+		COPY_WHEN_MOVED
+	}
+	[CCode (cprefix = "G_FILE_ATTRIBUTE_STATUS_", cheader_filename = "gio/gio.h")]
+	public enum FileAttributeStatus {
+		UNSET,
+		SET,
+		ERROR_SETTING
+	}
+	[CCode (cprefix = "G_FILE_ATTRIBUTE_TYPE_", cheader_filename = "gio/gio.h")]
+	public enum FileAttributeType {
+		INVALID,
+		STRING,
+		BYTE_STRING,
+		BOOLEAN,
+		UINT32,
+		INT32,
+		UINT64,
+		INT64,
+		OBJECT
+	}
+	[CCode (cprefix = "G_FILE_COPY_", cheader_filename = "gio/gio.h")]
+	[Flags]
+	public enum FileCopyFlags {
+		NONE,
+		OVERWRITE,
+		BACKUP,
+		NOFOLLOW_SYMLINKS,
+		ALL_METADATA,
+		NO_FALLBACK_FOR_MOVE
+	}
+	[CCode (cprefix = "G_FILE_CREATE_", cheader_filename = "gio/gio.h")]
+	[Flags]
+	public enum FileCreateFlags {
+		NONE,
+		PRIVATE
+	}
+	[CCode (cprefix = "G_FILE_MONITOR_EVENT_", cheader_filename = "gio/gio.h")]
+	public enum FileMonitorEvent {
+		CHANGED,
+		CHANGES_DONE_HINT,
+		DELETED,
+		CREATED,
+		ATTRIBUTE_CHANGED,
+		PRE_UNMOUNT,
+		UNMOUNTED
+	}
+	[CCode (cprefix = "G_FILE_MONITOR_", cheader_filename = "gio/gio.h")]
+	[Flags]
+	public enum FileMonitorFlags {
+		NONE,
+		WATCH_MOUNTS
+	}
+	[CCode (cprefix = "G_FILE_QUERY_INFO_", cheader_filename = "gio/gio.h")]
+	[Flags]
+	public enum FileQueryInfoFlags {
+		NONE,
+		NOFOLLOW_SYMLINKS
+	}
+	[CCode (cprefix = "G_FILE_TYPE_", cheader_filename = "gio/gio.h")]
+	public enum FileType {
+		UNKNOWN,
+		REGULAR,
+		DIRECTORY,
+		SYMBOLIC_LINK,
+		SPECIAL,
+		SHORTCUT,
+		MOUNTABLE
+	}
+	[CCode (cprefix = "G_FILESYSTEM_PREVIEW_TYPE_", cheader_filename = "gio/gio.h")]
+	public enum FilesystemPreviewType {
+		IF_ALWAYS,
+		IF_LOCAL,
+		NEVER
+	}
+	[CCode (cprefix = "G_MOUNT_MOUNT_", cheader_filename = "gio/gio.h")]
+	public enum MountMountFlags {
+		NONE
+	}
+	[CCode (cprefix = "G_MOUNT_OPERATION_", cheader_filename = "gio/gio.h")]
+	public enum MountOperationResult {
+		HANDLED,
+		ABORTED,
+		UNHANDLED
+	}
+	[CCode (cprefix = "G_MOUNT_UNMOUNT_", cheader_filename = "gio/gio.h")]
+	[Flags]
+	public enum MountUnmountFlags {
+		NONE,
+		FORCE
+	}
+	[CCode (cprefix = "G_OUTPUT_STREAM_SPLICE_", cheader_filename = "gio/gio.h")]
+	[Flags]
+	public enum OutputStreamSpliceFlags {
+		NONE,
+		CLOSE_SOURCE,
+		CLOSE_TARGET
+	}
+	[CCode (cprefix = "G_PASSWORD_SAVE_", cheader_filename = "gio/gio.h")]
+	public enum PasswordSave {
+		NEVER,
+		FOR_SESSION,
+		PERMANENTLY
+	}
+	[CCode (cprefix = "G_IO_ERROR_", cheader_filename = "gio/gio.h")]
+	public errordomain IOError {
+		FAILED,
+		NOT_FOUND,
+		EXISTS,
+		IS_DIRECTORY,
+		NOT_DIRECTORY,
+		NOT_EMPTY,
+		NOT_REGULAR_FILE,
+		NOT_SYMBOLIC_LINK,
+		NOT_MOUNTABLE_FILE,
+		FILENAME_TOO_LONG,
+		INVALID_FILENAME,
+		TOO_MANY_LINKS,
+		NO_SPACE,
+		INVALID_ARGUMENT,
+		PERMISSION_DENIED,
+		NOT_SUPPORTED,
+		NOT_MOUNTED,
+		ALREADY_MOUNTED,
+		CLOSED,
+		CANCELLED,
+		PENDING,
+		READ_ONLY,
+		CANT_CREATE_BACKUP,
+		WRONG_ETAG,
+		TIMED_OUT,
+		WOULD_RECURSE,
+		BUSY,
+		WOULD_BLOCK,
+		HOST_NOT_FOUND,
+		WOULD_MERGE,
+		FAILED_HANDLED,
+	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public delegate void AsyncReadyCallback (GLib.Object source_object, GLib.AsyncResult res);
 	[CCode (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	Fri Oct 24 16:50:22 2008
@@ -2,10 +2,32 @@
 
 [CCode (cprefix = "G", lower_case_cprefix = "g_")]
 namespace GLib {
+	[CCode (cheader_filename = "gio/gdesktopappinfo.h")]
+	public class DesktopAppInfo : GLib.Object, GLib.AppInfo {
+		[CCode (has_construct_function = false)]
+		public DesktopAppInfo.from_filename (string filename);
+		public bool get_is_hidden ();
+		[CCode (has_construct_function = false)]
+		public DesktopAppInfo (string desktop_id);
+		public static void set_desktop_env (string desktop_env);
+	}
+	[CCode (cheader_filename = "gio/gunixinputstream.h")]
+	public class UnixInputStream : GLib.InputStream {
+		[CCode (type = "GInputStream*", has_construct_function = false)]
+		public UnixInputStream (int fd, bool close_fd_at_close);
+	}
 	[Compact]
 	[CCode (cheader_filename = "gio/gunixmounts.h")]
 	public class UnixMountEntry {
 	}
+	[CCode (cheader_filename = "gio/gunixmounts.h")]
+	public class UnixMountMonitor : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public UnixMountMonitor ();
+		public void set_rate_limit (int limit_msec);
+		public virtual signal void mountpoints_changed ();
+		public virtual signal void mounts_changed ();
+	}
 	[Compact]
 	[CCode (cheader_filename = "gio/gunixmounts.h")]
 	public class UnixMountMonitorClass {
@@ -24,28 +46,6 @@
 		public bool is_readonly ();
 		public bool is_user_mountable ();
 	}
-	[CCode (cheader_filename = "gio/gdesktopappinfo.h")]
-	public class DesktopAppInfo : GLib.Object, GLib.AppInfo {
-		public bool get_is_hidden ();
-		[CCode (has_construct_function = false)]
-		public DesktopAppInfo (string desktop_id);
-		[CCode (has_construct_function = false)]
-		public DesktopAppInfo.from_filename (string filename);
-		public static void set_desktop_env (string desktop_env);
-	}
-	[CCode (cheader_filename = "gio/gunixinputstream.h")]
-	public class UnixInputStream : GLib.InputStream {
-		[CCode (type = "GInputStream*", has_construct_function = false)]
-		public UnixInputStream (int fd, bool close_fd_at_close);
-	}
-	[CCode (cheader_filename = "gio/gunixmounts.h")]
-	public class UnixMountMonitor : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public UnixMountMonitor ();
-		public void set_rate_limit (int limit_msec);
-		public virtual signal void mountpoints_changed ();
-		public virtual signal void mounts_changed ();
-	}
 	[CCode (cheader_filename = "gio/gunixoutputstream.h")]
 	public class UnixOutputStream : GLib.OutputStream {
 		[CCode (type = "GOutputStream*", has_construct_function = false)]

Modified: trunk/vapi/gnet-2.0.vapi
==============================================================================
--- trunk/vapi/gnet-2.0.vapi	(original)
+++ trunk/vapi/gnet-2.0.vapi	Fri Oct 24 16:50:22 2008
@@ -2,107 +2,42 @@
 
 [CCode (cprefix = "G", lower_case_cprefix = "gnet_")]
 namespace GNet {
-	[CCode (cprefix = "GNET_IO_ERROR_", cheader_filename = "gnet.h")]
-	public enum IOError {
-		NONE,
-		AGAIN,
-		INVAL,
-		UNKNOWN
-	}
-	[CCode (cprefix = "GNET_CONN_", has_type_id = "0", cheader_filename = "gnet.h")]
-	public enum ConnEventType {
-		ERROR,
-		CONNECT,
-		CLOSE,
-		TIMEOUT,
-		READ,
-		WRITE,
-		READABLE,
-		WRITABLE
-	}
-	[CCode (cprefix = "GNET_CONN_HTTP_ERROR_", has_type_id = "0", cheader_filename = "gnet.h")]
-	public enum ConnHttpError {
-		UNSPECIFIED,
-		PROTOCOL_UNSUPPORTED,
-		HOSTNAME_RESOLUTION
-	}
-	[CCode (cprefix = "GNET_CONN_HTTP_", has_type_id = "0", cheader_filename = "gnet.h")]
-	public enum ConnHttpEventType {
-		RESOLVED,
-		CONNECTED,
-		RESPONSE,
-		REDIRECT,
-		DATA_PARTIAL,
-		DATA_COMPLETE,
-		TIMEOUT,
-		ERROR
-	}
-	[CCode (cprefix = "GNET_CONN_HTTP_FLAG_SKIP_HEADER_", has_type_id = "0", cheader_filename = "gnet.h")]
-	public enum ConnHttpHeaderFlags {
-		CHECK
-	}
-	[CCode (cprefix = "GNET_CONN_HTTP_METHOD_", has_type_id = "0", cheader_filename = "gnet.h")]
-	public enum ConnHttpMethod {
-		GET,
-		POST
-	}
-	[CCode (cprefix = "GIPV6_POLICY_", has_type_id = "0", cheader_filename = "gnet.h")]
-	public enum IPv6Policy {
-		IPV4_THEN_IPV6,
-		IPV6_THEN_IPV4,
-		IPV4_ONLY,
-		IPV6_ONLY
-	}
-	[CCode (cprefix = "GNET_TOS_", has_type_id = "0", cheader_filename = "gnet.h")]
-	public enum TOS {
-		NONE,
-		LOWDELAY,
-		THROUGHPUT,
-		RELIABILITY,
-		LOWCOST
-	}
-	[CCode (cprefix = "GTCP_SOCKET_CONNECT_ASYNC_STATUS_", has_type_id = "0", cheader_filename = "gnet.h")]
-	public enum TcpSocketConnectAsyncStatus {
-		OK,
-		INETADDR_ERROR,
-		TCP_ERROR
-	}
 	[Compact]
 	[CCode (cheader_filename = "gnet.h")]
 	public class Conn {
+		public weak string buffer;
+		public uint bytes_read;
+		public uint bytes_written;
+		public weak GNet.TcpSocketConnectAsyncID connect_id;
+		public weak GLib.MainContext context;
+		public weak GNet.ConnFunc func;
 		public weak string hostname;
-		public int port;
-		public weak GLib.IOChannel iochannel;
-		public weak GNet.TcpSocket socket;
 		public weak GNet.InetAddr inetaddr;
-		public uint ref_count;
-		public uint ref_count_internal;
-		public weak GNet.TcpSocketConnectAsyncID connect_id;
-		public weak GNet.TcpSocketNewAsyncID new_id;
-		public weak GLib.List write_queue;
-		public uint bytes_written;
-		public weak string buffer;
+		public weak GLib.IOChannel iochannel;
 		public uint length;
-		public uint bytes_read;
+		public weak GNet.TcpSocketNewAsyncID new_id;
+		public int port;
+		public int priority;
+		public uint process_buffer_timeout;
 		public bool read_eof;
 		public weak GLib.List read_queue;
-		public uint process_buffer_timeout;
-		public bool watch_readable;
-		public bool watch_writable;
-		public uint watch_flags;
-		public uint watch;
+		public uint ref_count;
+		public uint ref_count_internal;
+		public weak GNet.TcpSocket socket;
 		public uint timer;
-		public weak GNet.ConnFunc func;
 		public void* user_data;
-		public weak GLib.MainContext context;
-		public int priority;
+		public uint watch;
+		public uint watch_flags;
+		public bool watch_readable;
+		public bool watch_writable;
+		public weak GLib.List write_queue;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gnet.h")]
 	public class ConnEvent {
-		public GNet.ConnEventType type;
 		public weak string buffer;
 		public int length;
+		public GNet.ConnEventType type;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gnet.h")]
@@ -111,53 +46,53 @@
 	[Compact]
 	[CCode (cheader_filename = "gnet.h")]
 	public class ConnHttpEvent {
-		public GNet.ConnHttpEventType type;
-		public ulong stsize;
 		public void* padding;
+		public ulong stsize;
+		public GNet.ConnHttpEventType type;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gnet.h")]
 	public class ConnHttpEventData {
-		public weak GNet.ConnHttpEvent parent;
-		public uint64 content_length;
-		public uint64 data_received;
 		public weak string buffer;
 		public ulong buffer_length;
+		public uint64 content_length;
+		public uint64 data_received;
 		public void* padding;
+		public weak GNet.ConnHttpEvent parent;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gnet.h")]
 	public class ConnHttpEventError {
-		public weak GNet.ConnHttpEvent parent;
 		public GNet.ConnHttpError code;
 		public weak string message;
 		public void* padding;
+		public weak GNet.ConnHttpEvent parent;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gnet.h")]
 	public class ConnHttpEventRedirect {
-		public weak GNet.ConnHttpEvent parent;
-		public uint num_redirects;
+		public bool auto_redirect;
 		public uint max_redirects;
 		public weak string new_location;
-		public bool auto_redirect;
+		public uint num_redirects;
 		public void* padding;
+		public weak GNet.ConnHttpEvent parent;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gnet.h")]
 	public class ConnHttpEventResolved {
-		public weak GNet.ConnHttpEvent parent;
 		public weak GNet.InetAddr ia;
 		public void* padding;
+		public weak GNet.ConnHttpEvent parent;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gnet.h")]
 	public class ConnHttpEventResponse {
-		public weak GNet.ConnHttpEvent parent;
-		public uint response_code;
 		public weak string header_fields;
 		public weak string header_values;
 		public void* padding;
+		public weak GNet.ConnHttpEvent parent;
+		public uint response_code;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gnet.h")]
@@ -190,11 +125,11 @@
 	[Compact]
 	[CCode (cheader_filename = "gnet.h")]
 	public class Server {
+		public weak GNet.ServerFunc func;
 		public weak GNet.InetAddr iface;
 		public int port;
-		public weak GNet.TcpSocket socket;
 		public uint ref_count;
-		public weak GNet.ServerFunc func;
+		public weak GNet.TcpSocket socket;
 		public void* user_data;
 	}
 	[Compact]
@@ -212,13 +147,13 @@
 	[Compact]
 	[CCode (cheader_filename = "gnet.h")]
 	public class URI {
-		public weak string scheme;
-		public weak string userinfo;
+		public weak string fragment;
 		public weak string hostname;
-		public int port;
 		public weak string path;
+		public int port;
 		public weak string query;
-		public weak string fragment;
+		public weak string scheme;
+		public weak string userinfo;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gnet.h")]
@@ -231,6 +166,71 @@
 	[CCode (cheader_filename = "gnet.h")]
 	public struct NetTOS {
 	}
+	[CCode (cprefix = "GNET_CONN_", has_type_id = "0", cheader_filename = "gnet.h")]
+	public enum ConnEventType {
+		ERROR,
+		CONNECT,
+		CLOSE,
+		TIMEOUT,
+		READ,
+		WRITE,
+		READABLE,
+		WRITABLE
+	}
+	[CCode (cprefix = "GNET_CONN_HTTP_ERROR_", has_type_id = "0", cheader_filename = "gnet.h")]
+	public enum ConnHttpError {
+		UNSPECIFIED,
+		PROTOCOL_UNSUPPORTED,
+		HOSTNAME_RESOLUTION
+	}
+	[CCode (cprefix = "GNET_CONN_HTTP_", has_type_id = "0", cheader_filename = "gnet.h")]
+	public enum ConnHttpEventType {
+		RESOLVED,
+		CONNECTED,
+		RESPONSE,
+		REDIRECT,
+		DATA_PARTIAL,
+		DATA_COMPLETE,
+		TIMEOUT,
+		ERROR
+	}
+	[CCode (cprefix = "GNET_CONN_HTTP_FLAG_SKIP_HEADER_", has_type_id = "0", cheader_filename = "gnet.h")]
+	public enum ConnHttpHeaderFlags {
+		CHECK
+	}
+	[CCode (cprefix = "GNET_CONN_HTTP_METHOD_", has_type_id = "0", cheader_filename = "gnet.h")]
+	public enum ConnHttpMethod {
+		GET,
+		POST
+	}
+	[CCode (cprefix = "GNET_IO_ERROR_", cheader_filename = "gnet.h")]
+	public enum IOError {
+		NONE,
+		AGAIN,
+		INVAL,
+		UNKNOWN
+	}
+	[CCode (cprefix = "GIPV6_POLICY_", has_type_id = "0", cheader_filename = "gnet.h")]
+	public enum IPv6Policy {
+		IPV4_THEN_IPV6,
+		IPV6_THEN_IPV4,
+		IPV4_ONLY,
+		IPV6_ONLY
+	}
+	[CCode (cprefix = "GNET_TOS_", has_type_id = "0", cheader_filename = "gnet.h")]
+	public enum TOS {
+		NONE,
+		LOWDELAY,
+		THROUGHPUT,
+		RELIABILITY,
+		LOWCOST
+	}
+	[CCode (cprefix = "GTCP_SOCKET_CONNECT_ASYNC_STATUS_", has_type_id = "0", cheader_filename = "gnet.h")]
+	public enum TcpSocketConnectAsyncStatus {
+		OK,
+		INETADDR_ERROR,
+		TCP_ERROR
+	}
 	[CCode (cheader_filename = "gnet.h")]
 	public delegate void ConnFunc (GNet.Conn conn, GNet.ConnEvent event);
 	[CCode (cheader_filename = "gnet.h")]
@@ -303,10 +303,6 @@
 	public static bool conn_is_connected (GNet.Conn conn);
 	[CCode (cheader_filename = "gnet.h")]
 	public static weak GNet.Conn conn_new (string hostname, int port, GNet.ConnFunc func);
-	[CCode (cname = "gnet_conn_new_inetaddr", cheader_filename = "gnet.h")]
-	public static weak GNet.Conn from_inetaddr (GNet.InetAddr inetaddr, GNet.ConnFunc func);
-	[CCode (cname = "gnet_conn_new_socket", cheader_filename = "gnet.h")]
-	public static weak GNet.Conn from_socket (GNet.TcpSocket socket, GNet.ConnFunc func);
 	[CCode (cheader_filename = "gnet.h")]
 	public static void conn_read (GNet.Conn conn);
 	[CCode (cheader_filename = "gnet.h")]
@@ -333,6 +329,10 @@
 	public static void conn_write (GNet.Conn conn, string buffer, int length);
 	[CCode (cheader_filename = "gnet.h")]
 	public static void conn_write_direct (GNet.Conn conn, string buffer, int length, GLib.DestroyNotify buffer_destroy_cb);
+	[CCode (cname = "gnet_conn_new_inetaddr", cheader_filename = "gnet.h")]
+	public static weak GNet.Conn from_inetaddr (GNet.InetAddr inetaddr, GNet.ConnFunc func);
+	[CCode (cname = "gnet_conn_new_socket", cheader_filename = "gnet.h")]
+	public static weak GNet.Conn from_socket (GNet.TcpSocket socket, GNet.ConnFunc func);
 	[CCode (cheader_filename = "gnet.h")]
 	public static bool http_get (string url, string buffer, ulong length, uint response);
 	[CCode (cheader_filename = "gnet.h")]

Modified: trunk/vapi/gnome-desktop-2.0.vapi
==============================================================================
--- trunk/vapi/gnome-desktop-2.0.vapi	(original)
+++ trunk/vapi/gnome-desktop-2.0.vapi	Fri Oct 24 16:50:22 2008
@@ -2,6 +2,75 @@
 
 [CCode (cprefix = "Gnome", lower_case_cprefix = "gnome_")]
 namespace Gnome {
+	[CCode (cheader_filename = "libgnomeui/gnome-ditem-edit.h")]
+	public class DItemEdit : Gtk.Notebook, Atk.Implementor, Gtk.Buildable {
+		public void clear ();
+		public weak Gnome.DesktopItem get_ditem ();
+		public weak string get_icon ();
+		public void grab_focus ();
+		public bool load_uri (string uri) throws GLib.Error;
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public DItemEdit ();
+		public void set_directory_only (bool directory_only);
+		public void set_ditem (Gnome.DesktopItem ditem);
+		public void set_editable (bool editable);
+		public void set_entry_type (string type);
+		public virtual signal void changed ();
+		public virtual signal void icon_changed ();
+		public virtual signal void name_changed ();
+	}
+	[Compact]
+	[CCode (ref_function = "gnome_desktop_item_ref", unref_function = "gnome_desktop_item_unref", cheader_filename = "libgnome/gnome-desktop-item.h")]
+	public class DesktopItem {
+		public bool attr_exists (string attr);
+		public void clear_localestring (string attr);
+		public void clear_section (string section);
+		public weak Gnome.DesktopItem copy ();
+		public int drop_uri_list (string uri_list, Gnome.DesktopItemLaunchFlags flags) throws GLib.Error;
+		public int drop_uri_list_with_env (string uri_list, Gnome.DesktopItemLaunchFlags flags, string[] envp) throws GLib.Error;
+		public static GLib.Quark error_quark ();
+		public bool exists ();
+		public static weak string find_icon (Gtk.IconTheme icon_theme, string icon, int desired_size, int flags);
+		[CCode (has_construct_function = false)]
+		public DesktopItem.from_basename (string basename, Gnome.DesktopItemLoadFlags flags) throws GLib.Error;
+		[CCode (has_construct_function = false)]
+		public DesktopItem.from_file (string file, Gnome.DesktopItemLoadFlags flags) throws GLib.Error;
+		[CCode (has_construct_function = false)]
+		public DesktopItem.from_string (string uri, string str, long length, Gnome.DesktopItemLoadFlags flags) throws GLib.Error;
+		[CCode (has_construct_function = false)]
+		public DesktopItem.from_uri (string uri, Gnome.DesktopItemLoadFlags flags) throws GLib.Error;
+		public weak string get_attr_locale (string attr);
+		public bool get_boolean (string attr);
+		public Gnome.DesktopItemType get_entry_type ();
+		public Gnome.DesktopItemStatus get_file_status ();
+		public weak string get_icon (Gtk.IconTheme icon_theme);
+		public weak GLib.List get_languages (string attr);
+		public weak string get_localestring (string attr);
+		public weak string get_localestring_lang (string attr, string language);
+		public weak string get_location ();
+		public weak string get_string (string attr);
+		public weak string get_strings (string attr);
+		public int launch (GLib.List file_list, Gnome.DesktopItemLaunchFlags flags) throws GLib.Error;
+		public int launch_on_screen (GLib.List file_list, Gnome.DesktopItemLaunchFlags flags, Gdk.Screen screen, int workspace) throws GLib.Error;
+		public int launch_with_env (GLib.List file_list, Gnome.DesktopItemLaunchFlags flags, string[] envp) throws GLib.Error;
+		[CCode (has_construct_function = false)]
+		public DesktopItem ();
+		public bool save (string under, bool force) throws GLib.Error;
+		public void set_boolean (string attr, bool value);
+		public void set_entry_type (Gnome.DesktopItemType type);
+		public void set_launch_time (uint timestamp);
+		public void set_localestring (string attr, string value);
+		public void set_localestring_lang (string attr, string language, string value);
+		public void set_location (string location);
+		public void set_location_file (string file);
+		public void set_string (string attr, string value);
+		public void set_strings (string attr, string[] strings);
+	}
+	[CCode (cheader_filename = "libgnomeui/gnome-hint.h")]
+	public class Hint : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Hint (string hintfile, string title, string background_image, string logo_image, string startupkey);
+	}
 	[CCode (cprefix = "GNOME_DESKTOP_ITEM_ERROR_", has_type_id = "0", cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public enum DesktopItemError {
 		NO_FILENAME,
@@ -48,68 +117,6 @@
 		SERVICE,
 		SERVICE_TYPE
 	}
-	[Compact]
-	[CCode (ref_function = "gnome_desktop_item_ref", unref_function = "gnome_desktop_item_unref", cheader_filename = "libgnome/gnome-desktop-item.h")]
-	public class DesktopItem : GLib.Boxed {
-		public bool attr_exists (string attr);
-		public void clear_localestring (string attr);
-		public void clear_section (string section);
-		public weak Gnome.DesktopItem copy ();
-		public int drop_uri_list (string uri_list, Gnome.DesktopItemLaunchFlags flags) throws GLib.Error;
-		public int drop_uri_list_with_env (string uri_list, Gnome.DesktopItemLaunchFlags flags, string[] envp) throws GLib.Error;
-		public static GLib.Quark error_quark ();
-		public bool exists ();
-		public static weak string find_icon (Gtk.IconTheme icon_theme, string icon, int desired_size, int flags);
-		public weak string get_attr_locale (string attr);
-		public bool get_boolean (string attr);
-		public Gnome.DesktopItemType get_entry_type ();
-		public Gnome.DesktopItemStatus get_file_status ();
-		public weak string get_icon (Gtk.IconTheme icon_theme);
-		public weak GLib.List get_languages (string attr);
-		public weak string get_localestring (string attr);
-		public weak string get_localestring_lang (string attr, string language);
-		public weak string get_location ();
-		public weak string get_string (string attr);
-		public weak string get_strings (string attr);
-		public int launch (GLib.List file_list, Gnome.DesktopItemLaunchFlags flags) throws GLib.Error;
-		public int launch_on_screen (GLib.List file_list, Gnome.DesktopItemLaunchFlags flags, Gdk.Screen screen, int workspace) throws GLib.Error;
-		public int launch_with_env (GLib.List file_list, Gnome.DesktopItemLaunchFlags flags, string[] envp) throws GLib.Error;
-		public DesktopItem ();
-		public DesktopItem.from_basename (string basename, Gnome.DesktopItemLoadFlags flags) throws GLib.Error;
-		public DesktopItem.from_file (string file, Gnome.DesktopItemLoadFlags flags) throws GLib.Error;
-		public DesktopItem.from_string (string uri, string str, long length, Gnome.DesktopItemLoadFlags flags) throws GLib.Error;
-		public DesktopItem.from_uri (string uri, Gnome.DesktopItemLoadFlags flags) throws GLib.Error;
-		public bool save (string under, bool force) throws GLib.Error;
-		public void set_boolean (string attr, bool value);
-		public void set_entry_type (Gnome.DesktopItemType type);
-		public void set_launch_time (uint timestamp);
-		public void set_localestring (string attr, string value);
-		public void set_localestring_lang (string attr, string language, string value);
-		public void set_location (string location);
-		public void set_location_file (string file);
-		public void set_string (string attr, string value);
-		public void set_strings (string attr, string[] strings);
-	}
-	[CCode (cheader_filename = "libgnomeui/gnome-ditem-edit.h")]
-	public class DItemEdit : Gtk.Notebook, Atk.Implementor, Gtk.Buildable {
-		public void clear ();
-		public weak Gnome.DesktopItem get_ditem ();
-		public weak string get_icon ();
-		public void grab_focus ();
-		public bool load_uri (string uri) throws GLib.Error;
-		public DItemEdit ();
-		public void set_directory_only (bool directory_only);
-		public void set_ditem (Gnome.DesktopItem ditem);
-		public void set_editable (bool editable);
-		public void set_entry_type (string type);
-		public virtual signal void changed ();
-		public virtual signal void icon_changed ();
-		public virtual signal void name_changed ();
-	}
-	[CCode (cheader_filename = "libgnomeui/gnome-hint.h")]
-	public class Hint : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		public Hint (string hintfile, string title, string background_image, string logo_image, string startupkey);
-	}
 	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_ACTIONS;
 	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]

Modified: trunk/vapi/gnome-keyring-1.vapi
==============================================================================
--- trunk/vapi/gnome-keyring-1.vapi	(original)
+++ trunk/vapi/gnome-keyring-1.vapi	Fri Oct 24 16:50:22 2008
@@ -2,61 +2,6 @@
 
 [CCode (cprefix = "GnomeKeyring", lower_case_cprefix = "gnome_keyring_")]
 namespace GnomeKeyring {
-	[CCode (cprefix = "GNOME_KEYRING_ACCESS_", has_type_id = "0", cheader_filename = "gnome-keyring.h")]
-	public enum AccessRestriction {
-		ASK,
-		DENY,
-		ALLOW
-	}
-	[CCode (cprefix = "GNOME_KEYRING_ACCESS_", has_type_id = "0", cheader_filename = "gnome-keyring.h")]
-	public enum AccessType {
-		READ,
-		WRITE,
-		REMOVE
-	}
-	[CCode (cprefix = "GNOME_KEYRING_ATTRIBUTE_TYPE_", has_type_id = "0", cheader_filename = "gnome-keyring.h")]
-	public enum AttributeType {
-		STRING,
-		UINT32
-	}
-	[CCode (cprefix = "GNOME_KEYRING_ITEM_INFO_", has_type_id = "0", cheader_filename = "gnome-keyring.h")]
-	public enum ItemInfoFlags {
-		BASICS,
-		SECRET
-	}
-	[CCode (cprefix = "GNOME_KEYRING_ITEM_", has_type_id = "0", cheader_filename = "gnome-keyring.h")]
-	public enum ItemType {
-		GENERIC_SECRET,
-		NETWORK_PASSWORD,
-		NOTE,
-		CHAINED_KEYRING_PASSWORD,
-		ENCRYPTION_KEY_PASSWORD,
-		LAST_TYPE
-	}
-	[CCode (cprefix = "GNOME_KEYRING_RESULT_", has_type_id = "0", cheader_filename = "gnome-keyring.h")]
-	public enum Result {
-		OK,
-		DENIED,
-		NO_KEYRING_DAEMON,
-		ALREADY_UNLOCKED,
-		NO_SUCH_KEYRING,
-		BAD_ARGUMENTS,
-		IO_ERROR,
-		CANCELLED,
-		KEYRING_ALREADY_EXISTS,
-		NO_MATCH
-	}
-	[CCode (ref_function = "gnome_keyring_attribute_list_ref", unref_function = "gnome_keyring_attribute_list_unref", cheader_filename = "gnome-keyring.h")]
-	public class AttributeList {
-		[NoArrayLength]
-		public GnomeKeyring.Attribute[] data;
-		public uint len;
-		public GnomeKeyring.Attribute index (int i);
-		public AttributeList ();
-		public void append_string (string name, string value);
-		public void append_uint32 (string name, uint value);
-		public weak GnomeKeyring.AttributeList copy ();
-	}
 	[Compact]
 	[CCode (copy_function = "gnome_keyring_access_control_copy", cheader_filename = "gnome-keyring.h")]
 	public class AccessControl {
@@ -71,12 +16,23 @@
 		[CCode (has_construct_function = false)]
 		public ApplicationRef ();
 	}
+	[CCode (ref_function = "gnome_keyring_attribute_list_ref", unref_function = "gnome_keyring_attribute_list_unref", cheader_filename = "gnome-keyring.h")]
+	public class AttributeList {
+		[NoArrayLength]
+		public GnomeKeyring.Attribute[] data;
+		public uint len;
+		public void append_string (string name, string value);
+		public void append_uint32 (string name, uint value);
+		public weak GnomeKeyring.AttributeList copy ();
+		public GnomeKeyring.Attribute index (int i);
+		public AttributeList ();
+	}
 	[Compact]
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public class Found {
-		public weak string keyring;
-		public uint item_id;
 		public weak GnomeKeyring.AttributeList attributes;
+		public uint item_id;
+		public weak string keyring;
 		public weak string secret;
 		public static void list_free (GLib.List found_list);
 	}
@@ -109,22 +65,22 @@
 	[Compact]
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public class NetworkPasswordData {
-		public weak string keyring;
+		public weak string authtype;
+		public weak string domain;
 		public uint item_id;
-		public weak string protocol;
-		public weak string server;
+		public weak string keyring;
 		public weak string object;
-		public weak string authtype;
+		public weak string password;
 		public uint port;
+		public weak string protocol;
+		public weak string server;
 		public weak string user;
-		public weak string domain;
-		public weak string password;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public class PasswordSchema {
-		public GnomeKeyring.ItemType item_type;
 		public void* attributes;
+		public GnomeKeyring.ItemType item_type;
 		public void* reserved1;
 		public void* reserved2;
 		public void* reserved3;
@@ -135,6 +91,50 @@
 		public GnomeKeyring.AttributeType type;
 		public void* value;
 	}
+	[CCode (cprefix = "GNOME_KEYRING_ACCESS_", has_type_id = "0", cheader_filename = "gnome-keyring.h")]
+	public enum AccessRestriction {
+		ASK,
+		DENY,
+		ALLOW
+	}
+	[CCode (cprefix = "GNOME_KEYRING_ACCESS_", has_type_id = "0", cheader_filename = "gnome-keyring.h")]
+	public enum AccessType {
+		READ,
+		WRITE,
+		REMOVE
+	}
+	[CCode (cprefix = "GNOME_KEYRING_ATTRIBUTE_TYPE_", has_type_id = "0", cheader_filename = "gnome-keyring.h")]
+	public enum AttributeType {
+		STRING,
+		UINT32
+	}
+	[CCode (cprefix = "GNOME_KEYRING_ITEM_INFO_", has_type_id = "0", cheader_filename = "gnome-keyring.h")]
+	public enum ItemInfoFlags {
+		BASICS,
+		SECRET
+	}
+	[CCode (cprefix = "GNOME_KEYRING_ITEM_", has_type_id = "0", cheader_filename = "gnome-keyring.h")]
+	public enum ItemType {
+		GENERIC_SECRET,
+		NETWORK_PASSWORD,
+		NOTE,
+		CHAINED_KEYRING_PASSWORD,
+		ENCRYPTION_KEY_PASSWORD,
+		LAST_TYPE
+	}
+	[CCode (cprefix = "GNOME_KEYRING_RESULT_", has_type_id = "0", cheader_filename = "gnome-keyring.h")]
+	public enum Result {
+		OK,
+		DENIED,
+		NO_KEYRING_DAEMON,
+		ALREADY_UNLOCKED,
+		NO_SUCH_KEYRING,
+		BAD_ARGUMENTS,
+		IO_ERROR,
+		CANCELLED,
+		KEYRING_ALREADY_EXISTS,
+		NO_MATCH
+	}
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public delegate void OperationDoneCallback (GnomeKeyring.Result result);
 	[CCode (cheader_filename = "gnome-keyring.h")]
@@ -152,8 +152,6 @@
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public const string DEFAULT;
 	[CCode (cheader_filename = "gnome-keyring.h")]
-	public const GnomeKeyring.PasswordSchema NETWORK_PASSWORD;
-	[CCode (cheader_filename = "gnome-keyring.h")]
 	public const int GNOME_KEYRING_ITEM_APPLICATION_SECRET;
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public const int GNOME_KEYRING_ITEM_INFO_ALL;
@@ -162,6 +160,8 @@
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public const string GNOME_KEYRING_SESSION;
 	[CCode (cheader_filename = "gnome-keyring.h")]
+	public const GnomeKeyring.PasswordSchema NETWORK_PASSWORD;
+	[CCode (cheader_filename = "gnome-keyring.h")]
 	public static weak GLib.List acl_copy (GLib.List list);
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public static void acl_free (GLib.List acl);

Modified: trunk/vapi/gnome-vfs-2.0.vapi
==============================================================================
--- trunk/vapi/gnome-vfs-2.0.vapi	(original)
+++ trunk/vapi/gnome-vfs-2.0.vapi	Fri Oct 24 16:50:22 2008
@@ -2,428 +2,215 @@
 
 [CCode (cprefix = "GnomeVFS", lower_case_cprefix = "gnome_vfs_")]
 namespace GnomeVFS {
-	[CCode (cprefix = "GNOME_VFS_DNS_SD_SERVICE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public enum DNSSDServiceStatus {
-		ADDED,
-		REMOVED
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public class ACE : GLib.Object {
+		public void add_perm (GnomeVFS.ACLPerm perm);
+		public bool check_perm (GnomeVFS.ACLPerm perm);
+		public void copy_perms (GnomeVFS.ACE dest);
+		public void del_perm (GnomeVFS.ACLPerm perm);
+		public bool equal (GnomeVFS.ACE entry_b);
+		public weak string get_id ();
+		public bool get_inherit ();
+		public weak GnomeVFS.ACLKind get_kind ();
+		public bool get_negative ();
+		public weak GnomeVFS.ACLPerm get_perms ();
+		[CCode (has_construct_function = false)]
+		public ACE (GnomeVFS.ACLKind kind, string id, GnomeVFS.ACLPerm perms);
+		[NoWrapper]
+		public virtual void reserved1 ();
+		[NoWrapper]
+		public virtual void reserved2 ();
+		[NoWrapper]
+		public virtual void reserved3 ();
+		[NoWrapper]
+		public virtual void reserved4 ();
+		public void set_id (string id);
+		public void set_inherit (bool inherit);
+		public void set_kind (GnomeVFS.ACLKind kind);
+		public void set_negative (bool negative);
+		public void set_perms (GnomeVFS.ACLPerm perms);
+		public string id { get; set construct; }
+		public bool inherit { get; set; }
+		public uint kind { get; set construct; }
+		public bool negative { get; set; }
+		[NoAccessorMethod]
+		public void* permissions { get; set construct; }
 	}
-	[CCode (cprefix = "GNOME_VFS_DEVICE_TYPE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public enum DeviceType {
-		UNKNOWN,
-		AUDIO_CD,
-		VIDEO_DVD,
-		HARDDRIVE,
-		CDROM,
-		FLOPPY,
-		ZIP,
-		JAZ,
-		NFS,
-		AUTOFS,
-		CAMERA,
-		MEMORY_STICK,
-		SMB,
-		APPLE,
-		MUSIC_PLAYER,
-		WINDOWS,
-		LOOPBACK,
-		NETWORK
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public class ACL : GLib.Object {
+		public void clear ();
+		public static void free_ace_list (GLib.List ace_list);
+		public weak GLib.List get_ace_list ();
+		[CCode (has_construct_function = false)]
+		public ACL ();
+		public void set (GnomeVFS.ACE ace);
+		public void unset (GnomeVFS.ACE ace);
 	}
-	[CCode (cprefix = "GNOME_VFS_FILE_TYPE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public enum FileType {
-		UNKNOWN,
-		REGULAR,
-		DIRECTORY,
-		FIFO,
-		SOCKET,
-		CHARACTER_DEVICE,
-		BLOCK_DEVICE,
-		SYMBOLIC_LINK
+	[Compact]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public class ACLKind {
+		public weak string to_string ();
 	}
-	[CCode (cprefix = "GNOME_VFS_DIRECTORY_KIND_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public enum FindDirectoryKind {
-		DESKTOP,
-		TRASH
+	[Compact]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public class ACLPerm {
+		public weak string to_string ();
 	}
-	[CCode (cprefix = "GNOME_VFS_MIME_ACTION_TYPE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public enum MimeActionType {
-		NONE,
-		APPLICATION,
-		COMPONENT
+	[Compact]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public class Address {
+		public weak GnomeVFS.Address dup ();
+		public bool equal (GnomeVFS.Address b);
+		[CCode (has_construct_function = false)]
+		public Address.from_ipv4 (uint ipv4_address);
+		[CCode (has_construct_function = false)]
+		public Address.from_string (string address);
+		public int get_family_type ();
+		public uint get_ipv4 ();
+		public void* get_sockaddr (ushort port, int len);
+		public bool match (GnomeVFS.Address b, uint prefix);
+		public weak string to_string ();
 	}
-	[CCode (cprefix = "GNOME_VFS_MIME_APPLICATION_ARGUMENT_TYPE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public enum MimeApplicationArgumentType {
-		URIS,
-		PATHS,
-		URIS_FOR_NON_FILES
+	[Compact]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public class AsyncHandle {
 	}
-	[CCode (cprefix = "GNOME_VFS_MIME_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public enum MimeEquivalence {
-		UNRELATED,
-		IDENTICAL,
-		PARENT
+	[Compact]
+	[CCode (free_function = "gnome_vfs_cancellation_destroy", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public class Cancellation {
+		public void ack ();
+		public void cancel ();
+		public bool check ();
+		public int get_fd ();
+		[CCode (has_construct_function = false)]
+		public Cancellation ();
 	}
-	[CCode (cprefix = "", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public enum ModuleCallbackAuthenticationAuthType {
-		AuthTypeBasic,
-		AuthTypeDigest
+	[Compact]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public class Context {
+		public static bool check_cancellation_current ();
+		public weak GnomeVFS.Cancellation get_cancellation ();
+		[CCode (has_construct_function = false)]
+		public Context ();
+		public static weak GnomeVFS.Context peek_current ();
 	}
-	[CCode (cprefix = "GNOME_VFS_MONITOR_EVENT_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public enum MonitorEventType {
-		CHANGED,
-		DELETED,
-		STARTEXECUTING,
-		STOPEXECUTING,
-		CREATED,
-		METADATA_CHANGED
+	[Compact]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public class DNSSDBrowseHandle {
 	}
-	[CCode (cprefix = "GNOME_VFS_MONITOR_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public enum MonitorType {
-		FILE,
-		DIRECTORY
+	[Compact]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public class DNSSDResolveHandle {
 	}
-	[CCode (cprefix = "GNOME_VFS_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public enum Result {
-		OK,
-		ERROR_NOT_FOUND,
-		ERROR_GENERIC,
-		ERROR_INTERNAL,
-		ERROR_BAD_PARAMETERS,
-		ERROR_NOT_SUPPORTED,
-		ERROR_IO,
-		ERROR_CORRUPTED_DATA,
-		ERROR_WRONG_FORMAT,
-		ERROR_BAD_FILE,
-		ERROR_TOO_BIG,
-		ERROR_NO_SPACE,
-		ERROR_READ_ONLY,
-		ERROR_INVALID_URI,
-		ERROR_NOT_OPEN,
-		ERROR_INVALID_OPEN_MODE,
-		ERROR_ACCESS_DENIED,
-		ERROR_TOO_MANY_OPEN_FILES,
-		ERROR_EOF,
-		ERROR_NOT_A_DIRECTORY,
-		ERROR_IN_PROGRESS,
-		ERROR_INTERRUPTED,
-		ERROR_FILE_EXISTS,
-		ERROR_LOOP,
-		ERROR_NOT_PERMITTED,
-		ERROR_IS_DIRECTORY,
-		ERROR_NO_MEMORY,
-		ERROR_HOST_NOT_FOUND,
-		ERROR_INVALID_HOST_NAME,
-		ERROR_HOST_HAS_NO_ADDRESS,
-		ERROR_LOGIN_FAILED,
-		ERROR_CANCELLED,
-		ERROR_DIRECTORY_BUSY,
-		ERROR_DIRECTORY_NOT_EMPTY,
-		ERROR_TOO_MANY_LINKS,
-		ERROR_READ_ONLY_FILE_SYSTEM,
-		ERROR_NOT_SAME_FILE_SYSTEM,
-		ERROR_NAME_TOO_LONG,
-		ERROR_SERVICE_NOT_AVAILABLE,
-		ERROR_SERVICE_OBSOLETE,
-		ERROR_PROTOCOL_ERROR,
-		ERROR_NO_MASTER_BROWSER,
-		ERROR_NO_DEFAULT,
-		ERROR_NO_HANDLER,
-		ERROR_PARSE,
-		ERROR_LAUNCH,
-		ERROR_TIMEOUT,
-		ERROR_NAMESERVER,
-		ERROR_LOCKED,
-		ERROR_DEPRECATED_FUNCTION,
-		ERROR_INVALID_FILENAME,
-		ERROR_NOT_A_SYMBOLIC_LINK,
-		NUM_ERRORS
+	[Compact]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public class DNSSDService {
+		public weak string domain;
+		public weak string name;
+		public weak string type;
+		[CCode (cname = "gnome_vfs_dns_sd_service_list_free")]
+		public void list_free (int n_services);
 	}
-	[CCode (cprefix = "GNOME_VFS_SEEK_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public enum SeekPosition {
-		START,
-		CURRENT,
-		END
+	[Compact]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public class DirectoryHandle {
 	}
-	[CCode (cprefix = "GNOME_VFS_VOLUME_TYPE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public enum VolumeType {
-		MOUNTPOINT,
-		VFS_MOUNT,
-		CONNECTED_SERVER
+	[CCode (type_check_function = "GNOME_IS_VFS_DRIVE", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public class Drive : GLib.Object {
+		public int compare (GnomeVFS.Drive b);
+		public void eject (GnomeVFS.VolumeOpCallback callback);
+		public weak string get_activation_uri ();
+		public weak string get_device_path ();
+		public GnomeVFS.DeviceType get_device_type ();
+		public weak string get_display_name ();
+		public weak string get_hal_udi ();
+		public weak string get_icon ();
+		public ulong get_id ();
+		public weak GnomeVFS.Volume get_mounted_volume ();
+		public weak GLib.List get_mounted_volumes ();
+		public bool is_connected ();
+		public bool is_mounted ();
+		public bool is_user_visible ();
+		public void mount (GnomeVFS.VolumeOpCallback callback);
+		public bool needs_eject ();
+		public weak GnomeVFS.Drive @ref ();
+		public void unmount (GnomeVFS.VolumeOpCallback callback);
+		public void unref ();
+		public static void volume_list_free (GLib.List volumes);
+		public virtual signal void volume_mounted (GnomeVFS.Volume volume);
+		public virtual signal void volume_pre_unmount (GnomeVFS.Volume volume);
+		public virtual signal void volume_unmounted (GnomeVFS.Volume volume);
 	}
-	[CCode (cprefix = "GNOME_VFS_XFER_ERROR_ACTION_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public enum XferErrorAction {
-		ABORT,
-		RETRY,
-		SKIP
-	}
-	[CCode (cprefix = "GNOME_VFS_XFER_ERROR_MODE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public enum XferErrorMode {
-		ABORT,
-		QUERY
-	}
-	[CCode (cprefix = "GNOME_VFS_XFER_OVERWRITE_ACTION_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public enum XferOverwriteAction {
-		ABORT,
-		REPLACE,
-		REPLACE_ALL,
-		SKIP,
-		SKIP_ALL
-	}
-	[CCode (cprefix = "GNOME_VFS_XFER_OVERWRITE_MODE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public enum XferOverwriteMode {
-		ABORT,
-		QUERY,
-		REPLACE,
-		SKIP
-	}
-	[CCode (cprefix = "GNOME_VFS_XFER_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public enum XferPhase {
-		PHASE_INITIAL,
-		CHECKING_DESTINATION,
-		PHASE_COLLECTING,
-		PHASE_READYTOGO,
-		PHASE_OPENSOURCE,
-		PHASE_OPENTARGET,
-		PHASE_COPYING,
-		PHASE_MOVING,
-		PHASE_READSOURCE,
-		PHASE_WRITETARGET,
-		PHASE_CLOSESOURCE,
-		PHASE_CLOSETARGET,
-		PHASE_DELETESOURCE,
-		PHASE_SETATTRIBUTES,
-		PHASE_FILECOMPLETED,
-		PHASE_CLEANUP,
-		PHASE_COMPLETED,
-		NUM_PHASES
-	}
-	[CCode (cprefix = "GNOME_VFS_XFER_PROGRESS_STATUS_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public enum XferProgressStatus {
-		OK,
-		VFSERROR,
-		OVERWRITE,
-		DUPLICATE
-	}
-	[CCode (cprefix = "GNOME_VFS_DIRECTORY_VISIT_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	[Flags]
-	public enum DirectoryVisitOptions {
-		DEFAULT,
-		SAMEFS,
-		LOOPCHECK,
-		IGNORE_RECURSE_ERROR
-	}
-	[CCode (cprefix = "GNOME_VFS_FILE_FLAGS_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	[Flags]
-	public enum FileFlags {
-		NONE,
-		SYMLINK,
-		LOCAL
-	}
-	[CCode (cprefix = "GNOME_VFS_FILE_INFO_FIELDS_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	[Flags]
-	public enum FileInfoFields {
-		NONE,
-		TYPE,
-		PERMISSIONS,
-		FLAGS,
-		DEVICE,
-		INODE,
-		LINK_COUNT,
-		SIZE,
-		BLOCK_COUNT,
-		IO_BLOCK_SIZE,
-		ATIME,
-		MTIME,
-		CTIME,
-		SYMLINK_NAME,
-		MIME_TYPE,
-		ACCESS,
-		IDS,
-		ACL,
-		SELINUX_CONTEXT
-	}
-	[CCode (cprefix = "GNOME_VFS_FILE_INFO_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	[Flags]
-	public enum FileInfoOptions {
-		DEFAULT,
-		GET_MIME_TYPE,
-		FORCE_FAST_MIME_TYPE,
-		FORCE_SLOW_MIME_TYPE,
-		FOLLOW_LINKS,
-		GET_ACCESS_RIGHTS,
-		NAME_ONLY,
-		GET_ACL,
-		GET_SELINUX_CONTEXT
-	}
-	[CCode (cprefix = "GNOME_VFS_PERM_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	[Flags]
-	public enum FilePermissions {
-		SUID,
-		SGID,
-		STICKY,
-		USER_READ,
-		USER_WRITE,
-		USER_EXEC,
-		USER_ALL,
-		GROUP_READ,
-		GROUP_WRITE,
-		GROUP_EXEC,
-		GROUP_ALL,
-		OTHER_READ,
-		OTHER_WRITE,
-		OTHER_EXEC,
-		OTHER_ALL,
-		ACCESS_READABLE,
-		ACCESS_WRITABLE,
-		ACCESS_EXECUTABLE
-	}
-	[CCode (cprefix = "GNOME_VFS_MAKE_URI_DIR_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	[Flags]
-	public enum MakeURIDirs {
-		NONE,
-		HOMEDIR,
-		CURRENT
-	}
-	[CCode (cprefix = "GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	[Flags]
-	public enum ModuleCallbackFullAuthenticationFlags {
-		PREVIOUS_ATTEMPT_FAILED,
-		NEED_PASSWORD,
-		NEED_USERNAME,
-		NEED_DOMAIN,
-		SAVING_SUPPORTED,
-		ANON_SUPPORTED
-	}
-	[CCode (cprefix = "GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_OUT_ANON_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	[Flags]
-	public enum ModuleCallbackFullAuthenticationOutFlags {
-		SELECTED
-	}
-	[CCode (cprefix = "GNOME_VFS_OPEN_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	[Flags]
-	public enum OpenMode {
-		NONE,
-		READ,
-		WRITE,
-		RANDOM,
-		TRUNCATE
+	[Compact]
+	[CCode (ref_function = "gnome_vfs_file_info_ref", unref_function = "gnome_vfs_file_info_unref", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public class FileInfo {
+		public weak GnomeVFS.ACL acl;
+		public ulong atime;
+		public weak GnomeVFS.FileSize block_count;
+		public ulong ctime;
+		public GnomeVFS.FileFlags flags;
+		public uint gid;
+		public weak GnomeVFS.InodeNumber inode;
+		public uint io_block_size;
+		public uint link_count;
+		public weak string mime_type;
+		public ulong mtime;
+		public weak string name;
+		public GnomeVFS.FilePermissions permissions;
+		public uint refcount;
+		public void* reserved1;
+		public void* reserved2;
+		public void* reserved3;
+		public weak string selinux_context;
+		public weak GnomeVFS.FileSize size;
+		public weak string symlink_name;
+		public GnomeVFS.FileType type;
+		public uint uid;
+		public GnomeVFS.FileInfoFields valid_fields;
+		public void clear ();
+		public void copy (GnomeVFS.FileInfo src);
+		public weak GnomeVFS.FileInfo dup ();
+		public weak string get_mime_type ();
+		public static weak GLib.List list_copy (GLib.List list);
+		public static void list_free (GLib.List list);
+		public static weak GLib.List list_ref (GLib.List list);
+		public static weak GLib.List list_unref (GLib.List list);
+		public bool matches (GnomeVFS.FileInfo b);
+		[CCode (has_construct_function = false)]
+		public FileInfo ();
 	}
-	[CCode (cprefix = "GNOME_VFS_SET_FILE_INFO_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	[Flags]
-	public enum SetFileInfoMask {
-		NONE,
-		NAME,
-		PERMISSIONS,
-		OWNER,
-		TIME,
-		ACL,
-		SELINUX_CONTEXT,
-		SYMLINK_NAME
+	[Compact]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public class FileOffset {
 	}
-	[CCode (cprefix = "GNOME_VFS_URI_HIDE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	[Flags]
-	public enum URIHideOptions {
-		NONE,
-		USER_NAME,
-		PASSWORD,
-		HOST_NAME,
-		HOST_PORT,
-		TOPLEVEL_METHOD,
-		FRAGMENT_IDENTIFIER
+	[Compact]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public class FileSize {
 	}
-	[CCode (cprefix = "GNOME_VFS_XFER_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	[Flags]
-	public enum XferOptions {
-		DEFAULT,
-		UNUSED_1,
-		FOLLOW_LINKS,
-		UNUSED_2,
-		RECURSIVE,
-		SAMEFS,
-		DELETE_ITEMS,
-		EMPTY_DIRECTORIES,
-		NEW_UNIQUE_DIRECTORY,
-		REMOVESOURCE,
-		USE_UNIQUE_NAMES,
-		LINK_ITEMS,
-		FOLLOW_LINKS_RECURSIVE,
-		TARGET_DEFAULT_PERMS
+	[Compact]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public class FindDirectoryResult {
+		public void* reserved1;
+		public void* reserved2;
+		public GnomeVFS.Result result;
+		public weak GnomeVFS.URI uri;
+		public weak GnomeVFS.FindDirectoryResult dup ();
 	}
 	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public class ACLKind {
-		public weak string to_string ();
+	public class GetFileInfoResult {
+		public weak GnomeVFS.FileInfo file_info;
+		public GnomeVFS.Result result;
+		public weak GnomeVFS.URI uri;
+		public weak GnomeVFS.GetFileInfoResult dup ();
 	}
 	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public class ACLPerm {
-		public weak string to_string ();
+	public class GnomeVfsFindDirectoryResult {
 	}
 	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public class AsyncHandle {
-	}
-	[Compact]
-	[CCode (free_function = "gnome_vfs_cancellation_destroy", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public class Cancellation {
-		public void ack ();
-		public void cancel ();
-		public bool check ();
-		public int get_fd ();
-		public Cancellation ();
-	}
-	[Compact]
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public class Context {
-		public static bool check_cancellation_current ();
-		public weak GnomeVFS.Cancellation get_cancellation ();
-		public Context ();
-		public static weak GnomeVFS.Context peek_current ();
-	}
-	[Compact]
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public class DNSSDBrowseHandle {
-	}
-	[Compact]
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public class DNSSDResolveHandle {
-	}
-	[Compact]
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public class DNSSDService {
-		public weak string name;
-		public weak string type;
-		public weak string domain;
-		[CCode (cname = "gnome_vfs_dns_sd_service_list_free")]
-		public void list_free (int n_services);
-	}
-	[Compact]
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public class DirectoryHandle {
-	}
-	[Compact]
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public class FileOffset {
-	}
-	[Compact]
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public class FileSize {
-	}
-	[Compact]
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public class FindDirectoryResult {
-		public weak GnomeVFS.URI uri;
-		public GnomeVFS.Result result;
-		public void* reserved1;
-		public void* reserved2;
-		public weak GnomeVFS.FindDirectoryResult dup ();
-	}
-	[Compact]
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public class GetFileInfoResult {
-		public weak GnomeVFS.URI uri;
-		public GnomeVFS.Result result;
-		public weak GnomeVFS.FileInfo file_info;
-		public weak GnomeVFS.GetFileInfoResult dup ();
+	public class GnomeVfsGetFileInfoResult {
 	}
 	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
@@ -433,6 +220,11 @@
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public class InodeNumber {
 	}
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public class MIMEMonitor : GLib.Object {
+		public static weak GnomeVFS.MIMEMonitor get ();
+		public virtual signal void data_changed ();
+	}
 	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public class MethodHandle {
@@ -440,8 +232,8 @@
 	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public class MimeAction {
-		public GnomeVFS.MimeActionType action_type;
 		public void* action;
+		public GnomeVFS.MimeActionType action_type;
 		public void* reserved1;
 		public GnomeVFS.Result launch (GLib.List uris);
 		public GnomeVFS.Result launch_with_env (GLib.List uris, out weak string envp);
@@ -449,15 +241,19 @@
 	[Compact]
 	[CCode (copy_function = "gnome_vfs_mime_application_copy", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public class MimeApplication {
-		public weak string id;
-		public weak string name;
-		public weak string command;
 		public bool can_open_multiple_files;
+		public weak string command;
 		public GnomeVFS.MimeApplicationArgumentType expects_uris;
-		public weak GLib.List supported_uri_schemes;
+		public weak string id;
+		public weak string name;
 		public void* reserved1;
+		public weak GLib.List supported_uri_schemes;
 		public weak GnomeVFS.MimeApplication copy ();
 		public bool equal (GnomeVFS.MimeApplication app_b);
+		[CCode (has_construct_function = false)]
+		public MimeApplication.from_desktop_id (string id);
+		[CCode (has_construct_function = false)]
+		public MimeApplication.from_id (string id);
 		public weak string get_binary_name ();
 		public weak string get_desktop_file_path ();
 		public weak string get_desktop_id ();
@@ -469,8 +265,6 @@
 		public GnomeVFS.Result launch (GLib.List uris);
 		public GnomeVFS.Result launch_with_env (GLib.List uris, out weak string envp);
 		public static void list_free (GLib.List list);
-		public MimeApplication.from_desktop_id (string id);
-		public MimeApplication.from_id (string id);
 		public bool requires_terminal ();
 		public bool supports_startup_notification ();
 		public bool supports_uris ();
@@ -478,9 +272,9 @@
 	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public class ModuleCallbackAdditionalHeadersIn {
-		public weak GnomeVFS.URI uri;
 		public void* reserved1;
 		public void* reserved2;
+		public weak GnomeVFS.URI uri;
 	}
 	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
@@ -492,82 +286,82 @@
 	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public class ModuleCallbackAuthenticationIn {
-		public weak string uri;
-		public weak string realm;
-		public bool previous_attempt_failed;
 		public GnomeVFS.ModuleCallbackAuthenticationAuthType auth_type;
+		public bool previous_attempt_failed;
+		public weak string realm;
 		public void* reserved1;
 		public void* reserved2;
+		public weak string uri;
 	}
 	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public class ModuleCallbackAuthenticationOut {
-		public weak string username;
 		public weak string password;
 		public void* reserved1;
 		public void* reserved2;
+		public weak string username;
 	}
 	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public class ModuleCallbackFillAuthenticationIn {
-		public weak string uri;
-		public weak string protocol;
-		public weak string server;
-		public weak string object;
-		public int port;
 		public weak string authtype;
-		public weak string username;
 		public weak string domain;
+		public weak string object;
+		public int port;
+		public weak string protocol;
 		public void* reserved1;
 		public void* reserved2;
+		public weak string server;
+		public weak string uri;
+		public weak string username;
 	}
 	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public class ModuleCallbackFillAuthenticationOut {
-		public bool valid;
-		public weak string username;
 		public weak string domain;
 		public weak string password;
 		public void* reserved1;
 		public void* reserved2;
+		public weak string username;
+		public bool valid;
 	}
 	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public class ModuleCallbackFullAuthenticationIn {
+		public weak string authtype;
+		public weak string default_domain;
+		public weak string default_user;
+		public weak string domain;
 		public GnomeVFS.ModuleCallbackFullAuthenticationFlags flags;
-		public weak string uri;
-		public weak string protocol;
-		public weak string server;
 		public weak string object;
 		public int port;
-		public weak string authtype;
-		public weak string username;
-		public weak string domain;
-		public weak string default_user;
-		public weak string default_domain;
+		public weak string protocol;
 		public void* reserved1;
 		public void* reserved2;
+		public weak string server;
+		public weak string uri;
+		public weak string username;
 	}
 	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public class ModuleCallbackFullAuthenticationOut {
 		public bool abort_auth;
-		public weak string username;
 		public weak string domain;
-		public weak string password;
-		public bool save_password;
 		public weak string keyring;
 		public ulong out_flags;
+		public weak string password;
 		public void* reserved2;
+		public bool save_password;
+		public weak string username;
 	}
 	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public class ModuleCallbackQuestionIn {
-		public weak string primary_message;
-		public weak string secondary_message;
 		public weak string choices;
+		public weak string primary_message;
 		public void* reserved1;
 		public void* reserved2;
+		public weak string secondary_message;
 	}
 	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
@@ -579,10 +373,10 @@
 	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public class ModuleCallbackReceivedHeadersIn {
-		public weak GnomeVFS.URI uri;
 		public weak GLib.List headers;
 		public void* reserved1;
 		public void* reserved2;
+		public weak GnomeVFS.URI uri;
 	}
 	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
@@ -594,18 +388,18 @@
 	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public class ModuleCallbackSaveAuthenticationIn {
-		public weak string keyring;
-		public weak string uri;
-		public weak string protocol;
-		public weak string server;
-		public weak string object;
-		public int port;
 		public weak string authtype;
-		public weak string username;
 		public weak string domain;
+		public weak string keyring;
+		public weak string object;
 		public weak string password;
+		public int port;
+		public weak string protocol;
 		public void* reserved1;
 		public void* reserved2;
+		public weak string server;
+		public weak string uri;
+		public weak string username;
 	}
 	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
@@ -616,11 +410,11 @@
 	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public class ModuleCallbackStatusMessageIn {
-		public weak string uri;
 		public weak string message;
 		public int percentage;
 		public void* reserved1;
 		public void* reserved2;
+		public weak string uri;
 	}
 	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
@@ -636,16 +430,16 @@
 	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public class ProgressCallbackState {
-		public weak GnomeVFS.XferProgressInfo progress_info;
-		public weak GnomeVFS.XferProgressCallback sync_callback;
-		public weak GnomeVFS.XferProgressCallback update_callback;
-		public void* user_data;
 		public void* async_job_data;
-		public int64 next_update_callback_time;
 		public int64 next_text_update_callback_time;
-		public int64 update_callback_period;
+		public int64 next_update_callback_time;
+		public weak GnomeVFS.XferProgressInfo progress_info;
 		public void* reserved1;
 		public void* reserved2;
+		public weak GnomeVFS.XferProgressCallback sync_callback;
+		public weak GnomeVFS.XferProgressCallback update_callback;
+		public int64 update_callback_period;
+		public void* user_data;
 	}
 	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
@@ -654,26 +448,26 @@
 	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public class ToplevelURI {
-		public weak GnomeVFS.URI uri;
 		public weak string host_name;
 		public uint host_port;
-		public weak string user_name;
 		public weak string password;
-		public weak string urn;
 		public void* reserved1;
 		public void* reserved2;
+		public weak GnomeVFS.URI uri;
+		public weak string urn;
+		public weak string user_name;
 	}
 	[Compact]
 	[CCode (ref_function = "gnome_vfs_uri_ref", unref_function = "gnome_vfs_uri_unref", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public class URI {
-		public uint ref_count;
-		public weak string text;
 		public weak string fragment_id;
-		public weak string method_string;
 		public void* method;
+		public weak string method_string;
 		public void* parent;
+		public uint ref_count;
 		public void* reserved1;
 		public void* reserved2;
+		public weak string text;
 		public weak GnomeVFS.URI append_file_name (string filename);
 		public weak GnomeVFS.URI append_path (string path);
 		public weak GnomeVFS.URI append_string (string uri_fragment);
@@ -703,6 +497,7 @@
 		public static weak GLib.List list_ref (GLib.List list);
 		public static weak GLib.List list_unref (GLib.List list);
 		public static weak string make_full_from_relative (string base_uri, string relative_uri);
+		[CCode (has_construct_function = false)]
 		public URI (string text_uri);
 		public weak GnomeVFS.URI resolve_relative (string relative_reference);
 		public weak GnomeVFS.URI resolve_symbolic_link (string relative_reference);
@@ -712,193 +507,408 @@
 		public void set_user_name (string user_name);
 		public weak string to_string (GnomeVFS.URIHideOptions hide_options);
 	}
+	[CCode (type_check_function = "GNOME_IS_VFS_VOLUME", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public class Volume : GLib.Object {
+		public int compare (GnomeVFS.Volume b);
+		public void eject (GnomeVFS.VolumeOpCallback callback);
+		public weak string get_activation_uri ();
+		public weak string get_device_path ();
+		public GnomeVFS.DeviceType get_device_type ();
+		public weak string get_display_name ();
+		public weak GnomeVFS.Drive get_drive ();
+		public weak string get_filesystem_type ();
+		public weak string get_hal_udi ();
+		public weak string get_icon ();
+		public ulong get_id ();
+		public GnomeVFS.VolumeType get_volume_type ();
+		public bool handles_trash ();
+		public bool is_mounted ();
+		public bool is_read_only ();
+		public bool is_user_visible ();
+		public weak GnomeVFS.Volume @ref ();
+		public void unmount (GnomeVFS.VolumeOpCallback callback);
+		public void unref ();
+	}
+	[CCode (type_check_function = "GNOME_IS_VFS_VOLUME_MONITOR", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public class VolumeMonitor : GLib.Object {
+		public weak GLib.List get_connected_drives ();
+		public weak GnomeVFS.Drive get_drive_by_id (ulong id);
+		public weak GLib.List get_mounted_volumes ();
+		public weak GnomeVFS.Volume get_volume_by_id (ulong id);
+		public weak GnomeVFS.Volume get_volume_for_path (string path);
+		public weak GnomeVFS.VolumeMonitor @ref ();
+		public void unref ();
+		public virtual signal void drive_connected (GnomeVFS.Drive drive);
+		public virtual signal void drive_disconnected (GnomeVFS.Drive drive);
+		public virtual signal void volume_mounted (GnomeVFS.Volume volume);
+		public virtual signal void volume_pre_unmount (GnomeVFS.Volume volume);
+		public virtual signal void volume_unmounted (GnomeVFS.Volume volume);
+	}
 	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public class XferProgressInfo {
-		public GnomeVFS.XferProgressStatus status;
-		public GnomeVFS.Result vfs_status;
-		public GnomeVFS.XferPhase phase;
-		public weak string source_name;
-		public weak string target_name;
-		public ulong file_index;
-		public ulong files_total;
-		public weak GnomeVFS.FileSize bytes_total;
-		public weak GnomeVFS.FileSize file_size;
 		public weak GnomeVFS.FileSize bytes_copied;
-		public weak GnomeVFS.FileSize total_bytes_copied;
-		public weak string duplicate_name;
+		public weak GnomeVFS.FileSize bytes_total;
 		public int duplicate_count;
-		public bool top_level_item;
+		public weak string duplicate_name;
+		public ulong file_index;
+		public weak GnomeVFS.FileSize file_size;
+		public ulong files_total;
+		public GnomeVFS.XferPhase phase;
 		public void* reserved1;
 		public void* reserved2;
+		public weak string source_name;
+		public GnomeVFS.XferProgressStatus status;
+		public weak string target_name;
+		public bool top_level_item;
+		public weak GnomeVFS.FileSize total_bytes_copied;
+		public GnomeVFS.Result vfs_status;
 	}
-	[Compact]
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public class Address {
-		public weak GnomeVFS.Address dup ();
-		public bool equal (GnomeVFS.Address b);
-		public int get_family_type ();
-		public uint get_ipv4 ();
-		public void* get_sockaddr (ushort port, int len);
-		public bool match (GnomeVFS.Address b, uint prefix);
-		public Address.from_ipv4 (uint ipv4_address);
-		public Address.from_string (string address);
-		public weak string to_string ();
+	[CCode (cprefix = "GNOME_VFS_DNS_SD_SERVICE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public enum DNSSDServiceStatus {
+		ADDED,
+		REMOVED
 	}
-	[Compact]
-	[CCode (ref_function = "gnome_vfs_file_info_ref", unref_function = "gnome_vfs_file_info_unref", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public class FileInfo {
-		public weak string name;
-		public GnomeVFS.FileInfoFields valid_fields;
-		public GnomeVFS.FileType type;
-		public GnomeVFS.FilePermissions permissions;
-		public GnomeVFS.FileFlags flags;
-		public weak GnomeVFS.InodeNumber inode;
-		public uint link_count;
-		public uint uid;
-		public uint gid;
-		public weak GnomeVFS.FileSize size;
-		public weak GnomeVFS.FileSize block_count;
-		public uint io_block_size;
-		public ulong atime;
-		public ulong mtime;
-		public ulong ctime;
-		public weak string symlink_name;
-		public weak string mime_type;
-		public uint refcount;
-		public weak GnomeVFS.ACL acl;
-		public weak string selinux_context;
-		public void* reserved1;
-		public void* reserved2;
-		public void* reserved3;
-		public void clear ();
-		public void copy (GnomeVFS.FileInfo src);
-		public weak GnomeVFS.FileInfo dup ();
-		public weak string get_mime_type ();
-		public static weak GLib.List list_copy (GLib.List list);
-		public static void list_free (GLib.List list);
-		public static weak GLib.List list_ref (GLib.List list);
-		public static weak GLib.List list_unref (GLib.List list);
-		public bool matches (GnomeVFS.FileInfo b);
-		public FileInfo ();
+	[CCode (cprefix = "GNOME_VFS_DEVICE_TYPE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public enum DeviceType {
+		UNKNOWN,
+		AUDIO_CD,
+		VIDEO_DVD,
+		HARDDRIVE,
+		CDROM,
+		FLOPPY,
+		ZIP,
+		JAZ,
+		NFS,
+		AUTOFS,
+		CAMERA,
+		MEMORY_STICK,
+		SMB,
+		APPLE,
+		MUSIC_PLAYER,
+		WINDOWS,
+		LOOPBACK,
+		NETWORK
 	}
-	[Compact]
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public class GnomeVfsFindDirectoryResult {
+	[CCode (cprefix = "GNOME_VFS_DIRECTORY_VISIT_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Flags]
+	public enum DirectoryVisitOptions {
+		DEFAULT,
+		SAMEFS,
+		LOOPCHECK,
+		IGNORE_RECURSE_ERROR
 	}
-	[Compact]
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public class GnomeVfsGetFileInfoResult {
+	[CCode (cprefix = "GNOME_VFS_FILE_FLAGS_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Flags]
+	public enum FileFlags {
+		NONE,
+		SYMLINK,
+		LOCAL
 	}
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public class ACE : GLib.Object {
-		public void add_perm (GnomeVFS.ACLPerm perm);
-		public bool check_perm (GnomeVFS.ACLPerm perm);
-		public void copy_perms (GnomeVFS.ACE dest);
-		public void del_perm (GnomeVFS.ACLPerm perm);
-		public bool equal (GnomeVFS.ACE entry_b);
-		public weak string get_id ();
-		public bool get_inherit ();
-		public weak GnomeVFS.ACLKind get_kind ();
-		public bool get_negative ();
-		public weak GnomeVFS.ACLPerm get_perms ();
-		public ACE (GnomeVFS.ACLKind kind, string id, GnomeVFS.ACLPerm perms);
-		public void set_id (string id);
-		public void set_inherit (bool inherit);
-		public void set_kind (GnomeVFS.ACLKind kind);
-		public void set_negative (bool negative);
-		public void set_perms (GnomeVFS.ACLPerm perms);
-		[NoWrapper]
-		public virtual void reserved1 ();
-		[NoWrapper]
-		public virtual void reserved2 ();
-		[NoWrapper]
-		public virtual void reserved3 ();
-		[NoWrapper]
-		public virtual void reserved4 ();
-		public string id { get; set construct; }
-		public bool inherit { get; set; }
-		public uint kind { get; set construct; }
-		public bool negative { get; set; }
-		[NoAccessorMethod]
-		public void* permissions { get; set construct; }
+	[CCode (cprefix = "GNOME_VFS_FILE_INFO_FIELDS_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Flags]
+	public enum FileInfoFields {
+		NONE,
+		TYPE,
+		PERMISSIONS,
+		FLAGS,
+		DEVICE,
+		INODE,
+		LINK_COUNT,
+		SIZE,
+		BLOCK_COUNT,
+		IO_BLOCK_SIZE,
+		ATIME,
+		MTIME,
+		CTIME,
+		SYMLINK_NAME,
+		MIME_TYPE,
+		ACCESS,
+		IDS,
+		ACL,
+		SELINUX_CONTEXT
 	}
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public class ACL : GLib.Object {
-		public void clear ();
-		public static void free_ace_list (GLib.List ace_list);
-		public weak GLib.List get_ace_list ();
-		public ACL ();
-		public void set (GnomeVFS.ACE ace);
-		public void unset (GnomeVFS.ACE ace);
+	[CCode (cprefix = "GNOME_VFS_FILE_INFO_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Flags]
+	public enum FileInfoOptions {
+		DEFAULT,
+		GET_MIME_TYPE,
+		FORCE_FAST_MIME_TYPE,
+		FORCE_SLOW_MIME_TYPE,
+		FOLLOW_LINKS,
+		GET_ACCESS_RIGHTS,
+		NAME_ONLY,
+		GET_ACL,
+		GET_SELINUX_CONTEXT
 	}
-	[CCode (type_check_function = "GNOME_IS_VFS_DRIVE", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public class Drive : GLib.Object {
-		public int compare (GnomeVFS.Drive b);
-		public void eject (GnomeVFS.VolumeOpCallback callback);
-		public weak string get_activation_uri ();
-		public weak string get_device_path ();
-		public GnomeVFS.DeviceType get_device_type ();
-		public weak string get_display_name ();
-		public weak string get_hal_udi ();
-		public weak string get_icon ();
-		public ulong get_id ();
-		public weak GnomeVFS.Volume get_mounted_volume ();
-		public weak GLib.List get_mounted_volumes ();
-		public bool is_connected ();
-		public bool is_mounted ();
-		public bool is_user_visible ();
-		public void mount (GnomeVFS.VolumeOpCallback callback);
-		public bool needs_eject ();
-		public weak GnomeVFS.Drive @ref ();
-		public void unmount (GnomeVFS.VolumeOpCallback callback);
-		public void unref ();
-		public static void volume_list_free (GLib.List volumes);
-		public virtual signal void volume_mounted (GnomeVFS.Volume volume);
-		public virtual signal void volume_pre_unmount (GnomeVFS.Volume volume);
-		public virtual signal void volume_unmounted (GnomeVFS.Volume volume);
+	[CCode (cprefix = "GNOME_VFS_PERM_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Flags]
+	public enum FilePermissions {
+		SUID,
+		SGID,
+		STICKY,
+		USER_READ,
+		USER_WRITE,
+		USER_EXEC,
+		USER_ALL,
+		GROUP_READ,
+		GROUP_WRITE,
+		GROUP_EXEC,
+		GROUP_ALL,
+		OTHER_READ,
+		OTHER_WRITE,
+		OTHER_EXEC,
+		OTHER_ALL,
+		ACCESS_READABLE,
+		ACCESS_WRITABLE,
+		ACCESS_EXECUTABLE
 	}
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public class MIMEMonitor : GLib.Object {
-		public static weak GnomeVFS.MIMEMonitor get ();
-		public virtual signal void data_changed ();
+	[CCode (cprefix = "GNOME_VFS_FILE_TYPE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public enum FileType {
+		UNKNOWN,
+		REGULAR,
+		DIRECTORY,
+		FIFO,
+		SOCKET,
+		CHARACTER_DEVICE,
+		BLOCK_DEVICE,
+		SYMBOLIC_LINK
 	}
-	[CCode (type_check_function = "GNOME_IS_VFS_VOLUME", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public class Volume : GLib.Object {
-		public int compare (GnomeVFS.Volume b);
-		public void eject (GnomeVFS.VolumeOpCallback callback);
-		public weak string get_activation_uri ();
-		public weak string get_device_path ();
-		public GnomeVFS.DeviceType get_device_type ();
-		public weak string get_display_name ();
-		public weak GnomeVFS.Drive get_drive ();
-		public weak string get_filesystem_type ();
-		public weak string get_hal_udi ();
-		public weak string get_icon ();
-		public ulong get_id ();
-		public GnomeVFS.VolumeType get_volume_type ();
-		public bool handles_trash ();
-		public bool is_mounted ();
-		public bool is_read_only ();
-		public bool is_user_visible ();
-		public weak GnomeVFS.Volume @ref ();
-		public void unmount (GnomeVFS.VolumeOpCallback callback);
-		public void unref ();
+	[CCode (cprefix = "GNOME_VFS_DIRECTORY_KIND_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public enum FindDirectoryKind {
+		DESKTOP,
+		TRASH
 	}
-	[CCode (type_check_function = "GNOME_IS_VFS_VOLUME_MONITOR", cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public class VolumeMonitor : GLib.Object {
-		public weak GLib.List get_connected_drives ();
-		public weak GnomeVFS.Drive get_drive_by_id (ulong id);
-		public weak GLib.List get_mounted_volumes ();
-		public weak GnomeVFS.Volume get_volume_by_id (ulong id);
-		public weak GnomeVFS.Volume get_volume_for_path (string path);
-		public weak GnomeVFS.VolumeMonitor @ref ();
-		public void unref ();
-		public virtual signal void drive_connected (GnomeVFS.Drive drive);
-		public virtual signal void drive_disconnected (GnomeVFS.Drive drive);
-		public virtual signal void volume_mounted (GnomeVFS.Volume volume);
-		public virtual signal void volume_pre_unmount (GnomeVFS.Volume volume);
-		public virtual signal void volume_unmounted (GnomeVFS.Volume volume);
+	[CCode (cprefix = "GNOME_VFS_MAKE_URI_DIR_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Flags]
+	public enum MakeURIDirs {
+		NONE,
+		HOMEDIR,
+		CURRENT
+	}
+	[CCode (cprefix = "GNOME_VFS_MIME_ACTION_TYPE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public enum MimeActionType {
+		NONE,
+		APPLICATION,
+		COMPONENT
+	}
+	[CCode (cprefix = "GNOME_VFS_MIME_APPLICATION_ARGUMENT_TYPE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public enum MimeApplicationArgumentType {
+		URIS,
+		PATHS,
+		URIS_FOR_NON_FILES
+	}
+	[CCode (cprefix = "GNOME_VFS_MIME_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public enum MimeEquivalence {
+		UNRELATED,
+		IDENTICAL,
+		PARENT
+	}
+	[CCode (cprefix = "", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public enum ModuleCallbackAuthenticationAuthType {
+		AuthTypeBasic,
+		AuthTypeDigest
+	}
+	[CCode (cprefix = "GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Flags]
+	public enum ModuleCallbackFullAuthenticationFlags {
+		PREVIOUS_ATTEMPT_FAILED,
+		NEED_PASSWORD,
+		NEED_USERNAME,
+		NEED_DOMAIN,
+		SAVING_SUPPORTED,
+		ANON_SUPPORTED
+	}
+	[CCode (cprefix = "GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_OUT_ANON_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Flags]
+	public enum ModuleCallbackFullAuthenticationOutFlags {
+		SELECTED
+	}
+	[CCode (cprefix = "GNOME_VFS_MONITOR_EVENT_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public enum MonitorEventType {
+		CHANGED,
+		DELETED,
+		STARTEXECUTING,
+		STOPEXECUTING,
+		CREATED,
+		METADATA_CHANGED
+	}
+	[CCode (cprefix = "GNOME_VFS_MONITOR_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public enum MonitorType {
+		FILE,
+		DIRECTORY
+	}
+	[CCode (cprefix = "GNOME_VFS_OPEN_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Flags]
+	public enum OpenMode {
+		NONE,
+		READ,
+		WRITE,
+		RANDOM,
+		TRUNCATE
+	}
+	[CCode (cprefix = "GNOME_VFS_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public enum Result {
+		OK,
+		ERROR_NOT_FOUND,
+		ERROR_GENERIC,
+		ERROR_INTERNAL,
+		ERROR_BAD_PARAMETERS,
+		ERROR_NOT_SUPPORTED,
+		ERROR_IO,
+		ERROR_CORRUPTED_DATA,
+		ERROR_WRONG_FORMAT,
+		ERROR_BAD_FILE,
+		ERROR_TOO_BIG,
+		ERROR_NO_SPACE,
+		ERROR_READ_ONLY,
+		ERROR_INVALID_URI,
+		ERROR_NOT_OPEN,
+		ERROR_INVALID_OPEN_MODE,
+		ERROR_ACCESS_DENIED,
+		ERROR_TOO_MANY_OPEN_FILES,
+		ERROR_EOF,
+		ERROR_NOT_A_DIRECTORY,
+		ERROR_IN_PROGRESS,
+		ERROR_INTERRUPTED,
+		ERROR_FILE_EXISTS,
+		ERROR_LOOP,
+		ERROR_NOT_PERMITTED,
+		ERROR_IS_DIRECTORY,
+		ERROR_NO_MEMORY,
+		ERROR_HOST_NOT_FOUND,
+		ERROR_INVALID_HOST_NAME,
+		ERROR_HOST_HAS_NO_ADDRESS,
+		ERROR_LOGIN_FAILED,
+		ERROR_CANCELLED,
+		ERROR_DIRECTORY_BUSY,
+		ERROR_DIRECTORY_NOT_EMPTY,
+		ERROR_TOO_MANY_LINKS,
+		ERROR_READ_ONLY_FILE_SYSTEM,
+		ERROR_NOT_SAME_FILE_SYSTEM,
+		ERROR_NAME_TOO_LONG,
+		ERROR_SERVICE_NOT_AVAILABLE,
+		ERROR_SERVICE_OBSOLETE,
+		ERROR_PROTOCOL_ERROR,
+		ERROR_NO_MASTER_BROWSER,
+		ERROR_NO_DEFAULT,
+		ERROR_NO_HANDLER,
+		ERROR_PARSE,
+		ERROR_LAUNCH,
+		ERROR_TIMEOUT,
+		ERROR_NAMESERVER,
+		ERROR_LOCKED,
+		ERROR_DEPRECATED_FUNCTION,
+		ERROR_INVALID_FILENAME,
+		ERROR_NOT_A_SYMBOLIC_LINK,
+		NUM_ERRORS
+	}
+	[CCode (cprefix = "GNOME_VFS_SEEK_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public enum SeekPosition {
+		START,
+		CURRENT,
+		END
+	}
+	[CCode (cprefix = "GNOME_VFS_SET_FILE_INFO_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Flags]
+	public enum SetFileInfoMask {
+		NONE,
+		NAME,
+		PERMISSIONS,
+		OWNER,
+		TIME,
+		ACL,
+		SELINUX_CONTEXT,
+		SYMLINK_NAME
+	}
+	[CCode (cprefix = "GNOME_VFS_URI_HIDE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Flags]
+	public enum URIHideOptions {
+		NONE,
+		USER_NAME,
+		PASSWORD,
+		HOST_NAME,
+		HOST_PORT,
+		TOPLEVEL_METHOD,
+		FRAGMENT_IDENTIFIER
+	}
+	[CCode (cprefix = "GNOME_VFS_VOLUME_TYPE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public enum VolumeType {
+		MOUNTPOINT,
+		VFS_MOUNT,
+		CONNECTED_SERVER
+	}
+	[CCode (cprefix = "GNOME_VFS_XFER_ERROR_ACTION_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public enum XferErrorAction {
+		ABORT,
+		RETRY,
+		SKIP
+	}
+	[CCode (cprefix = "GNOME_VFS_XFER_ERROR_MODE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public enum XferErrorMode {
+		ABORT,
+		QUERY
+	}
+	[CCode (cprefix = "GNOME_VFS_XFER_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Flags]
+	public enum XferOptions {
+		DEFAULT,
+		UNUSED_1,
+		FOLLOW_LINKS,
+		UNUSED_2,
+		RECURSIVE,
+		SAMEFS,
+		DELETE_ITEMS,
+		EMPTY_DIRECTORIES,
+		NEW_UNIQUE_DIRECTORY,
+		REMOVESOURCE,
+		USE_UNIQUE_NAMES,
+		LINK_ITEMS,
+		FOLLOW_LINKS_RECURSIVE,
+		TARGET_DEFAULT_PERMS
+	}
+	[CCode (cprefix = "GNOME_VFS_XFER_OVERWRITE_ACTION_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public enum XferOverwriteAction {
+		ABORT,
+		REPLACE,
+		REPLACE_ALL,
+		SKIP,
+		SKIP_ALL
+	}
+	[CCode (cprefix = "GNOME_VFS_XFER_OVERWRITE_MODE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public enum XferOverwriteMode {
+		ABORT,
+		QUERY,
+		REPLACE,
+		SKIP
+	}
+	[CCode (cprefix = "GNOME_VFS_XFER_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public enum XferPhase {
+		PHASE_INITIAL,
+		CHECKING_DESTINATION,
+		PHASE_COLLECTING,
+		PHASE_READYTOGO,
+		PHASE_OPENSOURCE,
+		PHASE_OPENTARGET,
+		PHASE_COPYING,
+		PHASE_MOVING,
+		PHASE_READSOURCE,
+		PHASE_WRITETARGET,
+		PHASE_CLOSESOURCE,
+		PHASE_CLOSETARGET,
+		PHASE_DELETESOURCE,
+		PHASE_SETATTRIBUTES,
+		PHASE_FILECOMPLETED,
+		PHASE_CLEANUP,
+		PHASE_COMPLETED,
+		NUM_PHASES
+	}
+	[CCode (cprefix = "GNOME_VFS_XFER_PROGRESS_STATUS_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	public enum XferProgressStatus {
+		OK,
+		VFSERROR,
+		OVERWRITE,
+		DUPLICATE
 	}
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static delegate void AsyncCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, void* callback_data);

Modified: trunk/vapi/goocanvas.vapi
==============================================================================
--- trunk/vapi/goocanvas.vapi	(original)
+++ trunk/vapi/goocanvas.vapi	Fri Oct 24 16:50:22 2008
@@ -2,447 +2,43 @@
 
 [CCode (cprefix = "Goo", lower_case_cprefix = "goo_")]
 namespace Goo {
-	[CCode (cprefix = "CAIRO_ANTIALIAS_", has_type_id = "0", cheader_filename = "goocanvas.h")]
-	public enum CairoAntialias {
-		DEFAULT,
-		NONE,
-		GRAY,
-		SUBPIXEL
-	}
-	[CCode (cprefix = "CAIRO_FILL_RULE_", has_type_id = "0", cheader_filename = "goocanvas.h")]
-	public enum CairoFillRule {
-		WINDING,
-		EVEN_ODD
-	}
-	[CCode (cprefix = "CAIRO_HINT_METRICS_", has_type_id = "0", cheader_filename = "goocanvas.h")]
-	public enum CairoHintMetrics {
-		DEFAULT,
-		OFF,
-		ON
-	}
-	[CCode (cprefix = "CAIRO_LINE_CAP_", has_type_id = "0", cheader_filename = "goocanvas.h")]
-	public enum CairoLineCap {
-		BUTT,
-		ROUND,
-		SQUARE
-	}
-	[CCode (cprefix = "CAIRO_LINE_JOIN_", has_type_id = "0", cheader_filename = "goocanvas.h")]
-	public enum CairoLineJoin {
-		MITER,
-		ROUND,
-		BEVEL
-	}
-	[CCode (cprefix = "CAIRO_OPERATOR_", has_type_id = "0", cheader_filename = "goocanvas.h")]
-	public enum CairoOperator {
-		CLEAR,
-		SOURCE,
-		OVER,
-		IN,
-		OUT,
-		ATOP,
-		DEST,
-		DEST_OVER,
-		DEST_IN,
-		DEST_OUT,
-		DEST_ATOP,
-		XOR,
-		ADD,
-		SATURATE
-	}
-	[CCode (cprefix = "GOO_CANVAS_ANIMATE_", has_type_id = "0", cheader_filename = "goocanvas.h")]
-	public enum CanvasAnimateType {
-		FREEZE,
-		RESET,
-		RESTART,
-		BOUNCE
-	}
-	[CCode (cprefix = "GOO_CANVAS_ITEM_", has_type_id = "0", cheader_filename = "goocanvas.h")]
-	public enum CanvasItemVisibility {
-		HIDDEN,
-		INVISIBLE,
-		VISIBLE,
-		VISIBLE_ABOVE_THRESHOLD
-	}
-	[CCode (cprefix = "GOO_CANVAS_PATH_", has_type_id = "0", cheader_filename = "goocanvas.h")]
-	public enum CanvasPathCommandType {
-		MOVE_TO,
-		CLOSE_PATH,
-		LINE_TO,
-		HORIZONTAL_LINE_TO,
-		VERTICAL_LINE_TO,
-		CURVE_TO,
-		SMOOTH_CURVE_TO,
-		QUADRATIC_CURVE_TO,
-		SMOOTH_QUADRATIC_CURVE_TO,
-		ELLIPTICAL_ARC
-	}
-	[CCode (cprefix = "GOO_CANVAS_EVENTS_", has_type_id = "0", cheader_filename = "goocanvas.h")]
-	[Flags]
-	public enum CanvasPointerEvents {
-		VISIBLE_MASK,
-		PAINTED_MASK,
-		FILL_MASK,
-		STROKE_MASK,
-		NONE,
-		VISIBLE_PAINTED,
-		VISIBLE_FILL,
-		VISIBLE_STROKE,
-		VISIBLE,
-		PAINTED,
-		FILL,
-		STROKE,
-		ALL
-	}
-	[CCode (cheader_filename = "goocanvas.h")]
-	public class CanvasEllipse : Goo.CanvasItemSimple, Goo.CanvasItem {
-		public Goo.CanvasEllipseData ellipse_data;
-		[CCode (cname = "goo_canvas_ellipse_new")]
-		public static weak Goo.CanvasEllipse create (Goo.CanvasItem? parent, double center_x, double center_y, double radius_x, double radius_y, ...);
-		public CanvasEllipse ();
-		[NoAccessorMethod]
-		public double center_x { get; set; }
-		[NoAccessorMethod]
-		public double center_y { get; set; }
-		[NoAccessorMethod]
-		public double radius_x { get; set; }
-		[NoAccessorMethod]
-		public double radius_y { get; set; }
-	}
-	[CCode (cheader_filename = "goocanvas.h")]
-	public class CanvasEllipseModel : Goo.CanvasItemModelSimple, Goo.CanvasItemModel {
-		public Goo.CanvasEllipseData ellipse_data;
-		[CCode (cname = "goo_canvas_ellipse_model_new")]
-		public static weak Goo.CanvasEllipseModel create (Goo.CanvasItemModel? parent, double center_x, double center_y, double radius_x, double radius_y, ...);
-		public CanvasEllipseModel ();
-		[NoAccessorMethod]
-		public double center_x { get; set; }
-		[NoAccessorMethod]
-		public double center_y { get; set; }
-		[NoAccessorMethod]
-		public double radius_x { get; set; }
-		[NoAccessorMethod]
-		public double radius_y { get; set; }
-	}
-	[CCode (cheader_filename = "goocanvas.h")]
-	public class CanvasGroup : Goo.CanvasItemSimple, Goo.CanvasItem {
-		public weak GLib.PtrArray items;
-		[CCode (cname = "goo_canvas_group_new")]
-		public static weak Goo.CanvasGroup create (Goo.CanvasItem? parent, ...);
-		public CanvasGroup ();
-	}
-	[CCode (cheader_filename = "goocanvas.h")]
-	public class CanvasGroupModel : Goo.CanvasItemModelSimple, Goo.CanvasItemModel {
-		public weak GLib.PtrArray children;
-		[CCode (cname = "goo_canvas_group_model_new")]
-		public static weak Goo.CanvasGroupModel create (Goo.CanvasItemModel? parent, ...);
-		public CanvasGroupModel ();
-	}
-	[CCode (cheader_filename = "goocanvas.h")]
-	public class CanvasImage : Goo.CanvasItemSimple, Goo.CanvasItem {
-		public Goo.CanvasImageData image_data;
-		[CCode (cname = "goo_image_group_new")]
-		public static weak Goo.CanvasImage create (Goo.CanvasItem? parent, Gdk.Pixbuf pixbuf, double x, double y, ...);
-		public CanvasImage ();
-		[NoAccessorMethod]
-		public double height { get; set; }
-		[NoAccessorMethod]
-		public Goo.CairoPattern pattern { get; set; }
-		[NoAccessorMethod]
-		public Gdk.Pixbuf pixbuf { set; }
-		[NoAccessorMethod]
-		public double width { get; set; }
-		[NoAccessorMethod]
-		public double x { get; set; }
-		[NoAccessorMethod]
-		public double y { get; set; }
-	}
-	[CCode (cheader_filename = "goocanvas.h")]
-	public class CanvasImageModel : Goo.CanvasItemModelSimple, Goo.CanvasItemModel {
-		public Goo.CanvasImageData image_data;
-		[CCode (cname = "goo_canvas_image_model_new")]
-		public static weak Goo.CanvasImageModel create (Goo.CanvasItemModel? parent, Gdk.Pixbuf pixbuf, double x, double y, ...);
-		public CanvasImageModel ();
-		[NoAccessorMethod]
-		public double height { get; set; }
-		[NoAccessorMethod]
-		public Goo.CairoPattern pattern { get; set; }
-		[NoAccessorMethod]
-		public Gdk.Pixbuf pixbuf { set; }
-		[NoAccessorMethod]
-		public double width { get; set; }
-		[NoAccessorMethod]
-		public double x { get; set; }
-		[NoAccessorMethod]
-		public double y { get; set; }
-	}
-	[CCode (cheader_filename = "goocanvas.h")]
-	public class CanvasPath : Goo.CanvasItemSimple, Goo.CanvasItem {
-		public Goo.CanvasPathData path_data;
-		[CCode (cname = "goo_canvas_path_new")]
-		public static weak Goo.CanvasPath create (Goo.CanvasItem? parent, string path_data, ...);
-		public CanvasPath ();
-		[NoAccessorMethod]
-		public string data { set; }
-	}
-	[CCode (cheader_filename = "goocanvas.h")]
-	public class CanvasPathModel : Goo.CanvasItemModelSimple, Goo.CanvasItemModel {
-		public Goo.CanvasPathData path_data;
-		[CCode (cname = "goo_canvas_path_model_new")]
-		public static weak Goo.CanvasPathModel create (Goo.CanvasItemModel? parent, string path_data, ...);
-		public CanvasPathModel ();
-		[NoAccessorMethod]
-		public string data { set; }
-	}
-	[CCode (cheader_filename = "goocanvas.h")]
-	public class CanvasPolyline : Goo.CanvasItemSimple, Goo.CanvasItem {
-		public Goo.CanvasPolylineData polyline_data;
-		[CCode (cname = "goo_canvas_polyline_new")]
-		public static weak Goo.CanvasPolyline create (Goo.CanvasItem? parent, bool close_path, int num_points, ...);
-		[CCode (cname = "goo_canvas_polyline_new_line")]
-		public static weak Goo.CanvasPolyline create_line (Goo.CanvasItem? parent, double x1, double y1, double x2, double y2, ...);
-		public CanvasPolyline ();
-		[CCode (type = "GooCanvasItem*")]
-		public CanvasPolyline.line (Goo.CanvasItem parent, double x1, double y1, double x2, double y2);
-		[NoAccessorMethod]
-		public double arrow_length { get; set; }
-		[NoAccessorMethod]
-		public double arrow_tip_length { get; set; }
-		[NoAccessorMethod]
-		public double arrow_width { get; set; }
-		[NoAccessorMethod]
-		public bool close_path { get; set; }
-		[NoAccessorMethod]
-		public bool end_arrow { get; set; }
-		[NoAccessorMethod]
-		public Goo.CanvasPoints points { get; set; }
-		[NoAccessorMethod]
-		public bool start_arrow { get; set; }
-	}
-	[CCode (cheader_filename = "goocanvas.h")]
-	public class CanvasPolylineModel : Goo.CanvasItemModelSimple, Goo.CanvasItemModel {
-		public Goo.CanvasPolylineData polyline_data;
-		[CCode (cname = "goo_canvas_polyline_model_new")]
-		public static weak Goo.CanvasPolylineModel create (Goo.CanvasItemModel? parent, bool close_path, int num_points, ...);
-		[CCode (cname = "goo_canvas_polyline_model_new_line")]
-		public static weak Goo.CanvasPolylineModel create_line (Goo.CanvasItemModel? parent, double x1, double y1, double x2, double y2, ...);
-		public CanvasPolylineModel ();
-		[CCode (type = "GooCanvasItemModel*")]
-		public CanvasPolylineModel.line (Goo.CanvasItemModel parent, double x1, double y1, double x2, double y2);
-		[NoAccessorMethod]
-		public double arrow_length { get; set; }
-		[NoAccessorMethod]
-		public double arrow_tip_length { get; set; }
-		[NoAccessorMethod]
-		public double arrow_width { get; set; }
-		[NoAccessorMethod]
-		public bool close_path { get; set; }
-		[NoAccessorMethod]
-		public bool end_arrow { get; set; }
-		[NoAccessorMethod]
-		public Goo.CanvasPoints points { get; set; }
-		[NoAccessorMethod]
-		public bool start_arrow { get; set; }
-	}
-	[CCode (cheader_filename = "goocanvas.h")]
-	public class CanvasRect : Goo.CanvasItemSimple, Goo.CanvasItem {
-		public Goo.CanvasRectData rect_data;
-		[CCode (cname = "goo_canvas_rect_new")]
-		public static weak Goo.CanvasRect create (Goo.CanvasItem? parent, double x, double y, double width, double height, ...);
-		public CanvasRect ();
-		[NoAccessorMethod]
-		public double height { get; set; }
-		[NoAccessorMethod]
-		public double radius_x { get; set; }
-		[NoAccessorMethod]
-		public double radius_y { get; set; }
-		[NoAccessorMethod]
-		public double width { get; set; }
-		[NoAccessorMethod]
-		public double x { get; set; }
-		[NoAccessorMethod]
-		public double y { get; set; }
-	}
-	[CCode (cheader_filename = "goocanvas.h")]
-	public class CanvasRectModel : Goo.CanvasItemModelSimple, Goo.CanvasItemModel {
-		public Goo.CanvasRectData rect_data;
-		[CCode (cname = "goo_canvas_rect_model_new")]
-		public static weak Goo.CanvasRectModel create (Goo.CanvasItemModel? parent, double x, double y, double width, double height, ...);
-		public CanvasRectModel ();
-		[NoAccessorMethod]
-		public double height { get; set; }
-		[NoAccessorMethod]
-		public double radius_x { get; set; }
-		[NoAccessorMethod]
-		public double radius_y { get; set; }
-		[NoAccessorMethod]
-		public double width { get; set; }
-		[NoAccessorMethod]
-		public double x { get; set; }
-		[NoAccessorMethod]
-		public double y { get; set; }
-	}
-	[CCode (cheader_filename = "goocanvas.h")]
-	public class CanvasTable : Goo.CanvasGroup, Goo.CanvasItem {
-		public Goo.CanvasTableData table_data;
-		[CCode (cname = "goo_canvas_table_new")]
-		public static weak Goo.CanvasTable create (Goo.CanvasItem? parent, ...);
-		public CanvasTable ();
-		[NoAccessorMethod]
-		public double column_spacing { get; set; }
-		[NoAccessorMethod]
-		public double height { get; set; }
-		[NoAccessorMethod]
-		public bool homogeneous_columns { get; set; }
-		[NoAccessorMethod]
-		public bool homogeneous_rows { get; set; }
-		[NoAccessorMethod]
-		public double row_spacing { get; set; }
-		[NoAccessorMethod]
-		public double width { get; set; }
-	}
-	[CCode (cheader_filename = "goocanvas.h")]
-	public class CanvasTableModel : Goo.CanvasGroupModel, Goo.CanvasItemModel {
-		public Goo.CanvasTableData table_data;
-		[CCode (cname = "goo_canvas_table_model_new")]
-		public static weak Goo.CanvasTableModel create (Goo.CanvasItemModel? parent, ...);
-		public CanvasTableModel ();
-		[NoAccessorMethod]
-		public double column_spacing { get; set; }
-		[NoAccessorMethod]
-		public double height { get; set; }
-		[NoAccessorMethod]
-		public bool homogeneous_columns { get; set; }
-		[NoAccessorMethod]
-		public bool homogeneous_rows { get; set; }
-		[NoAccessorMethod]
-		public double row_spacing { get; set; }
-		[NoAccessorMethod]
-		public double width { get; set; }
-	}
-	[CCode (cheader_filename = "goocanvas.h")]
-	public class CanvasText : Goo.CanvasItemSimple, Goo.CanvasItem {
-		public Goo.CanvasTextData text_data;
-		public double layout_width;
-		[CCode (cname = "goo_canvas_text_new")]
-		public static weak Goo.CanvasText create (Goo.CanvasItem? parent, string str, double x, double y, double width, Gtk.AnchorType anchor, ...);
-		public CanvasText ();
-		[NoAccessorMethod]
-		public Pango.Alignment alignment { get; set; }
-		[NoAccessorMethod]
-		public Gtk.AnchorType anchor { get; set; }
-		[NoAccessorMethod]
-		public Pango.EllipsizeMode ellipsize { get; set; }
-		[NoAccessorMethod]
-		public string text { get; set; }
-		[NoAccessorMethod]
-		public bool use_markup { get; set; }
-		[NoAccessorMethod]
-		public double width { get; set; }
-		[NoAccessorMethod]
-		public Pango.WrapMode wrap { get; set; }
-		[NoAccessorMethod]
-		public double x { get; set; }
-		[NoAccessorMethod]
-		public double y { get; set; }
-	}
-	[CCode (cheader_filename = "goocanvas.h")]
-	public class CanvasTextModel : Goo.CanvasItemModelSimple, Goo.CanvasItemModel {
-		public Goo.CanvasTextData text_data;
-		[CCode (cname = "goo_canvas_text_model_new")]
-		public static weak Goo.CanvasTextModel create (Goo.CanvasItemModel? parent, string str, double x, double y, double width, Gtk.AnchorType anchor, ...);
-		public CanvasTextModel ();
-		[NoAccessorMethod]
-		public Pango.Alignment alignment { get; set; }
-		[NoAccessorMethod]
-		public Gtk.AnchorType anchor { get; set; }
-		[NoAccessorMethod]
-		public Pango.EllipsizeMode ellipsize { get; set; }
-		[NoAccessorMethod]
-		public string text { get; set; }
-		[NoAccessorMethod]
-		public bool use_markup { get; set; }
-		[NoAccessorMethod]
-		public double width { get; set; }
-		[NoAccessorMethod]
-		public Pango.WrapMode wrap { get; set; }
-		[NoAccessorMethod]
-		public double x { get; set; }
-		[NoAccessorMethod]
-		public double y { get; set; }
-	}
-	[CCode (cheader_filename = "goocanvas.h")]
-	public class CanvasWidget : Goo.CanvasItemSimple, Goo.CanvasItem {
-		[CCode (cname = "goo_canvas_widget_new")]
-		public static weak Goo.CanvasWidget create (Goo.CanvasItem? parent, Gtk.Widget widget, double x, double y, double width, double height, ...);
-		public CanvasWidget ();
-		[NoAccessorMethod]
-		public Gtk.AnchorType anchor { get; set; }
-		[NoAccessorMethod]
-		public double height { get; set; }
-		[NoAccessorMethod]
-		public Gtk.Widget widget { get; set; }
-		[NoAccessorMethod]
-		public double width { get; set; }
-		[NoAccessorMethod]
-		public double x { get; set; }
-		[NoAccessorMethod]
-		public double y { get; set; }
-	}
-	[Compact]
-	[CCode (ref_function = "goo_canvas_line_dash_ref", unref_function = "goo_canvas_line_dash_unref", cheader_filename = "goocanvas.h")]
-	public class CanvasLineDash {
-		public int ref_count;
-		public int num_dashes;
-		public double dashes;
-		public double dash_offset;
-		public CanvasLineDash (int num_dashes);
-		[CCode (cname = "goo_canvas_line_dash_newv")]
-		public CanvasLineDash.newv (int num_dashes, double dashes);
-	}
 	[Compact]
 	[CCode (copy_function = "goo_cairo_matrix_copy", cheader_filename = "goocanvas.h")]
 	public class CairoMatrix {
 		public static Cairo.Matrix copy (Cairo.Matrix matrix);
 	}
-	[Compact]
-	[CCode (ref_function = "goo_canvas_points_ref", unref_function = "goo_canvas_points_unref", cheader_filename = "goocanvas.h")]
-	public class CanvasPoints {
-		public double coords;
-		public int num_points;
-		public int ref_count;
-		public CanvasPoints (int num_points);
-	}
 	[CCode (cheader_filename = "goocanvas.h")]
 	public class Canvas : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		public weak Goo.CanvasItemModel root_item_model;
-		public weak Goo.CanvasItem root_item;
 		public Goo.CanvasBounds bounds;
-		public uint idle_id;
-		public uint need_update;
-		public uint need_entire_subtree_update;
-		public weak Goo.CanvasItem pointer_item;
-		public weak Goo.CanvasItem pointer_grab_item;
-		public weak Goo.CanvasItem pointer_grab_initial_item;
-		public uint pointer_grab_button;
-		public weak Goo.CanvasItem focused_item;
-		public weak Goo.CanvasItem keyboard_grab_item;
-		public Gdk.EventCrossing crossing_event;
 		public weak Gdk.Window canvas_window;
 		public int canvas_x_offset;
 		public int canvas_y_offset;
-		public weak Gtk.Adjustment hadjustment;
-		public weak Gtk.Adjustment vadjustment;
-		public int freeze_count;
-		public weak Gdk.Window tmp_window;
-		public weak GLib.HashTable model_to_item;
+		public Gdk.EventCrossing crossing_event;
 		public double device_to_pixels_x;
 		public double device_to_pixels_y;
+		public weak Goo.CanvasItem focused_item;
+		public int freeze_count;
+		public weak Gtk.Adjustment hadjustment;
+		public uint idle_id;
+		public weak Goo.CanvasItem keyboard_grab_item;
+		public weak GLib.HashTable model_to_item;
+		public uint need_entire_subtree_update;
+		public uint need_update;
+		public uint pointer_grab_button;
+		public weak Goo.CanvasItem pointer_grab_initial_item;
+		public weak Goo.CanvasItem pointer_grab_item;
+		public weak Goo.CanvasItem pointer_item;
+		public weak Goo.CanvasItem root_item;
+		public weak Goo.CanvasItemModel root_item_model;
+		public weak Gdk.Window tmp_window;
+		public weak Gtk.Adjustment vadjustment;
 		public weak GLib.List widget_items;
 		public void convert_from_item_space (Goo.CanvasItem item, double x, double y);
 		public void convert_from_pixels (double x, double y);
 		public void convert_to_item_space (Goo.CanvasItem item, double x, double y);
 		public void convert_to_pixels (double x, double y);
 		public weak Cairo.Context create_cairo_context ();
+		public virtual weak Goo.CanvasItem create_item (Goo.CanvasItemModel model);
 		public static void create_path (GLib.Array commands, Cairo.Context cr);
 		public void get_bounds (double left, double top, double right, double bottom);
 		public double get_default_line_width ();
@@ -460,7 +56,7 @@
 		public static void marshal_BOOLEAN__OBJECT_BOXED (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
 		public static void marshal_VOID__INT_INT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
 		public static void marshal_VOID__OBJECT_OBJECT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
-		[CCode (type = "GtkWidget*")]
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Canvas ();
 		public static weak GLib.Array parse_path_data (string path_data);
 		public Gdk.GrabStatus pointer_grab (Goo.CanvasItem item, Gdk.EventMask event_mask, Gdk.Cursor cursor, uint time);
@@ -477,7 +73,6 @@
 		public void unregister_item (Goo.CanvasItemModel model);
 		public void unregister_widget_item (Goo.CanvasWidget witem);
 		public void update ();
-		public virtual weak Goo.CanvasItem create_item (Goo.CanvasItemModel model);
 		[NoAccessorMethod]
 		public Gtk.AnchorType anchor { get; set; }
 		[NoAccessorMethod]
@@ -504,22 +99,104 @@
 		[NoAccessorMethod]
 		public Gtk.Unit units { get; set; }
 		[NoAccessorMethod]
-		public double x1 { get; set; }
+		public double x1 { get; set; }
+		[NoAccessorMethod]
+		public double x2 { get; set; }
+		[NoAccessorMethod]
+		public double y1 { get; set; }
+		[NoAccessorMethod]
+		public double y2 { get; set; }
+		public virtual signal void item_created (Goo.CanvasItem item, Goo.CanvasItemModel model);
+		public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
+	}
+	[CCode (cheader_filename = "goocanvas.h")]
+	public class CanvasEllipse : Goo.CanvasItemSimple, Goo.CanvasItem {
+		public Goo.CanvasEllipseData ellipse_data;
+		[CCode (cname = "goo_canvas_ellipse_new")]
+		public static weak Goo.CanvasEllipse create (Goo.CanvasItem? parent, double center_x, double center_y, double radius_x, double radius_y, ...);
+		public CanvasEllipse ();
+		[NoAccessorMethod]
+		public double center_x { get; set; }
+		[NoAccessorMethod]
+		public double center_y { get; set; }
+		[NoAccessorMethod]
+		public double radius_x { get; set; }
+		[NoAccessorMethod]
+		public double radius_y { get; set; }
+	}
+	[CCode (cheader_filename = "goocanvas.h")]
+	public class CanvasEllipseModel : Goo.CanvasItemModelSimple, Goo.CanvasItemModel {
+		public Goo.CanvasEllipseData ellipse_data;
+		[CCode (cname = "goo_canvas_ellipse_model_new")]
+		public static weak Goo.CanvasEllipseModel create (Goo.CanvasItemModel? parent, double center_x, double center_y, double radius_x, double radius_y, ...);
+		public CanvasEllipseModel ();
+		[NoAccessorMethod]
+		public double center_x { get; set; }
+		[NoAccessorMethod]
+		public double center_y { get; set; }
+		[NoAccessorMethod]
+		public double radius_x { get; set; }
+		[NoAccessorMethod]
+		public double radius_y { get; set; }
+	}
+	[CCode (cheader_filename = "goocanvas.h")]
+	public class CanvasGroup : Goo.CanvasItemSimple, Goo.CanvasItem {
+		public weak GLib.PtrArray items;
+		[CCode (cname = "goo_canvas_group_new")]
+		public static weak Goo.CanvasGroup create (Goo.CanvasItem? parent, ...);
+		public CanvasGroup ();
+	}
+	[CCode (cheader_filename = "goocanvas.h")]
+	public class CanvasGroupModel : Goo.CanvasItemModelSimple, Goo.CanvasItemModel {
+		public weak GLib.PtrArray children;
+		[CCode (cname = "goo_canvas_group_model_new")]
+		public static weak Goo.CanvasGroupModel create (Goo.CanvasItemModel? parent, ...);
+		public CanvasGroupModel ();
+	}
+	[CCode (cheader_filename = "goocanvas.h")]
+	public class CanvasImage : Goo.CanvasItemSimple, Goo.CanvasItem {
+		public Goo.CanvasImageData image_data;
+		[CCode (cname = "goo_image_group_new")]
+		public static weak Goo.CanvasImage create (Goo.CanvasItem? parent, Gdk.Pixbuf pixbuf, double x, double y, ...);
+		public CanvasImage ();
+		[NoAccessorMethod]
+		public double height { get; set; }
+		[NoAccessorMethod]
+		public Goo.CairoPattern pattern { get; set; }
+		[NoAccessorMethod]
+		public Gdk.Pixbuf pixbuf { set; }
+		[NoAccessorMethod]
+		public double width { get; set; }
+		[NoAccessorMethod]
+		public double x { get; set; }
+		[NoAccessorMethod]
+		public double y { get; set; }
+	}
+	[CCode (cheader_filename = "goocanvas.h")]
+	public class CanvasImageModel : Goo.CanvasItemModelSimple, Goo.CanvasItemModel {
+		public Goo.CanvasImageData image_data;
+		[CCode (cname = "goo_canvas_image_model_new")]
+		public static weak Goo.CanvasImageModel create (Goo.CanvasItemModel? parent, Gdk.Pixbuf pixbuf, double x, double y, ...);
+		public CanvasImageModel ();
+		[NoAccessorMethod]
+		public double height { get; set; }
+		[NoAccessorMethod]
+		public Goo.CairoPattern pattern { get; set; }
+		[NoAccessorMethod]
+		public Gdk.Pixbuf pixbuf { set; }
 		[NoAccessorMethod]
-		public double x2 { get; set; }
+		public double width { get; set; }
 		[NoAccessorMethod]
-		public double y1 { get; set; }
+		public double x { get; set; }
 		[NoAccessorMethod]
-		public double y2 { get; set; }
-		public virtual signal void item_created (Goo.CanvasItem item, Goo.CanvasItemModel model);
-		public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
+		public double y { get; set; }
 	}
 	[CCode (cheader_filename = "goocanvas.h")]
 	public class CanvasItemModelSimple : GLib.Object, Goo.CanvasItemModel {
+		public weak string description;
 		public weak Goo.CanvasItemModel parent;
 		public Goo.CanvasItemSimpleData simple_data;
 		public weak string title;
-		public weak string description;
 		[NoAccessorMethod]
 		public Goo.CairoAntialias antialias { get; set; }
 		[NoAccessorMethod]
@@ -565,21 +242,19 @@
 	}
 	[CCode (cheader_filename = "goocanvas.h")]
 	public class CanvasItemSimple : GLib.Object, Goo.CanvasItem {
+		public Goo.CanvasBounds bounds;
 		public weak Goo.Canvas canvas;
-		public weak Goo.CanvasItem parent;
 		public weak Goo.CanvasItemModelSimple model;
-		public Goo.CanvasItemSimpleData simple_data;
-		public Goo.CanvasBounds bounds;
-		public uint need_update;
 		public uint need_entire_subtree_update;
+		public uint need_update;
+		public weak Goo.CanvasItem parent;
+		public Goo.CanvasItemSimpleData simple_data;
 		public void changed (bool recompute_bounds);
 		public bool check_in_path (double x, double y, Cairo.Context cr, Goo.CanvasPointerEvents pointer_events);
 		public void check_style ();
 		public double get_line_width ();
 		public void get_path_bounds (Cairo.Context cr, Goo.CanvasBounds bounds);
 		public void paint_path (Cairo.Context cr);
-		public void user_bounds_to_device (Cairo.Context cr, Goo.CanvasBounds bounds);
-		public void user_bounds_to_parent (Cairo.Context cr, Goo.CanvasBounds bounds);
 		[NoWrapper]
 		public virtual void simple_create_path (Cairo.Context cr);
 		[NoWrapper]
@@ -588,6 +263,8 @@
 		public virtual void simple_paint (Cairo.Context cr, Goo.CanvasBounds bounds);
 		[NoWrapper]
 		public virtual void simple_update (Cairo.Context cr);
+		public void user_bounds_to_device (Cairo.Context cr, Goo.CanvasBounds bounds);
+		public void user_bounds_to_parent (Cairo.Context cr, Goo.CanvasBounds bounds);
 		[NoAccessorMethod]
 		public Goo.CairoAntialias antialias { get; set; }
 		[NoAccessorMethod]
@@ -631,6 +308,133 @@
 		[NoAccessorMethod]
 		public Gdk.Pixbuf stroke_pixbuf { set; }
 	}
+	[Compact]
+	[CCode (ref_function = "goo_canvas_line_dash_ref", unref_function = "goo_canvas_line_dash_unref", cheader_filename = "goocanvas.h")]
+	public class CanvasLineDash {
+		public double dash_offset;
+		public double dashes;
+		public int num_dashes;
+		public int ref_count;
+		[CCode (has_construct_function = false)]
+		public CanvasLineDash (int num_dashes);
+		[CCode (cname = "goo_canvas_line_dash_newv", has_construct_function = false)]
+		public CanvasLineDash.newv (int num_dashes, double dashes);
+	}
+	[CCode (cheader_filename = "goocanvas.h")]
+	public class CanvasPath : Goo.CanvasItemSimple, Goo.CanvasItem {
+		public Goo.CanvasPathData path_data;
+		[CCode (cname = "goo_canvas_path_new")]
+		public static weak Goo.CanvasPath create (Goo.CanvasItem? parent, string path_data, ...);
+		public CanvasPath ();
+		[NoAccessorMethod]
+		public string data { set; }
+	}
+	[CCode (cheader_filename = "goocanvas.h")]
+	public class CanvasPathModel : Goo.CanvasItemModelSimple, Goo.CanvasItemModel {
+		public Goo.CanvasPathData path_data;
+		[CCode (cname = "goo_canvas_path_model_new")]
+		public static weak Goo.CanvasPathModel create (Goo.CanvasItemModel? parent, string path_data, ...);
+		public CanvasPathModel ();
+		[NoAccessorMethod]
+		public string data { set; }
+	}
+	[Compact]
+	[CCode (ref_function = "goo_canvas_points_ref", unref_function = "goo_canvas_points_unref", cheader_filename = "goocanvas.h")]
+	public class CanvasPoints {
+		public double coords;
+		public int num_points;
+		public int ref_count;
+		[CCode (has_construct_function = false)]
+		public CanvasPoints (int num_points);
+	}
+	[CCode (cheader_filename = "goocanvas.h")]
+	public class CanvasPolyline : Goo.CanvasItemSimple, Goo.CanvasItem {
+		public Goo.CanvasPolylineData polyline_data;
+		[CCode (cname = "goo_canvas_polyline_new")]
+		public static weak Goo.CanvasPolyline create (Goo.CanvasItem? parent, bool close_path, int num_points, ...);
+		[CCode (cname = "goo_canvas_polyline_new_line")]
+		public static weak Goo.CanvasPolyline create_line (Goo.CanvasItem? parent, double x1, double y1, double x2, double y2, ...);
+		[CCode (type = "GooCanvasItem*", has_construct_function = false)]
+		public CanvasPolyline.line (Goo.CanvasItem parent, double x1, double y1, double x2, double y2);
+		public CanvasPolyline ();
+		[NoAccessorMethod]
+		public double arrow_length { get; set; }
+		[NoAccessorMethod]
+		public double arrow_tip_length { get; set; }
+		[NoAccessorMethod]
+		public double arrow_width { get; set; }
+		[NoAccessorMethod]
+		public bool close_path { get; set; }
+		[NoAccessorMethod]
+		public bool end_arrow { get; set; }
+		[NoAccessorMethod]
+		public Goo.CanvasPoints points { get; set; }
+		[NoAccessorMethod]
+		public bool start_arrow { get; set; }
+	}
+	[CCode (cheader_filename = "goocanvas.h")]
+	public class CanvasPolylineModel : Goo.CanvasItemModelSimple, Goo.CanvasItemModel {
+		public Goo.CanvasPolylineData polyline_data;
+		[CCode (cname = "goo_canvas_polyline_model_new")]
+		public static weak Goo.CanvasPolylineModel create (Goo.CanvasItemModel? parent, bool close_path, int num_points, ...);
+		[CCode (cname = "goo_canvas_polyline_model_new_line")]
+		public static weak Goo.CanvasPolylineModel create_line (Goo.CanvasItemModel? parent, double x1, double y1, double x2, double y2, ...);
+		[CCode (type = "GooCanvasItemModel*", has_construct_function = false)]
+		public CanvasPolylineModel.line (Goo.CanvasItemModel parent, double x1, double y1, double x2, double y2);
+		public CanvasPolylineModel ();
+		[NoAccessorMethod]
+		public double arrow_length { get; set; }
+		[NoAccessorMethod]
+		public double arrow_tip_length { get; set; }
+		[NoAccessorMethod]
+		public double arrow_width { get; set; }
+		[NoAccessorMethod]
+		public bool close_path { get; set; }
+		[NoAccessorMethod]
+		public bool end_arrow { get; set; }
+		[NoAccessorMethod]
+		public Goo.CanvasPoints points { get; set; }
+		[NoAccessorMethod]
+		public bool start_arrow { get; set; }
+	}
+	[CCode (cheader_filename = "goocanvas.h")]
+	public class CanvasRect : Goo.CanvasItemSimple, Goo.CanvasItem {
+		public Goo.CanvasRectData rect_data;
+		[CCode (cname = "goo_canvas_rect_new")]
+		public static weak Goo.CanvasRect create (Goo.CanvasItem? parent, double x, double y, double width, double height, ...);
+		public CanvasRect ();
+		[NoAccessorMethod]
+		public double height { get; set; }
+		[NoAccessorMethod]
+		public double radius_x { get; set; }
+		[NoAccessorMethod]
+		public double radius_y { get; set; }
+		[NoAccessorMethod]
+		public double width { get; set; }
+		[NoAccessorMethod]
+		public double x { get; set; }
+		[NoAccessorMethod]
+		public double y { get; set; }
+	}
+	[CCode (cheader_filename = "goocanvas.h")]
+	public class CanvasRectModel : Goo.CanvasItemModelSimple, Goo.CanvasItemModel {
+		public Goo.CanvasRectData rect_data;
+		[CCode (cname = "goo_canvas_rect_model_new")]
+		public static weak Goo.CanvasRectModel create (Goo.CanvasItemModel? parent, double x, double y, double width, double height, ...);
+		public CanvasRectModel ();
+		[NoAccessorMethod]
+		public double height { get; set; }
+		[NoAccessorMethod]
+		public double radius_x { get; set; }
+		[NoAccessorMethod]
+		public double radius_y { get; set; }
+		[NoAccessorMethod]
+		public double width { get; set; }
+		[NoAccessorMethod]
+		public double x { get; set; }
+		[NoAccessorMethod]
+		public double y { get; set; }
+	}
 	[CCode (cheader_filename = "goocanvas.h")]
 	public class CanvasStyle : GLib.Object {
 		public weak Goo.CanvasStyle parent;
@@ -638,6 +442,7 @@
 		public weak Goo.CanvasStyle copy ();
 		public weak Goo.CanvasStyle get_parent ();
 		public GLib.Value get_property (GLib.Quark property_id);
+		[CCode (has_construct_function = false)]
 		public CanvasStyle ();
 		public bool set_fill_options (Cairo.Context cr);
 		public void set_parent (Goo.CanvasStyle parent);
@@ -645,34 +450,127 @@
 		public bool set_stroke_options (Cairo.Context cr);
 	}
 	[CCode (cheader_filename = "goocanvas.h")]
+	public class CanvasTable : Goo.CanvasGroup, Goo.CanvasItem {
+		public Goo.CanvasTableData table_data;
+		[CCode (cname = "goo_canvas_table_new")]
+		public static weak Goo.CanvasTable create (Goo.CanvasItem? parent, ...);
+		public CanvasTable ();
+		[NoAccessorMethod]
+		public double column_spacing { get; set; }
+		[NoAccessorMethod]
+		public double height { get; set; }
+		[NoAccessorMethod]
+		public bool homogeneous_columns { get; set; }
+		[NoAccessorMethod]
+		public bool homogeneous_rows { get; set; }
+		[NoAccessorMethod]
+		public double row_spacing { get; set; }
+		[NoAccessorMethod]
+		public double width { get; set; }
+	}
+	[CCode (cheader_filename = "goocanvas.h")]
+	public class CanvasTableModel : Goo.CanvasGroupModel, Goo.CanvasItemModel {
+		public Goo.CanvasTableData table_data;
+		[CCode (cname = "goo_canvas_table_model_new")]
+		public static weak Goo.CanvasTableModel create (Goo.CanvasItemModel? parent, ...);
+		public CanvasTableModel ();
+		[NoAccessorMethod]
+		public double column_spacing { get; set; }
+		[NoAccessorMethod]
+		public double height { get; set; }
+		[NoAccessorMethod]
+		public bool homogeneous_columns { get; set; }
+		[NoAccessorMethod]
+		public bool homogeneous_rows { get; set; }
+		[NoAccessorMethod]
+		public double row_spacing { get; set; }
+		[NoAccessorMethod]
+		public double width { get; set; }
+	}
+	[CCode (cheader_filename = "goocanvas.h")]
+	public class CanvasText : Goo.CanvasItemSimple, Goo.CanvasItem {
+		public double layout_width;
+		public Goo.CanvasTextData text_data;
+		[CCode (cname = "goo_canvas_text_new")]
+		public static weak Goo.CanvasText create (Goo.CanvasItem? parent, string str, double x, double y, double width, Gtk.AnchorType anchor, ...);
+		public CanvasText ();
+		[NoAccessorMethod]
+		public Pango.Alignment alignment { get; set; }
+		[NoAccessorMethod]
+		public Gtk.AnchorType anchor { get; set; }
+		[NoAccessorMethod]
+		public Pango.EllipsizeMode ellipsize { get; set; }
+		[NoAccessorMethod]
+		public string text { get; set; }
+		[NoAccessorMethod]
+		public bool use_markup { get; set; }
+		[NoAccessorMethod]
+		public double width { get; set; }
+		[NoAccessorMethod]
+		public Pango.WrapMode wrap { get; set; }
+		[NoAccessorMethod]
+		public double x { get; set; }
+		[NoAccessorMethod]
+		public double y { get; set; }
+	}
+	[CCode (cheader_filename = "goocanvas.h")]
+	public class CanvasTextModel : Goo.CanvasItemModelSimple, Goo.CanvasItemModel {
+		public Goo.CanvasTextData text_data;
+		[CCode (cname = "goo_canvas_text_model_new")]
+		public static weak Goo.CanvasTextModel create (Goo.CanvasItemModel? parent, string str, double x, double y, double width, Gtk.AnchorType anchor, ...);
+		public CanvasTextModel ();
+		[NoAccessorMethod]
+		public Pango.Alignment alignment { get; set; }
+		[NoAccessorMethod]
+		public Gtk.AnchorType anchor { get; set; }
+		[NoAccessorMethod]
+		public Pango.EllipsizeMode ellipsize { get; set; }
+		[NoAccessorMethod]
+		public string text { get; set; }
+		[NoAccessorMethod]
+		public bool use_markup { get; set; }
+		[NoAccessorMethod]
+		public double width { get; set; }
+		[NoAccessorMethod]
+		public Pango.WrapMode wrap { get; set; }
+		[NoAccessorMethod]
+		public double x { get; set; }
+		[NoAccessorMethod]
+		public double y { get; set; }
+	}
+	[CCode (cheader_filename = "goocanvas.h")]
+	public class CanvasWidget : Goo.CanvasItemSimple, Goo.CanvasItem {
+		[CCode (cname = "goo_canvas_widget_new")]
+		public static weak Goo.CanvasWidget create (Goo.CanvasItem? parent, Gtk.Widget widget, double x, double y, double width, double height, ...);
+		public CanvasWidget ();
+		[NoAccessorMethod]
+		public Gtk.AnchorType anchor { get; set; }
+		[NoAccessorMethod]
+		public double height { get; set; }
+		[NoAccessorMethod]
+		public Gtk.Widget widget { get; set; }
+		[NoAccessorMethod]
+		public double width { get; set; }
+		[NoAccessorMethod]
+		public double x { get; set; }
+		[NoAccessorMethod]
+		public double y { get; set; }
+	}
+	[CCode (cheader_filename = "goocanvas.h")]
 	public interface CanvasItem : GLib.Object {
-		public void get_simple_transform (out double x, out double y, out double scale, out double rotation);
+		public abstract void add_child (Goo.CanvasItem child, int position);
+		public abstract void allocate_area (Cairo.Context cr, Goo.CanvasBounds requested_area, Goo.CanvasBounds allocated_area, double x_offset, double y_offset);
 		public void animate (double x, double y, double scale, double degrees, bool absolute, int duration, int step_time, Goo.CanvasAnimateType type);
 		public static weak GLib.ParamSpec class_find_child_property (GLib.ObjectClass iclass, string property_name);
 		public static void class_install_child_property (GLib.ObjectClass iclass, uint property_id, GLib.ParamSpec pspec);
 		public static weak GLib.ParamSpec class_list_child_properties (GLib.ObjectClass iclass, uint n_properties);
 		public void ensure_updated ();
 		public int find_child (Goo.CanvasItem child);
-		public void get_child_properties (Goo.CanvasItem child);
-		public void get_child_properties_valist (Goo.CanvasItem child, void* var_args);
-		public bool is_container ();
-		public void lower (Goo.CanvasItem below);
-		public void raise (Goo.CanvasItem above);
-		public void remove ();
-		public void rotate (double degrees, double cx, double cy);
-		public void scale (double sx, double sy);
-		public void set_child_properties (Goo.CanvasItem child);
-		public void set_child_properties_valist (Goo.CanvasItem child, void* var_args);
-		public void set_simple_transform (double x, double y, double scale, double rotation);
-		public void skew_x (double degrees, double cx, double cy);
-		public void skew_y (double degrees, double cx, double cy);
-		public void stop_animation ();
-		public void translate (double tx, double ty);
-		public abstract void add_child (Goo.CanvasItem child, int position);
-		public abstract void allocate_area (Cairo.Context cr, Goo.CanvasBounds requested_area, Goo.CanvasBounds allocated_area, double x_offset, double y_offset);
 		public abstract void get_bounds (Goo.CanvasBounds bounds);
 		public abstract weak Goo.Canvas get_canvas ();
 		public abstract weak Goo.CanvasItem get_child (int child_num);
+		public void get_child_properties (Goo.CanvasItem child);
+		public void get_child_properties_valist (Goo.CanvasItem child, void* var_args);
 		[NoWrapper]
 		public abstract void get_child_property (Goo.CanvasItem child, uint property_id, GLib.Value value, GLib.ParamSpec pspec);
 		public abstract weak GLib.List get_items_at (double x, double y, Cairo.Context cr, bool is_pointer_event, bool parent_is_visible, GLib.List found_items);
@@ -681,23 +579,37 @@
 		public abstract weak Goo.CanvasItem get_parent ();
 		public abstract bool get_requested_area (Cairo.Context cr, Goo.CanvasBounds requested_area);
 		public abstract double get_requested_height (Cairo.Context cr, double width);
+		public void get_simple_transform (out double x, out double y, out double scale, out double rotation);
 		public abstract weak Goo.CanvasStyle get_style ();
 		public abstract bool get_transform (Cairo.Matrix transform);
 		public abstract bool get_transform_for_child (Goo.CanvasItem child, Cairo.Matrix transform);
+		public bool is_container ();
 		public abstract bool is_visible ();
+		public void lower (Goo.CanvasItem below);
 		public abstract void move_child (int old_position, int new_position);
 		public abstract void paint (Cairo.Context cr, Goo.CanvasBounds bounds, double scale);
 		[NoWrapper]
 		public abstract bool query_tooltip (double x, double y, bool keyboard_tooltip, void* tooltip);
+		public void raise (Goo.CanvasItem above);
+		public void remove ();
 		public abstract void remove_child (int child_num);
 		public abstract void request_update ();
+		public void rotate (double degrees, double cx, double cy);
+		public void scale (double sx, double sy);
 		public abstract void set_canvas (Goo.Canvas canvas);
+		public void set_child_properties (Goo.CanvasItem child);
+		public void set_child_properties_valist (Goo.CanvasItem child, void* var_args);
 		[NoWrapper]
 		public abstract void set_child_property (Goo.CanvasItem child, uint property_id, GLib.Value value, GLib.ParamSpec pspec);
 		public abstract void set_model (Goo.CanvasItemModel model);
 		public abstract void set_parent (Goo.CanvasItem parent);
+		public void set_simple_transform (double x, double y, double scale, double rotation);
 		public abstract void set_style (Goo.CanvasStyle style);
 		public abstract void set_transform (Cairo.Matrix transform);
+		public void skew_x (double degrees, double cx, double cy);
+		public void skew_y (double degrees, double cx, double cy);
+		public void stop_animation ();
+		public void translate (double tx, double ty);
 		public abstract void update (bool entire_tree, Cairo.Context cr, Goo.CanvasBounds bounds);
 		public bool can_focus { get; set; }
 		public string description { get; set; }
@@ -721,44 +633,44 @@
 	}
 	[CCode (cheader_filename = "goocanvas.h")]
 	public interface CanvasItemModel : GLib.Object {
-		public void get_simple_transform (out double x, out double y, out double scale, out double rotation);
+		public abstract void add_child (Goo.CanvasItemModel child, int position);
 		public void animate (double x, double y, double scale, double degrees, bool absolute, int duration, int step_time, Goo.CanvasAnimateType type);
 		public static weak GLib.ParamSpec class_find_child_property (GLib.ObjectClass mclass, string property_name);
 		public static void class_install_child_property (GLib.ObjectClass mclass, uint property_id, GLib.ParamSpec pspec);
 		public static weak GLib.ParamSpec class_list_child_properties (GLib.ObjectClass mclass, uint n_properties);
-		public int find_child (Goo.CanvasItemModel child);
-		public void get_child_properties (Goo.CanvasItemModel child);
-		public void get_child_properties_valist (Goo.CanvasItemModel child, void* var_args);
-		public bool is_container ();
-		public void lower (Goo.CanvasItemModel below);
-		public void raise (Goo.CanvasItemModel above);
-		public void remove ();
-		public void rotate (double degrees, double cx, double cy);
-		public void scale (double sx, double sy);
-		public void set_child_properties (Goo.CanvasItemModel child);
-		public void set_child_properties_valist (Goo.CanvasItemModel child, void* var_args);
-		public void set_simple_transform (double x, double y, double scale, double rotation);
-		public void skew_x (double degrees, double cx, double cy);
-		public void skew_y (double degrees, double cx, double cy);
-		public void stop_animation ();
-		public void translate (double tx, double ty);
-		public abstract void add_child (Goo.CanvasItemModel child, int position);
 		[NoWrapper]
 		public abstract weak Goo.CanvasItem create_item (Goo.Canvas canvas);
+		public int find_child (Goo.CanvasItemModel child);
 		public abstract weak Goo.CanvasItemModel get_child (int child_num);
+		public void get_child_properties (Goo.CanvasItemModel child);
+		public void get_child_properties_valist (Goo.CanvasItemModel child, void* var_args);
 		[NoWrapper]
 		public abstract void get_child_property (Goo.CanvasItemModel child, uint property_id, GLib.Value value, GLib.ParamSpec pspec);
 		public abstract int get_n_children ();
 		public abstract weak Goo.CanvasItemModel get_parent ();
+		public void get_simple_transform (out double x, out double y, out double scale, out double rotation);
 		public abstract weak Goo.CanvasStyle get_style ();
 		public abstract bool get_transform (Cairo.Matrix transform);
+		public bool is_container ();
+		public void lower (Goo.CanvasItemModel below);
 		public abstract void move_child (int old_position, int new_position);
+		public void raise (Goo.CanvasItemModel above);
+		public void remove ();
 		public abstract void remove_child (int child_num);
+		public void rotate (double degrees, double cx, double cy);
+		public void scale (double sx, double sy);
+		public void set_child_properties (Goo.CanvasItemModel child);
+		public void set_child_properties_valist (Goo.CanvasItemModel child, void* var_args);
 		[NoWrapper]
 		public abstract void set_child_property (Goo.CanvasItemModel child, uint property_id, GLib.Value value, GLib.ParamSpec pspec);
 		public abstract void set_parent (Goo.CanvasItemModel parent);
+		public void set_simple_transform (double x, double y, double scale, double rotation);
 		public abstract void set_style (Goo.CanvasStyle style);
 		public abstract void set_transform (Cairo.Matrix transform);
+		public void skew_x (double degrees, double cx, double cy);
+		public void skew_y (double degrees, double cx, double cy);
+		public void stop_animation ();
+		public void translate (double tx, double ty);
 		public bool can_focus { get; set; }
 		public string description { get; set; }
 		public Goo.CanvasItemModel parent { get; set; }
@@ -773,6 +685,19 @@
 		public virtual signal void child_notify (GLib.ParamSpec pspec);
 		public virtual signal void child_removed (int child_num);
 	}
+	[CCode (type_id = "GOO_TYPE_CAIRO_LINE_DASH", cheader_filename = "goocanvas.h")]
+	public struct CairoLineDash {
+	}
+	[CCode (type_id = "GOO_TYPE_CAIRO_PATTERN", cheader_filename = "goocanvas.h")]
+	public struct CairoPattern {
+	}
+	[CCode (type_id = "GOO_TYPE_CANVAS_BOUNDS", cheader_filename = "goocanvas.h")]
+	public struct CanvasBounds {
+		public double x1;
+		public double x2;
+		public double y1;
+		public double y2;
+	}
 	[CCode (cheader_filename = "goocanvas.h")]
 	public struct CanvasEllipseData {
 		public double center_x;
@@ -782,26 +707,32 @@
 	}
 	[CCode (cheader_filename = "goocanvas.h")]
 	public struct CanvasImageData {
+		public double height;
 		public weak Cairo.Pattern pattern;
+		public double width;
 		public double x;
 		public double y;
-		public double width;
-		public double height;
 	}
 	[CCode (cheader_filename = "goocanvas.h")]
 	public struct CanvasItemSimpleData {
-		public weak Goo.CanvasStyle style;
-		public Cairo.Matrix transform;
-		public weak GLib.Array clip_path_commands;
-		public weak string tooltip;
-		public double visibility_threshold;
-		public uint visibility;
-		public uint pointer_events;
+		public uint cache_setting;
 		public uint can_focus;
-		public uint own_style;
 		public uint clip_fill_rule;
-		public uint cache_setting;
+		public weak GLib.Array clip_path_commands;
 		public uint has_tooltip;
+		public uint own_style;
+		public uint pointer_events;
+		public weak Goo.CanvasStyle style;
+		public weak string tooltip;
+		public Cairo.Matrix transform;
+		public uint visibility;
+		public double visibility_threshold;
+	}
+	[CCode (cheader_filename = "goocanvas.h")]
+	public struct CanvasPathCommand {
+		public void* arc;
+		public void* curve;
+		public void* simple;
 	}
 	[CCode (cheader_filename = "goocanvas.h")]
 	public struct CanvasPathData {
@@ -809,36 +740,36 @@
 	}
 	[CCode (cheader_filename = "goocanvas.h")]
 	public struct CanvasPolylineArrowData {
-		public double arrow_width;
 		public double arrow_length;
 		public double arrow_tip_length;
+		public double arrow_width;
 		[NoArrayLength]
-		public weak double[] line_start;
+		public weak double[] end_arrow_coords;
 		[NoArrayLength]
 		public weak double[] line_end;
 		[NoArrayLength]
-		public weak double[] start_arrow_coords;
+		public weak double[] line_start;
 		[NoArrayLength]
-		public weak double[] end_arrow_coords;
+		public weak double[] start_arrow_coords;
 	}
 	[CCode (cheader_filename = "goocanvas.h")]
 	public struct CanvasPolylineData {
-		public double coords;
 		public Goo.CanvasPolylineArrowData arrow_data;
-		public uint num_points;
 		public uint close_path;
-		public uint start_arrow;
+		public double coords;
 		public uint end_arrow;
+		public uint num_points;
 		public uint reconfigure_arrows;
+		public uint start_arrow;
 	}
 	[CCode (cheader_filename = "goocanvas.h")]
 	public struct CanvasRectData {
-		public double x;
-		public double y;
-		public double width;
 		public double height;
 		public double radius_x;
 		public double radius_y;
+		public double width;
+		public double x;
+		public double y;
 	}
 	[CCode (cheader_filename = "goocanvas.h")]
 	public struct CanvasStyleProperty {
@@ -847,54 +778,126 @@
 	}
 	[CCode (cheader_filename = "goocanvas.h")]
 	public struct CanvasTableData {
-		public double width;
-		public double height;
-		[NoArrayLength]
-		public weak Goo.CanvasTableDimension[] dimensions;
 		public double border_width;
 		public weak GLib.Array children;
+		[NoArrayLength]
+		public weak Goo.CanvasTableDimension[] dimensions;
+		public double height;
 		public Goo.CanvasTableLayoutData layout_data;
+		public double width;
 	}
 	[CCode (cheader_filename = "goocanvas.h")]
 	public struct CanvasTableDimension {
-		public int size;
 		public double default_spacing;
-		public double spacings;
 		public uint homogeneous;
+		public int size;
+		public double spacings;
 	}
 	[CCode (cheader_filename = "goocanvas.h")]
 	public struct CanvasTableLayoutData {
 	}
 	[CCode (cheader_filename = "goocanvas.h")]
 	public struct CanvasTextData {
-		public weak string text;
-		public double x;
-		public double y;
-		public double width;
-		public uint use_markup;
-		public uint anchor;
 		public uint alignment;
+		public uint anchor;
 		public uint ellipsize;
+		public weak string text;
+		public uint use_markup;
+		public double width;
 		public uint wrap;
+		public double x;
+		public double y;
 	}
-	[CCode (type_id = "GOO_TYPE_CAIRO_LINE_DASH", cheader_filename = "goocanvas.h")]
-	public struct CairoLineDash {
+	[CCode (cprefix = "CAIRO_ANTIALIAS_", has_type_id = "0", cheader_filename = "goocanvas.h")]
+	public enum CairoAntialias {
+		DEFAULT,
+		NONE,
+		GRAY,
+		SUBPIXEL
 	}
-	[CCode (type_id = "GOO_TYPE_CAIRO_PATTERN", cheader_filename = "goocanvas.h")]
-	public struct CairoPattern {
+	[CCode (cprefix = "CAIRO_FILL_RULE_", has_type_id = "0", cheader_filename = "goocanvas.h")]
+	public enum CairoFillRule {
+		WINDING,
+		EVEN_ODD
 	}
-	[CCode (type_id = "GOO_TYPE_CANVAS_BOUNDS", cheader_filename = "goocanvas.h")]
-	public struct CanvasBounds {
-		public double x1;
-		public double y1;
-		public double x2;
-		public double y2;
+	[CCode (cprefix = "CAIRO_HINT_METRICS_", has_type_id = "0", cheader_filename = "goocanvas.h")]
+	public enum CairoHintMetrics {
+		DEFAULT,
+		OFF,
+		ON
 	}
-	[CCode (cheader_filename = "goocanvas.h")]
-	public struct CanvasPathCommand {
-		public void* simple;
-		public void* curve;
-		public void* arc;
+	[CCode (cprefix = "CAIRO_LINE_CAP_", has_type_id = "0", cheader_filename = "goocanvas.h")]
+	public enum CairoLineCap {
+		BUTT,
+		ROUND,
+		SQUARE
+	}
+	[CCode (cprefix = "CAIRO_LINE_JOIN_", has_type_id = "0", cheader_filename = "goocanvas.h")]
+	public enum CairoLineJoin {
+		MITER,
+		ROUND,
+		BEVEL
+	}
+	[CCode (cprefix = "CAIRO_OPERATOR_", has_type_id = "0", cheader_filename = "goocanvas.h")]
+	public enum CairoOperator {
+		CLEAR,
+		SOURCE,
+		OVER,
+		IN,
+		OUT,
+		ATOP,
+		DEST,
+		DEST_OVER,
+		DEST_IN,
+		DEST_OUT,
+		DEST_ATOP,
+		XOR,
+		ADD,
+		SATURATE
+	}
+	[CCode (cprefix = "GOO_CANVAS_ANIMATE_", has_type_id = "0", cheader_filename = "goocanvas.h")]
+	public enum CanvasAnimateType {
+		FREEZE,
+		RESET,
+		RESTART,
+		BOUNCE
+	}
+	[CCode (cprefix = "GOO_CANVAS_ITEM_", has_type_id = "0", cheader_filename = "goocanvas.h")]
+	public enum CanvasItemVisibility {
+		HIDDEN,
+		INVISIBLE,
+		VISIBLE,
+		VISIBLE_ABOVE_THRESHOLD
+	}
+	[CCode (cprefix = "GOO_CANVAS_PATH_", has_type_id = "0", cheader_filename = "goocanvas.h")]
+	public enum CanvasPathCommandType {
+		MOVE_TO,
+		CLOSE_PATH,
+		LINE_TO,
+		HORIZONTAL_LINE_TO,
+		VERTICAL_LINE_TO,
+		CURVE_TO,
+		SMOOTH_CURVE_TO,
+		QUADRATIC_CURVE_TO,
+		SMOOTH_QUADRATIC_CURVE_TO,
+		ELLIPTICAL_ARC
+	}
+	[CCode (cprefix = "GOO_CANVAS_EVENTS_", has_type_id = "0", cheader_filename = "goocanvas.h")]
+	[Flags]
+	public enum CanvasPointerEvents {
+		VISIBLE_MASK,
+		PAINTED_MASK,
+		FILL_MASK,
+		STROKE_MASK,
+		NONE,
+		VISIBLE_PAINTED,
+		VISIBLE_FILL,
+		VISIBLE_STROKE,
+		VISIBLE,
+		PAINTED,
+		FILL,
+		STROKE,
+		ALL
 	}
 	[CCode (cheader_filename = "goocanvas.h")]
 	public const int NUM_ARROW_POINTS;

Modified: trunk/vapi/gstreamer-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-0.10.vapi	Fri Oct 24 16:50:22 2008
@@ -2,564 +2,676 @@
 
 [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
 namespace Gst {
-	[CCode (cprefix = "GST_ACTIVATE_", cheader_filename = "gst/gst.h")]
-	public enum ActivateMode {
-		NONE,
-		PUSH,
-		PULL
-	}
-	[CCode (cprefix = "GST_BUFFERING_", cheader_filename = "gst/gst.h")]
-	public enum BufferingMode {
-		STREAM,
-		DOWNLOAD,
-		TIMESHIFT,
-		LIVE
-	}
-	[CCode (cprefix = "GST_BUS_", cheader_filename = "gst/gst.h")]
-	public enum BusSyncReply {
-		DROP,
-		PASS,
-		ASYNC
+	[Compact]
+	[CCode (cheader_filename = "gst/gst.h")]
+	public class AllocTrace {
+		public int flags;
+		public int live;
+		public weak GLib.SList mem_live;
+		public weak string name;
+		public static bool available ();
+		public static weak Gst.AllocTrace get (string name);
+		public static weak GLib.List list ();
+		public static int live_all ();
+		public void print ();
+		public static void print_all ();
+		public static void print_live ();
+		public void set_flags (Gst.AllocTraceFlags flags);
+		public static void set_flags_all (Gst.AllocTraceFlags flags);
 	}
-	[CCode (cprefix = "GST_CLOCK_ENTRY_", cheader_filename = "gst/gst.h")]
-	public enum ClockEntryType {
-		SINGLE,
-		PERIODIC
+	[CCode (cheader_filename = "gst/gst.h")]
+	public class Bin : Gst.Element, Gst.ChildProxy {
+		public weak Gst.Bus child_bus;
+		public weak GLib.List children;
+		public uint children_cookie;
+		public bool clock_dirty;
+		public weak Gst.Element clock_provider;
+		public weak GLib.List messages;
+		public int numchildren;
+		public bool polling;
+		public weak Gst.Clock provided_clock;
+		public bool state_dirty;
+		public bool add (Gst.Element# element);
+		[NoWrapper]
+		public virtual bool add_element (Gst.Element element);
+		public void add_many (Gst.Element element_1, ...);
+		public weak Gst.Pad find_unconnected_pad (Gst.PadDirection direction);
+		public weak Gst.Element get_by_interface (GLib.Type iface);
+		public weak Gst.Element get_by_name (string name);
+		public weak Gst.Element get_by_name_recurse_up (string name);
+		[NoWrapper]
+		public virtual void handle_message (Gst.Message message);
+		public weak Gst.Iterator iterate_all_by_interface (GLib.Type iface);
+		public weak Gst.Iterator iterate_elements ();
+		public weak Gst.Iterator iterate_recurse ();
+		public weak Gst.Iterator iterate_sinks ();
+		public weak Gst.Iterator iterate_sorted ();
+		public weak Gst.Iterator iterate_sources ();
+		[CCode (type = "GstElement*", has_construct_function = false)]
+		public Bin (string name);
+		public bool remove (Gst.Element element);
+		[NoWrapper]
+		public virtual bool remove_element (Gst.Element element);
+		public void remove_many (Gst.Element element_1, ...);
+		[NoAccessorMethod]
+		public bool async_handling { get; set; }
+		public virtual signal void element_added (Gst.Element child);
+		public virtual signal void element_removed (Gst.Element child);
 	}
-	[CCode (cprefix = "GST_CLOCK_", cheader_filename = "gst/gst.h")]
-	public enum ClockReturn {
-		OK,
-		EARLY,
-		UNSCHEDULED,
-		BUSY,
-		BADTIME,
-		ERROR,
-		UNSUPPORTED
+	[CCode (ref_function = "gst_buffer_ref", unref_function = "gst_buffer_unref", cheader_filename = "gst/gst.h")]
+	public class Buffer : Gst.MiniObject {
+		public weak Gst.Caps caps;
+		[NoArrayLength]
+		public weak uchar[] data;
+		public Gst.ClockTime duration;
+		public uchar malloc_data;
+		public uint64 offset;
+		public uint64 offset_end;
+		public uint size;
+		public Gst.ClockTime timestamp;
+		[CCode (has_construct_function = false)]
+		public Buffer.and_alloc (uint size);
+		public void copy_metadata (Gst.Buffer src, Gst.BufferCopyFlags flags);
+		public weak Gst.Buffer create_sub (uint offset, uint size);
+		[CCode (cname = "GST_BUFFER_FLAG_SET")]
+		public void flag_set (Gst.BufferFlag flag);
+		[CCode (cname = "GST_BUFFER_FLAG_UNSET")]
+		public void flag_unset (Gst.BufferFlag flag);
+		public weak Gst.Caps get_caps ();
+		public bool is_metadata_writable ();
+		public bool is_span_fast (Gst.Buffer buf2);
+		public weak Gst.Buffer join (Gst.Buffer buf2);
+		public weak Gst.Buffer make_metadata_writable ();
+		public weak Gst.Buffer merge (Gst.Buffer buf2);
+		public Buffer ();
+		public weak Gst.Buffer @ref ();
+		public void set_caps (Gst.Caps caps);
+		public weak Gst.Buffer span (uint offset, Gst.Buffer buf2, uint len);
+		public void stamp (Gst.Buffer src);
+		public static Gst.Buffer try_new_and_alloc (uint size);
+		public void unref ();
 	}
-	[CCode (cprefix = "GST_CORE_ERROR_", cheader_filename = "gst/gst.h")]
-	public enum CoreError {
-		FAILED,
-		TOO_LAZY,
-		NOT_IMPLEMENTED,
-		STATE_CHANGE,
-		PAD,
-		THREAD,
-		NEGOTIATION,
-		EVENT,
-		SEEK,
-		CAPS,
-		TAG,
-		MISSING_PLUGIN,
-		CLOCK,
-		DISABLED,
-		NUM_ERRORS
+	[Compact]
+	[CCode (cheader_filename = "gst/gst.h")]
+	public class BufferClass : Gst.MiniObjectClass {
 	}
-	[CCode (cprefix = "GST_DEBUG_", cheader_filename = "gst/gst.h")]
-	public enum DebugColorFlags {
-		FG_BLACK,
-		FG_RED,
-		FG_GREEN,
-		FG_YELLOW,
-		FG_BLUE,
-		FG_MAGENTA,
-		FG_CYAN,
-		FG_WHITE,
-		BG_BLACK,
-		BG_RED,
-		BG_GREEN,
-		BG_YELLOW,
-		BG_BLUE,
-		BG_MAGENTA,
-		BG_CYAN,
-		BG_WHITE,
-		BOLD,
-		UNDERLINE
+	[CCode (cheader_filename = "gst/gst.h")]
+	public class Bus : Gst.Object {
+		public uint num_signal_watchers;
+		public weak GLib.Queue queue;
+		public weak GLib.Mutex queue_lock;
+		public uint signal_watch_id;
+		public weak Gst.BusSyncHandler sync_handler;
+		public void* sync_handler_data;
+		public void add_signal_watch ();
+		public void add_signal_watch_full (int priority);
+		public uint add_watch (Gst.BusFunc func);
+		public uint add_watch_full (int priority, Gst.BusFunc# func);
+		public bool async_signal_func (Gst.Message message, void* data);
+		public weak GLib.TimeoutSource create_watch ();
+		public void disable_sync_message_emission ();
+		public void enable_sync_message_emission ();
+		public bool have_pending ();
+		[CCode (has_construct_function = false)]
+		public Bus ();
+		public weak Gst.Message peek ();
+		public weak Gst.Message poll (Gst.MessageType events, Gst.ClockTimeDiff timeout);
+		public weak Gst.Message pop ();
+		public weak Gst.Message pop_filtered (Gst.MessageType types);
+		public bool post (Gst.Message message);
+		public void remove_signal_watch ();
+		public void set_flushing (bool flushing);
+		public void set_sync_handler (Gst.BusSyncHandler func);
+		public Gst.BusSyncReply sync_signal_handler (Gst.Message message, void* data);
+		public weak Gst.Message timed_pop (Gst.ClockTime timeout);
+		public weak Gst.Message timed_pop_filtered (Gst.ClockTime timeout, Gst.MessageType types);
+		public virtual signal void message (Gst.Message message);
+		public virtual signal void sync_message (Gst.Message message);
 	}
-	[CCode (cprefix = "GST_LEVEL_", cheader_filename = "gst/gst.h")]
-	public enum DebugLevel {
-		NONE,
-		ERROR,
-		WARNING,
-		INFO,
-		DEBUG,
-		LOG,
-		COUNT
+	[CCode (ref_function = "gst_caps_ref", unref_function = "gst_caps_unref", cheader_filename = "gst/gst.h")]
+	public class Caps {
+		public Gst.CapsFlags flags;
+		public int refcount;
+		public weak GLib.PtrArray structs;
+		public GLib.Type type;
+		[CCode (has_construct_function = false)]
+		public Caps.any ();
+		public void append (Gst.Caps caps2);
+		public void append_structure (Gst.Structure structure);
+		public weak Gst.Caps copy ();
+		public weak Gst.Caps copy_nth (uint nth);
+		public bool do_simplify ();
+		[CCode (has_construct_function = false)]
+		public Caps.empty ();
+		public static weak Gst.Caps from_string (string str);
+		[CCode (has_construct_function = false)]
+		public Caps.full (Gst.Structure struct1, ...);
+		[CCode (has_construct_function = false)]
+		public Caps.full_valist (Gst.Structure structure, void* var_args);
+		public uint get_size ();
+		public weak Gst.Structure get_structure (uint index);
+		public weak Gst.Caps intersect (Gst.Caps caps2);
+		public bool is_always_compatible (Gst.Caps caps2);
+		public bool is_any ();
+		public bool is_empty ();
+		public bool is_equal (Gst.Caps caps2);
+		public bool is_equal_fixed (Gst.Caps caps2);
+		public bool is_fixed ();
+		public bool is_subset (Gst.Caps superset);
+		public static weak Gst.Caps load_thyself (void* parent);
+		public weak Gst.Caps make_writable ();
+		public void merge (Gst.Caps caps2);
+		public void merge_structure (Gst.Structure structure);
+		public Caps ();
+		public weak Gst.Caps normalize ();
+		public weak Gst.Caps @ref ();
+		public void remove_structure (uint idx);
+		public void replace (Gst.Caps newcaps);
+		public void* save_thyself (void* parent);
+		public void set_simple (string field, ...);
+		public void set_simple_valist (string field, void* varargs);
+		[CCode (has_construct_function = false)]
+		public Caps.simple (string media_type, string fieldname, ...);
+		public weak Gst.Caps subtract (Gst.Caps subtrahend);
+		public weak string to_string ();
+		public void truncate ();
+		public Gst.Caps union (Gst.Caps caps2);
+		public void unref ();
 	}
-	[CCode (cprefix = "GST_EVENT_", cheader_filename = "gst/gst.h")]
-	public enum EventType {
-		UNKNOWN,
-		FLUSH_START,
-		FLUSH_STOP,
-		EOS,
-		NEWSEGMENT,
-		TAG,
-		BUFFERSIZE,
-		QOS,
-		SEEK,
-		NAVIGATION,
-		LATENCY,
-		CUSTOM_UPSTREAM,
-		CUSTOM_DOWNSTREAM,
-		CUSTOM_DOWNSTREAM_OOB,
-		CUSTOM_BOTH,
-		CUSTOM_BOTH_OOB
-	}
-	[CCode (cprefix = "GST_FLOW_", cheader_filename = "gst/gst.h")]
-	public enum FlowReturn {
-		CUSTOM_SUCCESS,
-		RESEND,
-		OK,
-		NOT_LINKED,
-		WRONG_STATE,
-		UNEXPECTED,
-		NOT_NEGOTIATED,
-		ERROR,
-		NOT_SUPPORTED,
-		CUSTOM_ERROR
-	}
-	[CCode (cprefix = "GST_FORMAT_", cheader_filename = "gst/gst.h")]
-	public enum Format {
-		UNDEFINED,
-		DEFAULT,
-		BYTES,
-		TIME,
-		BUFFERS,
-		PERCENT
-	}
-	[CCode (cprefix = "GST_INDEX_", cheader_filename = "gst/gst.h")]
-	public enum IndexCertainty {
-		UNKNOWN,
-		CERTAIN,
-		FUZZY
-	}
-	[CCode (cprefix = "GST_INDEX_ENTRY_", cheader_filename = "gst/gst.h")]
-	public enum IndexEntryType {
-		ID,
-		ASSOCIATION,
-		OBJECT,
-		FORMAT
-	}
-	[CCode (cprefix = "GST_INDEX_LOOKUP_", cheader_filename = "gst/gst.h")]
-	public enum IndexLookupMethod {
-		EXACT,
-		BEFORE,
-		AFTER
-	}
-	[CCode (cprefix = "GST_INDEX_RESOLVER_", cheader_filename = "gst/gst.h")]
-	public enum IndexResolverMethod {
-		CUSTOM,
-		GTYPE,
-		PATH
-	}
-	[CCode (cprefix = "GST_ITERATOR_ITEM_", cheader_filename = "gst/gst.h")]
-	public enum IteratorItem {
-		SKIP,
-		PASS,
-		END
-	}
-	[CCode (cprefix = "GST_ITERATOR_", cheader_filename = "gst/gst.h")]
-	public enum IteratorResult {
-		DONE,
-		OK,
-		RESYNC,
-		ERROR
-	}
-	[CCode (cprefix = "GST_LIBRARY_ERROR_", cheader_filename = "gst/gst.h")]
-	public enum LibraryError {
-		FAILED,
-		TOO_LAZY,
-		INIT,
-		SHUTDOWN,
-		SETTINGS,
-		ENCODE,
-		NUM_ERRORS
-	}
-	[CCode (cprefix = "GST_PAD_", cheader_filename = "gst/gst.h")]
-	public enum PadDirection {
-		UNKNOWN,
-		SRC,
-		SINK
-	}
-	[CCode (cprefix = "GST_PAD_LINK_", cheader_filename = "gst/gst.h")]
-	public enum PadLinkReturn {
-		OK,
-		WRONG_HIERARCHY,
-		WAS_LINKED,
-		WRONG_DIRECTION,
-		NOFORMAT,
-		NOSCHED,
-		REFUSED
+	[CCode (cheader_filename = "gst/gst.h")]
+	public class Clock : Gst.Object {
+		public weak Gst.ClockID clockid;
+		public weak GLib.List entries;
+		public weak GLib.Cond entries_changed;
+		public Gst.ClockTime external_calibration;
+		public bool filling;
+		public Gst.ClockTime internal_calibration;
+		public Gst.ClockTime last_time;
+		public weak Gst.Clock master;
+		public Gst.ClockTime rate_denominator;
+		public Gst.ClockTime rate_numerator;
+		public Gst.ClockTime resolution;
+		public weak GLib.Mutex slave_lock;
+		public int time_index;
+		public Gst.ClockTime times;
+		public bool add_observation (Gst.ClockTime slave, Gst.ClockTime master, double r_squared);
+		public Gst.ClockTime adjust_unlocked (Gst.ClockTime internal);
+		[NoWrapper]
+		public virtual Gst.ClockTime change_resolution (Gst.ClockTime old_resolution, Gst.ClockTime new_resolution);
+		public void get_calibration (Gst.ClockTime internal, Gst.ClockTime external, Gst.ClockTime rate_num, Gst.ClockTime rate_denom);
+		public virtual Gst.ClockTime get_internal_time ();
+		public weak Gst.Clock get_master ();
+		public virtual Gst.ClockTime get_resolution ();
+		public Gst.ClockTime get_time ();
+		[CCode (type = "GstClockID", has_construct_function = false)]
+		public Clock.periodic_id (Gst.Clock clock, Gst.ClockTime start_time, Gst.ClockTime interval);
+		public void set_calibration (Gst.ClockTime internal, Gst.ClockTime external, Gst.ClockTime rate_num, Gst.ClockTime rate_denom);
+		public bool set_master (Gst.Clock master);
+		public Gst.ClockTime set_resolution (Gst.ClockTime resolution);
+		[CCode (type = "GstClockID", has_construct_function = false)]
+		public Clock.single_shot_id (Gst.Clock clock, Gst.ClockTime time);
+		public Gst.ClockTime unadjust_unlocked (Gst.ClockTime external);
+		[NoWrapper]
+		public virtual void unschedule (Gst.ClockEntry entry);
+		[NoWrapper]
+		public virtual Gst.ClockReturn wait (Gst.ClockEntry entry);
+		[NoWrapper]
+		public virtual Gst.ClockReturn wait_async (Gst.ClockEntry entry);
+		[NoWrapper]
+		public virtual Gst.ClockReturn wait_jitter (Gst.ClockEntry entry, Gst.ClockTimeDiff jitter);
+		[NoAccessorMethod]
+		public bool stats { get; set; }
+		[NoAccessorMethod]
+		public uint64 timeout { get; set; }
+		[NoAccessorMethod]
+		public int window_size { get; set; }
+		[NoAccessorMethod]
+		public int window_threshold { get; set; }
 	}
-	[CCode (cprefix = "GST_PAD_", cheader_filename = "gst/gst.h")]
-	public enum PadPresence {
-		ALWAYS,
-		SOMETIMES,
-		REQUEST
+	[Compact]
+	[CCode (cheader_filename = "gst/gst.h")]
+	public class ClockEntry {
+		public weak Gst.Clock clock;
+		public weak Gst.ClockCallback func;
+		public Gst.ClockTime interval;
+		public int refcount;
+		public Gst.ClockReturn status;
+		public Gst.ClockTime time;
+		public Gst.ClockEntryType type;
+		public void* user_data;
 	}
-	[CCode (cprefix = "GST_PARSE_ERROR_", cheader_filename = "gst/gst.h")]
-	public enum ParseError {
-		SYNTAX,
-		NO_SUCH_ELEMENT,
-		NO_SUCH_PROPERTY,
-		LINK,
-		COULD_NOT_SET_PROPERTY,
-		EMPTY_BIN,
-		EMPTY
+	[Compact]
+	[CCode (ref_function = "gst_clock_id_ref", unref_function = "gst_clock_id_unref", cheader_filename = "gst/gst.h")]
+	public class ClockID {
+		public static int compare_func (void* id1, void* id2);
+		public Gst.ClockTime get_time ();
+		public void unschedule ();
+		public Gst.ClockReturn wait (Gst.ClockTimeDiff jitter);
+		public Gst.ClockReturn wait_async (Gst.ClockCallback func);
 	}
-	[CCode (cprefix = "GST_PLUGIN_ERROR_", cheader_filename = "gst/gst.h")]
-	public enum PluginError {
-		MODULE,
-		DEPENDENCIES,
-		NAME_MISMATCH
+	[Compact]
+	[CCode (cheader_filename = "gst/gst.h")]
+	public class Date {
 	}
-	[CCode (cprefix = "GST_QUERY_", cheader_filename = "gst/gst.h")]
-	public enum QueryType {
-		NONE,
-		POSITION,
-		DURATION,
-		LATENCY,
-		JITTER,
-		RATE,
-		SEEKING,
-		SEGMENT,
-		CONVERT,
-		FORMATS,
-		BUFFERING
+	[Compact]
+	[CCode (cheader_filename = "gst/gst.h")]
+	public class DebugCategory {
+		public uint color;
+		public weak string description;
+		public weak string name;
+		public int threshold;
+		[CCode (cname = "GST_CAT_DEBUG")]
+		public void debug (string format, ...);
+		[CCode (cname = "GST_CAT_DEBUG_OBJECT")]
+		public void debug_object (GLib.Object obj, string format, ...);
+		[CCode (cname = "GST_CAT_ERROR")]
+		public void error (string format, ...);
+		[CCode (cname = "GST_CAT_ERROR_OBJECT")]
+		public void error_object (GLib.Object obj, string format, ...);
+		public uint get_color ();
+		public weak string get_description ();
+		public weak string get_name ();
+		public Gst.DebugLevel get_threshold ();
+		[CCode (cname = "GST_CAT_INFO")]
+		public void info (string format, ...);
+		[CCode (cname = "GST_CAT_INFO_OBJECT")]
+		public void info_object (GLib.Object obj, string format, ...);
+		[CCode (cname = "GST_DEBUG_CATEGORY_INIT")]
+		public void init (string name, uint color, string description);
+		[CCode (cname = "GST_CAT_LOG")]
+		public void log (string format, ...);
+		[CCode (cname = "GST_CAT_LOG_OBJECT")]
+		public void log_object (GLib.Object obj, string format, ...);
+		public DebugCategory ();
+		public void reset_threshold ();
+		public void set_threshold (Gst.DebugLevel level);
+		[CCode (cname = "GST_CAT_WARNING")]
+		public void warning (string format, ...);
+		[CCode (cname = "GST_CAT_WARNING_OBJECT")]
+		public void warning_object (GLib.Object obj, string format, ...);
 	}
-	[CCode (cprefix = "GST_RANK_", cheader_filename = "gst/gst.h")]
-	public enum Rank {
-		NONE,
-		MARGINAL,
-		SECONDARY,
-		PRIMARY
+	[Compact]
+	[CCode (cheader_filename = "gst/gst.h")]
+	public class DebugMessage {
+		public weak string get ();
 	}
-	[CCode (cprefix = "GST_RESOURCE_ERROR_", cheader_filename = "gst/gst.h")]
-	public enum ResourceError {
-		FAILED,
-		TOO_LAZY,
-		NOT_FOUND,
-		BUSY,
-		OPEN_READ,
-		OPEN_WRITE,
-		OPEN_READ_WRITE,
-		CLOSE,
-		READ,
-		WRITE,
-		SEEK,
-		SYNC,
-		SETTINGS,
-		NO_SPACE_LEFT,
-		NUM_ERRORS
-	}
-	[CCode (cprefix = "GST_SEEK_TYPE_", cheader_filename = "gst/gst.h")]
-	public enum SeekType {
-		NONE,
-		CUR,
-		SET,
-		END
-	}
-	[CCode (cprefix = "GST_STATE_", cheader_filename = "gst/gst.h")]
-	public enum State {
-		VOID_PENDING,
-		NULL,
-		READY,
-		PAUSED,
-		PLAYING
-	}
-	[CCode (cprefix = "GST_STATE_CHANGE_", cheader_filename = "gst/gst.h")]
-	public enum StateChange {
-		NULL_TO_READY,
-		READY_TO_PAUSED,
-		PAUSED_TO_PLAYING,
-		PLAYING_TO_PAUSED,
-		PAUSED_TO_READY,
-		READY_TO_NULL
-	}
-	[CCode (cprefix = "GST_STATE_CHANGE_", cheader_filename = "gst/gst.h")]
-	public enum StateChangeReturn {
-		FAILURE,
-		SUCCESS,
-		ASYNC,
-		NO_PREROLL
+	[CCode (cheader_filename = "gst/gst.h")]
+	public class Element : Gst.Object {
+		public void* abidata;
+		public Gst.ClockTimeDiff base_time;
+		public weak Gst.Bus bus;
+		public weak Gst.Clock clock;
+		public Gst.State current_state;
+		public Gst.StateChangeReturn last_return;
+		public Gst.State next_state;
+		public ushort numpads;
+		public ushort numsinkpads;
+		public ushort numsrcpads;
+		public weak GLib.List pads;
+		public uint pads_cookie;
+		public Gst.State pending_state;
+		public weak GLib.List sinkpads;
+		public weak GLib.List srcpads;
+		public weak GLib.Cond state_cond;
+		public uint state_cookie;
+		public GLib.StaticRecMutex state_lock;
+		public void abort_state ();
+		public bool add_pad (Gst.Pad# pad);
+		[CCode (cname = "gst_element_class_add_pad_template")]
+		public class void add_pad_template (Gst.PadTemplate templ);
+		public virtual Gst.StateChangeReturn change_state (Gst.StateChange transition);
+		public Gst.StateChangeReturn continue_state (Gst.StateChangeReturn ret);
+		public void create_all_pads ();
+		public void found_tags (Gst.TagList list);
+		public void found_tags_for_pad (Gst.Pad pad, Gst.TagList list);
+		public Gst.ClockTime get_base_time ();
+		public Gst.Bus get_bus ();
+		public weak Gst.Clock get_clock ();
+		public weak Gst.Pad get_compatible_pad (Gst.Pad pad, Gst.Caps caps);
+		public weak Gst.PadTemplate get_compatible_pad_template (Gst.PadTemplate compattempl);
+		public weak Gst.ElementFactory get_factory ();
+		public virtual weak Gst.Index get_index ();
+		public weak Gst.Pad get_pad (string name);
+		[CCode (cname = "gst_element_class_get_pad_template")]
+		public class weak Gst.PadTemplate get_pad_template (string name);
+		[CCode (cname = "gst_element_class_get_pad_template_list")]
+		public class weak GLib.List get_pad_template_list ();
+		public virtual Gst.QueryType get_query_types ();
+		public weak Gst.Pad get_request_pad (string name);
+		public virtual Gst.StateChangeReturn get_state (out Gst.State state, out Gst.State pending, Gst.ClockTime timeout);
+		public weak Gst.Pad get_static_pad (string name);
+		public bool implements_interface (GLib.Type iface_type);
+		[CCode (cname = "gst_element_class_install_std_props")]
+		public class void install_std_props (...);
+		public bool is_indexable ();
+		public bool is_locked_state ();
+		public weak Gst.Iterator iterate_pads ();
+		public weak Gst.Iterator iterate_sink_pads ();
+		public weak Gst.Iterator iterate_src_pads ();
+		public bool link (Gst.Element dest);
+		public bool link_filtered (Gst.Element dest, Gst.Caps filter);
+		public bool link_many (Gst.Element element_2, ...);
+		public bool link_pads (string srcpadname, Gst.Element dest, string destpadname);
+		public bool link_pads_filtered (string srcpadname, Gst.Element dest, string destpadname, Gst.Caps filter);
+		public void lost_state ();
+		public static weak Gst.Element make_from_uri (Gst.URIType type, string uri, string elementname);
+		public void message_full (Gst.MessageType type, GLib.Quark domain, int code, string text, string debug, string file, string function, int line);
+		public bool post_message (Gst.Message message);
+		public virtual weak Gst.Clock provide_clock ();
+		public bool provides_clock ();
+		public virtual bool query (Gst.Query query);
+		public bool query_convert (Gst.Format src_format, int64 src_val, Gst.Format dest_format, int64 dest_val);
+		public bool query_duration (ref Gst.Format format, out int64 duration);
+		public bool query_position (ref Gst.Format format, out int64 cur);
+		public static bool register (Gst.Plugin plugin, string name, uint rank, GLib.Type type);
+		[NoWrapper]
+		public virtual void release_pad (Gst.Pad pad);
+		public void release_request_pad (Gst.Pad pad);
+		public bool remove_pad (Gst.Pad pad);
+		[NoWrapper]
+		public virtual weak Gst.Pad request_new_pad (Gst.PadTemplate templ, string name);
+		public bool requires_clock ();
+		public bool seek (double rate, Gst.Format format, Gst.SeekFlags flags, Gst.SeekType cur_type, int64 cur, Gst.SeekType stop_type, int64 stop);
+		public bool seek_simple (Gst.Format format, Gst.SeekFlags seek_flags, int64 seek_pos);
+		public virtual bool send_event (Gst.Event# event);
+		public void set_base_time (Gst.ClockTime time);
+		public virtual void set_bus (Gst.Bus bus);
+		public virtual bool set_clock (Gst.Clock clock);
+		[CCode (cname = "gst_element_class_set_details")]
+		public class void set_details (Gst.ElementDetails details);
+		[CCode (cname = "gst_element_class_set_details_simple")]
+		public class void set_details_simple (string longname, string classification, string description, string author);
+		public virtual void set_index (Gst.Index index);
+		public bool set_locked_state (bool locked_state);
+		public virtual Gst.StateChangeReturn set_state (Gst.State state);
+		public static weak string state_change_return_get_name (Gst.StateChangeReturn state_ret);
+		public static weak string state_get_name (Gst.State state);
+		public bool sync_state_with_parent ();
+		public void unlink (Gst.Element dest);
+		public void unlink_many (Gst.Element element_2, ...);
+		public void unlink_pads (string srcpadname, Gst.Element dest, string destpadname);
+		[HasEmitter]
+		public virtual signal void no_more_pads ();
+		public virtual signal void pad_added (Gst.Pad pad);
+		public virtual signal void pad_removed (Gst.Pad pad);
 	}
-	[CCode (cprefix = "GST_STREAM_ERROR_", cheader_filename = "gst/gst.h")]
-	public enum StreamError {
-		FAILED,
-		TOO_LAZY,
-		NOT_IMPLEMENTED,
-		TYPE_NOT_FOUND,
-		WRONG_TYPE,
-		CODEC_NOT_FOUND,
-		DECODE,
-		ENCODE,
-		DEMUX,
-		MUX,
-		FORMAT,
-		DECRYPT,
-		DECRYPT_NOKEY,
-		NUM_ERRORS
+	[CCode (cheader_filename = "gst/gst.h")]
+	public class ElementFactory : Gst.PluginFeature {
+		public Gst.ElementDetails details;
+		public weak GLib.List interfaces;
+		public uint numpadtemplates;
+		public weak GLib.List staticpadtemplates;
+		public GLib.Type type;
+		public weak string uri_protocols;
+		public uint uri_type;
+		public bool can_sink_caps (Gst.Caps caps);
+		public bool can_src_caps (Gst.Caps caps);
+		public Gst.Element? create (string? name);
+		public static weak Gst.ElementFactory find (string name);
+		public weak string get_author ();
+		public weak string get_description ();
+		public GLib.Type get_element_type ();
+		public weak string get_klass ();
+		public weak string get_longname ();
+		public uint get_num_pad_templates ();
+		public weak GLib.List get_static_pad_templates ();
+		public weak string get_uri_protocols ();
+		public int get_uri_type ();
+		public bool has_interface (string interfacename);
+		public static Gst.Element? make (string factoryname, string? name);
 	}
-	[CCode (cprefix = "GST_TAG_FLAG_", cheader_filename = "gst/gst.h")]
-	public enum TagFlag {
-		UNDEFINED,
-		META,
-		ENCODED,
-		DECODED,
-		COUNT
+	[CCode (ref_function = "gst_event_ref", unref_function = "gst_event_unref", cheader_filename = "gst/gst.h")]
+	public class Event {
+		public weak Gst.Object src;
+		public weak Gst.Structure structure;
+		public uint64 timestamp;
+		public Gst.EventType type;
+		[CCode (has_construct_function = false)]
+		public Event.buffer_size (Gst.Format format, int64 minsize, int64 maxsize, bool async);
+		[CCode (has_construct_function = false)]
+		public Event.custom (Gst.EventType type, Gst.Structure# structure);
+		[CCode (has_construct_function = false)]
+		public Event.eos ();
+		[CCode (has_construct_function = false)]
+		public Event.flush_start ();
+		[CCode (has_construct_function = false)]
+		public Event.flush_stop ();
+		public weak Gst.Structure get_structure ();
+		public bool has_name (string name);
+		[CCode (has_construct_function = false)]
+		public Event.latency (Gst.ClockTime latency);
+		[CCode (has_construct_function = false)]
+		public Event.navigation (Gst.Structure# structure);
+		public Event ();
+		[CCode (has_construct_function = false)]
+		public Event.new_segment (bool update, double rate, Gst.Format format, int64 start, int64 stop, int64 position);
+		[CCode (has_construct_function = false)]
+		public Event.new_segment_full (bool update, double rate, double applied_rate, Gst.Format format, int64 start, int64 stop, int64 position);
+		public void parse_buffer_size (out Gst.Format format, out int64 minsize, out int64 maxsize, out bool async);
+		public void parse_latency (out Gst.ClockTime latency);
+		public void parse_new_segment (out bool update, out double rate, out Gst.Format format, out int64 start, out int64 stop, out int64 position);
+		public void parse_new_segment_full (out bool update, out double rate, out double applied_rate, out Gst.Format format, out int64 start, out int64 stop, out int64 position);
+		public void parse_qos (out double proportion, out Gst.ClockTimeDiff diff, out Gst.ClockTime timestamp);
+		public void parse_seek (out double rate, out Gst.Format format, out Gst.SeekFlags flags, out Gst.SeekType start_type, out int64 start, out Gst.SeekType stop_type, out int64 stop);
+		public void parse_tag (out Gst.TagList taglist);
+		[CCode (has_construct_function = false)]
+		public Event.qos (double proportion, Gst.ClockTimeDiff diff, Gst.ClockTime timestamp);
+		[CCode (has_construct_function = false)]
+		public Event.seek (double rate, Gst.Format format, Gst.SeekFlags flags, Gst.SeekType start_type, int64 start, Gst.SeekType stop_type, int64 stop);
+		[CCode (has_construct_function = false)]
+		public Event.tag (Gst.TagList taglist);
+		public static Gst.EventTypeFlags type_get_flags (Gst.EventType type);
+		public static weak string type_get_name (Gst.EventType type);
+		public static GLib.Quark type_to_quark (Gst.EventType type);
 	}
-	[CCode (cprefix = "GST_TAG_MERGE_", cheader_filename = "gst/gst.h")]
-	public enum TagMergeMode {
-		UNDEFINED,
-		REPLACE_ALL,
-		REPLACE,
-		APPEND,
-		PREPEND,
-		KEEP,
-		KEEP_ALL,
-		COUNT
+	[Compact]
+	[CCode (cheader_filename = "gst/gst.h")]
+	public class GError {
 	}
-	[CCode (cprefix = "GST_TASK_", cheader_filename = "gst/gst.h")]
-	public enum TaskState {
-		STARTED,
-		STOPPED,
-		PAUSED
+	[CCode (cheader_filename = "gst/gst.h")]
+	public class GhostPad : Gst.Pad {
+		[CCode (type = "GstPad*", has_construct_function = false)]
+		public GhostPad.from_template (string name, Gst.Pad target, Gst.PadTemplate templ);
+		public weak Gst.Pad get_target ();
+		[CCode (type = "GstPad*", has_construct_function = false)]
+		public GhostPad (string name, Gst.Pad target);
+		[CCode (type = "GstPad*", has_construct_function = false)]
+		public GhostPad.no_target (string name, Gst.PadDirection dir);
+		[CCode (type = "GstPad*", has_construct_function = false)]
+		public GhostPad.no_target_from_template (string name, Gst.PadTemplate templ);
+		public bool set_target (Gst.Pad? newtarget);
 	}
-	[CCode (cprefix = "GST_TYPE_FIND_", cheader_filename = "gst/gst.h")]
-	public enum TypeFindProbability {
-		MINIMUM,
-		POSSIBLE,
-		LIKELY,
-		NEARLY_CERTAIN,
-		MAXIMUM
-	}
-	[CCode (cprefix = "GST_URI_", cheader_filename = "gst/gst.h")]
-	public enum URIType {
-		UNKNOWN,
-		SINK,
-		SRC
-	}
-	[CCode (cprefix = "GST_ALLOC_TRACE_", cheader_filename = "gst/gst.h")]
-	[Flags]
-	public enum AllocTraceFlags {
-		LIVE,
-		MEM_LIVE
+	[CCode (cheader_filename = "gst/gst.h")]
+	public class Index : Gst.Object {
+		public weak Gst.IndexGroup curgroup;
+		public weak Gst.IndexFilter filter;
+		public void* filter_user_data;
+		public weak GLib.DestroyNotify filter_user_data_destroy;
+		public weak GLib.List groups;
+		public int last_id;
+		public int maxgroup;
+		public Gst.IndexResolverMethod method;
+		public void* resolver_user_data;
+		public weak GLib.DestroyNotify resolver_user_data_destroy;
+		public weak GLib.HashTable writers;
+		public weak Gst.IndexEntry add_association (int id, Gst.AssocFlags flags, Gst.Format format, int64 value);
+		public weak Gst.IndexEntry add_associationv (int id, Gst.AssocFlags flags, int n, Gst.IndexAssociation list);
+		[NoWrapper]
+		public virtual void add_entry (Gst.IndexEntry entry);
+		public weak Gst.IndexEntry add_format (int id, Gst.Format format);
+		public weak Gst.IndexEntry add_id (int id, string description);
+		public weak Gst.IndexEntry add_object (int id, string key, GLib.Type type, void* object);
+		public virtual void commit (int id);
+		public virtual weak Gst.IndexEntry get_assoc_entry (int id, Gst.IndexLookupMethod method, Gst.AssocFlags flags, Gst.Format format, int64 value);
+		public weak Gst.IndexEntry get_assoc_entry_full (int id, Gst.IndexLookupMethod method, Gst.AssocFlags flags, Gst.Format format, int64 value, GLib.CompareDataFunc func);
+		public Gst.IndexCertainty get_certainty ();
+		public int get_group ();
+		public virtual bool get_writer_id (Gst.Object writer, int id);
+		[CCode (type = "gint", has_construct_function = false)]
+		public Index.group (Gst.Index index);
+		[CCode (has_construct_function = false)]
+		public Index ();
+		public void set_certainty (Gst.IndexCertainty certainty);
+		public void set_filter (Gst.IndexFilter filter);
+		public void set_filter_full (Gst.IndexFilter filter, GLib.DestroyNotify user_data_destroy);
+		public bool set_group (int groupnum);
+		public void set_resolver (Gst.IndexResolver resolver);
+		public void set_resolver_full (Gst.IndexResolver resolver, GLib.DestroyNotify user_data_destroy);
+		[NoAccessorMethod]
+		public Gst.IndexResolver resolver { get; set; }
+		public virtual signal void entry_added (Gst.IndexEntry entry);
 	}
-	[CCode (cprefix = "GST_ASSOCIATION_FLAG_", cheader_filename = "gst/gst.h")]
-	[Flags]
-	public enum AssocFlags {
-		NONE,
-		KEY_UNIT,
-		DELTA_UNIT,
-		LAST
+	[Compact]
+	[CCode (cheader_filename = "gst/gst.h")]
+	public class IndexAssociation {
+		public Gst.Format format;
+		public int64 value;
 	}
-	[CCode (cprefix = "GST_BIN_FLAG_", cheader_filename = "gst/gst.h")]
-	[Flags]
-	public enum BinFlags {
-		LAST
+	[Compact]
+	[CCode (copy_function = "gst_index_entry_copy", cheader_filename = "gst/gst.h")]
+	public class IndexEntry {
+		public void* data;
+		public int id;
+		public Gst.IndexEntryType type;
+		public bool assoc_map (Gst.Format format, int64 value);
+		public weak Gst.IndexEntry copy ();
 	}
-	[CCode (cprefix = "GST_BUFFER_COPY_", cheader_filename = "gst/gst.h")]
-	[Flags]
-	public enum BufferCopyFlags {
-		FLAGS,
-		TIMESTAMPS,
-		CAPS
+	[CCode (cheader_filename = "gst/gst.h")]
+	public class IndexFactory : Gst.PluginFeature {
+		public weak string longdesc;
+		public GLib.Type type;
+		public weak Gst.Index create ();
+		public void destroy ();
+		public static weak Gst.IndexFactory find (string name);
+		public static weak Gst.Index make (string name);
+		[CCode (has_construct_function = false)]
+		public IndexFactory (string name, string longdesc, GLib.Type type);
 	}
-	[CCode (cprefix = "GST_BUFFER_FLAG_", cheader_filename = "gst/gst.h")]
-	[Flags]
-	public enum BufferFlag {
-		READONLY,
-		PREROLL,
-		DISCONT,
-		IN_CAPS,
-		GAP,
-		DELTA_UNIT,
-		LAST
+	[Compact]
+	[CCode (cheader_filename = "gst/gst.h")]
+	public class IndexGroup {
+		public Gst.IndexCertainty certainty;
+		public weak GLib.List entries;
+		public int groupnum;
+		public int peergroup;
 	}
-	[CCode (cprefix = "GST_BUS_", cheader_filename = "gst/gst.h")]
-	[Flags]
-	public enum BusFlags {
-		FLUSHING,
-		FLAG_LAST
+	[Compact]
+	[CCode (cheader_filename = "gst/gst.h")]
+	public class Iterator {
+		public uint cookie;
+		public weak Gst.IteratorFreeFunction free;
+		public weak Gst.IteratorItemFunction item;
+		public weak GLib.Mutex @lock;
+		public uint master_cookie;
+		public weak Gst.IteratorNextFunction next;
+		public weak Gst.Iterator pushed;
+		public weak Gst.IteratorResyncFunction resync;
+		public GLib.Type type;
+		public weak Gst.Iterator filter (GLib.CompareFunc func);
+		public void* find_custom (GLib.CompareFunc func);
+		public Gst.IteratorResult fold (Gst.IteratorFoldFunction func, GLib.Value ret);
+		public Gst.IteratorResult @foreach (GLib.Func func);
+		[CCode (has_construct_function = false)]
+		public Iterator.list (GLib.Type type, GLib.Mutex @lock, uint master_cookie, GLib.List list, void* owner, Gst.IteratorItemFunction item, Gst.IteratorDisposeFunction free);
+		[CCode (has_construct_function = false)]
+		public Iterator (uint size, GLib.Type type, GLib.Mutex @lock, uint master_cookie, Gst.IteratorNextFunction next, Gst.IteratorItemFunction item, Gst.IteratorResyncFunction resync, Gst.IteratorFreeFunction free);
+		public void push (Gst.Iterator other);
 	}
-	[CCode (cprefix = "GST_CAPS_FLAGS_", cheader_filename = "gst/gst.h")]
-	[Flags]
-	public enum CapsFlags {
-		ANY
+	[CCode (cheader_filename = "gst/gst.h")]
+	public class Message : Gst.MiniObject {
+		public weak GLib.Cond cond;
+		public weak GLib.Mutex @lock;
+		public weak Gst.Object src;
+		public weak Gst.Structure structure;
+		public uint64 timestamp;
+		public Gst.MessageType type;
+		[CCode (has_construct_function = false)]
+		public Message.application (Gst.Object src, Gst.Structure structure);
+		[CCode (has_construct_function = false)]
+		public Message.async_done (Gst.Object src);
+		[CCode (has_construct_function = false)]
+		public Message.async_start (Gst.Object src, bool new_base_time);
+		[CCode (has_construct_function = false)]
+		public Message.buffering (Gst.Object src, int percent);
+		[CCode (has_construct_function = false)]
+		public Message.clock_lost (Gst.Object src, Gst.Clock clock);
+		[CCode (has_construct_function = false)]
+		public Message.clock_provide (Gst.Object src, Gst.Clock clock, bool ready);
+		[CCode (has_construct_function = false)]
+		public Message.custom (Gst.MessageType type, Gst.Object src, Gst.Structure structure);
+		[CCode (has_construct_function = false)]
+		public Message.duration (Gst.Object src, Gst.Format format, int64 duration);
+		[CCode (has_construct_function = false)]
+		public Message.element (Gst.Object src, Gst.Structure structure);
+		[CCode (has_construct_function = false)]
+		public Message.eos (Gst.Object src);
+		[CCode (has_construct_function = false)]
+		public Message.error (Gst.Object src, GLib.Error error, string debug);
+		public weak Gst.Structure get_structure ();
+		[CCode (has_construct_function = false)]
+		public Message.info (Gst.Object src, GLib.Error error, string debug);
+		[CCode (has_construct_function = false)]
+		public Message.latency (Gst.Object src);
+		[CCode (has_construct_function = false)]
+		public Message.new_clock (Gst.Object src, Gst.Clock clock);
+		public void parse_async_start (out bool new_base_time);
+		public void parse_buffering (out int percent);
+		public void parse_buffering_stats (Gst.BufferingMode mode, int avg_in, int avg_out, int64 buffering_left);
+		public void parse_clock_lost (out weak Gst.Clock clock);
+		public void parse_clock_provide (out weak Gst.Clock clock, out bool ready);
+		public void parse_duration (out Gst.Format format, out int64 duration);
+		public void parse_error (out GLib.Error gerror, out string debug);
+		public void parse_info (out GLib.Error gerror, out string debug);
+		public void parse_new_clock (out weak Gst.Clock clock);
+		public void parse_segment_done (out Gst.Format format, out int64 position);
+		public void parse_segment_start (out Gst.Format format, out int64 position);
+		public void parse_state_changed (out Gst.State oldstate, out Gst.State newstate, out Gst.State pending);
+		public void parse_tag (out Gst.TagList tag_list);
+		public void parse_warning (out GLib.Error gerror, out string debug);
+		[CCode (has_construct_function = false)]
+		public Message.segment_done (Gst.Object src, Gst.Format format, int64 position);
+		[CCode (has_construct_function = false)]
+		public Message.segment_start (Gst.Object src, Gst.Format format, int64 position);
+		public void set_buffering_stats (Gst.BufferingMode mode, int avg_in, int avg_out, int64 buffering_left);
+		[CCode (has_construct_function = false)]
+		public Message.state_changed (Gst.Object src, Gst.State oldstate, Gst.State newstate, Gst.State pending);
+		[CCode (has_construct_function = false)]
+		public Message.state_dirty (Gst.Object src);
+		[CCode (has_construct_function = false)]
+		public Message.tag (Gst.Object src, Gst.TagList tag_list);
+		public static weak string type_get_name (Gst.MessageType type);
+		public static GLib.Quark type_to_quark (Gst.MessageType type);
+		[CCode (has_construct_function = false)]
+		public Message.warning (Gst.Object src, GLib.Error error, string debug);
 	}
-	[CCode (cprefix = "GST_CLOCK_FLAG_", cheader_filename = "gst/gst.h")]
-	[Flags]
-	public enum ClockFlags {
-		CAN_DO_SINGLE_SYNC,
-		CAN_DO_SINGLE_ASYNC,
-		CAN_DO_PERIODIC_SYNC,
-		CAN_DO_PERIODIC_ASYNC,
-		CAN_SET_RESOLUTION,
-		CAN_SET_MASTER,
-		LAST
+	[Compact]
+	[CCode (cheader_filename = "gst/gst.h")]
+	public class MessageClass : Gst.MiniObjectClass {
 	}
-	[CCode (cprefix = "GST_DEBUG_GRAPH_SHOW_", cheader_filename = "gst/gst.h")]
-	[Flags]
-	public enum DebugGraphDetails {
-		MEDIA_TYPE,
-		CAPS_DETAILS,
-		NON_DEFAULT_PARAMS,
-		STATES,
-		ALL
+	[CCode (ref_function = "gst_mini_object_ref", unref_function = "gst_mini_object_unref", cheader_filename = "gst/gst.h")]
+	public class MiniObject {
+		public uint flags;
+		public int refcount;
+		public weak Gst.MiniObject copy ();
+		public bool is_writable ();
+		public weak Gst.MiniObject make_writable ();
+		[CCode (has_construct_function = false)]
+		public MiniObject (GLib.Type type);
+		public void replace (Gst.MiniObject newdata);
 	}
-	[CCode (cprefix = "GST_ELEMENT_", cheader_filename = "gst/gst.h")]
-	[Flags]
-	public enum ElementFlags {
-		LOCKED_STATE,
-		IS_SINK,
-		UNPARENTING,
-		FLAG_LAST
-	}
-	[CCode (cprefix = "GST_EVENT_TYPE_", cheader_filename = "gst/gst.h")]
-	[Flags]
-	public enum EventTypeFlags {
-		UPSTREAM,
-		DOWNSTREAM,
-		SERIALIZED
-	}
-	[CCode (cprefix = "GST_INDEX_", cheader_filename = "gst/gst.h")]
-	[Flags]
-	public enum IndexFlags {
-		WRITABLE,
-		READABLE,
-		FLAG_LAST
-	}
-	[CCode (cprefix = "GST_MESSAGE_", cheader_filename = "gst/gst.h")]
-	[Flags]
-	public enum MessageType {
-		UNKNOWN,
-		EOS,
-		ERROR,
-		WARNING,
-		INFO,
-		TAG,
-		BUFFERING,
-		STATE_CHANGED,
-		STATE_DIRTY,
-		STEP_DONE,
-		CLOCK_PROVIDE,
-		CLOCK_LOST,
-		NEW_CLOCK,
-		STRUCTURE_CHANGE,
-		STREAM_STATUS,
-		APPLICATION,
-		ELEMENT,
-		SEGMENT_START,
-		SEGMENT_DONE,
-		DURATION,
-		LATENCY,
-		ASYNC_START,
-		ASYNC_DONE,
-		ANY
-	}
-	[CCode (cprefix = "GST_MINI_OBJECT_FLAG_", cheader_filename = "gst/gst.h")]
-	[Flags]
-	public enum MiniObjectFlags {
-		READONLY,
-		LAST
-	}
-	[CCode (cprefix = "GST_OBJECT_", cheader_filename = "gst/gst.h")]
-	[Flags]
-	public enum ObjectFlags {
-		DISPOSING,
-		FLOATING,
-		FLAG_LAST
-	}
-	[CCode (cprefix = "GST_PAD_", cheader_filename = "gst/gst.h")]
-	[Flags]
-	public enum PadFlags {
-		BLOCKED,
-		FLUSHING,
-		IN_GETCAPS,
-		IN_SETCAPS,
-		BLOCKING,
-		FLAG_LAST
-	}
-	[CCode (cprefix = "GST_PAD_TEMPLATE_", cheader_filename = "gst/gst.h")]
-	[Flags]
-	public enum PadTemplateFlags {
-		FIXED,
-		FLAG_LAST
-	}
-	[CCode (cprefix = "GST_PIPELINE_FLAG_", cheader_filename = "gst/gst.h")]
-	[Flags]
-	public enum PipelineFlags {
-		FIXED_CLOCK,
-		LAST
-	}
-	[CCode (cprefix = "GST_PLUGIN_FLAG_", cheader_filename = "gst/gst.h")]
-	[Flags]
-	public enum PluginFlags {
-		CACHED
-	}
-	[CCode (cprefix = "GST_SEEK_FLAG_", cheader_filename = "gst/gst.h")]
-	[Flags]
-	public enum SeekFlags {
-		NONE,
-		FLUSH,
-		ACCURATE,
-		KEY_UNIT,
-		SEGMENT
-	}
-	[CCode (ref_function = "gst_event_ref", unref_function = "gst_event_unref", cheader_filename = "gst/gst.h")]
-	public class Event {
-		public Gst.EventType type;
-		public uint64 timestamp;
-		public weak Gst.Object src;
-		public weak Gst.Structure structure;
-		public Event ();
-		public weak Gst.Structure get_structure ();
-		public bool has_name (string name);
-		[CCode (has_construct_function = false)]
-		public Event.buffer_size (Gst.Format format, int64 minsize, int64 maxsize, bool async);
-		[CCode (has_construct_function = false)]
-		public Event.custom (Gst.EventType type, Gst.Structure# structure);
-		[CCode (has_construct_function = false)]
-		public Event.eos ();
-		[CCode (has_construct_function = false)]
-		public Event.flush_start ();
-		[CCode (has_construct_function = false)]
-		public Event.flush_stop ();
-		[CCode (has_construct_function = false)]
-		public Event.latency (Gst.ClockTime latency);
-		[CCode (has_construct_function = false)]
-		public Event.navigation (Gst.Structure# structure);
-		[CCode (has_construct_function = false)]
-		public Event.new_segment (bool update, double rate, Gst.Format format, int64 start, int64 stop, int64 position);
-		[CCode (has_construct_function = false)]
-		public Event.new_segment_full (bool update, double rate, double applied_rate, Gst.Format format, int64 start, int64 stop, int64 position);
-		[CCode (has_construct_function = false)]
-		public Event.qos (double proportion, Gst.ClockTimeDiff diff, Gst.ClockTime timestamp);
-		[CCode (has_construct_function = false)]
-		public Event.seek (double rate, Gst.Format format, Gst.SeekFlags flags, Gst.SeekType start_type, int64 start, Gst.SeekType stop_type, int64 stop);
-		[CCode (has_construct_function = false)]
-		public Event.tag (Gst.TagList taglist);
-		public void parse_buffer_size (out Gst.Format format, out int64 minsize, out int64 maxsize, out bool async);
-		public void parse_latency (out Gst.ClockTime latency);
-		public void parse_new_segment (out bool update, out double rate, out Gst.Format format, out int64 start, out int64 stop, out int64 position);
-		public void parse_new_segment_full (out bool update, out double rate, out double applied_rate, out Gst.Format format, out int64 start, out int64 stop, out int64 position);
-		public void parse_qos (out double proportion, out Gst.ClockTimeDiff diff, out Gst.ClockTime timestamp);
-		public void parse_seek (out double rate, out Gst.Format format, out Gst.SeekFlags flags, out Gst.SeekType start_type, out int64 start, out Gst.SeekType stop_type, out int64 stop);
-		public void parse_tag (out Gst.TagList taglist);
-		public static Gst.EventTypeFlags type_get_flags (Gst.EventType type);
-		public static weak string type_get_name (Gst.EventType type);
-		public static GLib.Quark type_to_quark (Gst.EventType type);
+	[Compact]
+	[CCode (cheader_filename = "gst/gst.h")]
+	public class MiniObjectClass : GLib.TypeClass {
+		public weak Gst.MiniObjectCopyFunction copy;
+		public weak Gst.MiniObjectFinalizeFunction finalize;
 	}
 	[CCode (ref_function = "gst_object_ref", unref_function = "gst_object_unref", cheader_filename = "gst/gst.h")]
 	public class Object : GLib.Object {
-		public int refcount;
+		public uint flags;
 		public weak GLib.Mutex @lock;
 		public weak string name_prefix;
 		public weak Gst.Object parent;
-		public uint flags;
-		public weak Gst.Object @ref ();
-		public void unref ();
-		public void sink ();
-		public Object ();
+		public int refcount;
 		public static bool check_uniqueness (GLib.List list, string name);
 		public static void default_deep_notify (GLib.Object object, Gst.Object orig, GLib.ParamSpec pspec, string excluded_props);
 		public void default_error (GLib.Error error, string debug);
@@ -568,95 +680,64 @@
 		public weak Gst.Object get_parent ();
 		public weak string get_path_string ();
 		public bool has_ancestor (Gst.Object ancestor);
+		public Object ();
+		public weak Gst.Object @ref ();
 		public void replace (Gst.Object newobj);
+		public virtual void restore_thyself (void* self);
+		public virtual void* save_thyself (void* parent);
 		public bool set_name (string name);
 		public void set_name_prefix (string name_prefix);
 		public bool set_parent (Gst.Object parent);
+		public void sink ();
 		public void unparent ();
-		public virtual void restore_thyself (void* self);
-		public virtual void* save_thyself (void* parent);
+		public void unref ();
 		public string name { get; set construct; }
 		public virtual signal void deep_notify (Gst.Object orig, GLib.ParamSpec pspec);
 		public virtual signal void object_saved (void* parent);
 		public virtual signal void parent_set (Gst.Object parent);
 		public virtual signal void parent_unset (Gst.Object parent);
 	}
-	[CCode (ref_function = "gst_buffer_ref", unref_function = "gst_buffer_unref", cheader_filename = "gst/gst.h")]
-	public class Buffer : Gst.MiniObject {
-		[NoArrayLength]
-		public weak uchar[] data;
-		public uint size;
-		public Gst.ClockTime timestamp;
-		public Gst.ClockTime duration;
-		public weak Gst.Caps caps;
-		public uint64 offset;
-		public uint64 offset_end;
-		public uchar malloc_data;
-		public Buffer ();
-		public weak Gst.Buffer @ref ();
-		public void unref ();
-		[CCode (cname = "GST_BUFFER_FLAG_SET")]
-		public void flag_set (Gst.BufferFlag flag);
-		[CCode (cname = "GST_BUFFER_FLAG_UNSET")]
-		public void flag_unset (Gst.BufferFlag flag);
-		public void copy_metadata (Gst.Buffer src, Gst.BufferCopyFlags flags);
-		public weak Gst.Buffer create_sub (uint offset, uint size);
-		public weak Gst.Caps get_caps ();
-		public bool is_metadata_writable ();
-		public bool is_span_fast (Gst.Buffer buf2);
-		public weak Gst.Buffer join (Gst.Buffer buf2);
-		public weak Gst.Buffer make_metadata_writable ();
-		public weak Gst.Buffer merge (Gst.Buffer buf2);
-		[CCode (has_construct_function = false)]
-		public Buffer.and_alloc (uint size);
-		public void set_caps (Gst.Caps caps);
-		public weak Gst.Buffer span (uint offset, Gst.Buffer buf2, uint len);
-		public void stamp (Gst.Buffer src);
-		public static Gst.Buffer try_new_and_alloc (uint size);
-	}
 	[CCode (cheader_filename = "gst/gst.h")]
 	public class Pad : Gst.Object {
-		public void* element_private;
-		public weak Gst.PadTemplate padtemplate;
-		public GLib.StaticRecMutex stream_rec_lock;
-		public weak Gst.Task task;
-		public weak GLib.Mutex preroll_lock;
-		public weak GLib.Cond preroll_cond;
-		public weak GLib.Cond block_cond;
-		public weak Gst.PadBlockCallback block_callback;
-		public void* block_data;
-		public weak Gst.PadGetCapsFunction getcapsfunc;
-		public weak Gst.PadSetCapsFunction setcapsfunc;
 		public weak Gst.PadAcceptCapsFunction acceptcapsfunc;
-		public weak Gst.PadFixateCapsFunction fixatecapsfunc;
 		public weak Gst.PadActivateFunction activatefunc;
-		public weak Gst.PadActivateModeFunction activatepushfunc;
 		public weak Gst.PadActivateModeFunction activatepullfunc;
-		public weak Gst.PadLinkFunction linkfunc;
-		public weak Gst.PadUnlinkFunction unlinkfunc;
-		public weak Gst.Pad peer;
-		public void* sched_private;
+		public weak Gst.PadActivateModeFunction activatepushfunc;
+		public weak Gst.PadBlockCallback block_callback;
+		public weak GLib.Cond block_cond;
+		public void* block_data;
+		public weak Gst.PadBufferAllocFunction bufferallocfunc;
 		public weak Gst.PadChainFunction chainfunc;
 		public weak Gst.PadCheckGetRangeFunction checkgetrangefunc;
-		public weak Gst.PadGetRangeFunction getrangefunc;
+		public int do_buffer_signals;
+		public int do_event_signals;
+		public void* element_private;
 		public weak Gst.PadEventFunction eventfunc;
+		public weak Gst.PadFixateCapsFunction fixatecapsfunc;
+		public weak Gst.PadGetCapsFunction getcapsfunc;
+		public weak Gst.PadGetRangeFunction getrangefunc;
+		public weak Gst.PadIntLinkFunction intlinkfunc;
+		public weak Gst.PadLinkFunction linkfunc;
 		public Gst.ActivateMode mode;
+		public weak Gst.PadTemplate padtemplate;
+		public weak Gst.Pad peer;
+		public weak GLib.Cond preroll_cond;
+		public weak GLib.Mutex preroll_lock;
 		public weak Gst.PadQueryFunction queryfunc;
-		public weak Gst.PadIntLinkFunction intlinkfunc;
-		public weak Gst.PadBufferAllocFunction bufferallocfunc;
-		public int do_buffer_signals;
-		public int do_event_signals;
-		[CCode (array_length_pos = 0, delegate_target_pos = 0)]
-		public Pad (string name, Gst.PadDirection direction);
+		public void* sched_private;
+		public weak Gst.PadSetCapsFunction setcapsfunc;
+		public GLib.StaticRecMutex stream_rec_lock;
+		public weak Gst.Task task;
+		public weak Gst.PadUnlinkFunction unlinkfunc;
+		public bool accept_caps (Gst.Caps caps);
+		public bool activate_pull (bool active);
+		public bool activate_push (bool active);
 		public uint add_buffer_probe (Gst.BufferProbeCallback handler);
 		public uint add_buffer_probe_full (Gst.BufferProbeCallback handler, GLib.DestroyNotify notify);
 		public uint add_data_probe (Gst.DataProbeCallback handler);
 		public uint add_data_probe_full (Gst.DataProbeCallback handler, GLib.DestroyNotify notify);
 		public uint add_event_probe (Gst.EventProbeCallback handler);
 		public uint add_event_probe_full (Gst.EventProbeCallback handler, GLib.DestroyNotify notify);
-		public bool accept_caps (Gst.Caps caps);
-		public bool activate_pull (bool active);
-		public bool activate_push (bool active);
 		public Gst.FlowReturn alloc_buffer (uint64 offset, int size, Gst.Caps caps, out weak Gst.Buffer buf);
 		public Gst.FlowReturn alloc_buffer_and_set_caps (uint64 offset, int size, Gst.Caps caps, out weak Gst.Buffer buf);
 		public bool can_link (Gst.Pad sinkpad);
@@ -665,6 +746,10 @@
 		public bool dispatcher (Gst.PadDispatcherFunction dispatch, void* data);
 		public bool event_default (Gst.Event event);
 		public void fixate_caps (Gst.Caps caps);
+		[CCode (has_construct_function = false)]
+		public Pad.from_static_template (Gst.StaticPadTemplate templ, string name);
+		[CCode (has_construct_function = false)]
+		public Pad.from_template (Gst.PadTemplate templ, string name);
 		public Gst.Caps get_allowed_caps ();
 		public Gst.Caps get_caps ();
 		public Gst.PadDirection get_direction ();
@@ -686,10 +771,8 @@
 		public bool is_linked ();
 		public Gst.PadLinkReturn link (Gst.Pad sinkpad);
 		public void load_and_link (Gst.Object parent);
-		[CCode (has_construct_function = false)]
-		public Pad.from_static_template (Gst.StaticPadTemplate templ, string name);
-		[CCode (has_construct_function = false)]
-		public Pad.from_template (Gst.PadTemplate templ, string name);
+		[CCode (array_length_pos = 0, delegate_target_pos = 0)]
+		public Pad (string name, Gst.PadDirection direction);
 		public bool pause_task ();
 		public bool peer_accept_caps (Gst.Caps caps);
 		public Gst.Caps peer_get_caps ();
@@ -746,339 +829,151 @@
 		public virtual signal void request_link ();
 		public virtual signal void unlinked (Gst.Pad peer);
 	}
-	[CCode (ref_function = "gst_caps_ref", unref_function = "gst_caps_unref", cheader_filename = "gst/gst.h")]
-	public class Caps {
-		public GLib.Type type;
-		public int refcount;
-		public Gst.CapsFlags flags;
-		public weak GLib.PtrArray structs;
-		public weak Gst.Caps @ref ();
-		public void unref ();
-		public Caps ();
-		public void append (Gst.Caps caps2);
-		public void append_structure (Gst.Structure structure);
-		public weak Gst.Caps copy ();
-		public weak Gst.Caps copy_nth (uint nth);
-		public bool do_simplify ();
-		public static weak Gst.Caps from_string (string str);
-		public uint get_size ();
-		public weak Gst.Structure get_structure (uint index);
-		public weak Gst.Caps intersect (Gst.Caps caps2);
-		public bool is_always_compatible (Gst.Caps caps2);
-		public bool is_any ();
-		public bool is_empty ();
-		public bool is_equal (Gst.Caps caps2);
-		public bool is_equal_fixed (Gst.Caps caps2);
-		public bool is_fixed ();
-		public bool is_subset (Gst.Caps superset);
-		public static weak Gst.Caps load_thyself (void* parent);
-		public weak Gst.Caps make_writable ();
-		public void merge (Gst.Caps caps2);
-		public void merge_structure (Gst.Structure structure);
-		[CCode (has_construct_function = false)]
-		public Caps.any ();
-		[CCode (has_construct_function = false)]
-		public Caps.empty ();
-		[CCode (has_construct_function = false)]
-		public Caps.full (Gst.Structure struct1, ...);
-		[CCode (has_construct_function = false)]
-		public Caps.full_valist (Gst.Structure structure, void* var_args);
+	[CCode (cheader_filename = "gst/gst.h")]
+	public class PadTemplate : Gst.Object {
+		public weak Gst.Caps caps;
+		public Gst.PadDirection direction;
+		public weak string name_template;
+		public Gst.PadPresence presence;
+		public weak Gst.Caps get_caps ();
 		[CCode (has_construct_function = false)]
-		public Caps.simple (string media_type, string fieldname, ...);
-		public weak Gst.Caps normalize ();
-		public void remove_structure (uint idx);
-		public void replace (Gst.Caps newcaps);
-		public void* save_thyself (void* parent);
-		public void set_simple (string field, ...);
-		public void set_simple_valist (string field, void* varargs);
-		public weak Gst.Caps subtract (Gst.Caps subtrahend);
-		public weak string to_string ();
-		public void truncate ();
-		public Gst.Caps union (Gst.Caps caps2);
+		public PadTemplate (string name_template, Gst.PadDirection direction, Gst.PadPresence presence, Gst.Caps caps);
+		[HasEmitter]
+		public virtual signal void pad_created (Gst.Pad pad);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/gst.h")]
-	public class DebugCategory {
-		public int threshold;
-		public uint color;
-		public weak string name;
-		public weak string description;
-		[CCode (cname = "GST_DEBUG_CATEGORY_INIT")]
-		public void init (string name, uint color, string description);
-		[CCode (cname = "GST_CAT_LOG")]
-		public void log (string format, ...);
-		[CCode (cname = "GST_CAT_DEBUG")]
-		public void debug (string format, ...);
-		[CCode (cname = "GST_CAT_INFO")]
-		public void info (string format, ...);
-		[CCode (cname = "GST_CAT_WARNING")]
-		public void warning (string format, ...);
-		[CCode (cname = "GST_CAT_ERROR")]
-		public void error (string format, ...);
-		[CCode (cname = "GST_CAT_LOG_OBJECT")]
-		public void log_object (GLib.Object obj, string format, ...);
-		[CCode (cname = "GST_CAT_DEBUG_OBJECT")]
-		public void debug_object (GLib.Object obj, string format, ...);
-		[CCode (cname = "GST_CAT_INFO_OBJECT")]
-		public void info_object (GLib.Object obj, string format, ...);
-		[CCode (cname = "GST_CAT_WARNING_OBJECT")]
-		public void warning_object (GLib.Object obj, string format, ...);
-		[CCode (cname = "GST_CAT_ERROR_OBJECT")]
-		public void error_object (GLib.Object obj, string format, ...);
-		public DebugCategory ();
-		public uint get_color ();
-		public weak string get_description ();
-		public weak string get_name ();
-		public Gst.DebugLevel get_threshold ();
-		public void reset_threshold ();
-		public void set_threshold (Gst.DebugLevel level);
+	public class ParamSpecFraction : GLib.ParamSpec {
+		public int def_den;
+		public int def_num;
+		public int max_den;
+		public int max_num;
+		public int min_den;
+		public int min_num;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/gst.h")]
-	public class AllocTrace {
-		public weak string name;
-		public int flags;
-		public int live;
-		public weak GLib.SList mem_live;
-		public static bool available ();
-		public static weak Gst.AllocTrace get (string name);
-		public static weak GLib.List list ();
-		public static int live_all ();
-		public void print ();
-		public static void print_all ();
-		public static void print_live ();
-		public void set_flags (Gst.AllocTraceFlags flags);
-		public static void set_flags_all (Gst.AllocTraceFlags flags);
+	public class ParamSpecMiniObject : GLib.ParamSpec {
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/gst.h")]
-	public class BufferClass : Gst.MiniObjectClass {
+	public class Pipeline : Gst.Bin, Gst.ChildProxy {
+		public weak Gst.Clock fixed_clock;
+		public Gst.ClockTime stream_time;
+		public void auto_clock ();
+		public bool get_auto_flush_bus ();
+		public Gst.Bus get_bus ();
+		public weak Gst.Clock get_clock ();
+		public Gst.ClockTime get_delay ();
+		public Gst.ClockTime get_last_stream_time ();
+		[CCode (type = "GstElement*", has_construct_function = false)]
+		public Pipeline (string name);
+		public void set_auto_flush_bus (bool auto_flush);
+		public bool set_clock (Gst.Clock clock);
+		public void set_delay (Gst.ClockTime delay);
+		public void set_new_stream_time (Gst.ClockTime time);
+		public void use_clock (Gst.Clock clock);
+		public bool auto_flush_bus { get; set; }
+		public uint64 delay { get; set; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/gst.h")]
-	public class ClockEntry {
-		public int refcount;
-		public weak Gst.Clock clock;
-		public Gst.ClockEntryType type;
-		public Gst.ClockTime time;
-		public Gst.ClockTime interval;
-		public Gst.ClockReturn status;
-		public weak Gst.ClockCallback func;
-		public void* user_data;
-	}
-	[Compact]
-	[CCode (ref_function = "gst_clock_id_ref", unref_function = "gst_clock_id_unref", cheader_filename = "gst/gst.h")]
-	public class ClockID {
-		public static int compare_func (void* id1, void* id2);
-		public Gst.ClockTime get_time ();
-		public void unschedule ();
-		public Gst.ClockReturn wait (Gst.ClockTimeDiff jitter);
-		public Gst.ClockReturn wait_async (Gst.ClockCallback func);
+	public class Plugin : Gst.Object {
+		public weak string basename;
+		public weak Gst.PluginDesc desc;
+		public ulong file_mtime;
+		public int64 file_size;
+		public weak string filename;
+		public uint flags;
+		public weak GLib.Module module;
+		public weak Gst.PluginDesc orig_desc;
+		public bool registered;
+		public static GLib.Quark error_quark ();
+		public weak string get_description ();
+		public weak string get_filename ();
+		public weak string get_license ();
+		public weak GLib.Module get_module ();
+		public weak string get_name ();
+		public weak string get_origin ();
+		public weak string get_package ();
+		public weak string get_source ();
+		public weak string get_version ();
+		public bool is_loaded ();
+		public static void list_free (GLib.List list);
+		public weak Gst.Plugin load ();
+		public static weak Gst.Plugin load_by_name (string name);
+		public static weak Gst.Plugin load_file (string filename) throws GLib.Error;
+		public bool name_filter (string name);
+		public static bool register_static (int major_version, int minor_version, string name, string description, Gst.PluginInitFunc init_func, string version, string license, string source, string package, string origin);
 	}
 	[Compact]
 	[CCode (cheader_filename = "gst/gst.h")]
-	public class DebugMessage {
-		public weak string get ();
+	public class PluginDesc {
+		public weak string description;
+		public weak string license;
+		public int major_version;
+		public int minor_version;
+		public weak string name;
+		public weak string origin;
+		public weak string package;
+		public weak Gst.PluginInitFunc plugin_init;
+		public weak string source;
+		public weak string version;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/gst.h")]
-	public class IndexAssociation {
-		public Gst.Format format;
-		public int64 value;
+	public class PluginFeature : Gst.Object {
+		public bool loaded;
+		public weak string name;
+		public weak string plugin_name;
+		public uint rank;
+		public bool check_version (uint min_major, uint min_minor, uint min_micro);
+		public weak string get_name ();
+		public uint get_rank ();
+		public static void list_free (GLib.List list);
+		public weak Gst.PluginFeature load ();
+		public void set_name (string name);
+		public void set_rank (uint rank);
+		public bool type_name_filter (Gst.TypeNameData data);
 	}
 	[Compact]
 	[CCode (cheader_filename = "gst/gst.h")]
-	public class IndexGroup {
-		public int groupnum;
-		public weak GLib.List entries;
-		public Gst.IndexCertainty certainty;
-		public int peergroup;
+	public class Poll {
+		public bool add_fd (Gst.PollFD fd);
+		[CCode (has_construct_function = false)]
+		public Poll (bool controllable);
+		public bool remove_fd (Gst.PollFD fd);
+		public void restart ();
+		public bool set_controllable (bool controllable);
+		public void set_flushing (bool flushing);
+		public int wait (Gst.ClockTime timeout);
 	}
 	[Compact]
 	[CCode (cheader_filename = "gst/gst.h")]
-	public class Iterator {
-		public weak Gst.IteratorNextFunction next;
-		public weak Gst.IteratorItemFunction item;
-		public weak Gst.IteratorResyncFunction resync;
-		public weak Gst.IteratorFreeFunction free;
-		public weak Gst.Iterator pushed;
-		public GLib.Type type;
-		public weak GLib.Mutex @lock;
-		public uint cookie;
-		public uint master_cookie;
-		public weak Gst.Iterator filter (GLib.CompareFunc func);
-		public void* find_custom (GLib.CompareFunc func);
-		public Gst.IteratorResult fold (Gst.IteratorFoldFunction func, GLib.Value ret);
-		public Gst.IteratorResult @foreach (GLib.Func func);
-		[CCode (has_construct_function = false)]
-		public Iterator (uint size, GLib.Type type, GLib.Mutex @lock, uint master_cookie, Gst.IteratorNextFunction next, Gst.IteratorItemFunction item, Gst.IteratorResyncFunction resync, Gst.IteratorFreeFunction free);
-		[CCode (has_construct_function = false)]
-		public Iterator.list (GLib.Type type, GLib.Mutex @lock, uint master_cookie, GLib.List list, void* owner, Gst.IteratorItemFunction item, Gst.IteratorDisposeFunction free);
-		public void push (Gst.Iterator other);
+	public class PollFD {
+		public int fd;
+		public int idx;
+		public static bool can_read (Gst.Poll set, Gst.PollFD fd);
+		public static bool can_write (Gst.Poll set, Gst.PollFD fd);
+		public static bool ctl_read (Gst.Poll set, Gst.PollFD fd, bool active);
+		public static bool ctl_write (Gst.Poll set, Gst.PollFD fd, bool active);
+		public static bool has_closed (Gst.Poll set, Gst.PollFD fd);
+		public static bool has_error (Gst.Poll set, Gst.PollFD fd);
+		public static void ignored (Gst.Poll set, Gst.PollFD fd);
+		public void init ();
 	}
 	[CCode (cheader_filename = "gst/gst.h")]
-	public class Message : Gst.MiniObject {
-		public weak GLib.Mutex @lock;
-		public weak GLib.Cond cond;
-		public Gst.MessageType type;
-		public uint64 timestamp;
-		public weak Gst.Object src;
+	public class Query : Gst.MiniObject {
 		public weak Gst.Structure structure;
-		public weak Gst.Structure get_structure ();
+		public Gst.QueryType type;
 		[CCode (has_construct_function = false)]
-		public Message.application (Gst.Object src, Gst.Structure structure);
+		public Query.application (Gst.QueryType type, Gst.Structure structure);
 		[CCode (has_construct_function = false)]
-		public Message.async_done (Gst.Object src);
-		[CCode (has_construct_function = false)]
-		public Message.async_start (Gst.Object src, bool new_base_time);
-		[CCode (has_construct_function = false)]
-		public Message.buffering (Gst.Object src, int percent);
-		[CCode (has_construct_function = false)]
-		public Message.clock_lost (Gst.Object src, Gst.Clock clock);
-		[CCode (has_construct_function = false)]
-		public Message.clock_provide (Gst.Object src, Gst.Clock clock, bool ready);
-		[CCode (has_construct_function = false)]
-		public Message.custom (Gst.MessageType type, Gst.Object src, Gst.Structure structure);
-		[CCode (has_construct_function = false)]
-		public Message.duration (Gst.Object src, Gst.Format format, int64 duration);
-		[CCode (has_construct_function = false)]
-		public Message.element (Gst.Object src, Gst.Structure structure);
-		[CCode (has_construct_function = false)]
-		public Message.eos (Gst.Object src);
-		[CCode (has_construct_function = false)]
-		public Message.error (Gst.Object src, GLib.Error error, string debug);
-		[CCode (has_construct_function = false)]
-		public Message.info (Gst.Object src, GLib.Error error, string debug);
-		[CCode (has_construct_function = false)]
-		public Message.latency (Gst.Object src);
-		[CCode (has_construct_function = false)]
-		public Message.new_clock (Gst.Object src, Gst.Clock clock);
-		[CCode (has_construct_function = false)]
-		public Message.segment_done (Gst.Object src, Gst.Format format, int64 position);
-		[CCode (has_construct_function = false)]
-		public Message.segment_start (Gst.Object src, Gst.Format format, int64 position);
-		[CCode (has_construct_function = false)]
-		public Message.state_changed (Gst.Object src, Gst.State oldstate, Gst.State newstate, Gst.State pending);
-		[CCode (has_construct_function = false)]
-		public Message.state_dirty (Gst.Object src);
-		[CCode (has_construct_function = false)]
-		public Message.tag (Gst.Object src, Gst.TagList tag_list);
-		[CCode (has_construct_function = false)]
-		public Message.warning (Gst.Object src, GLib.Error error, string debug);
-		public void parse_async_start (out bool new_base_time);
-		public void parse_buffering (out int percent);
-		public void parse_buffering_stats (Gst.BufferingMode mode, int avg_in, int avg_out, int64 buffering_left);
-		public void parse_clock_lost (out weak Gst.Clock clock);
-		public void parse_clock_provide (out weak Gst.Clock clock, out bool ready);
-		public void parse_duration (out Gst.Format format, out int64 duration);
-		public void parse_error (out GLib.Error gerror, out string debug);
-		public void parse_info (out GLib.Error gerror, out string debug);
-		public void parse_new_clock (out weak Gst.Clock clock);
-		public void parse_segment_done (out Gst.Format format, out int64 position);
-		public void parse_segment_start (out Gst.Format format, out int64 position);
-		public void parse_state_changed (out Gst.State oldstate, out Gst.State newstate, out Gst.State pending);
-		public void parse_tag (out Gst.TagList tag_list);
-		public void parse_warning (out GLib.Error gerror, out string debug);
-		public void set_buffering_stats (Gst.BufferingMode mode, int avg_in, int avg_out, int64 buffering_left);
-		public static weak string type_get_name (Gst.MessageType type);
-		public static GLib.Quark type_to_quark (Gst.MessageType type);
-	}
-	[Compact]
-	[CCode (cheader_filename = "gst/gst.h")]
-	public class MessageClass : Gst.MiniObjectClass {
-	}
-	[CCode (ref_function = "gst_mini_object_ref", unref_function = "gst_mini_object_unref", cheader_filename = "gst/gst.h")]
-	public class MiniObject {
-		public int refcount;
-		public uint flags;
-		public weak Gst.MiniObject copy ();
-		public bool is_writable ();
-		public weak Gst.MiniObject make_writable ();
-		[CCode (has_construct_function = false)]
-		public MiniObject (GLib.Type type);
-		public void replace (Gst.MiniObject newdata);
-	}
-	[Compact]
-	[CCode (cheader_filename = "gst/gst.h")]
-	public class MiniObjectClass : GLib.TypeClass {
-		public weak Gst.MiniObjectCopyFunction copy;
-		public weak Gst.MiniObjectFinalizeFunction finalize;
-	}
-	[CCode (cheader_filename = "gst/gst.h")]
-	public class ParamSpecFraction : GLib.ParamSpec {
-		public int min_num;
-		public int min_den;
-		public int max_num;
-		public int max_den;
-		public int def_num;
-		public int def_den;
-	}
-	[CCode (cheader_filename = "gst/gst.h")]
-	public class ParamSpecMiniObject : GLib.ParamSpec {
-	}
-	[Compact]
-	[CCode (cheader_filename = "gst/gst.h")]
-	public class PluginDesc {
-		public int major_version;
-		public int minor_version;
-		public weak string name;
-		public weak string description;
-		public weak Gst.PluginInitFunc plugin_init;
-		public weak string version;
-		public weak string license;
-		public weak string source;
-		public weak string package;
-		public weak string origin;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gst/gst.h")]
-	public class Poll {
-		public bool add_fd (Gst.PollFD fd);
-		[CCode (has_construct_function = false)]
-		public Poll (bool controllable);
-		public bool remove_fd (Gst.PollFD fd);
-		public void restart ();
-		public bool set_controllable (bool controllable);
-		public void set_flushing (bool flushing);
-		public int wait (Gst.ClockTime timeout);
-	}
-	[Compact]
-	[CCode (cheader_filename = "gst/gst.h")]
-	public class PollFD {
-		public int fd;
-		public int idx;
-		public static bool can_read (Gst.Poll set, Gst.PollFD fd);
-		public static bool can_write (Gst.Poll set, Gst.PollFD fd);
-		public static bool ctl_read (Gst.Poll set, Gst.PollFD fd, bool active);
-		public static bool ctl_write (Gst.Poll set, Gst.PollFD fd, bool active);
-		public static bool has_closed (Gst.Poll set, Gst.PollFD fd);
-		public static bool has_error (Gst.Poll set, Gst.PollFD fd);
-		public static void ignored (Gst.Poll set, Gst.PollFD fd);
-		public void init ();
-	}
-	[CCode (cheader_filename = "gst/gst.h")]
-	public class Query : Gst.MiniObject {
-		public Gst.QueryType type;
-		public weak Gst.Structure structure;
-		public weak Gst.Structure get_structure ();
-		[CCode (has_construct_function = false)]
-		public Query.application (Gst.QueryType type, Gst.Structure structure);
-		[CCode (has_construct_function = false)]
-		public Query.buffering (Gst.Format format);
+		public Query.buffering (Gst.Format format);
 		[CCode (has_construct_function = false)]
 		public Query.convert (Gst.Format src_format, int64 value, Gst.Format dest_format);
 		[CCode (has_construct_function = false)]
 		public Query.duration (Gst.Format format);
 		[CCode (has_construct_function = false)]
 		public Query.formats ();
+		public weak Gst.Structure get_structure ();
 		[CCode (has_construct_function = false)]
 		public Query.latency ();
-		[CCode (has_construct_function = false)]
-		public Query.position (Gst.Format format);
-		[CCode (has_construct_function = false)]
-		public Query.seeking (Gst.Format format);
-		[CCode (has_construct_function = false)]
-		public Query.segment (Gst.Format format);
 		public void parse_buffering_percent (bool busy, int percent);
 		public void parse_buffering_range (Gst.Format format, int64 start, int64 stop, int64 estimated_total);
 		public void parse_buffering_stats (Gst.BufferingMode mode, int avg_in, int avg_out, int64 buffering_left);
@@ -1090,6 +985,12 @@
 		public void parse_position (out Gst.Format format, out int64 cur);
 		public void parse_seeking (out Gst.Format format, out bool seekable, out int64 segment_start, out int64 segment_end);
 		public void parse_segment (out double rate, out Gst.Format format, out int64 start_value, out int64 stop_value);
+		[CCode (has_construct_function = false)]
+		public Query.position (Gst.Format format);
+		[CCode (has_construct_function = false)]
+		public Query.seeking (Gst.Format format);
+		[CCode (has_construct_function = false)]
+		public Query.segment (Gst.Format format);
 		public void set_buffering_percent (bool busy, int percent);
 		public void set_buffering_range (Gst.Format format, int64 start, int64 stop, int64 estimated_total);
 		public void set_buffering_stats (Gst.BufferingMode mode, int avg_in, int avg_out, int64 buffering_left);
@@ -1116,161 +1017,77 @@
 	[Compact]
 	[CCode (cheader_filename = "gst/gst.h")]
 	public class QueryTypeDefinition {
-		public Gst.QueryType value;
-		public weak string nick;
 		public weak string description;
+		public weak string nick;
 		public GLib.Quark quark;
+		public Gst.QueryType value;
+	}
+	[CCode (cheader_filename = "gst/gst.h")]
+	public class Registry : Gst.Object {
+		public int cache_file;
+		public weak GLib.HashTable feature_hash;
+		public weak GLib.List features;
+		public weak GLib.List paths;
+		public weak GLib.List plugins;
+		public bool add_feature (Gst.PluginFeature feature);
+		public void add_path (string path);
+		public bool add_plugin (Gst.Plugin plugin);
+		public weak GLib.List feature_filter ([CCode (delegate_target_pos = 2.1)] Gst.PluginFeatureFilter filter, bool first);
+		public weak Gst.PluginFeature find_feature (string name, GLib.Type type);
+		public weak Gst.Plugin find_plugin (string name);
+		public static bool fork_is_enabled ();
+		public static void fork_set_enabled (bool enabled);
+		public static weak Gst.Registry get_default ();
+		public weak GLib.List get_feature_list (GLib.Type type);
+		public weak GLib.List get_feature_list_by_plugin (string name);
+		public weak GLib.List get_path_list ();
+		public weak GLib.List get_plugin_list ();
+		public weak Gst.Plugin lookup (string filename);
+		public weak Gst.PluginFeature lookup_feature (string name);
+		public weak GLib.List plugin_filter (Gst.PluginFilter filter, bool first);
+		public void remove_feature (Gst.PluginFeature feature);
+		public void remove_plugin (Gst.Plugin plugin);
+		public bool scan_path (string path);
+		public bool xml_read_cache (string location);
+		public bool xml_write_cache (string location);
+		public virtual signal void feature_added (void* feature);
+		public virtual signal void plugin_added (void* plugin);
 	}
 	[Compact]
-	[CCode (copy_function = "gst_tag_list_copy", cheader_filename = "gst/gst.h")]
-	public class TagList {
-		public void add (Gst.TagMergeMode mode, string tag, ...);
-		public void add_valist (Gst.TagMergeMode mode, string tag, void* var_args);
-		public void add_valist_values (Gst.TagMergeMode mode, string tag, void* var_args);
-		public void add_values (Gst.TagMergeMode mode, string tag, ...);
-		public Gst.TagList copy ();
-		public static bool copy_value (out GLib.Value dest, Gst.TagList list, string tag);
-		public void @foreach (Gst.TagForeachFunc func);
-		public bool get_boolean (string tag, out bool value);
-		public bool get_boolean_index (string tag, uint index, out bool value);
-		public bool get_char (string tag, out char value);
-		public bool get_char_index (string tag, uint index, out char value);
-		public bool get_date (string tag, out GLib.Date value);
-		public bool get_date_index (string tag, uint index, out GLib.Date value);
-		public bool get_double (string tag, out double value);
-		public bool get_double_index (string tag, uint index, out double value);
-		public bool get_float (string tag, out float value);
-		public bool get_float_index (string tag, uint index, out float value);
-		public bool get_int (string tag, out int value);
-		public bool get_int64 (string tag, out int64 value);
-		public bool get_int64_index (string tag, uint index, out int64 value);
-		public bool get_int_index (string tag, uint index, out int value);
-		public bool get_long (string tag, out long value);
-		public bool get_long_index (string tag, uint index, out long value);
-		public bool get_pointer (string tag, out void* value);
-		public bool get_pointer_index (string tag, uint index, out void* value);
-		public bool get_string (string tag, out string value);
-		public bool get_string_index (string tag, uint index, out string value);
-		public uint get_tag_size (string tag);
-		public bool get_uchar (string tag, out uchar value);
-		public bool get_uchar_index (string tag, uint index, out uchar value);
-		public bool get_uint (string tag, out uint value);
-		public bool get_uint64 (string tag, out uint64 value);
-		public bool get_uint64_index (string tag, uint index, out uint64 value);
-		public bool get_uint_index (string tag, uint index, out uint value);
-		public bool get_ulong (string tag, out ulong value);
-		public bool get_ulong_index (string tag, uint index, out ulong value);
-		public weak GLib.Value? get_value_index (string tag, uint index);
-		public void insert (Gst.TagList from, Gst.TagMergeMode mode);
-		public bool is_empty ();
-		public weak Gst.TagList merge (Gst.TagList list2, Gst.TagMergeMode mode);
+	[CCode (copy_function = "gst_segment_copy", cheader_filename = "gst/gst.h")]
+	public class Segment {
+		public double abs_rate;
+		public int64 accum;
+		public double applied_rate;
+		public int64 duration;
+		public Gst.SeekFlags flags;
+		public Gst.Format format;
+		public int64 last_stop;
+		public double rate;
+		public int64 start;
+		public int64 stop;
+		public int64 time;
+		public bool clip (Gst.Format format, int64 start, int64 stop, int64 clip_start, int64 clip_stop);
+		public weak Gst.Segment copy ();
+		public void init (Gst.Format format);
 		[CCode (has_construct_function = false)]
-		public TagList ();
-		public void remove_tag (string tag);
-	}
-	[Compact]
-	[CCode (free_function = "gst_trace_destroy", cheader_filename = "gst/gst.h")]
-	public class Trace {
-		public weak string filename;
-		public int fd;
-		public weak Gst.TraceEntry buf;
-		public int bufsize;
-		public int bufoffset;
-		public void flush ();
-		[CCode (has_construct_function = false)]
-		public Trace (string filename, int size);
-		public static void read_tsc (int64 dst);
-		public void set_default ();
-		public void text_flush ();
-	}
-	[Compact]
-	[CCode (cheader_filename = "gst/gst.h")]
-	public class TraceEntry {
-		public int64 timestamp;
-		public uint sequence;
-		public uint data;
-		[NoArrayLength]
-		public weak char[] message;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gst/gst.h")]
-	public class TypeFind {
-		public void* data;
-		[CCode (cname = "gst_type_find_get_length")]
-		public uint64 get_length ();
-		[CCode (cname = "gst_type_find_peek")]
-		public uchar peek (int64 offset, uint size);
-		[CCode (cname = "gst_type_find_register")]
-		public static bool register (Gst.Plugin plugin, string name, uint rank, Gst.TypeFindFunction func, string extensions, Gst.Caps possible_caps, void* data, GLib.DestroyNotify data_notify);
-		[CCode (cname = "gst_type_find_suggest")]
-		public void suggest (uint probability, Gst.Caps caps);
-	}
-	[Compact]
-	[CCode (cheader_filename = "gst/gst.h")]
-	public class TypeNameData {
-		public weak string name;
-		public GLib.Type type;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gst/gst.h")]
-	public class ValueTable {
-		public GLib.Type type;
-		public weak Gst.ValueCompareFunc compare;
-		public weak Gst.ValueSerializeFunc serialize;
-		public weak Gst.ValueDeserializeFunc deserialize;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gst/gst.h")]
-	public class Date {
-	}
-	[Compact]
-	[CCode (cheader_filename = "gst/gst.h")]
-	public class GError {
-	}
-	[Compact]
-	[CCode (copy_function = "gst_index_entry_copy", cheader_filename = "gst/gst.h")]
-	public class IndexEntry {
-		public Gst.IndexEntryType type;
-		public int id;
-		public void* data;
-		public bool assoc_map (Gst.Format format, int64 value);
-		public weak Gst.IndexEntry copy ();
-	}
-	[Compact]
-	[CCode (copy_function = "gst_segment_copy", cheader_filename = "gst/gst.h")]
-	public class Segment {
-		public double rate;
-		public double abs_rate;
-		public Gst.Format format;
-		public Gst.SeekFlags flags;
-		public int64 start;
-		public int64 stop;
-		public int64 time;
-		public int64 accum;
-		public int64 last_stop;
-		public int64 duration;
-		public double applied_rate;
-		public bool clip (Gst.Format format, int64 start, int64 stop, int64 clip_start, int64 clip_stop);
-		public weak Gst.Segment copy ();
-		public void init (Gst.Format format);
-		[CCode (has_construct_function = false)]
-		public Segment ();
-		public void set_duration (Gst.Format format, int64 duration);
-		public void set_last_stop (Gst.Format format, int64 position);
-		public void set_newsegment (bool update, double rate, Gst.Format format, int64 start, int64 stop, int64 time);
-		public void set_newsegment_full (bool update, double rate, double applied_rate, Gst.Format format, int64 start, int64 stop, int64 time);
-		public void set_seek (double rate, Gst.Format format, Gst.SeekFlags flags, Gst.SeekType start_type, int64 start, Gst.SeekType stop_type, int64 stop, bool update);
-		public int64 to_running_time (Gst.Format format, int64 position);
-		public int64 to_stream_time (Gst.Format format, int64 position);
+		public Segment ();
+		public void set_duration (Gst.Format format, int64 duration);
+		public void set_last_stop (Gst.Format format, int64 position);
+		public void set_newsegment (bool update, double rate, Gst.Format format, int64 start, int64 stop, int64 time);
+		public void set_newsegment_full (bool update, double rate, double applied_rate, Gst.Format format, int64 start, int64 stop, int64 time);
+		public void set_seek (double rate, Gst.Format format, Gst.SeekFlags flags, Gst.SeekType start_type, int64 start, Gst.SeekType stop_type, int64 stop, bool update);
+		public int64 to_running_time (Gst.Format format, int64 position);
+		public int64 to_stream_time (Gst.Format format, int64 position);
 	}
 	[Compact]
 	[Immutable]
 	[CCode (copy_function = "gst_structure_copy", cheader_filename = "gst/gst.h")]
 	public class Structure {
-		public GLib.Type type;
+		public weak GLib.Array fields;
 		public GLib.Quark name;
 		public int parent_refcount;
-		public weak GLib.Array fields;
+		public GLib.Type type;
 		public weak Gst.Structure copy ();
 		public static weak Gst.Structure empty_new (string name);
 		public bool fixate_field_boolean (string field_name, bool target);
@@ -1305,8 +1122,6 @@
 		public int n_fields ();
 		[CCode (has_construct_function = false)]
 		public Structure (string name, string firstfield, ...);
-		[CCode (has_construct_function = false)]
-		public Structure.valist (string name, string firstfield, void* varargs);
 		public weak string nth_field_name (uint index);
 		public void remove_all_fields ();
 		public void remove_field (string fieldname);
@@ -1318,636 +1133,821 @@
 		public void set_valist (string fieldname, void* varargs);
 		public void set_value (string fieldname, GLib.Value value);
 		public weak string to_string ();
+		[CCode (has_construct_function = false)]
+		public Structure.valist (string name, string firstfield, void* varargs);
 	}
 	[CCode (cheader_filename = "gst/gst.h")]
-	public class Bin : Gst.Element, Gst.ChildProxy {
-		public int numchildren;
-		public weak GLib.List children;
-		public uint children_cookie;
-		public weak Gst.Bus child_bus;
-		public weak GLib.List messages;
-		public bool polling;
-		public bool state_dirty;
-		public bool clock_dirty;
-		public weak Gst.Clock provided_clock;
-		public weak Gst.Element clock_provider;
-		public bool add (Gst.Element# element);
-		public void add_many (Gst.Element element_1, ...);
-		public weak Gst.Pad find_unconnected_pad (Gst.PadDirection direction);
-		public weak Gst.Element get_by_interface (GLib.Type iface);
-		public weak Gst.Element get_by_name (string name);
-		public weak Gst.Element get_by_name_recurse_up (string name);
-		public weak Gst.Iterator iterate_all_by_interface (GLib.Type iface);
-		public weak Gst.Iterator iterate_elements ();
-		public weak Gst.Iterator iterate_recurse ();
-		public weak Gst.Iterator iterate_sinks ();
-		public weak Gst.Iterator iterate_sorted ();
-		public weak Gst.Iterator iterate_sources ();
-		[CCode (type = "GstElement*", has_construct_function = false)]
-		public Bin (string name);
-		public bool remove (Gst.Element element);
-		public void remove_many (Gst.Element element_1, ...);
-		[NoWrapper]
-		public virtual bool add_element (Gst.Element element);
-		[NoWrapper]
-		public virtual void handle_message (Gst.Message message);
-		[NoWrapper]
-		public virtual bool remove_element (Gst.Element element);
-		[NoAccessorMethod]
-		public bool async_handling { get; set; }
-		public virtual signal void element_added (Gst.Element child);
-		public virtual signal void element_removed (Gst.Element child);
+	public class SystemClock : Gst.Clock {
+		public bool stopping;
+		public weak GLib.Thread thread;
+		public static weak Gst.Clock obtain ();
+	}
+	[Compact]
+	[CCode (copy_function = "gst_tag_list_copy", cheader_filename = "gst/gst.h")]
+	public class TagList {
+		public void add (Gst.TagMergeMode mode, string tag, ...);
+		public void add_valist (Gst.TagMergeMode mode, string tag, void* var_args);
+		public void add_valist_values (Gst.TagMergeMode mode, string tag, void* var_args);
+		public void add_values (Gst.TagMergeMode mode, string tag, ...);
+		public Gst.TagList copy ();
+		public static bool copy_value (out GLib.Value dest, Gst.TagList list, string tag);
+		public void @foreach (Gst.TagForeachFunc func);
+		public bool get_boolean (string tag, out bool value);
+		public bool get_boolean_index (string tag, uint index, out bool value);
+		public bool get_char (string tag, out char value);
+		public bool get_char_index (string tag, uint index, out char value);
+		public bool get_date (string tag, out GLib.Date value);
+		public bool get_date_index (string tag, uint index, out GLib.Date value);
+		public bool get_double (string tag, out double value);
+		public bool get_double_index (string tag, uint index, out double value);
+		public bool get_float (string tag, out float value);
+		public bool get_float_index (string tag, uint index, out float value);
+		public bool get_int (string tag, out int value);
+		public bool get_int64 (string tag, out int64 value);
+		public bool get_int64_index (string tag, uint index, out int64 value);
+		public bool get_int_index (string tag, uint index, out int value);
+		public bool get_long (string tag, out long value);
+		public bool get_long_index (string tag, uint index, out long value);
+		public bool get_pointer (string tag, out void* value);
+		public bool get_pointer_index (string tag, uint index, out void* value);
+		public bool get_string (string tag, out string value);
+		public bool get_string_index (string tag, uint index, out string value);
+		public uint get_tag_size (string tag);
+		public bool get_uchar (string tag, out uchar value);
+		public bool get_uchar_index (string tag, uint index, out uchar value);
+		public bool get_uint (string tag, out uint value);
+		public bool get_uint64 (string tag, out uint64 value);
+		public bool get_uint64_index (string tag, uint index, out uint64 value);
+		public bool get_uint_index (string tag, uint index, out uint value);
+		public bool get_ulong (string tag, out ulong value);
+		public bool get_ulong_index (string tag, uint index, out ulong value);
+		public weak GLib.Value? get_value_index (string tag, uint index);
+		public void insert (Gst.TagList from, Gst.TagMergeMode mode);
+		public bool is_empty ();
+		public weak Gst.TagList merge (Gst.TagList list2, Gst.TagMergeMode mode);
+		[CCode (has_construct_function = false)]
+		public TagList ();
+		public void remove_tag (string tag);
 	}
 	[CCode (cheader_filename = "gst/gst.h")]
-	public class Bus : Gst.Object {
-		public weak GLib.Queue queue;
-		public weak GLib.Mutex queue_lock;
-		public weak Gst.BusSyncHandler sync_handler;
-		public void* sync_handler_data;
-		public uint signal_watch_id;
-		public uint num_signal_watchers;
-		public void add_signal_watch ();
-		public void add_signal_watch_full (int priority);
-		public uint add_watch (Gst.BusFunc func);
-		public uint add_watch_full (int priority, Gst.BusFunc# func);
-		public bool async_signal_func (Gst.Message message, void* data);
-		public weak GLib.TimeoutSource create_watch ();
-		public void disable_sync_message_emission ();
-		public void enable_sync_message_emission ();
-		public bool have_pending ();
+	public class Task : Gst.Object {
+		public void* abidata;
+		public weak GLib.Cond cond;
+		public void* data;
+		public weak Gst.TaskFunction func;
+		public GLib.StaticRecMutex @lock;
+		public bool running;
+		public Gst.TaskState state;
+		public static void cleanup_all ();
+		public static weak Gst.Task create (Gst.TaskFunction func, void* data);
+		public Gst.TaskState get_state ();
+		public bool join ();
+		public bool pause ();
+		public void set_lock (GLib.StaticRecMutex mutex);
+		public bool start ();
+		public bool stop ();
+	}
+	[Compact]
+	[CCode (free_function = "gst_trace_destroy", cheader_filename = "gst/gst.h")]
+	public class Trace {
+		public weak Gst.TraceEntry buf;
+		public int bufoffset;
+		public int bufsize;
+		public int fd;
+		public weak string filename;
+		public void flush ();
 		[CCode (has_construct_function = false)]
-		public Bus ();
-		public weak Gst.Message peek ();
-		public weak Gst.Message poll (Gst.MessageType events, Gst.ClockTimeDiff timeout);
-		public weak Gst.Message pop ();
-		public weak Gst.Message pop_filtered (Gst.MessageType types);
-		public bool post (Gst.Message message);
-		public void remove_signal_watch ();
-		public void set_flushing (bool flushing);
-		public void set_sync_handler (Gst.BusSyncHandler func);
-		public Gst.BusSyncReply sync_signal_handler (Gst.Message message, void* data);
-		public weak Gst.Message timed_pop (Gst.ClockTime timeout);
-		public weak Gst.Message timed_pop_filtered (Gst.ClockTime timeout, Gst.MessageType types);
-		public virtual signal void message (Gst.Message message);
-		public virtual signal void sync_message (Gst.Message message);
+		public Trace (string filename, int size);
+		public static void read_tsc (int64 dst);
+		public void set_default ();
+		public void text_flush ();
 	}
+	[Compact]
 	[CCode (cheader_filename = "gst/gst.h")]
-	public class Clock : Gst.Object {
-		public weak GLib.Mutex slave_lock;
-		public Gst.ClockTime internal_calibration;
-		public Gst.ClockTime external_calibration;
-		public Gst.ClockTime rate_numerator;
-		public Gst.ClockTime rate_denominator;
-		public Gst.ClockTime last_time;
-		public weak GLib.List entries;
-		public weak GLib.Cond entries_changed;
-		public Gst.ClockTime resolution;
-		public weak Gst.Clock master;
-		public bool filling;
-		public int time_index;
-		public Gst.ClockTime times;
-		public weak Gst.ClockID clockid;
-		public bool add_observation (Gst.ClockTime slave, Gst.ClockTime master, double r_squared);
-		public Gst.ClockTime adjust_unlocked (Gst.ClockTime internal);
-		public void get_calibration (Gst.ClockTime internal, Gst.ClockTime external, Gst.ClockTime rate_num, Gst.ClockTime rate_denom);
-		public weak Gst.Clock get_master ();
-		public Gst.ClockTime get_time ();
-		[CCode (type = "GstClockID", has_construct_function = false)]
-		public Clock.periodic_id (Gst.Clock clock, Gst.ClockTime start_time, Gst.ClockTime interval);
-		[CCode (type = "GstClockID", has_construct_function = false)]
-		public Clock.single_shot_id (Gst.Clock clock, Gst.ClockTime time);
-		public void set_calibration (Gst.ClockTime internal, Gst.ClockTime external, Gst.ClockTime rate_num, Gst.ClockTime rate_denom);
-		public bool set_master (Gst.Clock master);
-		public Gst.ClockTime set_resolution (Gst.ClockTime resolution);
-		public Gst.ClockTime unadjust_unlocked (Gst.ClockTime external);
-		[NoWrapper]
-		public virtual Gst.ClockTime change_resolution (Gst.ClockTime old_resolution, Gst.ClockTime new_resolution);
-		public virtual Gst.ClockTime get_internal_time ();
-		public virtual Gst.ClockTime get_resolution ();
-		[NoWrapper]
-		public virtual void unschedule (Gst.ClockEntry entry);
-		[NoWrapper]
-		public virtual Gst.ClockReturn wait (Gst.ClockEntry entry);
-		[NoWrapper]
-		public virtual Gst.ClockReturn wait_async (Gst.ClockEntry entry);
-		[NoWrapper]
-		public virtual Gst.ClockReturn wait_jitter (Gst.ClockEntry entry, Gst.ClockTimeDiff jitter);
-		[NoAccessorMethod]
-		public bool stats { get; set; }
-		[NoAccessorMethod]
-		public uint64 timeout { get; set; }
-		[NoAccessorMethod]
-		public int window_size { get; set; }
-		[NoAccessorMethod]
-		public int window_threshold { get; set; }
+	public class TraceEntry {
+		public uint data;
+		[NoArrayLength]
+		public weak char[] message;
+		public uint sequence;
+		public int64 timestamp;
 	}
+	[Compact]
 	[CCode (cheader_filename = "gst/gst.h")]
-	public class Element : Gst.Object {
-		public GLib.StaticRecMutex state_lock;
-		public weak GLib.Cond state_cond;
-		public uint state_cookie;
-		public Gst.State current_state;
-		public Gst.State next_state;
-		public Gst.State pending_state;
-		public Gst.StateChangeReturn last_return;
-		public weak Gst.Bus bus;
-		public weak Gst.Clock clock;
-		public Gst.ClockTimeDiff base_time;
-		public ushort numpads;
-		public weak GLib.List pads;
-		public ushort numsrcpads;
-		public weak GLib.List srcpads;
-		public ushort numsinkpads;
-		public weak GLib.List sinkpads;
-		public uint pads_cookie;
-		public void* abidata;
-		public void abort_state ();
-		public bool add_pad (Gst.Pad# pad);
-		[CCode (cname = "gst_element_class_add_pad_template")]
-		public class void add_pad_template (Gst.PadTemplate templ);
-		[CCode (cname = "gst_element_class_get_pad_template")]
-		public class weak Gst.PadTemplate get_pad_template (string name);
-		[CCode (cname = "gst_element_class_get_pad_template_list")]
-		public class weak GLib.List get_pad_template_list ();
-		[CCode (cname = "gst_element_class_install_std_props")]
-		public class void install_std_props (...);
-		[CCode (cname = "gst_element_class_set_details")]
-		public class void set_details (Gst.ElementDetails details);
-		[CCode (cname = "gst_element_class_set_details_simple")]
-		public class void set_details_simple (string longname, string classification, string description, string author);
-		public Gst.StateChangeReturn continue_state (Gst.StateChangeReturn ret);
-		public void create_all_pads ();
-		public void found_tags (Gst.TagList list);
-		public void found_tags_for_pad (Gst.Pad pad, Gst.TagList list);
-		public Gst.ClockTime get_base_time ();
-		public Gst.Bus get_bus ();
-		public weak Gst.Clock get_clock ();
-		public weak Gst.Pad get_compatible_pad (Gst.Pad pad, Gst.Caps caps);
-		public weak Gst.PadTemplate get_compatible_pad_template (Gst.PadTemplate compattempl);
-		public weak Gst.ElementFactory get_factory ();
-		public weak Gst.Pad get_pad (string name);
-		public weak Gst.Pad get_request_pad (string name);
-		public weak Gst.Pad get_static_pad (string name);
-		public bool implements_interface (GLib.Type iface_type);
-		public bool is_indexable ();
-		public bool is_locked_state ();
-		public weak Gst.Iterator iterate_pads ();
-		public weak Gst.Iterator iterate_sink_pads ();
-		public weak Gst.Iterator iterate_src_pads ();
-		public bool link (Gst.Element dest);
-		public bool link_filtered (Gst.Element dest, Gst.Caps filter);
-		public bool link_many (Gst.Element element_2, ...);
-		public bool link_pads (string srcpadname, Gst.Element dest, string destpadname);
-		public bool link_pads_filtered (string srcpadname, Gst.Element dest, string destpadname, Gst.Caps filter);
-		public void lost_state ();
-		public static weak Gst.Element make_from_uri (Gst.URIType type, string uri, string elementname);
-		public void message_full (Gst.MessageType type, GLib.Quark domain, int code, string text, string debug, string file, string function, int line);
-		public bool post_message (Gst.Message message);
-		public bool provides_clock ();
-		public bool query_convert (Gst.Format src_format, int64 src_val, Gst.Format dest_format, int64 dest_val);
-		public bool query_duration (ref Gst.Format format, out int64 duration);
-		public bool query_position (ref Gst.Format format, out int64 cur);
-		public static bool register (Gst.Plugin plugin, string name, uint rank, GLib.Type type);
-		public void release_request_pad (Gst.Pad pad);
-		public bool remove_pad (Gst.Pad pad);
-		public bool requires_clock ();
-		public bool seek (double rate, Gst.Format format, Gst.SeekFlags flags, Gst.SeekType cur_type, int64 cur, Gst.SeekType stop_type, int64 stop);
-		public bool seek_simple (Gst.Format format, Gst.SeekFlags seek_flags, int64 seek_pos);
-		public void set_base_time (Gst.ClockTime time);
-		public bool set_locked_state (bool locked_state);
-		public static weak string state_change_return_get_name (Gst.StateChangeReturn state_ret);
-		public static weak string state_get_name (Gst.State state);
-		public bool sync_state_with_parent ();
-		public void unlink (Gst.Element dest);
-		public void unlink_many (Gst.Element element_2, ...);
-		public void unlink_pads (string srcpadname, Gst.Element dest, string destpadname);
-		public virtual Gst.StateChangeReturn change_state (Gst.StateChange transition);
-		public virtual weak Gst.Index get_index ();
-		public virtual Gst.QueryType get_query_types ();
-		public virtual Gst.StateChangeReturn get_state (out Gst.State state, out Gst.State pending, Gst.ClockTime timeout);
-		public virtual weak Gst.Clock provide_clock ();
-		public virtual bool query (Gst.Query query);
-		[NoWrapper]
-		public virtual void release_pad (Gst.Pad pad);
-		[NoWrapper]
-		public virtual weak Gst.Pad request_new_pad (Gst.PadTemplate templ, string name);
-		public virtual bool send_event (Gst.Event# event);
-		public virtual void set_bus (Gst.Bus bus);
-		public virtual bool set_clock (Gst.Clock clock);
-		public virtual void set_index (Gst.Index index);
-		public virtual Gst.StateChangeReturn set_state (Gst.State state);
-		[HasEmitter]
-		public virtual signal void no_more_pads ();
-		public virtual signal void pad_added (Gst.Pad pad);
-		public virtual signal void pad_removed (Gst.Pad pad);
+	public class TypeFind {
+		public void* data;
+		[CCode (cname = "gst_type_find_get_length")]
+		public uint64 get_length ();
+		[CCode (cname = "gst_type_find_peek")]
+		public uchar peek (int64 offset, uint size);
+		[CCode (cname = "gst_type_find_register")]
+		public static bool register (Gst.Plugin plugin, string name, uint rank, Gst.TypeFindFunction func, string extensions, Gst.Caps possible_caps, void* data, GLib.DestroyNotify data_notify);
+		[CCode (cname = "gst_type_find_suggest")]
+		public void suggest (uint probability, Gst.Caps caps);
 	}
 	[CCode (cheader_filename = "gst/gst.h")]
-	public class ElementFactory : Gst.PluginFeature {
+	public class TypeFindFactory : Gst.PluginFeature {
+		public weak Gst.Caps caps;
+		public weak string extensions;
+		public weak Gst.TypeFindFunction function;
+		public void* user_data;
+		public weak GLib.DestroyNotify user_data_notify;
+		[CCode (cname = "gst_type_find_factory_call_function")]
+		public void call_function (Gst.TypeFind find);
+		[CCode (cname = "gst_type_find_factory_get_caps")]
+		public weak Gst.Caps get_caps ();
+		[CCode (cname = "gst_type_find_factory_get_extensions")]
+		public weak string get_extensions ();
+		[CCode (cname = "gst_type_find_factory_get_list")]
+		public static weak GLib.List get_list ();
+	}
+	[Compact]
+	[CCode (cheader_filename = "gst/gst.h")]
+	public class TypeNameData {
+		public weak string name;
 		public GLib.Type type;
-		public Gst.ElementDetails details;
-		public weak GLib.List staticpadtemplates;
-		public uint numpadtemplates;
-		public uint uri_type;
-		public weak string uri_protocols;
-		public weak GLib.List interfaces;
-		public bool can_sink_caps (Gst.Caps caps);
-		public bool can_src_caps (Gst.Caps caps);
-		public Gst.Element? create (string? name);
-		public static weak Gst.ElementFactory find (string name);
-		public weak string get_author ();
-		public weak string get_description ();
-		public GLib.Type get_element_type ();
-		public weak string get_klass ();
-		public weak string get_longname ();
-		public uint get_num_pad_templates ();
-		public weak GLib.List get_static_pad_templates ();
-		public weak string get_uri_protocols ();
-		public int get_uri_type ();
-		public bool has_interface (string interfacename);
-		public static Gst.Element? make (string factoryname, string? name);
 	}
+	[Compact]
 	[CCode (cheader_filename = "gst/gst.h")]
-	public class GhostPad : Gst.Pad {
-		public weak Gst.Pad get_target ();
-		[CCode (type = "GstPad*", has_construct_function = false)]
-		public GhostPad (string name, Gst.Pad target);
-		[CCode (type = "GstPad*", has_construct_function = false)]
-		public GhostPad.from_template (string name, Gst.Pad target, Gst.PadTemplate templ);
-		[CCode (type = "GstPad*", has_construct_function = false)]
-		public GhostPad.no_target (string name, Gst.PadDirection dir);
-		[CCode (type = "GstPad*", has_construct_function = false)]
-		public GhostPad.no_target_from_template (string name, Gst.PadTemplate templ);
-		public bool set_target (Gst.Pad? newtarget);
+	public class ValueTable {
+		public weak Gst.ValueCompareFunc compare;
+		public weak Gst.ValueDeserializeFunc deserialize;
+		public weak Gst.ValueSerializeFunc serialize;
+		public GLib.Type type;
 	}
 	[CCode (cheader_filename = "gst/gst.h")]
-	public class Index : Gst.Object {
-		public weak GLib.List groups;
-		public weak Gst.IndexGroup curgroup;
-		public int maxgroup;
-		public Gst.IndexResolverMethod method;
-		public void* resolver_user_data;
-		public weak Gst.IndexFilter filter;
-		public void* filter_user_data;
-		public weak GLib.DestroyNotify filter_user_data_destroy;
-		public weak GLib.HashTable writers;
-		public int last_id;
-		public weak GLib.DestroyNotify resolver_user_data_destroy;
-		public weak Gst.IndexEntry add_association (int id, Gst.AssocFlags flags, Gst.Format format, int64 value);
-		public weak Gst.IndexEntry add_associationv (int id, Gst.AssocFlags flags, int n, Gst.IndexAssociation list);
-		public weak Gst.IndexEntry add_format (int id, Gst.Format format);
-		public weak Gst.IndexEntry add_id (int id, string description);
-		public weak Gst.IndexEntry add_object (int id, string key, GLib.Type type, void* object);
-		public weak Gst.IndexEntry get_assoc_entry_full (int id, Gst.IndexLookupMethod method, Gst.AssocFlags flags, Gst.Format format, int64 value, GLib.CompareDataFunc func);
-		public Gst.IndexCertainty get_certainty ();
-		public int get_group ();
+	public class XML : Gst.Object {
+		public void* ns;
+		public weak GLib.List topelements;
+		public weak Gst.Element get_element (uchar[] name);
+		public weak GLib.List get_topelements ();
+		public static weak Gst.Element make_element (void* cur, Gst.Object parent);
 		[CCode (has_construct_function = false)]
-		public Index ();
-		[CCode (type = "gint", has_construct_function = false)]
-		public Index.group (Gst.Index index);
-		public void set_certainty (Gst.IndexCertainty certainty);
-		public void set_filter (Gst.IndexFilter filter);
-		public void set_filter_full (Gst.IndexFilter filter, GLib.DestroyNotify user_data_destroy);
-		public bool set_group (int groupnum);
-		public void set_resolver (Gst.IndexResolver resolver);
-		public void set_resolver_full (Gst.IndexResolver resolver, GLib.DestroyNotify user_data_destroy);
+		public XML ();
 		[NoWrapper]
-		public virtual void add_entry (Gst.IndexEntry entry);
-		public virtual void commit (int id);
-		public virtual weak Gst.IndexEntry get_assoc_entry (int id, Gst.IndexLookupMethod method, Gst.AssocFlags flags, Gst.Format format, int64 value);
-		public virtual bool get_writer_id (Gst.Object writer, int id);
-		[NoAccessorMethod]
-		public Gst.IndexResolver resolver { get; set; }
-		public virtual signal void entry_added (Gst.IndexEntry entry);
+		public virtual void object_saved (Gst.Object object, void* self);
+		public bool parse_doc (void* doc, uchar[] root);
+		public bool parse_file (uchar[] fname, uchar[] root);
+		public bool parse_memory (uchar[] buffer, uint size, string root);
+		public static void* write (Gst.Element element);
+		public static int write_file (Gst.Element element, GLib.FileStream @out);
+		public virtual signal void object_loaded (Gst.Object object, void* self);
+	}
+	[CCode (cheader_filename = "gst/gst.h")]
+	public interface ChildProxy : Gst.Object {
+		public static void get (Gst.Object object, ...);
+		public abstract weak Gst.Object get_child_by_index (uint index);
+		public weak Gst.Object get_child_by_name (string name);
+		public abstract uint get_children_count ();
+		public static void get_property (Gst.Object object, string name, GLib.Value value);
+		public static void get_valist (Gst.Object object, string first_property_name, void* var_args);
+		public static bool lookup (Gst.Object object, string name, out weak Gst.Object target, out weak GLib.ParamSpec pspec);
+		public static void set (Gst.Object object, ...);
+		public static void set_property (Gst.Object object, string name, GLib.Value value);
+		public static void set_valist (Gst.Object object, string first_property_name, void* var_args);
+		[HasEmitter]
+		public virtual signal void child_added (GLib.Object child);
+		[HasEmitter]
+		public virtual signal void child_removed (GLib.Object child);
+	}
+	[CCode (cheader_filename = "gst/gst.h")]
+	public interface ImplementsInterface : Gst.Element {
+		public static void* cast (void* from, GLib.Type type);
+		public static bool check (void* from, GLib.Type type);
+		[NoWrapper]
+		public abstract bool supported (GLib.Type iface_type);
+	}
+	[CCode (cheader_filename = "gst/gst.h")]
+	public interface URIHandler {
+		public abstract weak string get_protocols ();
+		[NoWrapper]
+		public abstract weak string get_protocols_full (GLib.Type type);
+		[NoWrapper]
+		public abstract Gst.URIType get_type ();
+		[NoWrapper]
+		public abstract Gst.URIType get_type_full (GLib.Type type);
+		public abstract weak string get_uri ();
+		public uint get_uri_type ();
+		public abstract bool set_uri (string uri);
+		[HasEmitter]
+		public virtual signal void new_uri (string uri);
+	}
+	[CCode (cheader_filename = "gst/gst.h")]
+	[SimpleType]
+	[IntegerType (rank = 0)]
+	public struct ClockTime : uint64 {
+	}
+	[CCode (cheader_filename = "gst/gst.h")]
+	[SimpleType]
+	[IntegerType (rank = 0)]
+	public struct ClockTimeDiff : int64 {
+	}
+	[CCode (cheader_filename = "gst/gst.h")]
+	public struct ElementDetails {
+		public weak string author;
+		public weak string description;
+		public weak string klass;
+		public weak string longname;
+	}
+	[CCode (cheader_filename = "gst/gst.h")]
+	public struct FormatDefinition {
+		public weak string description;
+		public weak string nick;
+		public GLib.Quark quark;
+		public Gst.Format value;
+	}
+	[CCode (cheader_filename = "gst/gst.h")]
+	public struct StaticCaps {
+		[CCode (cname = "string")]
+		public weak string str;
+		public Gst.Caps get ();
+	}
+	[CCode (cheader_filename = "gst/gst.h")]
+	public struct StaticPadTemplate {
+		public Gst.PadDirection direction;
+		public weak string name_template;
+		public Gst.PadPresence presence;
+		public Gst.StaticCaps static_caps;
+		public Gst.PadTemplate get ();
+		public Gst.Caps get_caps ();
+	}
+	[CCode (cname = "GValue", type_id = "G_TYPE_VALUE", cheader_filename = "gst/gst.h")]
+	public struct Value : GLib.Value {
+		public void array_append_value (Gst.Value append_value);
+		public uint array_get_size ();
+		public static GLib.Type array_get_type ();
+		public weak Gst.Value? array_get_value (uint index);
+		public void array_prepend_value (Gst.Value prepend_value);
+		public static bool can_compare (Gst.Value value1, Gst.Value value2);
+		public static bool can_intersect (Gst.Value value1, Gst.Value value2);
+		public static bool can_subtract (Gst.Value minuend, Gst.Value subtrahend);
+		public static bool can_union (Gst.Value value1, Gst.Value value2);
+		public static int compare (Gst.Value value1, Gst.Value value2);
+		public bool deserialize (string src);
+		public static bool fraction_multiply (GLib.Value product, GLib.Value factor1, GLib.Value factor2);
+		public static bool fraction_subtract (GLib.Value dest, GLib.Value minuend, GLib.Value subtrahend);
+		public weak Gst.Buffer get_buffer ();
+		public Gst.Caps get_caps ();
+		public Gst.Date get_date ();
+		public double get_double_range_max ();
+		public double get_double_range_min ();
+		public uint get_fourcc ();
+		public int get_fraction_denominator ();
+		public int get_fraction_numerator ();
+		public weak Gst.Value? get_fraction_range_max ();
+		public weak Gst.Value? get_fraction_range_min ();
+		public int get_int_range_max ();
+		public int get_int_range_min ();
+		public weak Gst.Structure get_structure ();
+		public void init_and_copy (Gst.Value src);
+		public static bool intersect (Gst.Value dest, Gst.Value value1, Gst.Value value2);
+		public bool is_fixed ();
+		public void list_append_value (Gst.Value append_value);
+		public void list_concat (Gst.Value value1, Gst.Value value2);
+		public uint list_get_size ();
+		public static GLib.Type list_get_type ();
+		public weak Gst.Value? list_get_value (uint index);
+		public void list_prepend_value (Gst.Value prepend_value);
+		[CCode (cname = "GST_MAKE_FOURCC")]
+		public static uint make_fourcc (char a, char b, char c, char d);
+		public static void register (Gst.ValueTable table);
+		public static void register_intersect_func (GLib.Type type1, GLib.Type type2, Gst.ValueIntersectFunc func);
+		public static void register_subtract_func (GLib.Type minuend_type, GLib.Type subtrahend_type, Gst.ValueSubtractFunc func);
+		public static void register_union_func (GLib.Type type1, GLib.Type type2, Gst.ValueUnionFunc func);
+		public string serialize ();
+		public void set_buffer (Gst.Buffer b);
+		public void set_caps (Gst.Caps caps);
+		public void set_date (Gst.Date date);
+		public void set_double_range (double start, double end);
+		public void set_fourcc (uint fourcc);
+		public void set_fraction (int numerator, int denominator);
+		public void set_fraction_range (Gst.Value start, Gst.Value end);
+		public void set_fraction_range_full (int numerator_start, int denominator_start, int numerator_end, int denominator_end);
+		public void set_int_range (int start, int end);
+		public void set_structure (Gst.Structure structure);
+		[CCode (cname = "GST_STR_FOURCC")]
+		public static uint str_fourcc (string str);
+		public static bool subtract (Gst.Value dest, Gst.Value minuend, Gst.Value subtrahend);
+		public void take_buffer (Gst.Buffer b);
+		public static bool union (Gst.Value dest, Gst.Value value1, Gst.Value value2);
+	}
+	[CCode (cprefix = "GST_ACTIVATE_", cheader_filename = "gst/gst.h")]
+	public enum ActivateMode {
+		NONE,
+		PUSH,
+		PULL
+	}
+	[CCode (cprefix = "GST_ALLOC_TRACE_", cheader_filename = "gst/gst.h")]
+	[Flags]
+	public enum AllocTraceFlags {
+		LIVE,
+		MEM_LIVE
+	}
+	[CCode (cprefix = "GST_ASSOCIATION_FLAG_", cheader_filename = "gst/gst.h")]
+	[Flags]
+	public enum AssocFlags {
+		NONE,
+		KEY_UNIT,
+		DELTA_UNIT,
+		LAST
+	}
+	[CCode (cprefix = "GST_BIN_FLAG_", cheader_filename = "gst/gst.h")]
+	[Flags]
+	public enum BinFlags {
+		LAST
+	}
+	[CCode (cprefix = "GST_BUFFER_COPY_", cheader_filename = "gst/gst.h")]
+	[Flags]
+	public enum BufferCopyFlags {
+		FLAGS,
+		TIMESTAMPS,
+		CAPS
+	}
+	[CCode (cprefix = "GST_BUFFER_FLAG_", cheader_filename = "gst/gst.h")]
+	[Flags]
+	public enum BufferFlag {
+		READONLY,
+		PREROLL,
+		DISCONT,
+		IN_CAPS,
+		GAP,
+		DELTA_UNIT,
+		LAST
+	}
+	[CCode (cprefix = "GST_BUFFERING_", cheader_filename = "gst/gst.h")]
+	public enum BufferingMode {
+		STREAM,
+		DOWNLOAD,
+		TIMESHIFT,
+		LIVE
+	}
+	[CCode (cprefix = "GST_BUS_", cheader_filename = "gst/gst.h")]
+	[Flags]
+	public enum BusFlags {
+		FLUSHING,
+		FLAG_LAST
+	}
+	[CCode (cprefix = "GST_BUS_", cheader_filename = "gst/gst.h")]
+	public enum BusSyncReply {
+		DROP,
+		PASS,
+		ASYNC
+	}
+	[CCode (cprefix = "GST_CAPS_FLAGS_", cheader_filename = "gst/gst.h")]
+	[Flags]
+	public enum CapsFlags {
+		ANY
+	}
+	[CCode (cprefix = "GST_CLOCK_ENTRY_", cheader_filename = "gst/gst.h")]
+	public enum ClockEntryType {
+		SINGLE,
+		PERIODIC
+	}
+	[CCode (cprefix = "GST_CLOCK_FLAG_", cheader_filename = "gst/gst.h")]
+	[Flags]
+	public enum ClockFlags {
+		CAN_DO_SINGLE_SYNC,
+		CAN_DO_SINGLE_ASYNC,
+		CAN_DO_PERIODIC_SYNC,
+		CAN_DO_PERIODIC_ASYNC,
+		CAN_SET_RESOLUTION,
+		CAN_SET_MASTER,
+		LAST
+	}
+	[CCode (cprefix = "GST_CLOCK_", cheader_filename = "gst/gst.h")]
+	public enum ClockReturn {
+		OK,
+		EARLY,
+		UNSCHEDULED,
+		BUSY,
+		BADTIME,
+		ERROR,
+		UNSUPPORTED
+	}
+	[CCode (cprefix = "GST_CORE_ERROR_", cheader_filename = "gst/gst.h")]
+	public enum CoreError {
+		FAILED,
+		TOO_LAZY,
+		NOT_IMPLEMENTED,
+		STATE_CHANGE,
+		PAD,
+		THREAD,
+		NEGOTIATION,
+		EVENT,
+		SEEK,
+		CAPS,
+		TAG,
+		MISSING_PLUGIN,
+		CLOCK,
+		DISABLED,
+		NUM_ERRORS
+	}
+	[CCode (cprefix = "GST_DEBUG_", cheader_filename = "gst/gst.h")]
+	public enum DebugColorFlags {
+		FG_BLACK,
+		FG_RED,
+		FG_GREEN,
+		FG_YELLOW,
+		FG_BLUE,
+		FG_MAGENTA,
+		FG_CYAN,
+		FG_WHITE,
+		BG_BLACK,
+		BG_RED,
+		BG_GREEN,
+		BG_YELLOW,
+		BG_BLUE,
+		BG_MAGENTA,
+		BG_CYAN,
+		BG_WHITE,
+		BOLD,
+		UNDERLINE
+	}
+	[CCode (cprefix = "GST_DEBUG_GRAPH_SHOW_", cheader_filename = "gst/gst.h")]
+	[Flags]
+	public enum DebugGraphDetails {
+		MEDIA_TYPE,
+		CAPS_DETAILS,
+		NON_DEFAULT_PARAMS,
+		STATES,
+		ALL
+	}
+	[CCode (cprefix = "GST_LEVEL_", cheader_filename = "gst/gst.h")]
+	public enum DebugLevel {
+		NONE,
+		ERROR,
+		WARNING,
+		INFO,
+		DEBUG,
+		LOG,
+		COUNT
+	}
+	[CCode (cprefix = "GST_ELEMENT_", cheader_filename = "gst/gst.h")]
+	[Flags]
+	public enum ElementFlags {
+		LOCKED_STATE,
+		IS_SINK,
+		UNPARENTING,
+		FLAG_LAST
+	}
+	[CCode (cprefix = "GST_EVENT_", cheader_filename = "gst/gst.h")]
+	public enum EventType {
+		UNKNOWN,
+		FLUSH_START,
+		FLUSH_STOP,
+		EOS,
+		NEWSEGMENT,
+		TAG,
+		BUFFERSIZE,
+		QOS,
+		SEEK,
+		NAVIGATION,
+		LATENCY,
+		CUSTOM_UPSTREAM,
+		CUSTOM_DOWNSTREAM,
+		CUSTOM_DOWNSTREAM_OOB,
+		CUSTOM_BOTH,
+		CUSTOM_BOTH_OOB
+	}
+	[CCode (cprefix = "GST_EVENT_TYPE_", cheader_filename = "gst/gst.h")]
+	[Flags]
+	public enum EventTypeFlags {
+		UPSTREAM,
+		DOWNSTREAM,
+		SERIALIZED
+	}
+	[CCode (cprefix = "GST_FLOW_", cheader_filename = "gst/gst.h")]
+	public enum FlowReturn {
+		CUSTOM_SUCCESS,
+		RESEND,
+		OK,
+		NOT_LINKED,
+		WRONG_STATE,
+		UNEXPECTED,
+		NOT_NEGOTIATED,
+		ERROR,
+		NOT_SUPPORTED,
+		CUSTOM_ERROR
+	}
+	[CCode (cprefix = "GST_FORMAT_", cheader_filename = "gst/gst.h")]
+	public enum Format {
+		UNDEFINED,
+		DEFAULT,
+		BYTES,
+		TIME,
+		BUFFERS,
+		PERCENT
+	}
+	[CCode (cprefix = "GST_INDEX_", cheader_filename = "gst/gst.h")]
+	public enum IndexCertainty {
+		UNKNOWN,
+		CERTAIN,
+		FUZZY
+	}
+	[CCode (cprefix = "GST_INDEX_ENTRY_", cheader_filename = "gst/gst.h")]
+	public enum IndexEntryType {
+		ID,
+		ASSOCIATION,
+		OBJECT,
+		FORMAT
+	}
+	[CCode (cprefix = "GST_INDEX_", cheader_filename = "gst/gst.h")]
+	[Flags]
+	public enum IndexFlags {
+		WRITABLE,
+		READABLE,
+		FLAG_LAST
+	}
+	[CCode (cprefix = "GST_INDEX_LOOKUP_", cheader_filename = "gst/gst.h")]
+	public enum IndexLookupMethod {
+		EXACT,
+		BEFORE,
+		AFTER
+	}
+	[CCode (cprefix = "GST_INDEX_RESOLVER_", cheader_filename = "gst/gst.h")]
+	public enum IndexResolverMethod {
+		CUSTOM,
+		GTYPE,
+		PATH
+	}
+	[CCode (cprefix = "GST_ITERATOR_ITEM_", cheader_filename = "gst/gst.h")]
+	public enum IteratorItem {
+		SKIP,
+		PASS,
+		END
+	}
+	[CCode (cprefix = "GST_ITERATOR_", cheader_filename = "gst/gst.h")]
+	public enum IteratorResult {
+		DONE,
+		OK,
+		RESYNC,
+		ERROR
+	}
+	[CCode (cprefix = "GST_LIBRARY_ERROR_", cheader_filename = "gst/gst.h")]
+	public enum LibraryError {
+		FAILED,
+		TOO_LAZY,
+		INIT,
+		SHUTDOWN,
+		SETTINGS,
+		ENCODE,
+		NUM_ERRORS
+	}
+	[CCode (cprefix = "GST_MESSAGE_", cheader_filename = "gst/gst.h")]
+	[Flags]
+	public enum MessageType {
+		UNKNOWN,
+		EOS,
+		ERROR,
+		WARNING,
+		INFO,
+		TAG,
+		BUFFERING,
+		STATE_CHANGED,
+		STATE_DIRTY,
+		STEP_DONE,
+		CLOCK_PROVIDE,
+		CLOCK_LOST,
+		NEW_CLOCK,
+		STRUCTURE_CHANGE,
+		STREAM_STATUS,
+		APPLICATION,
+		ELEMENT,
+		SEGMENT_START,
+		SEGMENT_DONE,
+		DURATION,
+		LATENCY,
+		ASYNC_START,
+		ASYNC_DONE,
+		ANY
 	}
-	[CCode (cheader_filename = "gst/gst.h")]
-	public class IndexFactory : Gst.PluginFeature {
-		public weak string longdesc;
-		public GLib.Type type;
-		public weak Gst.Index create ();
-		public void destroy ();
-		public static weak Gst.IndexFactory find (string name);
-		public static weak Gst.Index make (string name);
-		[CCode (has_construct_function = false)]
-		public IndexFactory (string name, string longdesc, GLib.Type type);
+	[CCode (cprefix = "GST_MINI_OBJECT_FLAG_", cheader_filename = "gst/gst.h")]
+	[Flags]
+	public enum MiniObjectFlags {
+		READONLY,
+		LAST
 	}
-	[CCode (cheader_filename = "gst/gst.h")]
-	public class PadTemplate : Gst.Object {
-		public weak string name_template;
-		public Gst.PadDirection direction;
-		public Gst.PadPresence presence;
-		public weak Gst.Caps caps;
-		public weak Gst.Caps get_caps ();
-		[CCode (has_construct_function = false)]
-		public PadTemplate (string name_template, Gst.PadDirection direction, Gst.PadPresence presence, Gst.Caps caps);
-		[HasEmitter]
-		public virtual signal void pad_created (Gst.Pad pad);
+	[CCode (cprefix = "GST_OBJECT_", cheader_filename = "gst/gst.h")]
+	[Flags]
+	public enum ObjectFlags {
+		DISPOSING,
+		FLOATING,
+		FLAG_LAST
 	}
-	[CCode (cheader_filename = "gst/gst.h")]
-	public class Pipeline : Gst.Bin, Gst.ChildProxy {
-		public weak Gst.Clock fixed_clock;
-		public Gst.ClockTime stream_time;
-		public void auto_clock ();
-		public bool get_auto_flush_bus ();
-		public Gst.Bus get_bus ();
-		public weak Gst.Clock get_clock ();
-		public Gst.ClockTime get_delay ();
-		public Gst.ClockTime get_last_stream_time ();
-		[CCode (type = "GstElement*", has_construct_function = false)]
-		public Pipeline (string name);
-		public void set_auto_flush_bus (bool auto_flush);
-		public bool set_clock (Gst.Clock clock);
-		public void set_delay (Gst.ClockTime delay);
-		public void set_new_stream_time (Gst.ClockTime time);
-		public void use_clock (Gst.Clock clock);
-		public bool auto_flush_bus { get; set; }
-		public uint64 delay { get; set; }
+	[CCode (cprefix = "GST_PAD_", cheader_filename = "gst/gst.h")]
+	public enum PadDirection {
+		UNKNOWN,
+		SRC,
+		SINK
 	}
-	[CCode (cheader_filename = "gst/gst.h")]
-	public class Plugin : Gst.Object {
-		public weak Gst.PluginDesc desc;
-		public weak Gst.PluginDesc orig_desc;
-		public uint flags;
-		public weak string filename;
-		public weak string basename;
-		public weak GLib.Module module;
-		public int64 file_size;
-		public ulong file_mtime;
-		public bool registered;
-		public static GLib.Quark error_quark ();
-		public weak string get_description ();
-		public weak string get_filename ();
-		public weak string get_license ();
-		public weak GLib.Module get_module ();
-		public weak string get_name ();
-		public weak string get_origin ();
-		public weak string get_package ();
-		public weak string get_source ();
-		public weak string get_version ();
-		public bool is_loaded ();
-		public static void list_free (GLib.List list);
-		public weak Gst.Plugin load ();
-		public static weak Gst.Plugin load_by_name (string name);
-		public static weak Gst.Plugin load_file (string filename) throws GLib.Error;
-		public bool name_filter (string name);
-		public static bool register_static (int major_version, int minor_version, string name, string description, Gst.PluginInitFunc init_func, string version, string license, string source, string package, string origin);
+	[CCode (cprefix = "GST_PAD_", cheader_filename = "gst/gst.h")]
+	[Flags]
+	public enum PadFlags {
+		BLOCKED,
+		FLUSHING,
+		IN_GETCAPS,
+		IN_SETCAPS,
+		BLOCKING,
+		FLAG_LAST
 	}
-	[CCode (cheader_filename = "gst/gst.h")]
-	public class PluginFeature : Gst.Object {
-		public bool loaded;
-		public weak string name;
-		public uint rank;
-		public weak string plugin_name;
-		public bool check_version (uint min_major, uint min_minor, uint min_micro);
-		public weak string get_name ();
-		public uint get_rank ();
-		public static void list_free (GLib.List list);
-		public weak Gst.PluginFeature load ();
-		public void set_name (string name);
-		public void set_rank (uint rank);
-		public bool type_name_filter (Gst.TypeNameData data);
+	[CCode (cprefix = "GST_PAD_LINK_", cheader_filename = "gst/gst.h")]
+	public enum PadLinkReturn {
+		OK,
+		WRONG_HIERARCHY,
+		WAS_LINKED,
+		WRONG_DIRECTION,
+		NOFORMAT,
+		NOSCHED,
+		REFUSED
 	}
-	[CCode (cheader_filename = "gst/gst.h")]
-	public class Registry : Gst.Object {
-		public weak GLib.List plugins;
-		public weak GLib.List features;
-		public weak GLib.List paths;
-		public int cache_file;
-		public weak GLib.HashTable feature_hash;
-		public bool add_feature (Gst.PluginFeature feature);
-		public void add_path (string path);
-		public bool add_plugin (Gst.Plugin plugin);
-		public weak GLib.List feature_filter ([CCode (delegate_target_pos = 2.1)] Gst.PluginFeatureFilter filter, bool first);
-		public weak Gst.PluginFeature find_feature (string name, GLib.Type type);
-		public weak Gst.Plugin find_plugin (string name);
-		public static bool fork_is_enabled ();
-		public static void fork_set_enabled (bool enabled);
-		public static weak Gst.Registry get_default ();
-		public weak GLib.List get_feature_list (GLib.Type type);
-		public weak GLib.List get_feature_list_by_plugin (string name);
-		public weak GLib.List get_path_list ();
-		public weak GLib.List get_plugin_list ();
-		public weak Gst.Plugin lookup (string filename);
-		public weak Gst.PluginFeature lookup_feature (string name);
-		public weak GLib.List plugin_filter (Gst.PluginFilter filter, bool first);
-		public void remove_feature (Gst.PluginFeature feature);
-		public void remove_plugin (Gst.Plugin plugin);
-		public bool scan_path (string path);
-		public bool xml_read_cache (string location);
-		public bool xml_write_cache (string location);
-		public virtual signal void feature_added (void* feature);
-		public virtual signal void plugin_added (void* plugin);
+	[CCode (cprefix = "GST_PAD_", cheader_filename = "gst/gst.h")]
+	public enum PadPresence {
+		ALWAYS,
+		SOMETIMES,
+		REQUEST
 	}
-	[CCode (cheader_filename = "gst/gst.h")]
-	public class SystemClock : Gst.Clock {
-		public weak GLib.Thread thread;
-		public bool stopping;
-		public static weak Gst.Clock obtain ();
+	[CCode (cprefix = "GST_PAD_TEMPLATE_", cheader_filename = "gst/gst.h")]
+	[Flags]
+	public enum PadTemplateFlags {
+		FIXED,
+		FLAG_LAST
 	}
-	[CCode (cheader_filename = "gst/gst.h")]
-	public class Task : Gst.Object {
-		public Gst.TaskState state;
-		public weak GLib.Cond cond;
-		public GLib.StaticRecMutex @lock;
-		public weak Gst.TaskFunction func;
-		public void* data;
-		public bool running;
-		public void* abidata;
-		public static void cleanup_all ();
-		public static weak Gst.Task create (Gst.TaskFunction func, void* data);
-		public Gst.TaskState get_state ();
-		public bool join ();
-		public bool pause ();
-		public void set_lock (GLib.StaticRecMutex mutex);
-		public bool start ();
-		public bool stop ();
+	[CCode (cprefix = "GST_PARSE_ERROR_", cheader_filename = "gst/gst.h")]
+	public enum ParseError {
+		SYNTAX,
+		NO_SUCH_ELEMENT,
+		NO_SUCH_PROPERTY,
+		LINK,
+		COULD_NOT_SET_PROPERTY,
+		EMPTY_BIN,
+		EMPTY
 	}
-	[CCode (cheader_filename = "gst/gst.h")]
-	public class TypeFindFactory : Gst.PluginFeature {
-		public weak Gst.TypeFindFunction function;
-		public weak string extensions;
-		public weak Gst.Caps caps;
-		public void* user_data;
-		public weak GLib.DestroyNotify user_data_notify;
-		[CCode (cname = "gst_type_find_factory_call_function")]
-		public void call_function (Gst.TypeFind find);
-		[CCode (cname = "gst_type_find_factory_get_caps")]
-		public weak Gst.Caps get_caps ();
-		[CCode (cname = "gst_type_find_factory_get_extensions")]
-		public weak string get_extensions ();
-		[CCode (cname = "gst_type_find_factory_get_list")]
-		public static weak GLib.List get_list ();
+	[CCode (cprefix = "GST_PIPELINE_FLAG_", cheader_filename = "gst/gst.h")]
+	[Flags]
+	public enum PipelineFlags {
+		FIXED_CLOCK,
+		LAST
+	}
+	[CCode (cprefix = "GST_PLUGIN_ERROR_", cheader_filename = "gst/gst.h")]
+	public enum PluginError {
+		MODULE,
+		DEPENDENCIES,
+		NAME_MISMATCH
+	}
+	[CCode (cprefix = "GST_PLUGIN_FLAG_", cheader_filename = "gst/gst.h")]
+	[Flags]
+	public enum PluginFlags {
+		CACHED
+	}
+	[CCode (cprefix = "GST_QUERY_", cheader_filename = "gst/gst.h")]
+	public enum QueryType {
+		NONE,
+		POSITION,
+		DURATION,
+		LATENCY,
+		JITTER,
+		RATE,
+		SEEKING,
+		SEGMENT,
+		CONVERT,
+		FORMATS,
+		BUFFERING
+	}
+	[CCode (cprefix = "GST_RANK_", cheader_filename = "gst/gst.h")]
+	public enum Rank {
+		NONE,
+		MARGINAL,
+		SECONDARY,
+		PRIMARY
+	}
+	[CCode (cprefix = "GST_RESOURCE_ERROR_", cheader_filename = "gst/gst.h")]
+	public enum ResourceError {
+		FAILED,
+		TOO_LAZY,
+		NOT_FOUND,
+		BUSY,
+		OPEN_READ,
+		OPEN_WRITE,
+		OPEN_READ_WRITE,
+		CLOSE,
+		READ,
+		WRITE,
+		SEEK,
+		SYNC,
+		SETTINGS,
+		NO_SPACE_LEFT,
+		NUM_ERRORS
 	}
-	[CCode (cheader_filename = "gst/gst.h")]
-	public class XML : Gst.Object {
-		public weak GLib.List topelements;
-		public void* ns;
-		public weak Gst.Element get_element (uchar[] name);
-		public weak GLib.List get_topelements ();
-		public static weak Gst.Element make_element (void* cur, Gst.Object parent);
-		[CCode (has_construct_function = false)]
-		public XML ();
-		public bool parse_doc (void* doc, uchar[] root);
-		public bool parse_file (uchar[] fname, uchar[] root);
-		public bool parse_memory (uchar[] buffer, uint size, string root);
-		public static void* write (Gst.Element element);
-		public static int write_file (Gst.Element element, GLib.FileStream @out);
-		[NoWrapper]
-		public virtual void object_saved (Gst.Object object, void* self);
-		public virtual signal void object_loaded (Gst.Object object, void* self);
+	[CCode (cprefix = "GST_SEEK_FLAG_", cheader_filename = "gst/gst.h")]
+	[Flags]
+	public enum SeekFlags {
+		NONE,
+		FLUSH,
+		ACCURATE,
+		KEY_UNIT,
+		SEGMENT
 	}
-	[CCode (cheader_filename = "gst/gst.h")]
-	public interface ChildProxy : Gst.Object {
-		public static void get (Gst.Object object, ...);
-		public weak Gst.Object get_child_by_name (string name);
-		public static void get_property (Gst.Object object, string name, GLib.Value value);
-		public static void get_valist (Gst.Object object, string first_property_name, void* var_args);
-		public static bool lookup (Gst.Object object, string name, out weak Gst.Object target, out weak GLib.ParamSpec pspec);
-		public static void set (Gst.Object object, ...);
-		public static void set_property (Gst.Object object, string name, GLib.Value value);
-		public static void set_valist (Gst.Object object, string first_property_name, void* var_args);
-		public abstract weak Gst.Object get_child_by_index (uint index);
-		public abstract uint get_children_count ();
-		[HasEmitter]
-		public virtual signal void child_added (GLib.Object child);
-		[HasEmitter]
-		public virtual signal void child_removed (GLib.Object child);
+	[CCode (cprefix = "GST_SEEK_TYPE_", cheader_filename = "gst/gst.h")]
+	public enum SeekType {
+		NONE,
+		CUR,
+		SET,
+		END
 	}
-	[CCode (cheader_filename = "gst/gst.h")]
-	public interface ImplementsInterface : Gst.Element {
-		public static void* cast (void* from, GLib.Type type);
-		public static bool check (void* from, GLib.Type type);
-		[NoWrapper]
-		public abstract bool supported (GLib.Type iface_type);
+	[CCode (cprefix = "GST_STATE_", cheader_filename = "gst/gst.h")]
+	public enum State {
+		VOID_PENDING,
+		NULL,
+		READY,
+		PAUSED,
+		PLAYING
 	}
-	[CCode (cheader_filename = "gst/gst.h")]
-	public interface URIHandler {
-		public uint get_uri_type ();
-		public abstract weak string get_protocols ();
-		[NoWrapper]
-		public abstract weak string get_protocols_full (GLib.Type type);
-		[NoWrapper]
-		public abstract Gst.URIType get_type ();
-		[NoWrapper]
-		public abstract Gst.URIType get_type_full (GLib.Type type);
-		public abstract weak string get_uri ();
-		public abstract bool set_uri (string uri);
-		[HasEmitter]
-		public virtual signal void new_uri (string uri);
+	[CCode (cprefix = "GST_STATE_CHANGE_", cheader_filename = "gst/gst.h")]
+	public enum StateChange {
+		NULL_TO_READY,
+		READY_TO_PAUSED,
+		PAUSED_TO_PLAYING,
+		PLAYING_TO_PAUSED,
+		PAUSED_TO_READY,
+		READY_TO_NULL
 	}
-	[CCode (cheader_filename = "gst/gst.h")]
-	[SimpleType]
-	[IntegerType (rank = 0)]
-	public struct ClockTime : uint64 {
+	[CCode (cprefix = "GST_STATE_CHANGE_", cheader_filename = "gst/gst.h")]
+	public enum StateChangeReturn {
+		FAILURE,
+		SUCCESS,
+		ASYNC,
+		NO_PREROLL
 	}
-	[CCode (cheader_filename = "gst/gst.h")]
-	[SimpleType]
-	[IntegerType (rank = 0)]
-	public struct ClockTimeDiff : int64 {
+	[CCode (cprefix = "GST_STREAM_ERROR_", cheader_filename = "gst/gst.h")]
+	public enum StreamError {
+		FAILED,
+		TOO_LAZY,
+		NOT_IMPLEMENTED,
+		TYPE_NOT_FOUND,
+		WRONG_TYPE,
+		CODEC_NOT_FOUND,
+		DECODE,
+		ENCODE,
+		DEMUX,
+		MUX,
+		FORMAT,
+		DECRYPT,
+		DECRYPT_NOKEY,
+		NUM_ERRORS
 	}
-	[CCode (cname = "GValue", type_id = "G_TYPE_VALUE", cheader_filename = "gst/gst.h")]
-	public struct Value : GLib.Value {
-		public static GLib.Type array_get_type ();
-		public static GLib.Type list_get_type ();
-		[CCode (cname = "GST_MAKE_FOURCC")]
-		public static uint make_fourcc (char a, char b, char c, char d);
-		[CCode (cname = "GST_STR_FOURCC")]
-		public static uint str_fourcc (string str);
-		public void set_fourcc (uint fourcc);
-		public uint get_fourcc ();
-		public void set_int_range (int start, int end);
-		public int get_int_range_min ();
-		public int get_int_range_max ();
-		public void set_double_range (double start, double end);
-		public double get_double_range_min ();
-		public double get_double_range_max ();
-		public void list_append_value (Gst.Value append_value);
-		public void list_prepend_value (Gst.Value prepend_value);
-		public void list_concat (Gst.Value value1, Gst.Value value2);
-		public uint list_get_size ();
-		public weak Gst.Value? list_get_value (uint index);
-		public void set_fraction (int numerator, int denominator);
-		public int get_fraction_numerator ();
-		public int get_fraction_denominator ();
-		public static bool fraction_multiply (GLib.Value product, GLib.Value factor1, GLib.Value factor2);
-		public static bool fraction_subtract (GLib.Value dest, GLib.Value minuend, GLib.Value subtrahend);
-		public void set_fraction_range (Gst.Value start, Gst.Value end);
-		public weak Gst.Value? get_fraction_range_min ();
-		public weak Gst.Value? get_fraction_range_max ();
-		public void set_fraction_range_full (int numerator_start, int denominator_start, int numerator_end, int denominator_end);
-		public void set_date (Gst.Date date);
-		public Gst.Date get_date ();
-		public void set_caps (Gst.Caps caps);
-		public Gst.Caps get_caps ();
-		public void set_structure (Gst.Structure structure);
-		public weak Gst.Structure get_structure ();
-		public weak Gst.Buffer get_buffer ();
-		public void set_buffer (Gst.Buffer b);
-		public void take_buffer (Gst.Buffer b);
-		public bool is_fixed ();
-		public static void register (Gst.ValueTable table);
-		public void init_and_copy (Gst.Value src);
-		public string serialize ();
-		public bool deserialize (string src);
-		public static bool can_compare (Gst.Value value1, Gst.Value value2);
-		public static int compare (Gst.Value value1, Gst.Value value2);
-		public static void register_union_func (GLib.Type type1, GLib.Type type2, Gst.ValueUnionFunc func);
-		public static bool union (Gst.Value dest, Gst.Value value1, Gst.Value value2);
-		public static bool can_union (Gst.Value value1, Gst.Value value2);
-		public static void register_subtract_func (GLib.Type minuend_type, GLib.Type subtrahend_type, Gst.ValueSubtractFunc func);
-		public static bool subtract (Gst.Value dest, Gst.Value minuend, Gst.Value subtrahend);
-		public static bool can_subtract (Gst.Value minuend, Gst.Value subtrahend);
-		public static void register_intersect_func (GLib.Type type1, GLib.Type type2, Gst.ValueIntersectFunc func);
-		public static bool intersect (Gst.Value dest, Gst.Value value1, Gst.Value value2);
-		public static bool can_intersect (Gst.Value value1, Gst.Value value2);
-		public void array_append_value (Gst.Value append_value);
-		public uint array_get_size ();
-		public weak Gst.Value? array_get_value (uint index);
-		public void array_prepend_value (Gst.Value prepend_value);
+	[CCode (cprefix = "GST_TAG_FLAG_", cheader_filename = "gst/gst.h")]
+	public enum TagFlag {
+		UNDEFINED,
+		META,
+		ENCODED,
+		DECODED,
+		COUNT
 	}
-	[CCode (cheader_filename = "gst/gst.h")]
-	public struct ElementDetails {
-		public weak string longname;
-		public weak string klass;
-		public weak string description;
-		public weak string author;
+	[CCode (cprefix = "GST_TAG_MERGE_", cheader_filename = "gst/gst.h")]
+	public enum TagMergeMode {
+		UNDEFINED,
+		REPLACE_ALL,
+		REPLACE,
+		APPEND,
+		PREPEND,
+		KEEP,
+		KEEP_ALL,
+		COUNT
 	}
-	[CCode (cheader_filename = "gst/gst.h")]
-	public struct FormatDefinition {
-		public Gst.Format value;
-		public weak string nick;
-		public weak string description;
-		public GLib.Quark quark;
+	[CCode (cprefix = "GST_TASK_", cheader_filename = "gst/gst.h")]
+	public enum TaskState {
+		STARTED,
+		STOPPED,
+		PAUSED
 	}
-	[CCode (cheader_filename = "gst/gst.h")]
-	public struct StaticCaps {
-		[CCode (cname = "string")]
-		public weak string str;
-		public Gst.Caps get ();
+	[CCode (cprefix = "GST_TYPE_FIND_", cheader_filename = "gst/gst.h")]
+	public enum TypeFindProbability {
+		MINIMUM,
+		POSSIBLE,
+		LIKELY,
+		NEARLY_CERTAIN,
+		MAXIMUM
 	}
-	[CCode (cheader_filename = "gst/gst.h")]
-	public struct StaticPadTemplate {
-		public weak string name_template;
-		public Gst.PadDirection direction;
-		public Gst.PadPresence presence;
-		public Gst.StaticCaps static_caps;
-		public Gst.PadTemplate get ();
-		public Gst.Caps get_caps ();
+	[CCode (cprefix = "GST_URI_", cheader_filename = "gst/gst.h")]
+	public enum URIType {
+		UNKNOWN,
+		SINK,
+		SRC
 	}
 	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate bool BufferProbeCallback (Gst.Pad pad, Gst.Buffer buffer);
 	[CCode (cheader_filename = "gst/gst.h")]
-	public delegate bool EventProbeCallback (Gst.Pad pad, Gst.Event event);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public delegate bool DataProbeCallback (Gst.Pad pad, Gst.MiniObject data);
-	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate bool BusFunc (Gst.Bus bus, Gst.Message message);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate Gst.BusSyncReply BusSyncHandler (Gst.Bus bus, Gst.Message message);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate bool ClockCallback (Gst.Clock clock, Gst.ClockTime time, Gst.ClockID id);
 	[CCode (cheader_filename = "gst/gst.h")]
+	public delegate bool DataProbeCallback (Gst.Pad pad, Gst.MiniObject data);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static delegate void DebugFuncPtr ();
 	[CCode (cheader_filename = "gst/gst.h")]
+	public delegate bool EventProbeCallback (Gst.Pad pad, Gst.Event event);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate bool FilterFunc (void* obj);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate bool IndexFilter (Gst.Index index, Gst.IndexEntry entry);
@@ -2190,17 +2190,15 @@
 	[CCode (cheader_filename = "gst/gst.h")]
 	public const int VERSION_NANO;
 	[CCode (cheader_filename = "gst/gst.h")]
-	public static void init ([CCode (array_length_pos = 0.9)] ref weak string[] args);
-	[CCode (cname = "GST_DEBUG_BIN_TO_DOT_FILE", cheader_filename = "gst/gst.h")]
-	public static void debug_bin_to_dot_file (Gst.Bin bin, Gst.DebugGraphDetails details, string prefix);
-	[CCode (cname = "GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS", cheader_filename = "gst/gst.h")]
-	public static void debug_bin_to_dot_file_with_ts (Gst.Bin bin, Gst.DebugGraphDetails details, string prefix);
-	[CCode (cheader_filename = "gst/gst.h")]
 	public static void atomic_int_set (int atomic_int, int value);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static GLib.Quark core_error_quark ();
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static void debug_add_log_function (Gst.LogFunction func, void* data);
+	[CCode (cname = "GST_DEBUG_BIN_TO_DOT_FILE", cheader_filename = "gst/gst.h")]
+	public static void debug_bin_to_dot_file (Gst.Bin bin, Gst.DebugGraphDetails details, string prefix);
+	[CCode (cname = "GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS", cheader_filename = "gst/gst.h")]
+	public static void debug_bin_to_dot_file_with_ts (Gst.Bin bin, Gst.DebugGraphDetails details, string prefix);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak string debug_construct_term_color (uint colorinfo);
 	[CCode (cheader_filename = "gst/gst.h")]
@@ -2270,6 +2268,8 @@
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static GLib.Type fraction_range_get_type ();
 	[CCode (cheader_filename = "gst/gst.h")]
+	public static void init ([CCode (array_length_pos = 0.9)] ref weak string[] args);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool init_check (int argc, string argv) throws GLib.Error;
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static GLib.OptionGroup init_get_option_group ();

Modified: trunk/vapi/gstreamer-audio-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-audio-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-audio-0.10.vapi	Fri Oct 24 16:50:22 2008
@@ -2,126 +2,11 @@
 
 [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
 namespace Gst {
-	[CCode (cprefix = "GST_AUDIO_CHANNEL_POSITION_", has_type_id = "0", cheader_filename = "gst/audio/multichannel.h")]
-	public enum AudioChannelPosition {
-		INVALID,
-		FRONT_MONO,
-		FRONT_LEFT,
-		FRONT_RIGHT,
-		REAR_CENTER,
-		REAR_LEFT,
-		REAR_RIGHT,
-		LFE,
-		FRONT_CENTER,
-		FRONT_LEFT_OF_CENTER,
-		FRONT_RIGHT_OF_CENTER,
-		SIDE_LEFT,
-		SIDE_RIGHT,
-		NONE,
-		NUM
-	}
-	[CCode (cprefix = "GST_AUDIO_FIELD_", has_type_id = "0", cheader_filename = "gst/audio/audio.h")]
-	public enum AudioFieldFlag {
-		RATE,
-		CHANNELS,
-		ENDIANNESS,
-		WIDTH,
-		DEPTH,
-		SIGNED
-	}
-	[CCode (cprefix = "GST_BASE_AUDIO_SINK_SLAVE_", has_type_id = "0", cheader_filename = "gst/audio/gstbaseaudiosink.h")]
-	public enum BaseAudioSinkSlaveMethod {
-		RESAMPLE,
-		SKEW,
-		NONE
-	}
-	[CCode (cprefix = "GST_", has_type_id = "0", cheader_filename = "gst/audio/gstringbuffer.h")]
-	public enum BufferFormat {
-		UNKNOWN,
-		S8,
-		U8,
-		S16_LE,
-		S16_BE,
-		U16_LE,
-		U16_BE,
-		S24_LE,
-		S24_BE,
-		U24_LE,
-		U24_BE,
-		S32_LE,
-		S32_BE,
-		U32_LE,
-		U32_BE,
-		S24_3LE,
-		S24_3BE,
-		U24_3LE,
-		U24_3BE,
-		S20_3LE,
-		S20_3BE,
-		U20_3LE,
-		U20_3BE,
-		S18_3LE,
-		S18_3BE,
-		U18_3LE,
-		U18_3BE,
-		FLOAT32_LE,
-		FLOAT32_BE,
-		FLOAT64_LE,
-		FLOAT64_BE,
-		MU_LAW,
-		A_LAW,
-		IMA_ADPCM,
-		MPEG,
-		GSM
-	}
-	[CCode (cprefix = "GST_BUFTYPE_", has_type_id = "0", cheader_filename = "gst/audio/gstringbuffer.h")]
-	public enum BufferFormatType {
-		LINEAR,
-		FLOAT,
-		MU_LAW,
-		A_LAW,
-		IMA_ADPCM,
-		MPEG,
-		GSM
-	}
-	[CCode (cprefix = "GST_SEGSTATE_", has_type_id = "0", cheader_filename = "gst/audio/gstringbuffer.h")]
-	public enum RingBufferSegState {
-		INVALID,
-		EMPTY,
-		FILLED,
-		PARTIAL
-	}
-	[CCode (cprefix = "GST_RING_BUFFER_STATE_", has_type_id = "0", cheader_filename = "gst/audio/gstringbuffer.h")]
-	public enum RingBufferState {
-		STOPPED,
-		PAUSED,
-		STARTED
-	}
-	[Compact]
-	[CCode (cheader_filename = "gst/audio/gstaudiofilter.h")]
-	public class RingBufferSpec {
-		public weak Gst.Caps caps;
-		public Gst.BufferFormatType type;
-		public Gst.BufferFormat format;
-		public bool sign;
-		public bool bigend;
-		public int width;
-		public int depth;
-		public int rate;
-		public int channels;
-		public uint64 latency_time;
-		public uint64 buffer_time;
-		public int segsize;
-		public int segtotal;
-		public int bytes_per_sample;
-		[NoArrayLength]
-		public weak uchar[] silence_sample;
-	}
 	[CCode (cheader_filename = "gst/audio/gstaudioclock.h")]
 	public class AudioClock : Gst.SystemClock {
 		public weak Gst.AudioClockGetTimeFunc func;
-		public void* user_data;
 		public Gst.ClockTime last_time;
+		public void* user_data;
 		[CCode (type = "GstClock*", has_construct_function = false)]
 		public AudioClock (string name, Gst.AudioClockGetTimeFunc func);
 	}
@@ -171,14 +56,14 @@
 	}
 	[CCode (cheader_filename = "gst/audio/gstaudiosink.h")]
 	public class BaseAudioSink : Gst.BaseSink {
-		public weak Gst.RingBuffer ringbuffer;
 		public uint64 next_sample;
 		public weak Gst.Clock provided_clock;
+		public weak Gst.RingBuffer ringbuffer;
+		public virtual weak Gst.RingBuffer create_ringbuffer ();
 		public bool get_provide_clock ();
 		public Gst.BaseAudioSinkSlaveMethod get_slave_method ();
 		public void set_provide_clock (bool provide);
 		public void set_slave_method (Gst.BaseAudioSinkSlaveMethod method);
-		public virtual weak Gst.RingBuffer create_ringbuffer ();
 		[NoAccessorMethod]
 		public int64 buffer_time { get; set; }
 		[NoAccessorMethod]
@@ -188,12 +73,12 @@
 	}
 	[CCode (cheader_filename = "gst/audio/gstaudiosrc.h")]
 	public class BaseAudioSrc : Gst.PushSrc {
-		public weak Gst.RingBuffer ringbuffer;
-		public uint64 next_sample;
 		public weak Gst.Clock clock;
+		public uint64 next_sample;
+		public weak Gst.RingBuffer ringbuffer;
+		public virtual weak Gst.RingBuffer create_ringbuffer ();
 		public bool get_provide_clock ();
 		public void set_provide_clock (bool provide);
-		public virtual weak Gst.RingBuffer create_ringbuffer ();
 		[NoAccessorMethod]
 		public int64 buffer_time { get; set; }
 		[NoAccessorMethod]
@@ -202,49 +87,164 @@
 	}
 	[CCode (cheader_filename = "gst/audio/gstaudiofilter.h")]
 	public class RingBuffer : Gst.Object {
-		public weak GLib.Cond cond;
-		public bool open;
+		public void* abidata;
 		public bool acquired;
+		public weak Gst.RingBufferCallback callback;
+		public void* cb_data;
+		public weak GLib.Cond cond;
 		public weak Gst.Buffer data;
-		public weak Gst.RingBufferSpec spec;
-		public Gst.RingBufferSegState segstate;
-		public int samples_per_seg;
 		public uchar empty_seg;
-		public int state;
-		public int segdone;
+		public bool open;
+		public int samples_per_seg;
 		public int segbase;
+		public int segdone;
+		public Gst.RingBufferSegState segstate;
+		public weak Gst.RingBufferSpec spec;
+		public int state;
 		public int waiting;
-		public weak Gst.RingBufferCallback callback;
-		public void* cb_data;
-		public void* abidata;
+		public virtual bool acquire (Gst.RingBufferSpec spec);
 		public void advance (uint advance);
 		public void clear (int segment);
 		public void clear_all ();
+		public virtual bool close_device ();
 		public uint commit (uint64 sample, uchar[] data, uint len);
 		public uint commit_full (uint64 sample, uchar[] data, int in_samples, int out_samples, int accum);
 		public static void debug_spec_buff (Gst.RingBufferSpec spec);
 		public static void debug_spec_caps (Gst.RingBufferSpec spec);
+		public virtual uint delay ();
 		public bool device_is_open ();
 		public bool is_acquired ();
 		public void may_start (bool allowed);
+		public virtual bool open_device ();
 		public static bool parse_caps (Gst.RingBufferSpec spec, Gst.Caps caps);
+		public virtual bool pause ();
 		public bool prepare_read (int segment, uchar readptr, int len);
 		public uint read (uint64 sample, uchar[] data, uint len);
+		public virtual bool release ();
+		[NoWrapper]
+		public virtual bool resume ();
 		public uint64 samples_done ();
 		public void set_callback (Gst.RingBufferCallback cb);
 		public void set_flushing (bool flushing);
 		public void set_sample (uint64 sample);
-		public virtual bool acquire (Gst.RingBufferSpec spec);
-		public virtual bool close_device ();
-		public virtual uint delay ();
-		public virtual bool open_device ();
-		public virtual bool pause ();
-		public virtual bool release ();
-		[NoWrapper]
-		public virtual bool resume ();
 		public virtual bool start ();
 		public virtual bool stop ();
 	}
+	[Compact]
+	[CCode (cheader_filename = "gst/audio/gstaudiofilter.h")]
+	public class RingBufferSpec {
+		public bool bigend;
+		public uint64 buffer_time;
+		public int bytes_per_sample;
+		public weak Gst.Caps caps;
+		public int channels;
+		public int depth;
+		public Gst.BufferFormat format;
+		public uint64 latency_time;
+		public int rate;
+		public int segsize;
+		public int segtotal;
+		public bool sign;
+		[NoArrayLength]
+		public weak uchar[] silence_sample;
+		public Gst.BufferFormatType type;
+		public int width;
+	}
+	[CCode (cprefix = "GST_AUDIO_CHANNEL_POSITION_", has_type_id = "0", cheader_filename = "gst/audio/multichannel.h")]
+	public enum AudioChannelPosition {
+		INVALID,
+		FRONT_MONO,
+		FRONT_LEFT,
+		FRONT_RIGHT,
+		REAR_CENTER,
+		REAR_LEFT,
+		REAR_RIGHT,
+		LFE,
+		FRONT_CENTER,
+		FRONT_LEFT_OF_CENTER,
+		FRONT_RIGHT_OF_CENTER,
+		SIDE_LEFT,
+		SIDE_RIGHT,
+		NONE,
+		NUM
+	}
+	[CCode (cprefix = "GST_AUDIO_FIELD_", has_type_id = "0", cheader_filename = "gst/audio/audio.h")]
+	public enum AudioFieldFlag {
+		RATE,
+		CHANNELS,
+		ENDIANNESS,
+		WIDTH,
+		DEPTH,
+		SIGNED
+	}
+	[CCode (cprefix = "GST_BASE_AUDIO_SINK_SLAVE_", has_type_id = "0", cheader_filename = "gst/audio/gstbaseaudiosink.h")]
+	public enum BaseAudioSinkSlaveMethod {
+		RESAMPLE,
+		SKEW,
+		NONE
+	}
+	[CCode (cprefix = "GST_", has_type_id = "0", cheader_filename = "gst/audio/gstringbuffer.h")]
+	public enum BufferFormat {
+		UNKNOWN,
+		S8,
+		U8,
+		S16_LE,
+		S16_BE,
+		U16_LE,
+		U16_BE,
+		S24_LE,
+		S24_BE,
+		U24_LE,
+		U24_BE,
+		S32_LE,
+		S32_BE,
+		U32_LE,
+		U32_BE,
+		S24_3LE,
+		S24_3BE,
+		U24_3LE,
+		U24_3BE,
+		S20_3LE,
+		S20_3BE,
+		U20_3LE,
+		U20_3BE,
+		S18_3LE,
+		S18_3BE,
+		U18_3LE,
+		U18_3BE,
+		FLOAT32_LE,
+		FLOAT32_BE,
+		FLOAT64_LE,
+		FLOAT64_BE,
+		MU_LAW,
+		A_LAW,
+		IMA_ADPCM,
+		MPEG,
+		GSM
+	}
+	[CCode (cprefix = "GST_BUFTYPE_", has_type_id = "0", cheader_filename = "gst/audio/gstringbuffer.h")]
+	public enum BufferFormatType {
+		LINEAR,
+		FLOAT,
+		MU_LAW,
+		A_LAW,
+		IMA_ADPCM,
+		MPEG,
+		GSM
+	}
+	[CCode (cprefix = "GST_SEGSTATE_", has_type_id = "0", cheader_filename = "gst/audio/gstringbuffer.h")]
+	public enum RingBufferSegState {
+		INVALID,
+		EMPTY,
+		FILLED,
+		PARTIAL
+	}
+	[CCode (cprefix = "GST_RING_BUFFER_STATE_", has_type_id = "0", cheader_filename = "gst/audio/gstringbuffer.h")]
+	public enum RingBufferState {
+		STOPPED,
+		PAUSED,
+		STARTED
+	}
 	[CCode (cheader_filename = "gst/audio/gstaudioclock.h")]
 	public delegate Gst.ClockTime AudioClockGetTimeFunc (Gst.Clock clock);
 	[CCode (cheader_filename = "gst/audio/mixerutils.h")]

Modified: trunk/vapi/gstreamer-base-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-base-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-base-0.10.vapi	Fri Oct 24 16:50:22 2008
@@ -2,39 +2,115 @@
 
 [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
 namespace Gst {
-	[CCode (cprefix = "GST_BASE_SRC_", has_type_id = "0", cheader_filename = "gst/gst.h")]
-	public enum BaseSrcFlags {
-		STARTED,
-		FLAG_LAST
+	[CCode (cheader_filename = "gst/base/gstadapter.h")]
+	public class Adapter : GLib.Object {
+		public uint available ();
+		public uint available_fast ();
+		public void clear ();
+		public void copy (uchar dest, uint offset, uint size);
+		public void flush (uint flush);
+		[CCode (has_construct_function = false)]
+		public Adapter ();
+		public uchar peek (uint size);
+		public void push (Gst.Buffer buf);
+		public uchar take (uint nbytes);
+		public Gst.Buffer take_buffer (uint nbytes);
+	}
+	[CCode (cheader_filename = "gst/base/gstbasesink.h")]
+	public class BaseSink : Gst.Element {
+		public int buffers_queued;
+		public bool can_activate_pull;
+		public bool can_activate_push;
+		public Gst.ClockID clock_id;
+		public Gst.ClockTime end_time;
+		public bool eos;
+		public bool eos_queued;
+		public int events_queued;
+		public bool flushing;
+		public bool have_newsegment;
+		public bool have_preroll;
+		public bool need_preroll;
+		public uint64 offset;
+		public Gst.ActivateMode pad_mode;
+		public bool playing_async;
+		public GLib.Queue preroll_queue;
+		public int preroll_queue_max_len;
+		public int preroll_queued;
+		public Gst.Segment segment;
+		public Gst.Pad sinkpad;
+		[NoWrapper]
+		public virtual bool activate_pull (bool active);
+		[NoWrapper]
+		public virtual Gst.StateChangeReturn async_play ();
+		[NoWrapper]
+		public virtual Gst.FlowReturn buffer_alloc (uint64 offset, uint size, Gst.Caps caps, out weak Gst.Buffer buf);
+		[NoWrapper]
+		public virtual bool event (Gst.Event event);
+		[NoWrapper]
+		public virtual void fixate (Gst.Caps caps);
+		[NoWrapper]
+		public virtual weak Gst.Caps get_caps ();
+		public weak Gst.Buffer get_last_buffer ();
+		public Gst.ClockTime get_latency ();
+		public int64 get_max_lateness ();
+		public bool get_sync ();
+		[NoWrapper]
+		public virtual void get_times (Gst.Buffer buffer, out Gst.ClockTime start, out Gst.ClockTime end);
+		public Gst.ClockTimeDiff get_ts_offset ();
+		public bool is_async_enabled ();
+		public bool is_qos_enabled ();
+		[NoWrapper]
+		public virtual Gst.FlowReturn preroll (Gst.Buffer buffer);
+		public bool query_latency (bool live, bool upstream_live, out Gst.ClockTime min_latency, out Gst.ClockTime max_latency);
+		[NoWrapper]
+		public virtual Gst.FlowReturn render (Gst.Buffer buffer);
+		public void set_async_enabled (bool enabled);
+		[NoWrapper]
+		public virtual bool set_caps (Gst.Caps caps);
+		public void set_max_lateness (int64 max_lateness);
+		public void set_qos_enabled (bool enabled);
+		public void set_sync (bool sync);
+		public void set_ts_offset (Gst.ClockTimeDiff offset);
+		[NoWrapper]
+		public virtual bool start ();
+		[NoWrapper]
+		public virtual bool stop ();
+		[NoWrapper]
+		public virtual bool unlock ();
+		[NoWrapper]
+		public virtual bool unlock_stop ();
+		public Gst.ClockReturn wait_clock (Gst.ClockTime time, out Gst.ClockTimeDiff jitter);
+		public Gst.FlowReturn wait_eos (Gst.ClockTime time, out Gst.ClockTimeDiff jitter);
+		public Gst.FlowReturn wait_preroll ();
+		[NoAccessorMethod]
+		public bool async { get; set; }
+		public Gst.Buffer last_buffer { get; }
+		public int64 max_lateness { get; set; }
+		[NoAccessorMethod]
+		public uint preroll_queue_len { get; set construct; }
+		[NoAccessorMethod]
+		public bool qos { get; set; }
+		public bool sync { get; set; }
+		public int64 ts_offset { get; set; }
 	}
 	[CCode (cheader_filename = "gst/gst.h")]
 	public class BaseSrc : Gst.Element {
-		public Gst.Pad srcpad;
-		public GLib.Mutex live_lock;
-		public GLib.Cond live_cond;
-		public bool live_running;
 		public bool can_activate_push;
-		public Gst.ActivateMode pad_mode;
-		public bool seekable;
-		public bool random_access;
 		public Gst.ClockID clock_id;
+		public void* data;
 		public Gst.ClockTime end_time;
-		public Gst.Segment segment;
+		public GLib.Cond live_cond;
+		public GLib.Mutex live_lock;
+		public bool live_running;
 		public bool need_newsegment;
+		public int num_buffers_left;
 		public uint64 offset;
+		public Gst.ActivateMode pad_mode;
+		public bool random_access;
+		public bool seekable;
+		public Gst.Segment segment;
 		public uint64 size;
-		public int num_buffers_left;
-		public void* data;
-		[NoWrapper]
-		public virtual bool newsegment ();
-		public BaseSrc ();
-		public bool get_do_timestamp ();
-		public bool is_live ();
-		public bool query_latency (bool live, out Gst.ClockTime min_latency, out Gst.ClockTime max_latency);
-		public void set_do_timestamp (bool timestamp);
-		public void set_format (Gst.Format format);
-		public void set_live (bool live);
-		public Gst.FlowReturn wait_playing ();
+		public Gst.Pad srcpad;
 		[NoWrapper]
 		public virtual bool check_get_range ();
 		[NoWrapper]
@@ -47,20 +123,29 @@
 		public virtual void fixate (Gst.Caps caps);
 		[NoWrapper]
 		public virtual weak Gst.Caps get_caps ();
+		public bool get_do_timestamp ();
 		[NoWrapper]
 		public virtual bool get_size (uint64 size);
 		[NoWrapper]
 		public virtual void get_times (Gst.Buffer buffer, out Gst.ClockTime start, out Gst.ClockTime end);
+		public bool is_live ();
 		[NoWrapper]
 		public virtual bool is_seekable ();
 		[NoWrapper]
 		public virtual bool negotiate ();
+		public BaseSrc ();
+		[NoWrapper]
+		public virtual bool newsegment ();
 		[NoWrapper]
 		public virtual bool prepare_seek_segment (Gst.Event seek, Gst.Segment segment);
 		[NoWrapper]
 		public virtual bool query (Gst.Query query);
+		public bool query_latency (bool live, out Gst.ClockTime min_latency, out Gst.ClockTime max_latency);
 		[NoWrapper]
 		public virtual bool set_caps (Gst.Caps caps);
+		public void set_do_timestamp (bool timestamp);
+		public void set_format (Gst.Format format);
+		public void set_live (bool live);
 		[NoWrapper]
 		public virtual bool start ();
 		[NoWrapper]
@@ -69,6 +154,7 @@
 		public virtual bool unlock ();
 		[NoWrapper]
 		public virtual bool unlock_stop ();
+		public Gst.FlowReturn wait_playing ();
 		[NoAccessorMethod]
 		public ulong blocksize { get; set; }
 		public bool do_timestamp { get; set; }
@@ -79,42 +165,41 @@
 	}
 	[CCode (cheader_filename = "gst/gst.h")]
 	public class BaseTransform : Gst.Element {
-		public Gst.Pad sinkpad;
-		public Gst.Pad srcpad;
-		public bool passthrough;
 		public bool always_in_place;
 		public Gst.Caps cache_caps1;
 		public uint cache_caps1_size;
 		public Gst.Caps cache_caps2;
 		public uint cache_caps2_size;
-		public bool have_same_caps;
 		public bool delay_configure;
-		public bool pending_configure;
-		public bool negotiated;
 		public bool have_newsegment;
+		public bool have_same_caps;
+		public bool negotiated;
+		public bool passthrough;
+		public bool pending_configure;
 		public Gst.Segment segment;
+		public Gst.Pad sinkpad;
+		public Gst.Pad srcpad;
 		public GLib.Mutex transform_lock;
 		public const string SINK_NAME;
 		public const string SRC_NAME;
-		public BaseTransform ();
-		public bool is_in_place ();
-		public bool is_passthrough ();
-		public bool is_qos_enabled ();
-		public void set_gap_aware (bool gap_aware);
-		public void set_in_place (bool in_place);
-		public void set_passthrough (bool passthrough);
-		public void set_qos_enabled (bool enabled);
-		public void update_qos (double proportion, Gst.ClockTimeDiff diff, Gst.ClockTime timestamp);
 		[NoWrapper]
 		public virtual bool event (Gst.Event event);
 		[NoWrapper]
 		public virtual void fixate_caps (Gst.PadDirection direction, Gst.Caps caps, Gst.Caps othercaps);
 		[NoWrapper]
 		public virtual bool get_unit_size (Gst.Caps caps, uint size);
+		public bool is_in_place ();
+		public bool is_passthrough ();
+		public bool is_qos_enabled ();
+		public BaseTransform ();
 		[NoWrapper]
 		public virtual Gst.FlowReturn prepare_output_buffer (Gst.Buffer input, int size, Gst.Caps caps, out weak Gst.Buffer buf);
 		[NoWrapper]
 		public virtual bool set_caps (Gst.Caps incaps, Gst.Caps outcaps);
+		public void set_gap_aware (bool gap_aware);
+		public void set_in_place (bool in_place);
+		public void set_passthrough (bool passthrough);
+		public void set_qos_enabled (bool enabled);
 		[NoWrapper]
 		public virtual bool src_event (Gst.Event event);
 		[NoWrapper]
@@ -129,136 +214,30 @@
 		public virtual Gst.FlowReturn transform_ip (Gst.Buffer buf);
 		[NoWrapper]
 		public virtual bool transform_size (Gst.PadDirection direction, Gst.Caps caps, uint size, Gst.Caps othercaps, uint othersize);
+		public void update_qos (double proportion, Gst.ClockTimeDiff diff, Gst.ClockTime timestamp);
 		[NoAccessorMethod]
 		public bool qos { get; set; }
 	}
 	[Compact]
 	[CCode (cheader_filename = "gst/base/gstcollectpads.h")]
 	public class CollectData {
+		public Gst.Buffer buffer;
 		public weak Gst.CollectPads collect;
 		public Gst.Pad pad;
-		public Gst.Buffer buffer;
 		public uint pos;
 		public weak Gst.Segment segment;
 	}
-	[Compact]
-	[CCode (cheader_filename = "gst/base/gstdataqueue.h")]
-	public class DataQueueItem {
-		public weak Gst.MiniObject object;
-		public uint size;
-		public uint64 duration;
-		public bool visible;
-		public weak GLib.DestroyNotify destroy;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gst/base/gstdataqueue.h")]
-	public class DataQueueSize {
-		public uint visible;
-		public uint bytes;
-		public uint64 time;
-	}
-	[CCode (cheader_filename = "gst/base/gstadapter.h")]
-	public class Adapter : GLib.Object {
-		public uint available ();
-		public uint available_fast ();
-		public void clear ();
-		public void copy (uchar dest, uint offset, uint size);
-		public void flush (uint flush);
-		[CCode (has_construct_function = false)]
-		public Adapter ();
-		public uchar peek (uint size);
-		public void push (Gst.Buffer buf);
-		public uchar take (uint nbytes);
-		public Gst.Buffer take_buffer (uint nbytes);
-	}
-	[CCode (cheader_filename = "gst/base/gstbasesink.h")]
-	public class BaseSink : Gst.Element {
-		public Gst.Pad sinkpad;
-		public Gst.ActivateMode pad_mode;
-		public uint64 offset;
-		public bool can_activate_pull;
-		public bool can_activate_push;
-		public GLib.Queue preroll_queue;
-		public int preroll_queue_max_len;
-		public int preroll_queued;
-		public int buffers_queued;
-		public int events_queued;
-		public bool eos;
-		public bool eos_queued;
-		public bool need_preroll;
-		public bool have_preroll;
-		public bool playing_async;
-		public bool have_newsegment;
-		public Gst.Segment segment;
-		public Gst.ClockID clock_id;
-		public Gst.ClockTime end_time;
-		public bool flushing;
-		public weak Gst.Buffer get_last_buffer ();
-		public Gst.ClockTime get_latency ();
-		public int64 get_max_lateness ();
-		public bool get_sync ();
-		public Gst.ClockTimeDiff get_ts_offset ();
-		public bool is_async_enabled ();
-		public bool is_qos_enabled ();
-		public bool query_latency (bool live, bool upstream_live, out Gst.ClockTime min_latency, out Gst.ClockTime max_latency);
-		public void set_async_enabled (bool enabled);
-		public void set_max_lateness (int64 max_lateness);
-		public void set_qos_enabled (bool enabled);
-		public void set_sync (bool sync);
-		public void set_ts_offset (Gst.ClockTimeDiff offset);
-		public Gst.ClockReturn wait_clock (Gst.ClockTime time, out Gst.ClockTimeDiff jitter);
-		public Gst.FlowReturn wait_eos (Gst.ClockTime time, out Gst.ClockTimeDiff jitter);
-		public Gst.FlowReturn wait_preroll ();
-		[NoWrapper]
-		public virtual bool activate_pull (bool active);
-		[NoWrapper]
-		public virtual Gst.StateChangeReturn async_play ();
-		[NoWrapper]
-		public virtual Gst.FlowReturn buffer_alloc (uint64 offset, uint size, Gst.Caps caps, out weak Gst.Buffer buf);
-		[NoWrapper]
-		public virtual bool event (Gst.Event event);
-		[NoWrapper]
-		public virtual void fixate (Gst.Caps caps);
-		[NoWrapper]
-		public virtual weak Gst.Caps get_caps ();
-		[NoWrapper]
-		public virtual void get_times (Gst.Buffer buffer, out Gst.ClockTime start, out Gst.ClockTime end);
-		[NoWrapper]
-		public virtual Gst.FlowReturn preroll (Gst.Buffer buffer);
-		[NoWrapper]
-		public virtual Gst.FlowReturn render (Gst.Buffer buffer);
-		[NoWrapper]
-		public virtual bool set_caps (Gst.Caps caps);
-		[NoWrapper]
-		public virtual bool start ();
-		[NoWrapper]
-		public virtual bool stop ();
-		[NoWrapper]
-		public virtual bool unlock ();
-		[NoWrapper]
-		public virtual bool unlock_stop ();
-		[NoAccessorMethod]
-		public bool async { get; set; }
-		public Gst.Buffer last_buffer { get; }
-		public int64 max_lateness { get; set; }
-		[NoAccessorMethod]
-		public uint preroll_queue_len { get; set construct; }
-		[NoAccessorMethod]
-		public bool qos { get; set; }
-		public bool sync { get; set; }
-		public int64 ts_offset { get; set; }
-	}
 	[CCode (cheader_filename = "gst/base/gstcollectpads.h")]
 	public class CollectPads : Gst.Object {
-		public weak GLib.SList<Gst.CollectData> data;
-		public uint cookie;
 		public weak GLib.Cond cond;
+		public uint cookie;
+		public weak GLib.SList<Gst.CollectData> data;
+		public uint eospads;
 		public weak Gst.CollectPadsFunction func;
-		public void* user_data;
 		public uint numpads;
 		public uint queuedpads;
-		public uint eospads;
 		public bool started;
+		public void* user_data;
 		public weak Gst.CollectData add_pad (Gst.Pad pad, uint size);
 		public weak Gst.CollectData add_pad_full (Gst.Pad pad, uint size, Gst.CollectDataDestroyNotify destroy_notify);
 		public uint available ();
@@ -281,14 +260,14 @@
 	}
 	[CCode (cheader_filename = "gst/base/gstdataqueue.h")]
 	public class DataQueue : GLib.Object {
-		public weak GLib.Queue queue;
-		public weak Gst.DataQueueSize cur_level;
-		public weak Gst.DataQueueCheckFullFunction checkfull;
 		public void* checkdata;
-		public weak GLib.Mutex qlock;
+		public weak Gst.DataQueueCheckFullFunction checkfull;
+		public weak Gst.DataQueueSize cur_level;
+		public bool flushing;
 		public weak GLib.Cond item_add;
 		public weak GLib.Cond item_del;
-		public bool flushing;
+		public weak GLib.Mutex qlock;
+		public weak GLib.Queue queue;
 		public bool drop_head (GLib.Type type);
 		public void flush ();
 		public void get_level (Gst.DataQueueSize level);
@@ -309,11 +288,32 @@
 		public virtual signal void empty ();
 		public virtual signal void full ();
 	}
+	[Compact]
+	[CCode (cheader_filename = "gst/base/gstdataqueue.h")]
+	public class DataQueueItem {
+		public weak GLib.DestroyNotify destroy;
+		public uint64 duration;
+		public weak Gst.MiniObject object;
+		public uint size;
+		public bool visible;
+	}
+	[Compact]
+	[CCode (cheader_filename = "gst/base/gstdataqueue.h")]
+	public class DataQueueSize {
+		public uint bytes;
+		public uint64 time;
+		public uint visible;
+	}
 	[CCode (cheader_filename = "gst/base/gstpushsrc.h")]
 	public class PushSrc : Gst.BaseSrc {
 		[NoWrapper]
 		public virtual Gst.FlowReturn create (out weak Gst.Buffer buf);
 	}
+	[CCode (cprefix = "GST_BASE_SRC_", has_type_id = "0", cheader_filename = "gst/gst.h")]
+	public enum BaseSrcFlags {
+		STARTED,
+		FLAG_LAST
+	}
 	[CCode (cheader_filename = "gst/base/gstcollectpads.h")]
 	public delegate void CollectDataDestroyNotify ();
 	[CCode (cheader_filename = "gst/gst.h")]

Modified: trunk/vapi/gstreamer-check-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-check-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-check-0.10.vapi	Fri Oct 24 16:50:22 2008
@@ -5,9 +5,9 @@
 	[Compact]
 	[CCode (cheader_filename = "gst/gst.h")]
 	public class CheckABIStruct {
+		public int abi_size;
 		public weak string name;
 		public int size;
-		public int abi_size;
 	}
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak Gst.Buffer buffer_straw_get_buffer (Gst.Element bin, Gst.Pad pad);

Modified: trunk/vapi/gstreamer-controller-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-controller-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-controller-0.10.vapi	Fri Oct 24 16:50:22 2008
@@ -2,37 +2,6 @@
 
 [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
 namespace Gst {
-	[CCode (cprefix = "GST_INTERPOLATE_", has_type_id = "0", cheader_filename = "gst/controller/gstcontroller.h")]
-	public enum InterpolateMode {
-		NONE,
-		TRIGGER,
-		LINEAR,
-		QUADRATIC,
-		CUBIC,
-		USER
-	}
-	[CCode (cprefix = "", has_type_id = "0", cheader_filename = "gst/controller/gstlfocontrolsource.h")]
-	public enum LFOWaveform {
-		Sine waveform (default),
-		Square waveform,
-		Saw waveform,
-		Reverse saw waveform,
-		Triangle waveform
-	}
-	[Compact]
-	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
-	public class TimedValue {
-		public Gst.ClockTime timestamp;
-		public GLib.Value value;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
-	public class ValueArray {
-		public weak string property_name;
-		public int nbsamples;
-		public Gst.ClockTime sample_interval;
-		public void* values;
-	}
 	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
 	public class ControlSource : GLib.Object {
 		public bool bound;
@@ -42,9 +11,9 @@
 	}
 	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
 	public class Controller : GLib.Object {
-		public weak GLib.List properties;
 		public weak GLib.Mutex @lock;
 		public weak GLib.Object object;
+		public weak GLib.List properties;
 		public GLib.Value get (string property_name, Gst.ClockTime timestamp);
 		public weak GLib.List get_all (string property_name);
 		public weak Gst.ControlSource get_control_source (string property_name);
@@ -52,11 +21,9 @@
 		public bool get_value_arrays (Gst.ClockTime timestamp, GLib.SList value_arrays);
 		public static bool init (int argc, out weak string argv);
 		[CCode (has_construct_function = false)]
-		public Controller (GLib.Object object);
-		[CCode (has_construct_function = false)]
 		public Controller.list (GLib.Object object, GLib.List list);
 		[CCode (has_construct_function = false)]
-		public Controller.valist (GLib.Object object, void* var_args);
+		public Controller (GLib.Object object);
 		public bool remove_properties ();
 		public bool remove_properties_list (GLib.List list);
 		public bool remove_properties_valist (void* var_args);
@@ -70,6 +37,8 @@
 		public bool sync_values (Gst.ClockTime timestamp);
 		public bool unset (string property_name, Gst.ClockTime timestamp);
 		public bool unset_all (string property_name);
+		[CCode (has_construct_function = false)]
+		public Controller.valist (GLib.Object object, void* var_args);
 		[NoAccessorMethod]
 		public uint64 control_rate { get; set; }
 	}
@@ -102,6 +71,37 @@
 		[NoAccessorMethod]
 		public Gst.LFOWaveform waveform { get; set; }
 	}
+	[Compact]
+	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
+	public class TimedValue {
+		public Gst.ClockTime timestamp;
+		public GLib.Value value;
+	}
+	[Compact]
+	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
+	public class ValueArray {
+		public int nbsamples;
+		public weak string property_name;
+		public Gst.ClockTime sample_interval;
+		public void* values;
+	}
+	[CCode (cprefix = "GST_INTERPOLATE_", has_type_id = "0", cheader_filename = "gst/controller/gstcontroller.h")]
+	public enum InterpolateMode {
+		NONE,
+		TRIGGER,
+		LINEAR,
+		QUADRATIC,
+		CUBIC,
+		USER
+	}
+	[CCode (cprefix = "", has_type_id = "0", cheader_filename = "gst/controller/gstlfocontrolsource.h")]
+	public enum LFOWaveform {
+		Sine waveform (default),
+		Square waveform,
+		Saw waveform,
+		Reverse saw waveform,
+		Triangle waveform
+	}
 	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
 	public static delegate bool ControlSourceBind (Gst.ControlSource _self, GLib.ParamSpec pspec);
 	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]

Modified: trunk/vapi/gstreamer-dataprotocol-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-dataprotocol-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-dataprotocol-0.10.vapi	Fri Oct 24 16:50:22 2008
@@ -2,6 +2,16 @@
 
 [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
 namespace Gst {
+	[Compact]
+	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
+	public class DPPacketizer {
+		public weak Gst.DPHeaderFromBufferFunction header_from_buffer;
+		public weak Gst.DPPacketFromCapsFunction packet_from_caps;
+		public weak Gst.DPPacketFromEventFunction packet_from_event;
+		public Gst.DPVersion version;
+		[CCode (has_construct_function = false)]
+		public DPPacketizer (Gst.DPVersion version);
+	}
 	[CCode (cprefix = "GST_DP_HEADER_FLAG_", has_type_id = "0", cheader_filename = "gst/dataprotocol/dataprotocol.h")]
 	public enum DPHeaderFlag {
 		NONE,
@@ -21,16 +31,6 @@
 		GDP Version 0.2,
 		GDP Version 1.0
 	}
-	[Compact]
-	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
-	public class DPPacketizer {
-		public Gst.DPVersion version;
-		public weak Gst.DPHeaderFromBufferFunction header_from_buffer;
-		public weak Gst.DPPacketFromCapsFunction packet_from_caps;
-		public weak Gst.DPPacketFromEventFunction packet_from_event;
-		[CCode (has_construct_function = false)]
-		public DPPacketizer (Gst.DPVersion version);
-	}
 	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
 	public static delegate bool DPHeaderFromBufferFunction (Gst.Buffer buffer, Gst.DPHeaderFlag flags, uint length, uchar header);
 	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]

Modified: trunk/vapi/gstreamer-fft-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-fft-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-fft-0.10.vapi	Fri Oct 24 16:50:22 2008
@@ -2,14 +2,6 @@
 
 [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
 namespace Gst {
-	[CCode (cprefix = "GST_FFT_WINDOW_", has_type_id = "0", cheader_filename = "gst/fft/gstfft.h")]
-	public enum FFTWindow {
-		RECTANGULAR,
-		HAMMING,
-		HANN,
-		BARTLETT,
-		BLACKMAN
-	}
 	[Compact]
 	[CCode (cheader_filename = "gst/fft/gstfftf32.h")]
 	public class FFTF32 {
@@ -25,8 +17,8 @@
 	[Compact]
 	[CCode (cheader_filename = "gst/fft/gstfftf32.h")]
 	public class FFTF32Complex {
-		public float r;
 		public float i;
+		public float r;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gst/fft/gstfftf64.h")]
@@ -43,8 +35,8 @@
 	[Compact]
 	[CCode (cheader_filename = "gst/fft/gstfftf64.h")]
 	public class FFTF64Complex {
-		public double r;
 		public double i;
+		public double r;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gst/fft/gstffts16.h")]
@@ -61,8 +53,8 @@
 	[Compact]
 	[CCode (cheader_filename = "gst/fft/gstffts16.h")]
 	public class FFTS16Complex {
-		public short r;
 		public short i;
+		public short r;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gst/fft/gstffts32.h")]
@@ -79,8 +71,16 @@
 	[Compact]
 	[CCode (cheader_filename = "gst/fft/gstffts32.h")]
 	public class FFTS32Complex {
-		public int r;
 		public int i;
+		public int r;
+	}
+	[CCode (cprefix = "GST_FFT_WINDOW_", has_type_id = "0", cheader_filename = "gst/fft/gstfft.h")]
+	public enum FFTWindow {
+		RECTANGULAR,
+		HAMMING,
+		HANN,
+		BARTLETT,
+		BLACKMAN
 	}
 	[CCode (cheader_filename = "gst/fft/gstfft.h")]
 	public static int fft_next_fast_length (int n);

Modified: trunk/vapi/gstreamer-interfaces-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-interfaces-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-interfaces-0.10.vapi	Fri Oct 24 16:50:22 2008
@@ -2,53 +2,11 @@
 
 [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
 namespace Gst {
-	[CCode (cprefix = "GST_COLOR_BALANCE_", has_type_id = "0", cheader_filename = "gst/interfaces/colorbalance.h")]
-	public enum ColorBalanceType {
-		HARDWARE,
-		SOFTWARE
-	}
-	[CCode (cprefix = "GST_MIXER_MESSAGE_", has_type_id = "0", cheader_filename = "gst/interfaces/mixer.h")]
-	public enum MixerMessageType {
-		INVALID,
-		MUTE_TOGGLED,
-		RECORD_TOGGLED,
-		VOLUME_CHANGED,
-		OPTION_CHANGED
-	}
-	[CCode (cprefix = "GST_MIXER_", has_type_id = "0", cheader_filename = "gst/interfaces/mixer.h")]
-	public enum MixerType {
-		HARDWARE,
-		SOFTWARE
-	}
-	[CCode (cprefix = "GST_MIXER_FLAG_", has_type_id = "0", cheader_filename = "gst/interfaces/mixer.h")]
-	[Flags]
-	public enum MixerFlags {
-		NONE,
-		AUTO_NOTIFICATIONS
-	}
-	[CCode (cprefix = "GST_MIXER_TRACK_", has_type_id = "0", cheader_filename = "gst/interfaces/mixertrack.h")]
-	[Flags]
-	public enum MixerTrackFlags {
-		INPUT,
-		OUTPUT,
-		MUTE,
-		RECORD,
-		MASTER,
-		SOFTWARE
-	}
-	[CCode (cprefix = "GST_TUNER_CHANNEL_", has_type_id = "0", cheader_filename = "gst/interfaces/tunerchannel.h")]
-	[Flags]
-	public enum TunerChannelFlags {
-		INPUT,
-		OUTPUT,
-		FREQUENCY,
-		AUDIO
-	}
 	[CCode (cheader_filename = "gst/interfaces/colorbalancechannel.h")]
 	public class ColorBalanceChannel : GLib.Object {
 		public weak string label;
-		public int min_value;
 		public int max_value;
+		public int min_value;
 		public virtual signal void value_changed (int value);
 	}
 	[CCode (cheader_filename = "gst/interfaces/mixer.h")]
@@ -73,21 +31,21 @@
 	}
 	[CCode (cheader_filename = "gst/interfaces/tunerchannel.h")]
 	public class TunerChannel : GLib.Object {
-		public weak string label;
 		public Gst.TunerChannelFlags flags;
 		public float freq_multiplicator;
-		public ulong min_frequency;
+		public weak string label;
 		public ulong max_frequency;
-		public int min_signal;
 		public int max_signal;
+		public ulong min_frequency;
+		public int min_signal;
 		public static void changed (Gst.Tuner tuner, Gst.TunerChannel channel);
 		public virtual signal void frequency_changed (ulong frequency);
 		public virtual signal void signal_changed (int @signal);
 	}
 	[CCode (cheader_filename = "gst/interfaces/tuner.h")]
 	public class TunerNorm : GLib.Object {
-		public weak string label;
 		public GLib.Value framerate;
+		public weak string label;
 		public static void changed (Gst.Tuner tuner, Gst.TunerNorm norm);
 	}
 	[CCode (cheader_filename = "gst/interfaces/colorbalancechannel.h")]
@@ -100,15 +58,15 @@
 	}
 	[CCode (cheader_filename = "gst/interfaces/mixer.h")]
 	public interface Mixer : Gst.ImplementsInterface, Gst.Element {
+		public abstract Gst.MixerFlags get_mixer_flags ();
+		public abstract weak string get_option (Gst.MixerOptions opts);
+		public abstract void get_volume (Gst.MixerTrack track, int volumes);
+		public abstract weak GLib.List list_tracks ();
 		public static Gst.MixerMessageType message_get_type (Gst.Message message);
 		public static void message_parse_mute_toggled (Gst.Message message, out weak Gst.MixerTrack track, bool mute);
 		public static void message_parse_option_changed (Gst.Message message, out weak Gst.MixerOptions options, string value);
 		public static void message_parse_record_toggled (Gst.Message message, out weak Gst.MixerTrack track, bool record);
 		public static void message_parse_volume_changed (Gst.Message message, out weak Gst.MixerTrack track, int volumes, int num_channels);
-		public abstract Gst.MixerFlags get_mixer_flags ();
-		public abstract weak string get_option (Gst.MixerOptions opts);
-		public abstract void get_volume (Gst.MixerTrack track, int volumes);
-		public abstract weak GLib.List list_tracks ();
 		public abstract void set_mute (Gst.MixerTrack track, bool mute);
 		public abstract void set_option (Gst.MixerOptions opts, string value);
 		public abstract void set_record (Gst.MixerTrack track, bool record);
@@ -124,22 +82,22 @@
 	}
 	[CCode (cheader_filename = "gst/interfaces/navigation.h")]
 	public interface Navigation {
+		public abstract void send_event (Gst.Structure structure);
 		public void send_key_event (string event, string key);
 		public void send_mouse_event (string event, int button, double x, double y);
-		public abstract void send_event (Gst.Structure structure);
 	}
 	[CCode (cheader_filename = "gst/interfaces/propertyprobe.h")]
 	public interface PropertyProbe {
+		public abstract weak GLib.List get_properties ();
 		public weak GLib.ParamSpec get_property (string name);
+		public abstract GLib.ValueArray get_values (GLib.ParamSpec pspec);
 		public GLib.ValueArray get_values_name (string name);
+		public abstract bool needs_probe (GLib.ParamSpec pspec);
 		public bool needs_probe_name (string name);
 		public GLib.ValueArray probe_and_get_values (GLib.ParamSpec pspec);
 		public GLib.ValueArray probe_and_get_values_name (string name);
-		public void probe_property_name (string name);
-		public abstract weak GLib.List get_properties ();
-		public abstract GLib.ValueArray get_values (GLib.ParamSpec pspec);
-		public abstract bool needs_probe (GLib.ParamSpec pspec);
 		public abstract void probe_property (GLib.ParamSpec pspec);
+		public void probe_property_name (string name);
 		public virtual signal void probe_needed (void* pspec);
 	}
 	[CCode (cheader_filename = "gst/interfaces/tunerchannel.h")]
@@ -175,10 +133,52 @@
 	}
 	[CCode (cheader_filename = "gst/interfaces/xoverlay.h", lower_case_csuffix = "x_overlay")]
 	public interface XOverlay : Gst.ImplementsInterface, Gst.Element {
-		public void got_xwindow_id (ulong xwindow_id);
-		public void prepare_xwindow_id ();
 		public abstract void expose ();
+		public void got_xwindow_id (ulong xwindow_id);
 		public abstract void handle_events (bool handle_events);
+		public void prepare_xwindow_id ();
 		public abstract void set_xwindow_id (ulong xwindow_id);
 	}
+	[CCode (cprefix = "GST_COLOR_BALANCE_", has_type_id = "0", cheader_filename = "gst/interfaces/colorbalance.h")]
+	public enum ColorBalanceType {
+		HARDWARE,
+		SOFTWARE
+	}
+	[CCode (cprefix = "GST_MIXER_FLAG_", has_type_id = "0", cheader_filename = "gst/interfaces/mixer.h")]
+	[Flags]
+	public enum MixerFlags {
+		NONE,
+		AUTO_NOTIFICATIONS
+	}
+	[CCode (cprefix = "GST_MIXER_MESSAGE_", has_type_id = "0", cheader_filename = "gst/interfaces/mixer.h")]
+	public enum MixerMessageType {
+		INVALID,
+		MUTE_TOGGLED,
+		RECORD_TOGGLED,
+		VOLUME_CHANGED,
+		OPTION_CHANGED
+	}
+	[CCode (cprefix = "GST_MIXER_TRACK_", has_type_id = "0", cheader_filename = "gst/interfaces/mixertrack.h")]
+	[Flags]
+	public enum MixerTrackFlags {
+		INPUT,
+		OUTPUT,
+		MUTE,
+		RECORD,
+		MASTER,
+		SOFTWARE
+	}
+	[CCode (cprefix = "GST_MIXER_", has_type_id = "0", cheader_filename = "gst/interfaces/mixer.h")]
+	public enum MixerType {
+		HARDWARE,
+		SOFTWARE
+	}
+	[CCode (cprefix = "GST_TUNER_CHANNEL_", has_type_id = "0", cheader_filename = "gst/interfaces/tunerchannel.h")]
+	[Flags]
+	public enum TunerChannelFlags {
+		INPUT,
+		OUTPUT,
+		FREQUENCY,
+		AUDIO
+	}
 }

Modified: trunk/vapi/gstreamer-net-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-net-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-net-0.10.vapi	Fri Oct 24 16:50:22 2008
@@ -2,24 +2,13 @@
 
 [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
 namespace Gst {
-	[Compact]
-	[CCode (cheader_filename = "gst/net/gstnet.h")]
-	public class NetTimePacket {
-		public Gst.ClockTime local_time;
-		public Gst.ClockTime remote_time;
-		[CCode (has_construct_function = false)]
-		public NetTimePacket (uchar buffer);
-		public static weak Gst.NetTimePacket receive (int fd, void* addr, uint32 len);
-		public int send (int fd, void* addr, uint32 len);
-		public uchar serialize ();
-	}
 	[CCode (cheader_filename = "gst/net/gstnet.h")]
 	public class NetClientClock : Gst.SystemClock {
-		public int sock;
 		[NoArrayLength]
 		public weak int[] control_sock;
 		public Gst.ClockTime current_timeout;
 		public void* servaddr;
+		public int sock;
 		public weak GLib.Thread thread;
 		[CCode (type = "GstClock*", has_construct_function = false)]
 		public NetClientClock (string name, string remote_address, int remote_port, Gst.ClockTime base_time);
@@ -28,11 +17,22 @@
 		[NoAccessorMethod]
 		public int port { get; set; }
 	}
+	[Compact]
+	[CCode (cheader_filename = "gst/net/gstnet.h")]
+	public class NetTimePacket {
+		public Gst.ClockTime local_time;
+		public Gst.ClockTime remote_time;
+		[CCode (has_construct_function = false)]
+		public NetTimePacket (uchar buffer);
+		public static weak Gst.NetTimePacket receive (int fd, void* addr, uint32 len);
+		public int send (int fd, void* addr, uint32 len);
+		public uchar serialize ();
+	}
 	[CCode (cheader_filename = "gst/net/gstnet.h")]
 	public class NetTimeProvider : Gst.Object {
-		public int sock;
 		[NoArrayLength]
 		public weak int[] control_sock;
+		public int sock;
 		public weak GLib.Thread thread;
 		[CCode (has_construct_function = false)]
 		public NetTimeProvider (Gst.Clock clock, string address, int port);

Modified: trunk/vapi/gstreamer-netbuffer-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-netbuffer-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-netbuffer-0.10.vapi	Fri Oct 24 16:50:22 2008
@@ -2,18 +2,12 @@
 
 [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
 namespace Gst {
-	[CCode (cprefix = "GST_NET_TYPE_", has_type_id = "0", cheader_filename = "gst/netbuffer/gstnetbuffer.h")]
-	public enum NetType {
-		UNKNOWN,
-		IP4,
-		IP6
-	}
 	[Compact]
 	[CCode (cheader_filename = "gst/netbuffer/gstnetbuffer.h")]
 	public class NetAddress {
-		public Gst.NetType type;
 		public void* address;
 		public ushort port;
+		public Gst.NetType type;
 		[CCode (cname = "gst_netaddress_get_ip4_address")]
 		public bool get_ip4_address (uint address, ushort port);
 		[CCode (cname = "gst_netaddress_get_ip6_address")]
@@ -39,4 +33,10 @@
 	public class NetBufferClass {
 		public weak Gst.BufferClass buffer_class;
 	}
+	[CCode (cprefix = "GST_NET_TYPE_", has_type_id = "0", cheader_filename = "gst/netbuffer/gstnetbuffer.h")]
+	public enum NetType {
+		UNKNOWN,
+		IP4,
+		IP6
+	}
 }

Modified: trunk/vapi/gstreamer-pbutils-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-pbutils-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-pbutils-0.10.vapi	Fri Oct 24 16:50:22 2008
@@ -2,6 +2,13 @@
 
 [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
 namespace Gst {
+	[Compact]
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
+	public class InstallPluginsContext {
+		[CCode (has_construct_function = false)]
+		public InstallPluginsContext ();
+		public void set_xid (uint xid);
+	}
 	[CCode (cprefix = "GST_INSTALL_PLUGINS_", has_type_id = "0", cheader_filename = "gst/pbutils/pbutils.h")]
 	public enum InstallPluginsReturn {
 		SUCCESS,
@@ -16,13 +23,6 @@
 		HELPER_MISSING,
 		INSTALL_IN_PROGRESS
 	}
-	[Compact]
-	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
-	public class InstallPluginsContext {
-		[CCode (has_construct_function = false)]
-		public InstallPluginsContext ();
-		public void set_xid (uint xid);
-	}
 	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public delegate void InstallPluginsResultFunc (Gst.InstallPluginsReturn result);
 	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]

Modified: trunk/vapi/gstreamer-riff-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-riff-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-riff-0.10.vapi	Fri Oct 24 16:50:22 2008
@@ -10,63 +10,63 @@
 	[Compact]
 	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public class gst_riff_index_entry {
-		public uint id;
 		public uint flags;
+		public uint id;
 		public uint offset;
 		public uint size;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public class gst_riff_strf_auds {
-		public ushort format;
-		public ushort channels;
-		public uint rate;
 		public uint av_bps;
 		public ushort blockalign;
+		public ushort channels;
+		public ushort format;
+		public uint rate;
 		public ushort size;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public class gst_riff_strf_iavs {
-		public uint DVAAuxSrc;
 		public uint DVAAuxCtl;
-		public uint DVAAuxSrc1;
 		public uint DVAAuxCtl1;
-		public uint DVVAuxSrc;
-		public uint DVVAuxCtl;
+		public uint DVAAuxSrc;
+		public uint DVAAuxSrc1;
 		public uint DVReserved1;
 		public uint DVReserved2;
+		public uint DVVAuxCtl;
+		public uint DVVAuxSrc;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public class gst_riff_strf_vids {
-		public uint size;
-		public uint width;
-		public uint height;
-		public ushort planes;
 		public ushort bit_cnt;
 		public uint compression;
+		public uint height;
 		public uint image_size;
+		public uint imp_colors;
+		public uint num_colors;
+		public ushort planes;
+		public uint size;
+		public uint width;
 		public uint xpels_meter;
 		public uint ypels_meter;
-		public uint num_colors;
-		public uint imp_colors;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public class gst_riff_strh {
-		public uint type;
+		public uint bufsize;
 		public uint fcc_handler;
 		public uint flags;
-		public uint priority;
 		public uint init_frames;
-		public uint scale;
-		public uint rate;
-		public uint start;
 		public uint length;
-		public uint bufsize;
+		public uint priority;
 		public uint quality;
+		public uint rate;
 		public uint samplesize;
+		public uint scale;
+		public uint start;
+		public uint type;
 	}
 	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_IBM_FORMAT_ADPCM;

Modified: trunk/vapi/gstreamer-rtp-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-rtp-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-rtp-0.10.vapi	Fri Oct 24 16:50:22 2008
@@ -2,117 +2,11 @@
 
 [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
 namespace Gst {
-	[CCode (cprefix = "GST_RTCP_SDES_", has_type_id = "0", cheader_filename = "gst/rtp/gstrtcpbuffer.h")]
-	public enum RTCPSDESType {
-		INVALID,
-		END,
-		CNAME,
-		NAME,
-		EMAIL,
-		PHONE,
-		LOC,
-		TOOL,
-		NOTE,
-		PRIV
-	}
-	[CCode (cprefix = "GST_RTCP_TYPE_", has_type_id = "0", cheader_filename = "gst/rtp/gstrtcpbuffer.h")]
-	public enum RTCPType {
-		INVALID,
-		SR,
-		RR,
-		SDES,
-		BYE,
-		APP
-	}
-	[CCode (cprefix = "GST_RTP_PAYLOAD_", has_type_id = "0", cheader_filename = "gst/rtp/gstbasertpaudiopayload.h")]
-	public enum RTPPayload {
-		PCMU,
-		1016,
-		G721,
-		GSM,
-		G723,
-		DVI4_8000,
-		DVI4_16000,
-		LPC,
-		PCMA,
-		G722,
-		L16_STEREO,
-		L16_MONO,
-		QCELP,
-		CN,
-		MPA,
-		G728,
-		DVI4_11025,
-		DVI4_22050,
-		G729,
-		CELLB,
-		JPEG,
-		NV,
-		H261,
-		MPV,
-		MP2T,
-		H263
-	}
-	[Compact]
-	[CCode (cheader_filename = "gst/rtp/gstrtcpbuffer.h")]
-	public class RTCPPacket {
-		public weak Gst.Buffer buffer;
-		public uint offset;
-		public bool padding;
-		public uchar count;
-		public Gst.RTCPType type;
-		public ushort length;
-		public uint item_offset;
-		public uint item_count;
-		public uint entry_offset;
-		public bool add_rb (uint ssrc, uchar fractionlost, int packetslost, uint exthighestseq, uint jitter, uint lsr, uint dlsr);
-		public bool bye_add_ssrc (uint ssrc);
-		public bool bye_add_ssrcs (uint ssrc, uint len);
-		public uint bye_get_nth_ssrc (uint nth);
-		public weak string bye_get_reason ();
-		public uchar bye_get_reason_len ();
-		public uint bye_get_ssrc_count ();
-		public bool bye_set_reason (string reason);
-		public uchar get_count ();
-		public ushort get_length ();
-		public bool get_padding ();
-		public void get_rb (uint nth, uint ssrc, uchar fractionlost, int packetslost, uint exthighestseq, uint jitter, uint lsr, uint dlsr);
-		public uint get_rb_count ();
-		public bool move_to_next ();
-		public void remove ();
-		public uint rr_get_ssrc ();
-		public void rr_set_ssrc (uint ssrc);
-		public bool sdes_add_entry (Gst.RTCPSDESType type, uchar len, uchar data);
-		public bool sdes_add_item (uint ssrc);
-		public bool sdes_copy_entry (Gst.RTCPSDESType type, uchar len, uchar data);
-		public bool sdes_first_entry ();
-		public bool sdes_first_item ();
-		public bool sdes_get_entry (Gst.RTCPSDESType type, uchar len, uchar data);
-		public uint sdes_get_item_count ();
-		public uint sdes_get_ssrc ();
-		public bool sdes_next_entry ();
-		public bool sdes_next_item ();
-		public void set_rb (uint nth, uint ssrc, uchar fractionlost, int packetslost, uint exthighestseq, uint jitter, uint lsr, uint dlsr);
-		public void sr_get_sender_info (uint ssrc, uint64 ntptime, uint rtptime, uint packet_count, uint octet_count);
-		public void sr_set_sender_info (uint ssrc, uint64 ntptime, uint rtptime, uint packet_count, uint octet_count);
-	}
-	[Compact]
-	[CCode (cheader_filename = "gst/rtp/gstrtppayloads.h")]
-	public class RTPPayloadInfo {
-		public uchar payload_type;
-		public weak string media;
-		public weak string encoding_name;
-		public uint clock_rate;
-		public weak string encoding_parameters;
-		public uint bitrate;
-		public static weak Gst.RTPPayloadInfo for_name (string media, string encoding_name);
-		public static weak Gst.RTPPayloadInfo for_pt (uchar payload_type);
-	}
 	[CCode (cheader_filename = "gst/rtp/gstbasertpaudiopayload.h")]
 	public class BaseRTPAudioPayload : Gst.BaseRTPPayload {
 		public Gst.ClockTime base_ts;
-		public int frame_size;
 		public int frame_duration;
+		public int frame_size;
 		public int sample_size;
 		public weak Gst.Adapter get_adapter ();
 		public Gst.FlowReturn push (uchar data, uint payload_len, Gst.ClockTime timestamp);
@@ -123,21 +17,21 @@
 	}
 	[CCode (cheader_filename = "gst/rtp/gstbasertpdepayload.h")]
 	public class BaseRTPDepayload : Gst.Element {
-		public weak Gst.Pad sinkpad;
-		public weak Gst.Pad srcpad;
-		public GLib.StaticRecMutex queuelock;
-		public bool thread_running;
-		public weak GLib.Thread thread;
 		public uint clock_rate;
+		public bool need_newsegment;
 		public weak GLib.Queue queue;
+		public GLib.StaticRecMutex queuelock;
 		public weak Gst.Segment segment;
-		public bool need_newsegment;
-		public Gst.FlowReturn push (Gst.Buffer out_buf);
-		public Gst.FlowReturn push_ts (uint timestamp, Gst.Buffer out_buf);
+		public weak Gst.Pad sinkpad;
+		public weak Gst.Pad srcpad;
+		public weak GLib.Thread thread;
+		public bool thread_running;
 		[NoWrapper]
 		public virtual Gst.FlowReturn add_to_queue (Gst.Buffer @in);
 		[NoWrapper]
 		public virtual weak Gst.Buffer process (Gst.Buffer @in);
+		public Gst.FlowReturn push (Gst.Buffer out_buf);
+		public Gst.FlowReturn push_ts (uint timestamp, Gst.Buffer out_buf);
 		[NoWrapper]
 		public virtual bool set_caps (Gst.Caps caps);
 		[NoWrapper]
@@ -147,36 +41,36 @@
 	}
 	[CCode (cheader_filename = "gst/rtp/gstbasertpaudiopayload.h")]
 	public class BaseRTPPayload : Gst.Element {
+		public uint clock_rate;
+		public uint current_ssrc;
+		public bool dynamic;
+		public weak string encoding_name;
+		public weak string media;
+		public weak Gst.Segment segment;
+		public weak GLib.Rand seq_rand;
+		public ushort seqnum_base;
 		public weak Gst.Pad sinkpad;
 		public weak Gst.Pad srcpad;
-		public weak GLib.Rand seq_rand;
 		public weak GLib.Rand ssrc_rand;
-		public weak GLib.Rand ts_rand;
 		public uint ts_base;
-		public ushort seqnum_base;
-		public weak string media;
-		public weak string encoding_name;
-		public bool dynamic;
-		public uint clock_rate;
 		public int ts_offset;
-		public uint current_ssrc;
-		public weak Gst.Segment segment;
-		[CCode (cname = "gst_basertppayload_is_filled")]
-		public bool is_filled (uint size, Gst.ClockTime duration);
-		[CCode (cname = "gst_basertppayload_push")]
-		public Gst.FlowReturn push (Gst.Buffer buffer);
-		[CCode (cname = "gst_basertppayload_set_options")]
-		public void set_options (string media, bool dynamic, string encoding_name, uint clock_rate);
-		[CCode (cname = "gst_basertppayload_set_outcaps")]
-		public bool set_outcaps (string fieldname);
+		public weak GLib.Rand ts_rand;
 		[NoWrapper]
 		public virtual weak Gst.Caps get_caps (Gst.Pad pad);
 		[NoWrapper]
 		public virtual Gst.FlowReturn handle_buffer (Gst.Buffer buffer);
 		[NoWrapper]
 		public virtual bool handle_event (Gst.Pad pad, Gst.Event event);
+		[CCode (cname = "gst_basertppayload_is_filled")]
+		public bool is_filled (uint size, Gst.ClockTime duration);
+		[CCode (cname = "gst_basertppayload_push")]
+		public Gst.FlowReturn push (Gst.Buffer buffer);
 		[NoWrapper]
 		public virtual bool set_caps (Gst.Caps caps);
+		[CCode (cname = "gst_basertppayload_set_options")]
+		public void set_options (string media, bool dynamic, string encoding_name, uint clock_rate);
+		[CCode (cname = "gst_basertppayload_set_outcaps")]
+		public bool set_outcaps (string fieldname);
 		[NoAccessorMethod]
 		public int64 max_ptime { get; set; }
 		[NoAccessorMethod]
@@ -196,6 +90,112 @@
 		[NoAccessorMethod]
 		public uint timestamp_offset { get; set; }
 	}
+	[Compact]
+	[CCode (cheader_filename = "gst/rtp/gstrtcpbuffer.h")]
+	public class RTCPPacket {
+		public weak Gst.Buffer buffer;
+		public uchar count;
+		public uint entry_offset;
+		public uint item_count;
+		public uint item_offset;
+		public ushort length;
+		public uint offset;
+		public bool padding;
+		public Gst.RTCPType type;
+		public bool add_rb (uint ssrc, uchar fractionlost, int packetslost, uint exthighestseq, uint jitter, uint lsr, uint dlsr);
+		public bool bye_add_ssrc (uint ssrc);
+		public bool bye_add_ssrcs (uint ssrc, uint len);
+		public uint bye_get_nth_ssrc (uint nth);
+		public weak string bye_get_reason ();
+		public uchar bye_get_reason_len ();
+		public uint bye_get_ssrc_count ();
+		public bool bye_set_reason (string reason);
+		public uchar get_count ();
+		public ushort get_length ();
+		public bool get_padding ();
+		public void get_rb (uint nth, uint ssrc, uchar fractionlost, int packetslost, uint exthighestseq, uint jitter, uint lsr, uint dlsr);
+		public uint get_rb_count ();
+		public bool move_to_next ();
+		public void remove ();
+		public uint rr_get_ssrc ();
+		public void rr_set_ssrc (uint ssrc);
+		public bool sdes_add_entry (Gst.RTCPSDESType type, uchar len, uchar data);
+		public bool sdes_add_item (uint ssrc);
+		public bool sdes_copy_entry (Gst.RTCPSDESType type, uchar len, uchar data);
+		public bool sdes_first_entry ();
+		public bool sdes_first_item ();
+		public bool sdes_get_entry (Gst.RTCPSDESType type, uchar len, uchar data);
+		public uint sdes_get_item_count ();
+		public uint sdes_get_ssrc ();
+		public bool sdes_next_entry ();
+		public bool sdes_next_item ();
+		public void set_rb (uint nth, uint ssrc, uchar fractionlost, int packetslost, uint exthighestseq, uint jitter, uint lsr, uint dlsr);
+		public void sr_get_sender_info (uint ssrc, uint64 ntptime, uint rtptime, uint packet_count, uint octet_count);
+		public void sr_set_sender_info (uint ssrc, uint64 ntptime, uint rtptime, uint packet_count, uint octet_count);
+	}
+	[Compact]
+	[CCode (cheader_filename = "gst/rtp/gstrtppayloads.h")]
+	public class RTPPayloadInfo {
+		public uint bitrate;
+		public uint clock_rate;
+		public weak string encoding_name;
+		public weak string encoding_parameters;
+		public weak string media;
+		public uchar payload_type;
+		public static weak Gst.RTPPayloadInfo for_name (string media, string encoding_name);
+		public static weak Gst.RTPPayloadInfo for_pt (uchar payload_type);
+	}
+	[CCode (cprefix = "GST_RTCP_SDES_", has_type_id = "0", cheader_filename = "gst/rtp/gstrtcpbuffer.h")]
+	public enum RTCPSDESType {
+		INVALID,
+		END,
+		CNAME,
+		NAME,
+		EMAIL,
+		PHONE,
+		LOC,
+		TOOL,
+		NOTE,
+		PRIV
+	}
+	[CCode (cprefix = "GST_RTCP_TYPE_", has_type_id = "0", cheader_filename = "gst/rtp/gstrtcpbuffer.h")]
+	public enum RTCPType {
+		INVALID,
+		SR,
+		RR,
+		SDES,
+		BYE,
+		APP
+	}
+	[CCode (cprefix = "GST_RTP_PAYLOAD_", has_type_id = "0", cheader_filename = "gst/rtp/gstbasertpaudiopayload.h")]
+	public enum RTPPayload {
+		PCMU,
+		1016,
+		G721,
+		GSM,
+		G723,
+		DVI4_8000,
+		DVI4_16000,
+		LPC,
+		PCMA,
+		G722,
+		L16_STEREO,
+		L16_MONO,
+		QCELP,
+		CN,
+		MPA,
+		G728,
+		DVI4_11025,
+		DVI4_22050,
+		G729,
+		CELLB,
+		JPEG,
+		NV,
+		H261,
+		MPV,
+		MP2T,
+		H263
+	}
 	[CCode (cheader_filename = "gst/rtp/gstrtcpbuffer.h")]
 	public const int RTCP_MAX_BYE_SSRC_COUNT;
 	[CCode (cheader_filename = "gst/rtp/gstrtcpbuffer.h")]

Modified: trunk/vapi/gstreamer-sdp-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-sdp-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-sdp-0.10.vapi	Fri Oct 24 16:50:22 2008
@@ -2,11 +2,6 @@
 
 [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
 namespace Gst {
-	[CCode (cprefix = "GST_SDP_", has_type_id = "0", cheader_filename = "gst/sdp/gstsdp.h")]
-	public enum SDPResult {
-		OK,
-		EINVAL
-	}
 	[Compact]
 	[CCode (cheader_filename = "gst/sdp/gstsdpmessage.h")]
 	public class SDPAttribute {
@@ -16,37 +11,37 @@
 	[Compact]
 	[CCode (cheader_filename = "gst/sdp/gstsdpmessage.h")]
 	public class SDPBandwidth {
-		public weak string bwtype;
 		public uint bandwidth;
+		public weak string bwtype;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gst/sdp/gstsdpmessage.h")]
 	public class SDPConnection {
-		public weak string nettype;
-		public weak string addrtype;
+		public uint addr_number;
 		public weak string address;
+		public weak string addrtype;
+		public weak string nettype;
 		public uint ttl;
-		public uint addr_number;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gst/sdp/gstsdpmessage.h")]
 	public class SDPKey {
-		public weak string type;
 		public weak string data;
+		public weak string type;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gst/sdp/gstsdpmessage.h")]
 	public class SDPMedia {
-		public weak string media;
-		public uint port;
-		public uint num_ports;
-		public weak string proto;
+		public weak GLib.Array attributes;
+		public weak GLib.Array bandwidths;
+		public weak GLib.Array connections;
 		public weak GLib.Array fmts;
 		public weak string information;
-		public weak GLib.Array connections;
-		public weak GLib.Array bandwidths;
 		public weak Gst.SDPKey key;
-		public weak GLib.Array attributes;
+		public weak string media;
+		public uint num_ports;
+		public uint port;
+		public weak string proto;
 		public Gst.SDPResult add_attribute (string key, string value);
 		public Gst.SDPResult add_bandwidth (string bwtype, uint bandwidth);
 		public Gst.SDPResult add_connection (string nettype, string addrtype, string address, uint ttl, uint addr_number);
@@ -81,20 +76,20 @@
 	[Compact]
 	[CCode (cheader_filename = "gst/sdp/gstsdpmessage.h")]
 	public class SDPMessage {
-		public weak string version;
-		public weak Gst.SDPOrigin origin;
-		public weak string session_name;
-		public weak string information;
-		public weak string uri;
+		public weak GLib.Array attributes;
+		public weak GLib.Array bandwidths;
+		public weak Gst.SDPConnection connection;
 		public weak GLib.Array emails;
+		public weak string information;
+		public weak Gst.SDPKey key;
+		public weak GLib.Array medias;
+		public weak Gst.SDPOrigin origin;
 		public weak GLib.Array phones;
-		public weak Gst.SDPConnection connection;
-		public weak GLib.Array bandwidths;
+		public weak string session_name;
 		public weak GLib.Array times;
+		public weak string uri;
+		public weak string version;
 		public weak GLib.Array zones;
-		public weak Gst.SDPKey key;
-		public weak GLib.Array attributes;
-		public weak GLib.Array medias;
 		public Gst.SDPResult add_attribute (string key, string value);
 		public Gst.SDPResult add_bandwidth (string bwtype, uint bandwidth);
 		public Gst.SDPResult add_email (string email);
@@ -143,19 +138,19 @@
 	[Compact]
 	[CCode (cheader_filename = "gst/sdp/gstsdpmessage.h")]
 	public class SDPOrigin {
-		public weak string username;
+		public weak string addr;
+		public weak string addrtype;
+		public weak string nettype;
 		public weak string sess_id;
 		public weak string sess_version;
-		public weak string nettype;
-		public weak string addrtype;
-		public weak string addr;
+		public weak string username;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gst/sdp/gstsdpmessage.h")]
 	public class SDPTime {
+		public weak GLib.Array repeat;
 		public weak string start;
 		public weak string stop;
-		public weak GLib.Array repeat;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gst/sdp/gstsdpmessage.h")]
@@ -163,6 +158,11 @@
 		public weak string time;
 		public weak string typed_time;
 	}
+	[CCode (cprefix = "GST_SDP_", has_type_id = "0", cheader_filename = "gst/sdp/gstsdp.h")]
+	public enum SDPResult {
+		OK,
+		EINVAL
+	}
 	[CCode (cheader_filename = "gst/sdp/gstsdpmessage.h")]
 	public const string SDP_BWTYPE_AS;
 	[CCode (cheader_filename = "gst/sdp/gstsdpmessage.h")]

Modified: trunk/vapi/gstreamer-tag-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-tag-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-tag-0.10.vapi	Fri Oct 24 16:50:22 2008
@@ -2,6 +2,16 @@
 
 [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
 namespace Gst {
+	[CCode (cheader_filename = "gst/tag/gsttagdemux.h")]
+	public class TagDemux : Gst.Element {
+		public void* reserved;
+		[NoWrapper]
+		public virtual bool identify_tag (Gst.Buffer buffer, bool start_tag, uint tag_size);
+		[NoWrapper]
+		public virtual weak Gst.TagList merge_tags (Gst.TagList start_tags, Gst.TagList end_tags);
+		[NoWrapper]
+		public virtual Gst.TagDemuxResult parse_tag (Gst.Buffer buffer, bool start_tag, uint tag_size, out weak Gst.TagList tags);
+	}
 	[CCode (cprefix = "GST_TAG_DEMUX_RESULT_", has_type_id = "0", cheader_filename = "gst/tag/gsttagdemux.h")]
 	public enum TagDemuxResult {
 		BROKEN_TAG,
@@ -30,16 +40,6 @@
 		BAND_ARTIST_LOGO,
 		PUBLISHER_STUDIO_LOGO
 	}
-	[CCode (cheader_filename = "gst/tag/gsttagdemux.h")]
-	public class TagDemux : Gst.Element {
-		public void* reserved;
-		[NoWrapper]
-		public virtual bool identify_tag (Gst.Buffer buffer, bool start_tag, uint tag_size);
-		[NoWrapper]
-		public virtual weak Gst.TagList merge_tags (Gst.TagList start_tags, Gst.TagList end_tags);
-		[NoWrapper]
-		public virtual Gst.TagDemuxResult parse_tag (Gst.Buffer buffer, bool start_tag, uint tag_size, out weak Gst.TagList tags);
-	}
 	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public const string TAG_CDDA_CDDB_DISCID;
 	[CCode (cheader_filename = "gst/tag/tag.h")]

Modified: trunk/vapi/gstreamer-video-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-video-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-video-0.10.vapi	Fri Oct 24 16:50:22 2008
@@ -2,110 +2,128 @@
 
 [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
 namespace Gst {
-	[CCode (cprefix = "GstVideoMask32", lower_case_cprefix = "gst_video_mask32_")]
-	namespace VideoMask32 {
-		[CCode (cname = "GST_VIDEO_BYTE1_MASK_32", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const string BYTE1;
-		[CCode (cname = "GST_VIDEO_BYTE2_MASK_32", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const string BYTE2;
-		[CCode (cname = "GST_VIDEO_BYTE3_MASK_32", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const string BYTE3;
-		[CCode (cname = "GST_VIDEO_BYTE4_MASK_32", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const string BYTE4;
-		[CCode (cname = "GST_VIDEO_BYTE1_MASK_32_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const int BYTE1_INT;
-		[CCode (cname = "GST_VIDEO_BYTE2_MASK_32_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const int BYTE2_INT;
-		[CCode (cname = "GST_VIDEO_BYTE3_MASK_32_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const int BYTE3_INT;
-		[CCode (cname = "GST_VIDEO_BYTE4_MASK_32_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const int BYTE4_INT;
-	}
-	[CCode (cprefix = "GstVideoMask24", lower_case_cprefix = "gst_video_mask24_")]
-	namespace VideoMask24 {
-		[CCode (cname = "GST_VIDEO_BYTE1_MASK_24", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const string BYTE1;
-		[CCode (cname = "GST_VIDEO_BYTE2_MASK_24", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const string BYTE2;
-		[CCode (cname = "GST_VIDEO_BYTE3_MASK_24", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const string BYTE3;
-		[CCode (cname = "GST_VIDEO_BYTE1_MASK_24_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const int BYTE1_INT;
-		[CCode (cname = "GST_VIDEO_BYTE2_MASK_24_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const int BYTE2_INT;
-		[CCode (cname = "GST_VIDEO_BYTE3_MASK_24_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const int BYTE3_INT;
-	}
-	[CCode (cprefix = "GstVideoMask16", lower_case_cprefix = "gst_video_mask16_")]
-	namespace VideoMask16 {
-		[CCode (cname = "GST_VIDEO_RED_MASK_16", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const string RED;
-		[CCode (cname = "GST_VIDEO_GREEN_MASK_16", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const string GREEN;
-		[CCode (cname = "GST_VIDEO_BLUE_MASK_16", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const string BLUE;
-		[CCode (cname = "GST_VIDEO_RED_MASK_16_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const int RED_INT;
-		[CCode (cname = "GST_VIDEO_GREEN_MASK_16_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const int GREEN_INT;
-		[CCode (cname = "GST_VIDEO_BLUE_MASK_16_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const int BLUE_INT;
-	}
-	[CCode (cprefix = "GstVideoMask15", lower_case_cprefix = "gst_video_mask15_")]
-	namespace VideoMask15 {
-		[CCode (cname = "GST_VIDEO_RED_MASK_15", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const string RED;
-		[CCode (cname = "GST_VIDEO_GREEN_MASK_15", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const string GREEN;
-		[CCode (cname = "GST_VIDEO_BLUE_MASK_15", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const string BLUE;
-		[CCode (cname = "GST_VIDEO_RED_MASK_15_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const int RED_INT;
-		[CCode (cname = "GST_VIDEO_GREEN_MASK_15_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const int GREEN_INT;
-		[CCode (cname = "GST_VIDEO_BLUE_MASK_15_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const int BLUE_INT;
-	}
-	[CCode (cprefix = "GstVideoRange", lower_case_cprefix = "gst_video_range_")]
-	namespace VideoRange {
-		[CCode (cname = "GST_VIDEO_SIZE_RANGE", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const string SIZE;
-		[CCode (cname = "GST_VIDEO_FPS_RANGE", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const string FPS;
-	}
 	[CCode (cprefix = "GST_VIDEO_CAPS_", lower_case_cprefix = "gst_video_caps_")]
 	namespace VideoCaps {
 		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const string RGB;
+		public const string ABGR;
 		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const string BGR;
+		public const string ARGB;
 		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const string RGBx;
+		public const string BGR;
 		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const string xRGB;
+		public const string BGRA;
 		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const string BGRx;
 		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const string xBGR;
+		public const string BGRx_HOST_ENDIAN;
 		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const string RGBA;
+		public const string RGB;
 		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const string ARGB;
+		public const string RGBA;
 		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const string BGRA;
+		public const string RGB_15;
 		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const string ABGR;
+		public const string RGB_16;
 		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const string xRGB_HOST_ENDIAN;
+		public const string RGBx;
 		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const string BGRx_HOST_ENDIAN;
+		public const string xBGR;
 		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const string RGB_16;
+		public const string xRGB;
 		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
-		public const string RGB_15;
+		public const string xRGB_HOST_ENDIAN;
 		[CCode (cname = "GST_VIDEO_CAPS_YUV", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public static weak string YUV (string fourcc);
 	}
+	[CCode (cprefix = "GstVideoMask15", lower_case_cprefix = "gst_video_mask15_")]
+	namespace VideoMask15 {
+		[CCode (cname = "GST_VIDEO_BLUE_MASK_15", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		public const string BLUE;
+		[CCode (cname = "GST_VIDEO_BLUE_MASK_15_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		public const int BLUE_INT;
+		[CCode (cname = "GST_VIDEO_GREEN_MASK_15", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		public const string GREEN;
+		[CCode (cname = "GST_VIDEO_GREEN_MASK_15_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		public const int GREEN_INT;
+		[CCode (cname = "GST_VIDEO_RED_MASK_15", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		public const string RED;
+		[CCode (cname = "GST_VIDEO_RED_MASK_15_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		public const int RED_INT;
+	}
+	[CCode (cprefix = "GstVideoMask16", lower_case_cprefix = "gst_video_mask16_")]
+	namespace VideoMask16 {
+		[CCode (cname = "GST_VIDEO_BLUE_MASK_16", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		public const string BLUE;
+		[CCode (cname = "GST_VIDEO_BLUE_MASK_16_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		public const int BLUE_INT;
+		[CCode (cname = "GST_VIDEO_GREEN_MASK_16", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		public const string GREEN;
+		[CCode (cname = "GST_VIDEO_GREEN_MASK_16_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		public const int GREEN_INT;
+		[CCode (cname = "GST_VIDEO_RED_MASK_16", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		public const string RED;
+		[CCode (cname = "GST_VIDEO_RED_MASK_16_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		public const int RED_INT;
+	}
+	[CCode (cprefix = "GstVideoMask24", lower_case_cprefix = "gst_video_mask24_")]
+	namespace VideoMask24 {
+		[CCode (cname = "GST_VIDEO_BYTE1_MASK_24", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		public const string BYTE1;
+		[CCode (cname = "GST_VIDEO_BYTE1_MASK_24_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		public const int BYTE1_INT;
+		[CCode (cname = "GST_VIDEO_BYTE2_MASK_24", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		public const string BYTE2;
+		[CCode (cname = "GST_VIDEO_BYTE2_MASK_24_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		public const int BYTE2_INT;
+		[CCode (cname = "GST_VIDEO_BYTE3_MASK_24", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		public const string BYTE3;
+		[CCode (cname = "GST_VIDEO_BYTE3_MASK_24_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		public const int BYTE3_INT;
+	}
+	[CCode (cprefix = "GstVideoMask32", lower_case_cprefix = "gst_video_mask32_")]
+	namespace VideoMask32 {
+		[CCode (cname = "GST_VIDEO_BYTE1_MASK_32", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		public const string BYTE1;
+		[CCode (cname = "GST_VIDEO_BYTE1_MASK_32_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		public const int BYTE1_INT;
+		[CCode (cname = "GST_VIDEO_BYTE2_MASK_32", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		public const string BYTE2;
+		[CCode (cname = "GST_VIDEO_BYTE2_MASK_32_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		public const int BYTE2_INT;
+		[CCode (cname = "GST_VIDEO_BYTE3_MASK_32", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		public const string BYTE3;
+		[CCode (cname = "GST_VIDEO_BYTE3_MASK_32_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		public const int BYTE3_INT;
+		[CCode (cname = "GST_VIDEO_BYTE4_MASK_32", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		public const string BYTE4;
+		[CCode (cname = "GST_VIDEO_BYTE4_MASK_32_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		public const int BYTE4_INT;
+	}
+	[CCode (cprefix = "GstVideoRange", lower_case_cprefix = "gst_video_range_")]
+	namespace VideoRange {
+		[CCode (cname = "GST_VIDEO_FPS_RANGE", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		public const string FPS;
+		[CCode (cname = "GST_VIDEO_SIZE_RANGE", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
+		public const string SIZE;
+	}
+	[CCode (cheader_filename = "gst/video/gstvideofilter.h")]
+	public class VideoFilter : Gst.BaseTransform {
+		public bool inited;
+	}
+	[Compact]
+	[CCode (cheader_filename = "gst/video/gstvideosink.h")]
+	public class VideoRectangle {
+		public int h;
+		public int w;
+		public int x;
+		public int y;
+	}
+	[CCode (cheader_filename = "gst/video/gstvideosink.h")]
+	public class VideoSink : Gst.BaseSink {
+		public int height;
+		public int width;
+		public static void center_rect (Gst.VideoRectangle src, Gst.VideoRectangle dst, Gst.VideoRectangle _result, bool scaling);
+	}
 	[CCode (cprefix = "GST_VIDEO_FORMAT_", has_type_id = "0", cheader_filename = "gst/video/video.h")]
 	public enum VideoFormat {
 		UNKNOWN,
@@ -127,24 +145,6 @@
 		Y41B,
 		Y42B
 	}
-	[Compact]
-	[CCode (cheader_filename = "gst/video/gstvideosink.h")]
-	public class VideoRectangle {
-		public int x;
-		public int y;
-		public int w;
-		public int h;
-	}
-	[CCode (cheader_filename = "gst/video/gstvideofilter.h")]
-	public class VideoFilter : Gst.BaseTransform {
-		public bool inited;
-	}
-	[CCode (cheader_filename = "gst/video/gstvideosink.h")]
-	public class VideoSink : Gst.BaseSink {
-		public int width;
-		public int height;
-		public static void center_rect (Gst.VideoRectangle src, Gst.VideoRectangle dst, Gst.VideoRectangle _result, bool scaling);
-	}
 	[CCode (cheader_filename = "gst/video/video.h")]
 	public static bool video_calculate_display_ratio (ref uint dar_n, ref uint dar_d, uint video_width, uint video_height, uint video_par_n, uint video_par_d, uint display_par_n, uint display_par_d);
 	[CCode (cheader_filename = "gst/video/video.h")]

Modified: trunk/vapi/gtk+-2.0.vapi
==============================================================================
--- trunk/vapi/gtk+-2.0.vapi	(original)
+++ trunk/vapi/gtk+-2.0.vapi	Fri Oct 24 16:50:22 2008
@@ -2,1585 +2,2508 @@
 
 [CCode (cprefix = "Gtk", lower_case_cprefix = "gtk_")]
 namespace Gtk {
-	[CCode (cprefix = "GTK_ANCHOR_", cheader_filename = "gtk/gtk.h")]
-	public enum AnchorType {
-		CENTER,
-		NORTH,
-		NORTH_WEST,
-		NORTH_EAST,
-		SOUTH,
-		SOUTH_WEST,
-		SOUTH_EAST,
-		WEST,
-		EAST,
-		N,
-		NW,
-		NE,
-		S,
-		SW,
-		SE,
-		W,
-		E
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class AboutDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
+		public weak string get_artists ();
+		public weak string get_authors ();
+		public weak string get_comments ();
+		public weak string get_copyright ();
+		public weak string get_documenters ();
+		public weak string get_license ();
+		public weak Gdk.Pixbuf get_logo ();
+		public weak string get_logo_icon_name ();
+		public weak string get_program_name ();
+		public weak string get_translator_credits ();
+		public weak string get_version ();
+		public weak string get_website ();
+		public weak string get_website_label ();
+		public bool get_wrap_license ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public AboutDialog ();
+		[NoArrayLength]
+		public void set_artists (string[] artists);
+		[NoArrayLength]
+		public void set_authors (string[] authors);
+		public void set_comments (string comments);
+		public void set_copyright (string copyright);
+		[NoArrayLength]
+		public void set_documenters (string[] documenters);
+		public static void set_email_hook (Gtk.AboutDialogActivateLinkFunc func, GLib.DestroyNotify? destroy);
+		public void set_license (string license);
+		public void set_logo (Gdk.Pixbuf logo);
+		public void set_logo_icon_name (string icon_name);
+		public void set_program_name (string name);
+		public void set_translator_credits (string translator_credits);
+		public static void set_url_hook (Gtk.AboutDialogActivateLinkFunc func, GLib.DestroyNotify? destroy);
+		public void set_version (string version);
+		public void set_website (string website);
+		public void set_website_label (string website_label);
+		public void set_wrap_license (bool wrap_license);
+		public string[] artists { get; set; }
+		public string[] authors { get; set; }
+		public string comments { get; set; }
+		public string copyright { get; set; }
+		public string[] documenters { get; set; }
+		public string license { get; set; }
+		public Gdk.Pixbuf logo { get; set; }
+		public string logo_icon_name { get; set; }
+		public string program_name { get; set; }
+		public string translator_credits { get; set; }
+		public string version { get; set; }
+		public string website { get; set; }
+		public string website_label { get; set; }
+		public bool wrap_license { get; set; }
 	}
-	[CCode (cprefix = "GTK_ARROW_", cheader_filename = "gtk/gtk.h")]
-	public enum ArrowType {
-		UP,
-		DOWN,
-		LEFT,
-		RIGHT,
-		NONE
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class AccelGroup : GLib.Object {
+		public weak GLib.SList acceleratables;
+		public uint lock_count;
+		public Gdk.ModifierType modifier_mask;
+		public uint n_accels;
+		public bool activate (GLib.Quark accel_quark, GLib.Object acceleratable, uint accel_key, Gdk.ModifierType accel_mods);
+		public void connect (uint accel_key, Gdk.ModifierType accel_mods, Gtk.AccelFlags accel_flags, GLib.Closure closure);
+		public void connect_by_path (string accel_path, GLib.Closure closure);
+		public bool disconnect (GLib.Closure closure);
+		public bool disconnect_key (uint accel_key, Gdk.ModifierType accel_mods);
+		public weak Gtk.AccelKey find (Gtk.AccelGroupFindFunc find_func, void* data);
+		public static weak Gtk.AccelGroup from_accel_closure (GLib.Closure closure);
+		public void @lock ();
+		[CCode (has_construct_function = false)]
+		public AccelGroup ();
+		public weak Gtk.AccelGroupEntry query (uint accel_key, Gdk.ModifierType accel_mods, uint n_entries);
+		public void unlock ();
+		public virtual signal bool accel_activate (GLib.Object p0, uint p1, Gdk.ModifierType p2);
+		public virtual signal void accel_changed (uint keyval, Gdk.ModifierType modifier, GLib.Closure accel_closure);
 	}
-	[CCode (cprefix = "GTK_ASSISTANT_PAGE_", cheader_filename = "gtk/gtk.h")]
-	public enum AssistantPageType {
-		CONTENT,
-		INTRO,
-		CONFIRM,
-		SUMMARY,
-		PROGRESS
+	[Compact]
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class AccelGroupEntry {
+		public GLib.Quark accel_path_quark;
+		public weak GLib.Closure closure;
+		public weak Gtk.AccelKey key;
 	}
-	[CCode (cprefix = "GTK_BUTTONBOX_", cheader_filename = "gtk/gtk.h")]
-	public enum ButtonBoxStyle {
-		DEFAULT_STYLE,
-		SPREAD,
-		EDGE,
-		START,
-		END,
-		CENTER
+	[Compact]
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class AccelKey {
+		public uint accel_flags;
+		public uint accel_key;
+		public Gdk.ModifierType accel_mods;
 	}
-	[CCode (cprefix = "GTK_BUTTONS_", cheader_filename = "gtk/gtk.h")]
-	public enum ButtonsType {
-		NONE,
-		OK,
-		CLOSE,
-		CANCEL,
-		YES_NO,
-		OK_CANCEL
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class AccelLabel : Gtk.Label, Atk.Implementor, Gtk.Buildable {
+		public weak Gtk.AccelGroup accel_group;
+		public uint accel_padding;
+		public weak string accel_string;
+		public ushort accel_string_width;
+		public uint gtk_reserved;
+		public weak Gtk.Widget get_accel_widget ();
+		public uint get_accel_width ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public AccelLabel (string str);
+		public bool refetch ();
+		public void set_accel_closure (GLib.Closure accel_closure);
+		public void set_accel_widget (Gtk.Widget accel_widget);
+		[NoAccessorMethod]
+		public GLib.Closure accel_closure { get; set; }
+		public Gtk.Widget accel_widget { get; set; }
 	}
-	[CCode (cprefix = "GTK_CLIST_DRAG_", cheader_filename = "gtk/gtk.h")]
-	public enum CListDragPos {
-		NONE,
-		BEFORE,
-		INTO,
-		AFTER
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class AccelMap : GLib.Object {
+		public static void add_entry (string accel_path, uint accel_key, Gdk.ModifierType accel_mods);
+		public static void add_filter (string filter_pattern);
+		public static bool change_entry (string accel_path, uint accel_key, Gdk.ModifierType accel_mods, bool replace);
+		public static void @foreach (void* data, Gtk.AccelMapForeach foreach_func);
+		public static void foreach_unfiltered (void* data, Gtk.AccelMapForeach foreach_func);
+		public static weak Gtk.AccelMap get ();
+		public static void load (string file_name);
+		public static void load_fd (int fd);
+		public static void load_scanner (GLib.Scanner scanner);
+		public static void lock_path (string accel_path);
+		public static bool lookup_entry (string accel_path, Gtk.AccelKey key);
+		public static void save (string file_name);
+		public static void save_fd (int fd);
+		public static void unlock_path (string accel_path);
+		public virtual signal void changed (string p0, uint p1, Gdk.ModifierType p2);
 	}
-	[CCode (cprefix = "GTK_CTREE_EXPANDER_", cheader_filename = "gtk/gtk.h")]
-	public enum CTreeExpanderStyle {
-		NONE,
-		SQUARE,
-		TRIANGLE,
-		CIRCULAR
+	[Compact]
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class AccelMapClass {
 	}
-	[CCode (cprefix = "GTK_CTREE_EXPANSION_", cheader_filename = "gtk/gtk.h")]
-	public enum CTreeExpansionType {
-		EXPAND,
-		EXPAND_RECURSIVE,
-		COLLAPSE,
-		COLLAPSE_RECURSIVE,
-		TOGGLE,
-		TOGGLE_RECURSIVE
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Accessible : Atk.Object {
+		public weak Gtk.Widget widget;
+		public virtual void connect_widget_destroyed ();
 	}
-	[CCode (cprefix = "GTK_CTREE_LINES_", cheader_filename = "gtk/gtk.h")]
-	public enum CTreeLineStyle {
-		NONE,
-		SOLID,
-		DOTTED,
-		TABBED
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Action : GLib.Object, Gtk.Buildable {
+		public void block_activate_from (Gtk.Widget proxy);
+		public void connect_accelerator ();
+		public virtual void connect_proxy (Gtk.Widget proxy);
+		public weak Gtk.Widget create_icon (Gtk.IconSize icon_size);
+		public virtual weak Gtk.Widget create_menu ();
+		public virtual weak Gtk.Widget create_menu_item ();
+		public virtual weak Gtk.Widget create_tool_item ();
+		public void disconnect_accelerator ();
+		public virtual void disconnect_proxy (Gtk.Widget proxy);
+		public weak GLib.Closure get_accel_closure ();
+		public weak string get_accel_path ();
+		public weak GLib.SList get_proxies ();
+		public bool get_sensitive ();
+		public bool get_visible ();
+		public bool is_sensitive ();
+		public bool is_visible ();
+		[CCode (has_construct_function = false)]
+		public Action (string name, string? label, string? tooltip, string? stock_id);
+		public void set_accel_group (Gtk.AccelGroup accel_group);
+		public void set_accel_path (string accel_path);
+		public void set_sensitive (bool sensitive);
+		public void set_visible (bool visible);
+		public void unblock_activate_from (Gtk.Widget proxy);
+		[NoAccessorMethod]
+		public Gtk.ActionGroup action_group { get; set; }
+		[NoAccessorMethod]
+		public bool hide_if_empty { get; set; }
+		[NoAccessorMethod]
+		public string icon_name { get; set; }
+		[NoAccessorMethod]
+		public bool is_important { get; set; }
+		[NoAccessorMethod]
+		public string label { get; set; }
+		[NoAccessorMethod]
+		public string name { get; construct; }
+		public bool sensitive { get; set; }
+		[NoAccessorMethod]
+		public string short_label { get; set; }
+		[NoAccessorMethod]
+		public string stock_id { get; set; }
+		[NoAccessorMethod]
+		public string tooltip { get; set; }
+		public bool visible { get; set; }
+		[NoAccessorMethod]
+		public bool visible_horizontal { get; set; }
+		[NoAccessorMethod]
+		public bool visible_overflown { get; set; }
+		[NoAccessorMethod]
+		public bool visible_vertical { get; set; }
+		[HasEmitter]
+		public virtual signal void activate ();
 	}
-	[CCode (cprefix = "GTK_CTREE_POS_", cheader_filename = "gtk/gtk.h")]
-	public enum CTreePos {
-		BEFORE,
-		AS_CHILD,
-		AFTER
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class ActionGroup : GLib.Object, Gtk.Buildable {
+		public void add_action (Gtk.Action action);
+		public void add_action_with_accel (Gtk.Action action, string? accelerator);
+		public void add_actions (Gtk.ActionEntry[] entries, void* user_data);
+		public void add_actions_full (Gtk.ActionEntry[] entries, void* user_data, GLib.DestroyNotify? destroy);
+		public void add_radio_actions (Gtk.RadioActionEntry[] entries, int value, Gtk.RadioActionCallback on_change);
+		public void add_radio_actions_full (Gtk.RadioActionEntry[] entries, int value, Gtk.RadioActionCallback on_change, GLib.DestroyNotify? destroy);
+		public void add_toggle_actions (Gtk.ToggleActionEntry[] entries, void* user_data);
+		public void add_toggle_actions_full (Gtk.ToggleActionEntry[] entries, void* user_data, GLib.DestroyNotify? destroy);
+		public virtual weak Gtk.Action get_action (string action_name);
+		public bool get_sensitive ();
+		public bool get_visible ();
+		public weak GLib.List list_actions ();
+		[CCode (has_construct_function = false)]
+		public ActionGroup (string name);
+		public void remove_action (Gtk.Action action);
+		public void set_sensitive (bool sensitive);
+		public void set_translate_func (Gtk.TranslateFunc func, void* data, Gtk.DestroyNotify notify);
+		public void set_translation_domain (string domain);
+		public void set_visible (bool visible);
+		public weak string translate_string (string str);
+		[NoAccessorMethod]
+		public string name { get; construct; }
+		public bool sensitive { get; set; }
+		public bool visible { get; set; }
+		public virtual signal void connect_proxy (Gtk.Action p0, Gtk.Widget p1);
+		public virtual signal void disconnect_proxy (Gtk.Action p0, Gtk.Widget p1);
+		public virtual signal void post_activate (Gtk.Action p0);
+		public virtual signal void pre_activate (Gtk.Action p0);
 	}
-	[CCode (cprefix = "GTK_CELL_RENDERER_ACCEL_MODE_", cheader_filename = "gtk/gtk.h")]
-	public enum CellRendererAccelMode {
-		GTK,
-		OTHER
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Adjustment : Gtk.Object {
+		public void clamp_page (double lower, double upper);
+		public double get_value ();
+		[CCode (type = "GtkObject*", has_construct_function = false)]
+		public Adjustment (double value, double lower, double upper, double step_increment, double page_increment, double page_size);
+		public void set_value (double value);
+		[NoAccessorMethod]
+		public double lower { get; set; }
+		[NoAccessorMethod]
+		public double page_increment { get; set; }
+		[NoAccessorMethod]
+		public double page_size { get; set; }
+		[NoAccessorMethod]
+		public double step_increment { get; set; }
+		[NoAccessorMethod]
+		public double upper { get; set; }
+		public double value { get; set; }
+		[HasEmitter]
+		public virtual signal void changed ();
+		[HasEmitter]
+		public virtual signal void value_changed ();
 	}
-	[CCode (cprefix = "GTK_CELL_RENDERER_MODE_", cheader_filename = "gtk/gtk.h")]
-	public enum CellRendererMode {
-		INERT,
-		ACTIVATABLE,
-		EDITABLE
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Alignment : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
+		public void get_padding (uint padding_top, uint padding_bottom, uint padding_left, uint padding_right);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Alignment (float xalign, float yalign, float xscale, float yscale);
+		public void set (float xalign, float yalign, float xscale, float yscale);
+		public void set_padding (uint padding_top, uint padding_bottom, uint padding_left, uint padding_right);
+		[NoAccessorMethod]
+		public uint bottom_padding { get; set; }
+		[NoAccessorMethod]
+		public uint left_padding { get; set; }
+		[NoAccessorMethod]
+		public uint right_padding { get; set; }
+		[NoAccessorMethod]
+		public uint top_padding { get; set; }
+		[NoAccessorMethod]
+		public float xalign { get; set; }
+		[NoAccessorMethod]
+		public float xscale { get; set; }
+		[NoAccessorMethod]
+		public float yalign { get; set; }
+		[NoAccessorMethod]
+		public float yscale { get; set; }
 	}
-	[CCode (cprefix = "GTK_CELL_", cheader_filename = "gtk/gtk.h")]
-	public enum CellType {
-		EMPTY,
-		TEXT,
-		PIXMAP,
-		PIXTEXT,
-		WIDGET
+	[Compact]
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Arg {
+		public weak string name;
+		public weak Gtk.Type type;
 	}
-	[CCode (cprefix = "GTK_CORNER_", cheader_filename = "gtk/gtk.h")]
-	public enum CornerType {
-		TOP_LEFT,
-		BOTTOM_LEFT,
-		TOP_RIGHT,
-		BOTTOM_RIGHT
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Arrow : Gtk.Misc, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Arrow (Gtk.ArrowType arrow_type, Gtk.ShadowType shadow_type);
+		public void set (Gtk.ArrowType arrow_type, Gtk.ShadowType shadow_type);
+		[NoAccessorMethod]
+		public Gtk.ArrowType arrow_type { get; set; }
+		[NoAccessorMethod]
+		public Gtk.ShadowType shadow_type { get; set; }
 	}
-	[CCode (cprefix = "GTK_CURVE_TYPE_", cheader_filename = "gtk/gtk.h")]
-	public enum CurveType {
-		LINEAR,
-		SPLINE,
-		FREE
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class AspectFrame : Gtk.Frame, Atk.Implementor, Gtk.Buildable {
+		public Gtk.Allocation center_allocation;
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public AspectFrame (string label, float xalign, float yalign, float ratio, bool obey_child);
+		public void set (float xalign, float yalign, float ratio, bool obey_child);
+		[NoAccessorMethod]
+		public bool obey_child { get; set; }
+		[NoAccessorMethod]
+		public float ratio { get; set; }
+		[NoAccessorMethod]
+		public float xalign { get; set; }
+		[NoAccessorMethod]
+		public float yalign { get; set; }
 	}
-	[CCode (cprefix = "GTK_DELETE_", cheader_filename = "gtk/gtk.h")]
-	public enum DeleteType {
-		CHARS,
-		WORD_ENDS,
-		WORDS,
-		DISPLAY_LINES,
-		DISPLAY_LINE_ENDS,
-		PARAGRAPH_ENDS,
-		PARAGRAPHS,
-		WHITESPACE
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Assistant : Gtk.Window, Atk.Implementor, Gtk.Buildable {
+		public weak Gtk.Widget back;
+		public weak Gtk.Widget forward;
+		public weak Gtk.Widget last;
+		public void add_action_widget (Gtk.Widget child);
+		public int append_page (Gtk.Widget page);
+		public int get_current_page ();
+		public int get_n_pages ();
+		public weak Gtk.Widget get_nth_page (int page_num);
+		public bool get_page_complete (Gtk.Widget page);
+		public weak Gdk.Pixbuf get_page_header_image (Gtk.Widget page);
+		public weak Gdk.Pixbuf get_page_side_image (Gtk.Widget page);
+		public weak string get_page_title (Gtk.Widget page);
+		public Gtk.AssistantPageType get_page_type (Gtk.Widget page);
+		public int insert_page (Gtk.Widget page, int position);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Assistant ();
+		public int prepend_page (Gtk.Widget page);
+		public void remove_action_widget (Gtk.Widget child);
+		public void set_current_page (int page_num);
+		public void set_forward_page_func (Gtk.AssistantPageFunc page_func, void* data, GLib.DestroyNotify destroy);
+		public void set_page_complete (Gtk.Widget page, bool complete);
+		public void set_page_header_image (Gtk.Widget page, Gdk.Pixbuf pixbuf);
+		public void set_page_side_image (Gtk.Widget page, Gdk.Pixbuf pixbuf);
+		public void set_page_title (Gtk.Widget page, string title);
+		public void set_page_type (Gtk.Widget page, Gtk.AssistantPageType type);
+		public void update_buttons_state ();
+		public virtual signal void apply ();
+		public virtual signal void cancel ();
+		public virtual signal void close ();
+		public virtual signal void prepare (Gtk.Widget page);
 	}
-	[CCode (cprefix = "GTK_DIR_", cheader_filename = "gtk/gtk.h")]
-	public enum DirectionType {
-		TAB_FORWARD,
-		TAB_BACKWARD,
-		UP,
-		DOWN,
-		LEFT,
-		RIGHT
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Bin : Gtk.Container, Atk.Implementor, Gtk.Buildable {
+		public weak Gtk.Widget child;
+		public weak Gtk.Widget get_child ();
 	}
-	[CCode (cprefix = "GTK_DRAG_RESULT_", cheader_filename = "gtk/gtk.h")]
-	public enum DragResult {
-		SUCCESS,
-		NO_TARGET,
-		USER_CANCELLED,
-		TIMEOUT_EXPIRED,
-		GRAB_BROKEN,
-		ERROR
+	[Compact]
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class BindingArg {
+		public GLib.Type arg_type;
 	}
-	[CCode (cprefix = "GTK_EXPANDER_", cheader_filename = "gtk/gtk.h")]
-	public enum ExpanderStyle {
-		COLLAPSED,
-		SEMI_COLLAPSED,
-		SEMI_EXPANDED,
-		EXPANDED
+	[Compact]
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class BindingEntry {
+		public weak Gtk.BindingSet binding_set;
+		public uint destroyed;
+		public weak Gtk.BindingEntry hash_next;
+		public uint in_emission;
+		public uint keyval;
+		public uint marks_unbound;
+		public Gdk.ModifierType modifiers;
+		public weak Gtk.BindingEntry set_next;
+		public weak Gtk.BindingSignal signals;
+		public static void add_signal (Gtk.BindingSet binding_set, uint keyval, Gdk.ModifierType modifiers, string signal_name, uint n_args);
+		public static void remove (Gtk.BindingSet binding_set, uint keyval, Gdk.ModifierType modifiers);
+		public static void skip (Gtk.BindingSet binding_set, uint keyval, Gdk.ModifierType modifiers);
 	}
-	[CCode (cprefix = "GTK_FILE_CHOOSER_ACTION_", cheader_filename = "gtk/gtk.h")]
-	public enum FileChooserAction {
-		OPEN,
-		SAVE,
-		SELECT_FOLDER,
-		CREATE_FOLDER
+	[Compact]
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class BindingSet {
+		public weak GLib.SList class_branch_pspecs;
+		public weak Gtk.BindingEntry current;
+		public weak Gtk.BindingEntry entries;
+		public uint parsed;
+		public int priority;
+		public weak string set_name;
+		public weak GLib.SList widget_class_pspecs;
+		public weak GLib.SList widget_path_pspecs;
+		public bool activate (uint keyval, Gdk.ModifierType modifiers, Gtk.Object object);
+		public void add_path (Gtk.PathType path_type, string path_pattern, Gtk.PathPriorityType priority);
+		public static weak Gtk.BindingSet by_class (void* object_class);
+		public static weak Gtk.BindingSet find (string set_name);
+		[CCode (has_construct_function = false)]
+		public BindingSet (string set_name);
 	}
-	[CCode (cprefix = "GTK_FILE_CHOOSER_CONFIRMATION_", cheader_filename = "gtk/gtk.h")]
-	public enum FileChooserConfirmation {
-		CONFIRM,
-		ACCEPT_FILENAME,
-		SELECT_AGAIN
+	[Compact]
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class BindingSignal {
+		public weak Gtk.BindingArg args;
+		public uint n_args;
+		public weak Gtk.BindingSignal next;
+		public weak string signal_name;
 	}
-	[CCode (cprefix = "GTK_FILE_CHOOSER_ERROR_", cheader_filename = "gtk/gtk.h")]
-	public enum FileChooserError {
-		NONEXISTENT,
-		BAD_FILENAME,
-		ALREADY_EXISTS
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Box : Gtk.Container, Atk.Implementor, Gtk.Buildable {
+		public weak GLib.List children;
+		public bool get_homogeneous ();
+		public int get_spacing ();
+		public void pack_end (Gtk.Widget child, bool expand, bool fill, uint padding);
+		public void pack_end_defaults (Gtk.Widget widget);
+		public void pack_start (Gtk.Widget child, bool expand, bool fill, uint padding);
+		public void pack_start_defaults (Gtk.Widget widget);
+		public void query_child_packing (Gtk.Widget child, out bool expand, out bool fill, out uint padding, out Gtk.PackType pack_type);
+		public void reorder_child (Gtk.Widget child, int position);
+		public void set_child_packing (Gtk.Widget child, bool expand, bool fill, uint padding, Gtk.PackType pack_type);
+		public void set_homogeneous (bool homogeneous);
+		public void set_spacing (int spacing);
+		public bool homogeneous { get; set; }
+		public int spacing { get; set; }
 	}
-	[CCode (cprefix = "GTK_IM_PREEDIT_", cheader_filename = "gtk/gtk.h")]
-	public enum IMPreeditStyle {
-		NOTHING,
-		CALLBACK,
-		NONE
+	[Compact]
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class BoxChild {
+		public uint expand;
+		public uint fill;
+		public uint is_secondary;
+		public uint pack;
+		public ushort padding;
+		public weak Gtk.Widget widget;
 	}
-	[CCode (cprefix = "GTK_IM_STATUS_", cheader_filename = "gtk/gtk.h")]
-	public enum IMStatusStyle {
-		NOTHING,
-		CALLBACK,
-		NONE
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Builder : GLib.Object {
+		public uint add_from_file (string filename) throws GLib.Error;
+		public uint add_from_string (string buffer, ulong length) throws GLib.Error;
+		public void connect_signals (void* user_data);
+		public void connect_signals_full (Gtk.BuilderConnectFunc func);
+		public static GLib.Quark error_quark ();
+		public weak GLib.Object get_object (string name);
+		public weak GLib.SList get_objects ();
+		public weak string get_translation_domain ();
+		public virtual GLib.Type get_type_from_name (string type_name);
+		[CCode (has_construct_function = false)]
+		public Builder ();
+		public void set_translation_domain (string domain);
+		public bool value_from_string (GLib.ParamSpec pspec, string str, GLib.Value value) throws GLib.Error;
+		public bool value_from_string_type (GLib.Type type, string str, GLib.Value value) throws GLib.Error;
+		public string translation_domain { get; set; }
 	}
-	[CCode (cprefix = "GTK_ICON_SIZE_", cheader_filename = "gtk/gtk.h")]
-	public enum IconSize {
-		INVALID,
-		MENU,
-		SMALL_TOOLBAR,
-		LARGE_TOOLBAR,
-		BUTTON,
-		DND,
-		DIALOG
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Button : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
+		public uint activate_timeout;
+		public uint button_down;
+		public uint constructed;
+		public uint depress_on_activate;
+		public uint depressed;
+		public weak Gdk.Window event_window;
+		public uint in_button;
+		public weak string label_text;
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Button.from_stock (string stock_id);
+		public void get_alignment (float xalign, float yalign);
+		public bool get_focus_on_click ();
+		public weak Gtk.Widget get_image ();
+		public Gtk.PositionType get_image_position ();
+		public weak string get_label ();
+		public Gtk.ReliefStyle get_relief ();
+		public bool get_use_stock ();
+		public bool get_use_underline ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Button ();
+		public void set_alignment (float xalign, float yalign);
+		public void set_focus_on_click (bool focus_on_click);
+		public void set_image (Gtk.Widget image);
+		public void set_image_position (Gtk.PositionType position);
+		public void set_label (string label);
+		public void set_relief (Gtk.ReliefStyle newstyle);
+		public void set_use_stock (bool use_stock);
+		public void set_use_underline (bool use_underline);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Button.with_label (string label);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Button.with_mnemonic (string label);
+		public bool focus_on_click { get; set; }
+		public Gtk.Widget image { get; set; }
+		public Gtk.PositionType image_position { get; set; }
+		public string label { get; set construct; }
+		public Gtk.ReliefStyle relief { get; set; }
+		public bool use_stock { get; set construct; }
+		public bool use_underline { get; set construct; }
+		[NoAccessorMethod]
+		public float xalign { get; set; }
+		[NoAccessorMethod]
+		public float yalign { get; set; }
+		public virtual signal void activate ();
+		[HasEmitter]
+		public virtual signal void clicked ();
+		[HasEmitter]
+		public virtual signal void enter ();
+		[HasEmitter]
+		public virtual signal void leave ();
+		[HasEmitter]
+		public virtual signal void pressed ();
+		[HasEmitter]
+		public virtual signal void released ();
 	}
-	[CCode (cprefix = "GTK_ICON_THEME_", cheader_filename = "gtk/gtk.h")]
-	public enum IconThemeError {
-		NOT_FOUND,
-		FAILED
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class ButtonBox : Gtk.Box, Atk.Implementor, Gtk.Buildable {
+		public int child_ipad_x;
+		public int child_ipad_y;
+		public int child_min_height;
+		public int child_min_width;
+		public bool get_child_secondary (Gtk.Widget child);
+		public Gtk.ButtonBoxStyle get_layout ();
+		public void set_child_secondary (Gtk.Widget child, bool is_secondary);
+		public void set_layout (Gtk.ButtonBoxStyle layout_style);
+		[NoAccessorMethod]
+		public Gtk.ButtonBoxStyle layout_style { get; set; }
 	}
-	[CCode (cprefix = "GTK_ICON_VIEW_", cheader_filename = "gtk/gtk.h")]
-	public enum IconViewDropPosition {
-		NO_DROP,
-		DROP_INTO,
-		DROP_LEFT,
-		DROP_RIGHT,
-		DROP_ABOVE,
-		DROP_BELOW
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Calendar : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
+		[NoArrayLength]
+		public weak int[] day_month;
+		public Gtk.CalendarDisplayOptions display_flags;
+		public int focus_col;
+		public int focus_row;
+		public weak Gdk.GC gc;
+		[NoArrayLength]
+		public weak char[] grow_space;
+		public weak Gtk.Style header_style;
+		public int highlight_col;
+		public int highlight_row;
+		public weak Gtk.Style label_style;
+		[NoArrayLength]
+		public weak int[] marked_date;
+		[NoArrayLength]
+		public weak Gdk.Color[] marked_date_color;
+		public int num_marked_dates;
+		public int selected_day;
+		public weak Gdk.GC xor_gc;
+		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);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		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]
+		public bool no_month_change { get; set; }
+		[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; }
+		[NoAccessorMethod]
+		public int year { get; set; }
+		public virtual signal void day_selected ();
+		public virtual signal void day_selected_double_click ();
+		public virtual signal void month_changed ();
+		public virtual signal void next_month ();
+		public virtual signal void next_year ();
+		public virtual signal void prev_month ();
+		public virtual signal void prev_year ();
 	}
-	[CCode (cprefix = "GTK_IMAGE_", cheader_filename = "gtk/gtk.h")]
-	public enum ImageType {
-		EMPTY,
-		PIXMAP,
-		IMAGE,
-		PIXBUF,
-		STOCK,
-		ICON_SET,
-		ANIMATION,
-		ICON_NAME,
-		GICON
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public abstract class CellRenderer : Gtk.Object {
+		public uint editing;
+		public virtual bool activate (Gdk.Event event, Gtk.Widget widget, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState flags);
+		public void get_fixed_size (int width, int height);
+		public abstract void get_size (Gtk.Widget widget, Gdk.Rectangle? cell_area, out int x_offset, out int y_offset, out int width, out int height);
+		public abstract void render (Gdk.Window window, Gtk.Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, Gtk.CellRendererState flags);
+		public void set_fixed_size (int width, int height);
+		public virtual weak Gtk.CellEditable start_editing (Gdk.Event event, Gtk.Widget widget, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState flags);
+		public void stop_editing (bool canceled);
+		[NoAccessorMethod]
+		public string cell_background { set; }
+		[NoAccessorMethod]
+		public Gdk.Color cell_background_gdk { get; set; }
+		[NoAccessorMethod]
+		public bool cell_background_set { get; set; }
+		[NoAccessorMethod]
+		public int height { get; set; }
+		[NoAccessorMethod]
+		public bool is_expanded { get; set; }
+		[NoAccessorMethod]
+		public bool is_expander { get; set; }
+		[NoAccessorMethod]
+		public Gtk.CellRendererMode mode { get; set; }
+		[NoAccessorMethod]
+		public bool sensitive { get; set; }
+		[NoAccessorMethod]
+		public bool visible { get; set; }
+		[NoAccessorMethod]
+		public int width { get; set; }
+		[NoAccessorMethod]
+		public float xalign { get; set; }
+		[NoAccessorMethod]
+		public uint xpad { get; set; }
+		[NoAccessorMethod]
+		public float yalign { get; set; }
+		[NoAccessorMethod]
+		public uint ypad { get; set; }
+		[HasEmitter]
+		public virtual signal void editing_canceled ();
+		public virtual signal void editing_started (Gtk.CellEditable editable, string path);
 	}
-	[CCode (cprefix = "GTK_JUSTIFY_", cheader_filename = "gtk/gtk.h")]
-	public enum Justification {
-		LEFT,
-		RIGHT,
-		CENTER,
-		FILL
-	}
-	[CCode (cprefix = "GTK_MATCH_", cheader_filename = "gtk/gtk.h")]
-	public enum MatchType {
-		ALL,
-		ALL_TAIL,
-		HEAD,
-		TAIL,
-		EXACT,
-		LAST
-	}
-	[CCode (cprefix = "GTK_MENU_DIR_", cheader_filename = "gtk/gtk.h")]
-	public enum MenuDirectionType {
-		PARENT,
-		CHILD,
-		NEXT,
-		PREV
-	}
-	[CCode (cprefix = "GTK_MESSAGE_", cheader_filename = "gtk/gtk.h")]
-	public enum MessageType {
-		INFO,
-		WARNING,
-		QUESTION,
-		ERROR,
-		OTHER
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class CellRendererAccel : Gtk.CellRendererText {
+		public weak Gtk.Widget edit_widget;
+		public weak Gtk.Widget grab_widget;
+		public weak Gtk.Widget sizing_label;
+		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
+		public CellRendererAccel ();
+		[NoAccessorMethod]
+		public uint accel_key { get; set; }
+		[NoAccessorMethod]
+		public Gtk.CellRendererAccelMode accel_mode { get; set; }
+		[NoAccessorMethod]
+		public Gdk.ModifierType accel_mods { get; set; }
+		[NoAccessorMethod]
+		public uint keycode { get; set; }
+		public virtual signal void accel_cleared (string path_string);
+		public virtual signal void accel_edited (string path_string, uint accel_key, Gdk.ModifierType accel_mods, uint hardware_keycode);
 	}
-	[CCode (cprefix = "GTK_", cheader_filename = "gtk/gtk.h")]
-	public enum MetricType {
-		PIXELS,
-		INCHES,
-		CENTIMETERS
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class CellRendererCombo : Gtk.CellRendererText {
+		public uint focus_out_id;
+		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
+		public CellRendererCombo ();
+		[NoAccessorMethod]
+		public bool has_entry { get; set; }
+		[NoAccessorMethod]
+		public Gtk.TreeModel model { get; set; }
+		[NoAccessorMethod]
+		public int text_column { get; set; }
+		public virtual signal void changed (string p0, Gtk.TreeIter p1);
 	}
-	[CCode (cprefix = "GTK_MOVEMENT_", cheader_filename = "gtk/gtk.h")]
-	public enum MovementStep {
-		LOGICAL_POSITIONS,
-		VISUAL_POSITIONS,
-		WORDS,
-		DISPLAY_LINES,
-		DISPLAY_LINE_ENDS,
-		PARAGRAPHS,
-		PARAGRAPH_ENDS,
-		PAGES,
-		BUFFER_ENDS,
-		HORIZONTAL_PAGES
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class CellRendererPixbuf : Gtk.CellRenderer {
+		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
+		public CellRendererPixbuf ();
+		[NoAccessorMethod]
+		public bool follow_state { get; set; }
+		[NoAccessorMethod]
+		public string icon_name { get; set; }
+		[NoAccessorMethod]
+		public Gdk.Pixbuf pixbuf { get; set; }
+		[NoAccessorMethod]
+		public Gdk.Pixbuf pixbuf_expander_closed { get; set; }
+		[NoAccessorMethod]
+		public Gdk.Pixbuf pixbuf_expander_open { get; set; }
+		[NoAccessorMethod]
+		public string stock_detail { get; set; }
+		[NoAccessorMethod]
+		public string stock_id { get; set; }
+		[NoAccessorMethod]
+		public uint stock_size { get; set; }
 	}
-	[CCode (cprefix = "GTK_NOTEBOOK_TAB_", cheader_filename = "gtk/gtk.h")]
-	public enum NotebookTab {
-		FIRST,
-		LAST
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class CellRendererProgress : Gtk.CellRenderer {
+		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
+		public CellRendererProgress ();
+		[NoAccessorMethod]
+		public Gtk.ProgressBarOrientation orientation { get; set; }
+		[NoAccessorMethod]
+		public int pulse { get; set; }
+		[NoAccessorMethod]
+		public string text { get; set; }
+		[NoAccessorMethod]
+		public float text_xalign { get; set; }
+		[NoAccessorMethod]
+		public float text_yalign { get; set; }
+		[NoAccessorMethod]
+		public int value { get; set; }
 	}
-	[CCode (cprefix = "GTK_ORIENTATION_", cheader_filename = "gtk/gtk.h")]
-	public enum Orientation {
-		HORIZONTAL,
-		VERTICAL
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class CellRendererSpin : Gtk.CellRendererText {
+		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
+		public CellRendererSpin ();
+		[NoAccessorMethod]
+		public Gtk.Adjustment adjustment { get; set; }
+		[NoAccessorMethod]
+		public double climb_rate { get; set; }
+		[NoAccessorMethod]
+		public uint digits { get; set; }
 	}
-	[CCode (cprefix = "GTK_PACK_DIRECTION_", cheader_filename = "gtk/gtk.h")]
-	public enum PackDirection {
-		LTR,
-		RTL,
-		TTB,
-		BTT
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class CellRendererText : Gtk.CellRenderer {
+		public uint calc_fixed_height;
+		public weak Pango.AttrList extra_attrs;
+		public int fixed_height_rows;
+		public double font_scale;
+		public Pango.Underline underline_style;
+		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
+		public CellRendererText ();
+		public void set_fixed_height_from_font (int number_of_rows);
+		[NoAccessorMethod]
+		public bool align_set { get; set; }
+		[NoAccessorMethod]
+		public Pango.Alignment alignment { get; set; }
+		[NoAccessorMethod]
+		public Pango.AttrList attributes { get; set; }
+		[NoAccessorMethod]
+		public string background { set; }
+		[NoAccessorMethod]
+		public Gdk.Color background_gdk { get; set; }
+		[NoAccessorMethod]
+		public bool background_set { get; set; }
+		[NoAccessorMethod]
+		public bool editable { get; set; }
+		[NoAccessorMethod]
+		public bool editable_set { get; set; }
+		[NoAccessorMethod]
+		public Pango.EllipsizeMode ellipsize { get; set; }
+		[NoAccessorMethod]
+		public bool ellipsize_set { get; set; }
+		[NoAccessorMethod]
+		public string family { get; set; }
+		[NoAccessorMethod]
+		public bool family_set { get; set; }
+		[NoAccessorMethod]
+		public string font { get; set; }
+		[NoAccessorMethod]
+		public Pango.FontDescription font_desc { get; set; }
+		[NoAccessorMethod]
+		public string foreground { set; }
+		[NoAccessorMethod]
+		public Gdk.Color foreground_gdk { get; set; }
+		[NoAccessorMethod]
+		public bool foreground_set { get; set; }
+		[NoAccessorMethod]
+		public string language { get; set; }
+		[NoAccessorMethod]
+		public bool language_set { get; set; }
+		[NoAccessorMethod]
+		public string markup { set; }
+		[NoAccessorMethod]
+		public int rise { get; set; }
+		[NoAccessorMethod]
+		public bool rise_set { get; set; }
+		[NoAccessorMethod]
+		public double scale { get; set; }
+		[NoAccessorMethod]
+		public bool scale_set { get; set; }
+		[NoAccessorMethod]
+		public bool single_paragraph_mode { get; set; }
+		[NoAccessorMethod]
+		public int size { get; set; }
+		[NoAccessorMethod]
+		public double size_points { get; set; }
+		[NoAccessorMethod]
+		public bool size_set { get; set; }
+		[NoAccessorMethod]
+		public Pango.Stretch stretch { get; set; }
+		[NoAccessorMethod]
+		public bool stretch_set { get; set; }
+		[NoAccessorMethod]
+		public bool strikethrough { get; set; }
+		[NoAccessorMethod]
+		public bool strikethrough_set { get; set; }
+		[NoAccessorMethod]
+		public Pango.Style style { get; set; }
+		[NoAccessorMethod]
+		public bool style_set { get; set; }
+		[NoAccessorMethod]
+		public string text { get; set; }
+		[NoAccessorMethod]
+		public Pango.Underline underline { get; set; }
+		[NoAccessorMethod]
+		public bool underline_set { get; set; }
+		[NoAccessorMethod]
+		public Pango.Variant variant { get; set; }
+		[NoAccessorMethod]
+		public bool variant_set { get; set; }
+		[NoAccessorMethod]
+		public int weight { get; set; }
+		[NoAccessorMethod]
+		public bool weight_set { get; set; }
+		[NoAccessorMethod]
+		public int width_chars { get; set; }
+		[NoAccessorMethod]
+		public Pango.WrapMode wrap_mode { get; set; }
+		[NoAccessorMethod]
+		public int wrap_width { get; set; }
+		public virtual signal void edited (string path, string new_text);
 	}
-	[CCode (cprefix = "GTK_PACK_", cheader_filename = "gtk/gtk.h")]
-	public enum PackType {
-		START,
-		END
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class CellRendererToggle : Gtk.CellRenderer {
+		public bool get_active ();
+		public bool get_radio ();
+		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
+		public CellRendererToggle ();
+		public void set_active (bool setting);
+		public void set_radio (bool radio);
+		[NoAccessorMethod]
+		public bool activatable { get; set; }
+		public bool active { get; set; }
+		[NoAccessorMethod]
+		public bool inconsistent { get; set; }
+		[NoAccessorMethod]
+		public int indicator_size { get; set; }
+		public bool radio { get; set; }
+		public virtual signal void toggled (string path);
 	}
-	[CCode (cprefix = "GTK_PAGE_ORIENTATION_", cheader_filename = "gtk/gtk.h")]
-	public enum PageOrientation {
-		PORTRAIT,
-		LANDSCAPE,
-		REVERSE_PORTRAIT,
-		REVERSE_LANDSCAPE
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class CellView : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout {
+		public weak GLib.List get_cell_renderers ();
+		public weak Gtk.TreePath get_displayed_row ();
+		public bool get_size_of_row (Gtk.TreePath path, out Gtk.Requisition requisition);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public CellView ();
+		public void set_background_color (Gdk.Color color);
+		public void set_displayed_row (Gtk.TreePath path);
+		public void set_model (Gtk.TreeModel? model);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public CellView.with_markup (string markup);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public CellView.with_pixbuf (Gdk.Pixbuf pixbuf);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public CellView.with_text (string text);
+		[NoAccessorMethod]
+		public string background { set; }
+		[NoAccessorMethod]
+		public Gdk.Color background_gdk { get; set; }
+		[NoAccessorMethod]
+		public bool background_set { get; set; }
+		[NoAccessorMethod]
+		public Gtk.TreeModel model { get; set; }
 	}
-	[CCode (cprefix = "GTK_PAGE_SET_", cheader_filename = "gtk/gtk.h")]
-	public enum PageSet {
-		ALL,
-		EVEN,
-		ODD
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class CheckButton : Gtk.ToggleButton, Atk.Implementor, Gtk.Buildable {
+		[NoWrapper]
+		public virtual void draw_indicator (Gdk.Rectangle area);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public CheckButton ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public CheckButton.with_label (string label);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public CheckButton.with_mnemonic (string label);
 	}
-	[CCode (cprefix = "GTK_PATH_PRIO_", cheader_filename = "gtk/gtk.h")]
-	public enum PathPriorityType {
-		LOWEST,
-		GTK,
-		APPLICATION,
-		THEME,
-		RC,
-		HIGHEST
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class CheckMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable {
+		public uint always_show_toggle;
+		[NoWrapper]
+		public virtual void draw_indicator (Gdk.Rectangle area);
+		public bool get_active ();
+		public bool get_draw_as_radio ();
+		public bool get_inconsistent ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public CheckMenuItem ();
+		public void set_active (bool is_active);
+		public void set_draw_as_radio (bool draw_as_radio);
+		public void set_inconsistent (bool setting);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public CheckMenuItem.with_label (string label);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public CheckMenuItem.with_mnemonic (string label);
+		public bool active { get; set; }
+		public bool draw_as_radio { get; set; }
+		public bool inconsistent { get; set; }
+		[HasEmitter]
+		public virtual signal void toggled ();
 	}
-	[CCode (cprefix = "GTK_PATH_", cheader_filename = "gtk/gtk.h")]
-	public enum PathType {
-		WIDGET,
-		WIDGET_CLASS,
-		CLASS
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Clipboard : GLib.Object {
+		public void clear ();
+		public static weak Gtk.Clipboard get (Gdk.Atom selection);
+		public weak Gdk.Display get_display ();
+		public static weak Gtk.Clipboard get_for_display (Gdk.Display display, Gdk.Atom selection);
+		public weak GLib.Object get_owner ();
+		public void request_contents (Gdk.Atom target, Gtk.ClipboardReceivedFunc callback);
+		public void request_image (Gtk.ClipboardImageReceivedFunc callback);
+		public void request_rich_text (Gtk.TextBuffer buffer, Gtk.ClipboardRichTextReceivedFunc callback);
+		public void request_targets (Gtk.ClipboardTargetsReceivedFunc callback);
+		public void request_text (Gtk.ClipboardTextReceivedFunc callback);
+		public void set_can_store (Gtk.TargetEntry[] targets);
+		public void set_image (Gdk.Pixbuf pixbuf);
+		public void set_text (string text, int len);
+		public bool set_with_data (Gtk.TargetEntry[] targets, Gtk.ClipboardGetFunc get_func, Gtk.ClipboardClearFunc clear_func);
+		public bool set_with_owner (Gtk.TargetEntry[] targets, Gtk.ClipboardGetFunc get_func, Gtk.ClipboardClearFunc clear_func, GLib.Object owner);
+		public void store ();
+		public weak Gtk.SelectionData wait_for_contents (Gdk.Atom target);
+		public weak Gdk.Pixbuf wait_for_image ();
+		public uchar wait_for_rich_text (Gtk.TextBuffer buffer, out Gdk.Atom format, ulong length);
+		public bool wait_for_targets (Gdk.Atom[] targets);
+		public weak string wait_for_text ();
+		public bool wait_is_image_available ();
+		public bool wait_is_rich_text_available (Gtk.TextBuffer buffer);
+		public bool wait_is_target_available (Gdk.Atom target);
+		public bool wait_is_text_available ();
+		public virtual signal void owner_change (Gdk.Event p0);
 	}
-	[CCode (cprefix = "GTK_POLICY_", cheader_filename = "gtk/gtk.h")]
-	public enum PolicyType {
-		ALWAYS,
-		AUTOMATIC,
-		NEVER
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class ColorButton : Gtk.Button, Atk.Implementor, Gtk.Buildable {
+		public ushort get_alpha ();
+		public void get_color (out Gdk.Color color);
+		public weak string get_title ();
+		public bool get_use_alpha ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public ColorButton ();
+		public void set_alpha (ushort alpha);
+		public void set_color (Gdk.Color color);
+		public void set_title (string title);
+		public void set_use_alpha (bool use_alpha);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public ColorButton.with_color (Gdk.Color color);
+		public uint alpha { get; set; }
+		public Gdk.Color color { get; set; }
+		public string title { get; set; }
+		public bool use_alpha { get; set; }
+		public virtual signal void color_set ();
 	}
-	[CCode (cprefix = "GTK_POS_", cheader_filename = "gtk/gtk.h")]
-	public enum PositionType {
-		LEFT,
-		RIGHT,
-		TOP,
-		BOTTOM
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class ColorSelection : Gtk.VBox, Atk.Implementor, Gtk.Buildable {
+		public ushort get_current_alpha ();
+		public void get_current_color (out Gdk.Color color);
+		public bool get_has_opacity_control ();
+		public bool get_has_palette ();
+		public ushort get_previous_alpha ();
+		public void get_previous_color (out Gdk.Color color);
+		public bool is_adjusting ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public ColorSelection ();
+		public static bool palette_from_string (string str, Gdk.Color[] colors);
+		public static weak string palette_to_string (Gdk.Color[] colors);
+		public static weak Gtk.ColorSelectionChangePaletteWithScreenFunc set_change_palette_with_screen_hook (Gtk.ColorSelectionChangePaletteWithScreenFunc func);
+		public void set_current_alpha (ushort alpha);
+		public void set_current_color (Gdk.Color color);
+		public void set_has_opacity_control (bool has_opacity);
+		public void set_has_palette (bool has_palette);
+		public void set_previous_alpha (ushort alpha);
+		public void set_previous_color (Gdk.Color color);
+		public uint current_alpha { get; set; }
+		public Gdk.Color current_color { get; set; }
+		public bool has_opacity_control { get; set; }
+		public bool has_palette { get; set; }
+		public virtual signal void color_changed ();
 	}
-	[CCode (cprefix = "GTK_PREVIEW_", cheader_filename = "gtk/gtk.h")]
-	public enum PreviewType {
-		COLOR,
-		GRAYSCALE
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class ColorSelectionDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
+		public weak Gtk.Widget cancel_button;
+		public weak Gtk.Widget colorsel;
+		public weak Gtk.Widget help_button;
+		public weak Gtk.Widget ok_button;
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public ColorSelectionDialog (string title);
 	}
-	[CCode (cprefix = "GTK_PRINT_DUPLEX_", cheader_filename = "gtk/gtk.h")]
-	public enum PrintDuplex {
-		SIMPLEX,
-		HORIZONTAL,
-		VERTICAL
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class ComboBox : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.CellEditable, Gtk.CellLayout {
+		public void append_text (string text);
+		public int get_active ();
+		public bool get_active_iter (out Gtk.TreeIter iter);
+		public virtual weak string get_active_text ();
+		public bool get_add_tearoffs ();
+		public int get_column_span_column ();
+		public bool get_focus_on_click ();
+		public weak Gtk.TreeModel get_model ();
+		public weak Atk.Object get_popup_accessible ();
+		public weak Gtk.TreeViewRowSeparatorFunc get_row_separator_func ();
+		public int get_row_span_column ();
+		public weak string get_title ();
+		public int get_wrap_width ();
+		public void insert_text (int position, string text);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public ComboBox ();
+		public void prepend_text (string text);
+		public void remove_text (int position);
+		public void set_active (int index_);
+		public void set_active_iter (Gtk.TreeIter iter);
+		public void set_add_tearoffs (bool add_tearoffs);
+		public void set_column_span_column (int column_span);
+		public void set_focus_on_click (bool focus_on_click);
+		public void set_model (Gtk.TreeModel? model);
+		public void set_row_separator_func (Gtk.TreeViewRowSeparatorFunc func, void* data, Gtk.DestroyNotify destroy);
+		public void set_row_span_column (int row_span);
+		public void set_title (string title);
+		public void set_wrap_width (int width);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public ComboBox.text ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public ComboBox.with_model (Gtk.TreeModel model);
+		public int active { get; set; }
+		public bool add_tearoffs { get; set; }
+		public int column_span_column { get; set; }
+		public bool focus_on_click { get; set; }
+		[NoAccessorMethod]
+		public bool has_frame { get; set; }
+		public Gtk.TreeModel model { get; set; }
+		[NoAccessorMethod]
+		public bool popup_shown { get; }
+		public int row_span_column { get; set; }
+		[NoAccessorMethod]
+		public string tearoff_title { get; set; }
+		public int wrap_width { get; set; }
+		public virtual signal void changed ();
+		public virtual signal void move_active (Gtk.ScrollType p0);
+		[HasEmitter]
+		public virtual signal bool popdown ();
+		[HasEmitter]
+		public virtual signal void popup ();
 	}
-	[CCode (cprefix = "GTK_PRINT_ERROR_", cheader_filename = "gtk/gtk.h")]
-	public enum PrintError {
-		GENERAL,
-		INTERNAL_ERROR,
-		NOMEM,
-		INVALID_FILE
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class ComboBoxEntry : Gtk.ComboBox, Atk.Implementor, Gtk.Buildable, Gtk.CellEditable, Gtk.CellLayout {
+		public int get_text_column ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public ComboBoxEntry ();
+		public void set_text_column (int text_column);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public ComboBoxEntry.text ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public ComboBoxEntry.with_model (Gtk.TreeModel model, int text_column);
+		public int text_column { get; set; }
 	}
-	[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_", cheader_filename = "gtk/gtk.h")]
-	public enum PrintOperationResult {
-		ERROR,
-		APPLY,
-		CANCEL,
-		IN_PROGRESS
-	}
-	[CCode (cprefix = "GTK_PRINT_PAGES_", cheader_filename = "gtk/gtk.h")]
-	public enum PrintPages {
-		ALL,
-		CURRENT,
-		RANGES
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Container : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
+		public weak Gtk.Widget focus_child;
+		public uint has_focus_chain;
+		public uint need_resize;
+		public uint reallocate_redraws;
+		public void add_with_properties (Gtk.Widget widget, ...);
+		public void child_get (Gtk.Widget child, ...);
+		public void child_get_property (Gtk.Widget child, string property_name, GLib.Value value);
+		public void child_get_valist (Gtk.Widget child, string first_property_name, void* var_args);
+		public void child_set (Gtk.Widget child, ...);
+		public void child_set_property (Gtk.Widget child, string property_name, GLib.Value value);
+		public void child_set_valist (Gtk.Widget child, string first_property_name, void* var_args);
+		public virtual GLib.Type child_type ();
+		public static weak GLib.ParamSpec class_find_child_property (GLib.ObjectClass cclass, string property_name);
+		public static weak GLib.ParamSpec class_list_child_properties (GLib.ObjectClass cclass, uint n_properties);
+		[NoWrapper]
+		public virtual weak string composite_name (Gtk.Widget child);
+		public virtual void forall (Gtk.Callback callback, void* callback_data);
+		public void @foreach (Gtk.Callback callback);
+		public uint get_border_width ();
+		[NoWrapper]
+		public virtual void get_child_property (Gtk.Widget child, uint property_id, GLib.Value value, GLib.ParamSpec pspec);
+		public weak GLib.List<Gtk.Widget> get_children ();
+		public bool get_focus_chain (GLib.List focusable_widgets);
+		public weak Gtk.Adjustment get_focus_hadjustment ();
+		public weak Gtk.Adjustment get_focus_vadjustment ();
+		public Gtk.ResizeMode get_resize_mode ();
+		[CCode (cname = "gtk_container_class_install_child_property")]
+		public class void install_child_property (uint property_id, GLib.ParamSpec pspec);
+		public void propagate_expose (Gtk.Widget child, Gdk.EventExpose event);
+		public void resize_children ();
+		public void set_border_width (uint border_width);
+		[NoWrapper]
+		public virtual void set_child_property (Gtk.Widget child, uint property_id, GLib.Value value, GLib.ParamSpec pspec);
+		public void set_focus_chain (GLib.List focusable_widgets);
+		public void set_focus_hadjustment (Gtk.Adjustment adjustment);
+		public void set_focus_vadjustment (Gtk.Adjustment adjustment);
+		public void set_reallocate_redraws (bool needs_redraws);
+		public void set_resize_mode (Gtk.ResizeMode resize_mode);
+		public void unset_focus_chain ();
+		public uint border_width { get; set; }
+		[NoAccessorMethod]
+		public Gtk.Widget child { set; }
+		public Gtk.ResizeMode resize_mode { get; set; }
+		[HasEmitter]
+		public virtual signal void add (Gtk.Widget widget);
+		[HasEmitter]
+		public virtual signal void check_resize ();
+		[HasEmitter]
+		public virtual signal void remove (Gtk.Widget widget);
+		[HasEmitter]
+		public virtual signal void set_focus_child (Gtk.Widget widget);
 	}
-	[CCode (cprefix = "GTK_PRINT_QUALITY_", cheader_filename = "gtk/gtk.h")]
-	public enum PrintQuality {
-		LOW,
-		NORMAL,
-		HIGH,
-		DRAFT
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Curve : Gtk.DrawingArea, Atk.Implementor, Gtk.Buildable {
+		[NoArrayLength]
+		public weak float[] ctlpoint;
+		public int cursor_type;
+		public int grab_point;
+		public int height;
+		public int last;
+		public int num_ctlpoints;
+		public int num_points;
+		public weak Gdk.Pixmap pixmap;
+		public Gdk.Point point;
+		public void get_vector (int veclen, float[] vector);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Curve ();
+		public void reset ();
+		public void set_curve_type (Gtk.CurveType type);
+		public void set_gamma (float gamma_);
+		public void set_range (float min_x, float max_x, float min_y, float max_y);
+		public void set_vector (int veclen, float[] vector);
+		[NoAccessorMethod]
+		public Gtk.CurveType curve_type { get; set; }
+		[NoAccessorMethod]
+		public float max_x { get; set; }
+		[NoAccessorMethod]
+		public float max_y { get; set; }
+		[NoAccessorMethod]
+		public float min_x { get; set; }
+		[NoAccessorMethod]
+		public float min_y { get; set; }
+		public virtual signal void curve_type_changed ();
 	}
-	[CCode (cprefix = "GTK_PRINT_STATUS_", cheader_filename = "gtk/gtk.h")]
-	public enum PrintStatus {
-		INITIAL,
-		PREPARING,
-		GENERATING_DATA,
-		SENDING_DATA,
-		PENDING,
-		PENDING_ISSUE,
-		PRINTING,
-		FINISHED,
-		FINISHED_ABORTED
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Dialog : Gtk.Window, Atk.Implementor, Gtk.Buildable {
+		public weak Gtk.HButtonBox action_area;
+		public weak Gtk.Widget separator;
+		public weak Gtk.VBox vbox;
+		public void add_action_widget (Gtk.Widget child, int response_id);
+		public weak Gtk.Widget add_button (string button_text, int response_id);
+		public void add_buttons (...);
+		public bool get_has_separator ();
+		public int get_response_for_widget (Gtk.Widget widget);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Dialog ();
+		public int run ();
+		[CCode (sentinel = "-1")]
+		public void set_alternative_button_order (...);
+		public void set_alternative_button_order_from_array (int n_params, int new_order);
+		public void set_default_response (int response_id);
+		public void set_has_separator (bool setting);
+		public void set_response_sensitive (int response_id, bool setting);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Dialog.with_buttons (string? title, Gtk.Window? parent, Gtk.DialogFlags flags, ...);
+		public bool has_separator { get; set; }
+		public virtual signal void close ();
+		[HasEmitter]
+		public virtual signal void response (int response_id);
 	}
-	[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 (cheader_filename = "gtk/gtk.h")]
+	public class DrawingArea : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
+		public void* draw_data;
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public DrawingArea ();
 	}
-	[CCode (cprefix = "GTK_PROGRESS_", cheader_filename = "gtk/gtk.h")]
-	public enum ProgressBarStyle {
-		CONTINUOUS,
-		DISCRETE
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Entry : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.CellEditable, Gtk.Editable {
+		public int ascent;
+		public uint blink_timeout;
+		public uint button;
+		public uint cache_includes_preedit;
+		public weak Pango.Layout cached_layout;
+		public int current_pos;
+		public uint cursor_visible;
+		public int descent;
+		public int dnd_position;
+		public int drag_start_x;
+		public int drag_start_y;
+		public uint editing_canceled;
+		public weak Gtk.IMContext im_context;
+		public uint in_click;
+		public uint in_drag;
+		public uint is_cell_renderer;
+		public uint mouse_cursor_obscured;
+		public ushort n_bytes;
+		public uint need_im_reset;
+		public uint overwrite_mode;
+		public weak Gtk.Widget popup_menu;
+		public ushort preedit_cursor;
+		public ushort preedit_length;
+		public uint recompute_idle;
+		public uint resolved_dir;
+		public uint select_lines;
+		public uint select_words;
+		public weak Gdk.Window text_area;
+		public ushort text_length;
+		public ushort text_max_length;
+		public ushort text_size;
+		public uint visible;
+		public bool get_activates_default ();
+		public float get_alignment ();
+		public weak Gtk.EntryCompletion get_completion ();
+		public weak Gtk.Adjustment get_cursor_hadjustment ();
+		public bool get_has_frame ();
+		public Gtk.Border get_inner_border ();
+		public unichar get_invisible_char ();
+		public weak Pango.Layout get_layout ();
+		public void get_layout_offsets (int x, int y);
+		public int get_max_length ();
+		public weak string get_text ();
+		[NoWrapper]
+		public virtual void get_text_area_size (int x, int y, int width, int height);
+		public bool get_visibility ();
+		public int get_width_chars ();
+		public int layout_index_to_text_index (int layout_index);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Entry ();
+		public void set_activates_default (bool setting);
+		public void set_alignment (float xalign);
+		public void set_completion (Gtk.EntryCompletion completion);
+		public void set_cursor_hadjustment (Gtk.Adjustment adjustment);
+		public void set_has_frame (bool setting);
+		public void set_inner_border (Gtk.Border border);
+		public void set_invisible_char (unichar ch);
+		public void set_max_length (int max);
+		public void set_text (string text);
+		public void set_visibility (bool visible);
+		public void set_width_chars (int n_chars);
+		public int text_index_to_layout_index (int text_index);
+		public bool activates_default { get; set; }
+		[NoAccessorMethod]
+		public int cursor_position { get; }
+		[NoAccessorMethod]
+		public bool editable { get; set; }
+		public bool has_frame { get; set; }
+		public Gtk.Border inner_border { get; set; }
+		public uint invisible_char { get; set; }
+		public int max_length { get; set; }
+		[NoAccessorMethod]
+		public int scroll_offset { get; }
+		[NoAccessorMethod]
+		public int selection_bound { get; }
+		[NoAccessorMethod]
+		public Gtk.ShadowType shadow_type { get; set; }
+		public string text { get; set; }
+		[NoAccessorMethod]
+		public bool truncate_multiline { get; set; }
+		public bool visibility { get; set; }
+		public int width_chars { get; set; }
+		[NoAccessorMethod]
+		public float xalign { get; set; }
+		public virtual signal void activate ();
+		public virtual signal void backspace ();
+		public virtual signal void copy_clipboard ();
+		public virtual signal void cut_clipboard ();
+		public virtual signal void delete_from_cursor (Gtk.DeleteType type, int count);
+		public virtual signal void insert_at_cursor (string str);
+		public virtual signal void move_cursor (Gtk.MovementStep step, int count, bool extend_selection);
+		public virtual signal void paste_clipboard ();
+		public virtual signal void populate_popup (Gtk.Menu menu);
+		public virtual signal void toggle_overwrite ();
 	}
-	[CCode (cprefix = "GTK_RC_TOKEN_", cheader_filename = "gtk/gtk.h")]
-	public enum RcTokenType {
-		INVALID,
-		INCLUDE,
-		NORMAL,
-		ACTIVE,
-		PRELIGHT,
-		SELECTED,
-		INSENSITIVE,
-		FG,
-		BG,
-		TEXT,
-		BASE,
-		XTHICKNESS,
-		YTHICKNESS,
-		FONT,
-		FONTSET,
-		FONT_NAME,
-		BG_PIXMAP,
-		PIXMAP_PATH,
-		STYLE,
-		BINDING,
-		BIND,
-		WIDGET,
-		WIDGET_CLASS,
-		CLASS,
-		LOWEST,
-		GTK,
-		APPLICATION,
-		THEME,
-		RC,
-		HIGHEST,
-		ENGINE,
-		MODULE_PATH,
-		IM_MODULE_PATH,
-		IM_MODULE_FILE,
-		STOCK,
-		LTR,
-		RTL,
-		COLOR,
-		UNBIND,
-		LAST
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class EntryCompletion : GLib.Object, Gtk.Buildable, Gtk.CellLayout {
+		public void complete ();
+		public void delete_action (int index_);
+		public weak string get_completion_prefix ();
+		public weak Gtk.Widget get_entry ();
+		public bool get_inline_completion ();
+		public bool get_inline_selection ();
+		public int get_minimum_key_length ();
+		public weak Gtk.TreeModel get_model ();
+		public bool get_popup_completion ();
+		public bool get_popup_set_width ();
+		public bool get_popup_single_match ();
+		public int get_text_column ();
+		public void insert_action_markup (int index_, string markup);
+		public void insert_action_text (int index_, string text);
+		[CCode (has_construct_function = false)]
+		public EntryCompletion ();
+		public void set_inline_completion (bool inline_completion);
+		public void set_inline_selection (bool inline_selection);
+		public void set_match_func (Gtk.EntryCompletionMatchFunc func, void* func_data, GLib.DestroyNotify func_notify);
+		public void set_minimum_key_length (int length);
+		public void set_model (Gtk.TreeModel? model);
+		public void set_popup_completion (bool popup_completion);
+		public void set_popup_set_width (bool popup_set_width);
+		public void set_popup_single_match (bool popup_single_match);
+		public void set_text_column (int column);
+		public bool inline_completion { get; set; }
+		public bool inline_selection { get; set; }
+		public int minimum_key_length { get; set; }
+		public Gtk.TreeModel model { get; set; }
+		public bool popup_completion { get; set; }
+		public bool popup_set_width { get; set; }
+		public bool popup_single_match { get; set; }
+		public int text_column { get; set; }
+		public virtual signal void action_activated (int index_);
+		public virtual signal bool cursor_on_match (Gtk.TreeModel model, Gtk.TreeIter iter);
+		[HasEmitter]
+		public virtual signal bool insert_prefix (string prefix);
+		public virtual signal bool match_selected (Gtk.TreeModel model, Gtk.TreeIter iter);
 	}
-	[CCode (cprefix = "GTK_RECENT_CHOOSER_ERROR_", cheader_filename = "gtk/gtk.h")]
-	public enum RecentChooserError {
-		NOT_FOUND,
-		INVALID_URI
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class EventBox : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
+		public bool get_above_child ();
+		public bool get_visible_window ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public EventBox ();
+		public void set_above_child (bool above_child);
+		public void set_visible_window (bool visible_window);
+		public bool above_child { get; set; }
+		public bool visible_window { get; set; }
 	}
-	[CCode (cprefix = "GTK_RECENT_MANAGER_ERROR_", cheader_filename = "gtk/gtk.h")]
-	public enum RecentManagerError {
-		NOT_FOUND,
-		INVALID_URI,
-		INVALID_ENCODING,
-		NOT_REGISTERED,
-		READ,
-		WRITE,
-		UNKNOWN
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Expander : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
+		public bool get_expanded ();
+		public weak string get_label ();
+		public weak Gtk.Widget get_label_widget ();
+		public int get_spacing ();
+		public bool get_use_markup ();
+		public bool get_use_underline ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Expander (string label);
+		public void set_expanded (bool expanded);
+		public void set_label (string label);
+		public void set_label_widget (Gtk.Widget label_widget);
+		public void set_spacing (int spacing);
+		public void set_use_markup (bool use_markup);
+		public void set_use_underline (bool use_underline);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Expander.with_mnemonic (string label);
+		public bool expanded { get; set construct; }
+		public string label { get; set construct; }
+		public Gtk.Widget label_widget { get; set; }
+		public int spacing { get; set; }
+		public bool use_markup { get; set construct; }
+		public bool use_underline { get; set construct; }
+		public virtual signal void activate ();
 	}
-	[CCode (cprefix = "GTK_RECENT_SORT_", cheader_filename = "gtk/gtk.h")]
-	public enum RecentSortType {
-		NONE,
-		MRU,
-		LRU,
-		CUSTOM
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class FileChooserButton : Gtk.HBox, Atk.Implementor, Gtk.Buildable, Gtk.FileChooser {
+		public bool get_focus_on_click ();
+		public weak string get_title ();
+		public int get_width_chars ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public FileChooserButton (string title, Gtk.FileChooserAction action);
+		public void set_focus_on_click (bool focus_on_click);
+		public void set_title (string title);
+		public void set_width_chars (int n_chars);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public FileChooserButton.with_backend (string title, Gtk.FileChooserAction action, string backend);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public FileChooserButton.with_dialog (Gtk.Widget dialog);
+		[NoAccessorMethod]
+		public Gtk.FileChooser dialog { construct; }
+		public bool focus_on_click { get; set; }
+		public string title { get; set; }
+		public int width_chars { get; set; }
+		public virtual signal void file_set ();
 	}
-	[CCode (cprefix = "GTK_RELIEF_", cheader_filename = "gtk/gtk.h")]
-	public enum ReliefStyle {
-		NORMAL,
-		HALF,
-		NONE
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class FileChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.FileChooser {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public FileChooserDialog (string? title, Gtk.Window? parent, Gtk.FileChooserAction action, ...);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public FileChooserDialog.with_backend (string? title, Gtk.Window? parent, Gtk.FileChooserAction action, string backend, ...);
 	}
-	[CCode (cprefix = "GTK_RESIZE_", cheader_filename = "gtk/gtk.h")]
-	public enum ResizeMode {
-		PARENT,
-		QUEUE,
-		IMMEDIATE
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class FileChooserWidget : Gtk.VBox, Atk.Implementor, Gtk.Buildable, Gtk.FileChooser, Gtk.FileChooserEmbed {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public FileChooserWidget (Gtk.FileChooserAction action);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public FileChooserWidget.with_backend (Gtk.FileChooserAction action, string backend);
 	}
-	[CCode (cprefix = "GTK_RESPONSE_", cheader_filename = "gtk/gtk.h")]
-	public enum ResponseType {
-		NONE,
-		REJECT,
-		ACCEPT,
-		DELETE_EVENT,
-		OK,
-		CANCEL,
-		CLOSE,
-		YES,
-		NO,
-		APPLY,
-		HELP
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class FileFilter : Gtk.Object {
+		public void add_custom (Gtk.FileFilterFlags needed, Gtk.FileFilterFunc func, void* data, GLib.DestroyNotify notify);
+		public void add_mime_type (string mime_type);
+		public void add_pattern (string pattern);
+		public void add_pixbuf_formats ();
+		public bool filter (Gtk.FileFilterInfo filter_info);
+		public weak string get_name ();
+		public Gtk.FileFilterFlags get_needed ();
+		[CCode (has_construct_function = false)]
+		public FileFilter ();
+		public void set_name (string name);
 	}
-	[CCode (cprefix = "GTK_SCROLL_", cheader_filename = "gtk/gtk.h")]
-	public enum ScrollStep {
-		STEPS,
-		PAGES,
-		ENDS,
-		HORIZONTAL_STEPS,
-		HORIZONTAL_PAGES,
-		HORIZONTAL_ENDS
+	[Compact]
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class FileFilterInfo {
+		public Gtk.FileFilterFlags contains;
+		public weak string display_name;
+		public weak string filename;
+		public weak string mime_type;
+		public weak string uri;
 	}
-	[CCode (cprefix = "GTK_SCROLL_", cheader_filename = "gtk/gtk.h")]
-	public enum ScrollType {
-		NONE,
-		JUMP,
-		STEP_BACKWARD,
-		STEP_FORWARD,
-		PAGE_BACKWARD,
-		PAGE_FORWARD,
-		STEP_UP,
-		STEP_DOWN,
-		PAGE_UP,
-		PAGE_DOWN,
-		STEP_LEFT,
-		STEP_RIGHT,
-		PAGE_LEFT,
-		PAGE_RIGHT,
-		START,
-		END
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Fixed : Gtk.Container, Atk.Implementor, Gtk.Buildable {
+		public weak GLib.List children;
+		public bool get_has_window ();
+		public void move (Gtk.Widget widget, int x, int y);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Fixed ();
+		public void put (Gtk.Widget widget, int x, int y);
+		public void set_has_window (bool has_window);
 	}
-	[CCode (cprefix = "GTK_SELECTION_", cheader_filename = "gtk/gtk.h")]
-	public enum SelectionMode {
-		NONE,
-		SINGLE,
-		BROWSE,
-		MULTIPLE,
-		EXTENDED
+	[Compact]
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class FixedChild {
+		public weak Gtk.Widget widget;
+		public int x;
+		public int y;
 	}
-	[CCode (cprefix = "GTK_SENSITIVITY_", cheader_filename = "gtk/gtk.h")]
-	public enum SensitivityType {
-		AUTO,
-		ON,
-		OFF
-	}
-	[CCode (cprefix = "GTK_SHADOW_", cheader_filename = "gtk/gtk.h")]
-	public enum ShadowType {
-		NONE,
-		IN,
-		OUT,
-		ETCHED_IN,
-		ETCHED_OUT
-	}
-	[CCode (cprefix = "GTK_SIDE_", cheader_filename = "gtk/gtk.h")]
-	public enum SideType {
-		TOP,
-		BOTTOM,
-		LEFT,
-		RIGHT
-	}
-	[CCode (cprefix = "GTK_SIZE_GROUP_", cheader_filename = "gtk/gtk.h")]
-	public enum SizeGroupMode {
-		NONE,
-		HORIZONTAL,
-		VERTICAL,
-		BOTH
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class FontButton : Gtk.Button, Atk.Implementor, Gtk.Buildable {
+		public weak string get_font_name ();
+		public bool get_show_size ();
+		public bool get_show_style ();
+		public weak string get_title ();
+		public bool get_use_font ();
+		public bool get_use_size ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public FontButton ();
+		public bool set_font_name (string fontname);
+		public void set_show_size (bool show_size);
+		public void set_show_style (bool show_style);
+		public void set_title (string title);
+		public void set_use_font (bool use_font);
+		public void set_use_size (bool use_size);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public FontButton.with_font (string fontname);
+		public string font_name { get; set; }
+		public bool show_size { get; set; }
+		public bool show_style { get; set; }
+		public string title { get; set; }
+		public bool use_font { get; set; }
+		public bool use_size { get; set; }
+		public virtual signal void font_set ();
 	}
-	[CCode (cprefix = "GTK_SORT_", cheader_filename = "gtk/gtk.h")]
-	public enum SortType {
-		ASCENDING,
-		DESCENDING
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class FontSelection : Gtk.VBox, Atk.Implementor, Gtk.Buildable {
+		public weak Pango.FontFace face;
+		public weak Gtk.Widget face_list;
+		public weak Pango.FontFamily family;
+		public weak Gtk.Widget family_list;
+		public weak Gtk.Widget filter_button;
+		public weak Gtk.Widget font_entry;
+		public weak Gtk.Widget font_style_entry;
+		public weak Gtk.Widget pixels_button;
+		public weak Gtk.Widget points_button;
+		public weak Gtk.Widget preview_entry;
+		public int size;
+		public weak Gtk.Widget size_entry;
+		public weak Gtk.Widget size_list;
+		public weak string get_font_name ();
+		public weak string get_preview_text ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public FontSelection ();
+		public bool set_font_name (string fontname);
+		public void set_preview_text (string text);
+		[NoAccessorMethod]
+		public Gdk.Font font { get; }
+		public string font_name { get; set; }
+		public string preview_text { get; set; }
 	}
-	[CCode (cprefix = "GTK_UPDATE_", cheader_filename = "gtk/gtk.h")]
-	public enum SpinButtonUpdatePolicy {
-		ALWAYS,
-		IF_VALID
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class FontSelectionDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
+		public weak Gtk.Widget action_area;
+		public weak Gtk.Widget apply_button;
+		public bool auto_resize;
+		public weak Gtk.Widget cancel_button;
+		public int dialog_width;
+		public weak Gtk.Widget fontsel;
+		public weak Gtk.Widget main_vbox;
+		public weak Gtk.Widget ok_button;
+		public weak string get_font_name ();
+		public weak string get_preview_text ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public FontSelectionDialog (string title);
+		public bool set_font_name (string fontname);
+		public void set_preview_text (string text);
 	}
-	[CCode (cprefix = "GTK_SPIN_", cheader_filename = "gtk/gtk.h")]
-	public enum SpinType {
-		STEP_FORWARD,
-		STEP_BACKWARD,
-		PAGE_FORWARD,
-		PAGE_BACKWARD,
-		HOME,
-		END,
-		USER_DEFINED
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Frame : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
+		public Gtk.Allocation child_allocation;
+		[NoWrapper]
+		public virtual void compute_child_allocation (Gtk.Allocation allocation);
+		public weak string get_label ();
+		public void get_label_align (float xalign, float yalign);
+		public weak Gtk.Widget get_label_widget ();
+		public Gtk.ShadowType get_shadow_type ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Frame (string? label);
+		public void set_label (string label);
+		public void set_label_align (float xalign, float yalign);
+		public void set_label_widget (Gtk.Widget label_widget);
+		public void set_shadow_type (Gtk.ShadowType type);
+		public string label { get; set; }
+		public Gtk.Widget label_widget { get; set; }
+		[NoAccessorMethod]
+		public float label_xalign { get; set; }
+		[NoAccessorMethod]
+		public float label_yalign { get; set; }
+		[NoAccessorMethod]
+		public Gtk.ShadowType shadow { get; set; }
+		public Gtk.ShadowType shadow_type { get; set; }
 	}
-	[CCode (cprefix = "GTK_STATE_", cheader_filename = "gtk/gtk.h")]
-	public enum StateType {
-		NORMAL,
-		ACTIVE,
-		PRELIGHT,
-		SELECTED,
-		INSENSITIVE
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class GammaCurve : Gtk.VBox, Atk.Implementor, Gtk.Buildable {
+		[NoArrayLength]
+		public weak Gtk.Widget[] button;
+		public weak Gtk.Widget curve;
+		public float gamma;
+		public weak Gtk.Widget gamma_dialog;
+		public weak Gtk.Widget gamma_text;
+		public weak Gtk.Widget table;
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public GammaCurve ();
 	}
-	[CCode (cprefix = "GTK_DIRECTION_", cheader_filename = "gtk/gtk.h")]
-	public enum SubmenuDirection {
-		LEFT,
-		RIGHT
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class HBox : Gtk.Box, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public HBox (bool homogeneous, int spacing);
 	}
-	[CCode (cprefix = "GTK_", cheader_filename = "gtk/gtk.h")]
-	public enum SubmenuPlacement {
-		TOP_BOTTOM,
-		LEFT_RIGHT
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class HButtonBox : Gtk.ButtonBox, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public HButtonBox ();
 	}
-	[CCode (cprefix = "GTK_TEXT_BUFFER_TARGET_INFO_", cheader_filename = "gtk/gtk.h")]
-	public enum TextBufferTargetInfo {
-		BUFFER_CONTENTS,
-		RICH_TEXT,
-		TEXT
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class HPaned : Gtk.Paned, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public HPaned ();
 	}
-	[CCode (cprefix = "GTK_TEXT_DIR_", cheader_filename = "gtk/gtk.h")]
-	public enum TextDirection {
-		NONE,
-		LTR,
-		RTL
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class HRuler : Gtk.Ruler, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public HRuler ();
 	}
-	[CCode (cprefix = "GTK_TEXT_WINDOW_", cheader_filename = "gtk/gtk.h")]
-	public enum TextWindowType {
-		PRIVATE,
-		WIDGET,
-		TEXT,
-		LEFT,
-		RIGHT,
-		TOP,
-		BOTTOM
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class HScale : Gtk.Scale, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public HScale (Gtk.Adjustment adjustment);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public HScale.with_range (double min, double max, double step);
 	}
-	[CCode (cprefix = "GTK_TOOLBAR_CHILD_", cheader_filename = "gtk/gtk.h")]
-	public enum ToolbarChildType {
-		SPACE,
-		BUTTON,
-		TOGGLEBUTTON,
-		RADIOBUTTON,
-		WIDGET
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class HScrollbar : Gtk.Scrollbar, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public HScrollbar (Gtk.Adjustment adjustment);
 	}
-	[CCode (cprefix = "GTK_TOOLBAR_SPACE_", cheader_filename = "gtk/gtk.h")]
-	public enum ToolbarSpaceStyle {
-		EMPTY,
-		LINE
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class HSeparator : Gtk.Separator, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public HSeparator ();
 	}
-	[CCode (cprefix = "GTK_TOOLBAR_", cheader_filename = "gtk/gtk.h")]
-	public enum ToolbarStyle {
-		ICONS,
-		TEXT,
-		BOTH,
-		BOTH_HORIZ
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class HandleBox : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
+		public Gtk.Allocation attach_allocation;
+		public weak Gdk.Window bin_window;
+		public int deskoff_x;
+		public int deskoff_y;
+		public Gtk.Allocation float_allocation;
+		public weak Gdk.Window float_window;
+		public uint float_window_mapped;
+		public uint in_drag;
+		public uint shrink_on_detach;
+		public Gtk.PositionType get_handle_position ();
+		public Gtk.ShadowType get_shadow_type ();
+		public Gtk.PositionType get_snap_edge ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public HandleBox ();
+		public void set_handle_position (Gtk.PositionType position);
+		public void set_shadow_type (Gtk.ShadowType type);
+		public void set_snap_edge (Gtk.PositionType edge);
+		public Gtk.PositionType handle_position { get; set; }
+		[NoAccessorMethod]
+		public Gtk.ShadowType shadow { get; set; }
+		public Gtk.ShadowType shadow_type { get; set; }
+		public Gtk.PositionType snap_edge { get; set; }
+		[NoAccessorMethod]
+		public bool snap_edge_set { get; set; }
+		public virtual signal void child_attached (Gtk.Widget child);
+		public virtual signal void child_detached (Gtk.Widget child);
 	}
-	[CCode (cprefix = "GTK_TREE_VIEW_COLUMN_", cheader_filename = "gtk/gtk.h")]
-	public enum TreeViewColumnSizing {
-		GROW_ONLY,
-		AUTOSIZE,
-		FIXED
-	}
-	[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_", cheader_filename = "gtk/gtk.h")]
-	public enum TreeViewGridLines {
-		NONE,
-		HORIZONTAL,
-		VERTICAL,
-		BOTH
-	}
-	[CCode (cprefix = "GTK_TREE_VIEW_", cheader_filename = "gtk/gtk.h")]
-	public enum TreeViewMode {
-		LINE,
-		ITEM
-	}
-	[CCode (cprefix = "GTK_UNIT_", cheader_filename = "gtk/gtk.h")]
-	public enum Unit {
-		PIXEL,
-		POINTS,
-		INCH,
-		MM
-	}
-	[CCode (cprefix = "GTK_UPDATE_", cheader_filename = "gtk/gtk.h")]
-	public enum UpdateType {
-		CONTINUOUS,
-		DISCONTINUOUS,
-		DELAYED
-	}
-	[CCode (cprefix = "GTK_VISIBILITY_", cheader_filename = "gtk/gtk.h")]
-	public enum Visibility {
-		NONE,
-		PARTIAL,
-		FULL
-	}
-	[CCode (cprefix = "GTK_WIDGET_HELP_", cheader_filename = "gtk/gtk.h")]
-	public enum WidgetHelpType {
-		TOOLTIP,
-		WHATS_THIS
-	}
-	[CCode (cprefix = "GTK_WIN_POS_", cheader_filename = "gtk/gtk.h")]
-	public enum WindowPosition {
-		NONE,
-		CENTER,
-		MOUSE,
-		CENTER_ALWAYS,
-		CENTER_ON_PARENT
-	}
-	[CCode (cprefix = "GTK_WINDOW_", cheader_filename = "gtk/gtk.h")]
-	public enum WindowType {
-		TOPLEVEL,
-		POPUP
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class IMContext : GLib.Object {
+		public virtual bool filter_keypress (Gdk.EventKey event);
+		public virtual void focus_in ();
+		public virtual void focus_out ();
+		public virtual void get_preedit_string (string str, out weak Pango.AttrList attrs, int cursor_pos);
+		public virtual bool get_surrounding (string text, int cursor_index);
+		public virtual void reset ();
+		public virtual void set_client_window (Gdk.Window window);
+		public virtual void set_cursor_location (Gdk.Rectangle area);
+		public virtual void set_surrounding (string text, int len, int cursor_index);
+		public virtual void set_use_preedit (bool use_preedit);
+		public virtual signal void commit (string str);
+		[HasEmitter]
+		public virtual signal bool delete_surrounding (int offset, int n_chars);
+		public virtual signal void preedit_changed ();
+		public virtual signal void preedit_end ();
+		public virtual signal void preedit_start ();
+		public virtual signal bool retrieve_surrounding ();
 	}
-	[CCode (cprefix = "GTK_WRAP_", cheader_filename = "gtk/gtk.h")]
-	public enum WrapMode {
-		NONE,
-		CHAR,
-		WORD,
-		WORD_CHAR
+	[Compact]
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class IMContextInfo {
+		public weak string context_id;
+		public weak string context_name;
+		public weak string default_locales;
+		public weak string domain;
+		public weak string domain_dirname;
 	}
-	[CCode (cprefix = "GTK_ACCEL_", cheader_filename = "gtk/gtk.h")]
-	[Flags]
-	public enum AccelFlags {
-		VISIBLE,
-		LOCKED,
-		MASK
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class IMContextSimple : Gtk.IMContext {
+		[NoArrayLength]
+		public weak uint[] compose_buffer;
+		public uint in_hex_sequence;
+		public uint modifiers_dropped;
+		public weak GLib.SList tables;
+		public unichar tentative_match;
+		public int tentative_match_len;
+		public void add_table (ushort data, int max_seq_len, int n_seqs);
+		[CCode (type = "GtkIMContext*", has_construct_function = false)]
+		public IMContextSimple ();
 	}
-	[CCode (cprefix = "GTK_ARG_", cheader_filename = "gtk/gtk.h")]
-	[Flags]
-	public enum ArgFlags {
-		READABLE,
-		WRITABLE,
-		CONSTRUCT,
-		CONSTRUCT_ONLY,
-		CHILD_ARG
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class IMMulticontext : Gtk.IMContext {
+		public weak string context_id;
+		public weak Gtk.IMContext slave;
+		public void append_menuitems (Gtk.MenuShell menushell);
+		[CCode (type = "GtkIMContext*", has_construct_function = false)]
+		public IMMulticontext ();
 	}
-	[CCode (cprefix = "GTK_", cheader_filename = "gtk/gtk.h")]
-	[Flags]
-	public enum AttachOptions {
-		EXPAND,
-		SHRINK,
-		FILL
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	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 ();
+		public weak Gtk.IconSet lookup (string stock_id);
+		public static weak Gtk.IconSet lookup_default (string stock_id);
+		[CCode (has_construct_function = false)]
+		public IconFactory ();
+		public void remove_default ();
 	}
-	[CCode (cprefix = "GTK_BUTTON_", cheader_filename = "gtk/gtk.h")]
-	[Flags]
-	public enum ButtonAction {
-		IGNORED,
-		SELECTS,
-		DRAGS,
-		EXPANDS
+	[Compact]
+	[CCode (copy_function = "gtk_icon_info_copy", cheader_filename = "gtk/gtk.h")]
+	public class IconInfo {
+		public weak Gtk.IconInfo copy ();
+		[CCode (has_construct_function = false)]
+		public IconInfo.for_pixbuf (Gtk.IconTheme icon_theme, Gdk.Pixbuf pixbuf);
+		public bool get_attach_points (Gdk.Point[] points);
+		public int get_base_size ();
+		public weak Gdk.Pixbuf get_builtin_pixbuf ();
+		public weak string get_display_name ();
+		public bool get_embedded_rect (out Gdk.Rectangle rectangle);
+		public weak string get_filename ();
+		public weak Gdk.Pixbuf load_icon () throws GLib.Error;
+		public void set_raw_coordinates (bool raw_coordinates);
 	}
-	[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,
-		SHOW_DETAILS
+	[Compact]
+	[CCode (ref_function = "gtk_icon_set_ref", unref_function = "gtk_icon_set_unref", cheader_filename = "gtk/gtk.h")]
+	public class IconSet {
+		public void add_source (Gtk.IconSource source);
+		public weak Gtk.IconSet copy ();
+		[CCode (has_construct_function = false)]
+		public IconSet.from_pixbuf (Gdk.Pixbuf pixbuf);
+		public void get_sizes (Gtk.IconSize[] sizes);
+		[CCode (has_construct_function = false)]
+		public IconSet ();
+		public weak Gdk.Pixbuf render_icon (Gtk.Style style, Gtk.TextDirection direction, Gtk.StateType state, Gtk.IconSize size, Gtk.Widget widget, string detail);
 	}
-	[CCode (cprefix = "GTK_CELL_RENDERER_", cheader_filename = "gtk/gtk.h")]
-	[Flags]
-	public enum CellRendererState {
-		SELECTED,
-		PRELIT,
-		INSENSITIVE,
-		SORTED,
-		FOCUSED
+	[Compact]
+	[CCode (copy_function = "gtk_icon_source_copy", cheader_filename = "gtk/gtk.h")]
+	public class IconSource {
+		public weak Gtk.IconSource copy ();
+		public Gtk.TextDirection get_direction ();
+		public bool get_direction_wildcarded ();
+		public weak string get_filename ();
+		public weak string get_icon_name ();
+		public weak Gdk.Pixbuf get_pixbuf ();
+		public Gtk.IconSize get_size ();
+		public bool get_size_wildcarded ();
+		public Gtk.StateType get_state ();
+		public bool get_state_wildcarded ();
+		[CCode (has_construct_function = false)]
+		public IconSource ();
+		public void set_direction (Gtk.TextDirection direction);
+		public void set_direction_wildcarded (bool setting);
+		public void set_filename (string filename);
+		public void set_icon_name (string icon_name);
+		public void set_pixbuf (Gdk.Pixbuf pixbuf);
+		public void set_size (Gtk.IconSize size);
+		public void set_size_wildcarded (bool setting);
+		public void set_state (Gtk.StateType state);
+		public void set_state_wildcarded (bool setting);
 	}
-	[CCode (cprefix = "GTK_DEBUG_", cheader_filename = "gtk/gtk.h")]
-	[Flags]
-	public enum DebugFlag {
-		MISC,
-		PLUGSOCKET,
-		TEXT,
-		TREE,
-		UPDATES,
-		KEYBINDINGS,
-		MULTIHEAD,
-		MODULES,
-		GEOMETRY,
-		ICONTHEME,
-		PRINTING,
-		BUILDER
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class IconTheme : GLib.Object {
+		public static void add_builtin_icon (string icon_name, int size, Gdk.Pixbuf pixbuf);
+		public void append_search_path (string path);
+		public weak Gtk.IconInfo choose_icon (string[] icon_names, int size, Gtk.IconLookupFlags flags);
+		public static GLib.Quark error_quark ();
+		public static weak Gtk.IconTheme get_default ();
+		public weak string get_example_icon_name ();
+		public static weak Gtk.IconTheme get_for_screen (Gdk.Screen screen);
+		public int get_icon_sizes (string icon_name);
+		public void get_search_path (string path, int n_elements);
+		public bool has_icon (string icon_name);
+		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);
+		[CCode (has_construct_function = false)]
+		public IconTheme ();
+		public void prepend_search_path (string path);
+		public bool rescan_if_needed ();
+		public void set_custom_theme (string theme_name);
+		public void set_screen (Gdk.Screen screen);
+		public void set_search_path (string[] path, int n_elements);
+		public virtual signal void changed ();
 	}
-	[CCode (cprefix = "GTK_DEST_DEFAULT_", cheader_filename = "gtk/gtk.h")]
-	[Flags]
-	public enum DestDefaults {
-		MOTION,
-		HIGHLIGHT,
-		DROP,
-		ALL
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class IconView : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout {
+		public void convert_widget_to_bin_window_coords (int wx, int wy, int bx, int by);
+		public weak Gdk.Pixmap create_drag_icon (Gtk.TreePath path);
+		public void enable_model_drag_dest (Gtk.TargetEntry[] targets, Gdk.DragAction actions);
+		public void enable_model_drag_source (Gdk.ModifierType start_button_mask, Gtk.TargetEntry[] targets, Gdk.DragAction actions);
+		public int get_column_spacing ();
+		public int get_columns ();
+		public bool get_cursor (out Gtk.TreePath path, out weak Gtk.CellRenderer cell);
+		public bool get_dest_item_at_pos (int drag_x, int drag_y, out weak Gtk.TreePath path, Gtk.IconViewDropPosition pos);
+		public void get_drag_dest_item (out weak Gtk.TreePath path, Gtk.IconViewDropPosition pos);
+		public bool get_item_at_pos (int x, int y, out weak Gtk.TreePath path, out weak Gtk.CellRenderer cell);
+		public int get_item_width ();
+		public int get_margin ();
+		public int get_markup_column ();
+		public weak Gtk.TreeModel get_model ();
+		public Gtk.Orientation get_orientation ();
+		public weak Gtk.TreePath get_path_at_pos (int x, int y);
+		public int get_pixbuf_column ();
+		public bool get_reorderable ();
+		public int get_row_spacing ();
+		public weak GLib.List get_selected_items ();
+		public Gtk.SelectionMode get_selection_mode ();
+		public int get_spacing ();
+		public int get_text_column ();
+		public int get_tooltip_column ();
+		public bool get_tooltip_context (int x, int y, bool keyboard_tip, out weak Gtk.TreeModel model, out weak Gtk.TreePath path, out Gtk.TreeIter iter);
+		public bool get_visible_range (out weak Gtk.TreePath start_path, out weak Gtk.TreePath end_path);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public IconView ();
+		public bool path_is_selected (Gtk.TreePath path);
+		public void scroll_to_path (Gtk.TreePath path, bool use_align, float row_align, float col_align);
+		public void select_path (Gtk.TreePath path);
+		public void selected_foreach (Gtk.IconViewForeachFunc func);
+		public void set_column_spacing (int column_spacing);
+		public void set_columns (int columns);
+		public void set_cursor (Gtk.TreePath path, Gtk.CellRenderer? cell, bool start_editing);
+		public void set_drag_dest_item (Gtk.TreePath path, Gtk.IconViewDropPosition pos);
+		public void set_item_width (int item_width);
+		public void set_margin (int margin);
+		public void set_markup_column (int column);
+		public void set_model (Gtk.TreeModel? model);
+		public void set_orientation (Gtk.Orientation orientation);
+		public void set_pixbuf_column (int column);
+		public void set_reorderable (bool reorderable);
+		public void set_row_spacing (int row_spacing);
+		public void set_selection_mode (Gtk.SelectionMode mode);
+		public void set_spacing (int spacing);
+		public void set_text_column (int column);
+		public void set_tooltip_cell (Gtk.Tooltip tooltip, Gtk.TreePath path, Gtk.CellRenderer cell);
+		public void set_tooltip_column (int column);
+		public void set_tooltip_item (Gtk.Tooltip tooltip, Gtk.TreePath path);
+		public void unselect_path (Gtk.TreePath path);
+		public void unset_model_drag_dest ();
+		public void unset_model_drag_source ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public IconView.with_model (Gtk.TreeModel model);
+		public int column_spacing { get; set; }
+		public int columns { get; set; }
+		public int item_width { get; set; }
+		public int margin { get; set; }
+		public int markup_column { get; set; }
+		public Gtk.TreeModel model { get; set; }
+		public Gtk.Orientation orientation { get; set; }
+		public int pixbuf_column { get; set; }
+		public bool reorderable { get; set; }
+		public int row_spacing { get; set; }
+		public Gtk.SelectionMode selection_mode { get; set; }
+		public int spacing { get; set; }
+		public int text_column { get; set; }
+		public int tooltip_column { get; set; }
+		public virtual signal bool activate_cursor_item ();
+		[HasEmitter]
+		public virtual signal void item_activated (Gtk.TreePath path);
+		public virtual signal bool move_cursor (Gtk.MovementStep step, int count);
+		public virtual signal void select_all ();
+		public virtual signal void select_cursor_item ();
+		public virtual signal void selection_changed ();
+		public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
+		public virtual signal void toggle_cursor_item ();
+		public virtual signal void unselect_all ();
 	}
-	[CCode (cprefix = "GTK_DIALOG_", cheader_filename = "gtk/gtk.h")]
-	[Flags]
-	public enum DialogFlags {
-		MODAL,
-		DESTROY_WITH_PARENT,
-		NO_SEPARATOR
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Image : Gtk.Misc, Atk.Implementor, Gtk.Buildable {
+		public void clear ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Image.from_animation (Gdk.PixbufAnimation animation);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Image.from_file (string filename);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Image.from_gicon (GLib.Icon icon, Gtk.IconSize size);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Image.from_icon_name (string icon_name, Gtk.IconSize size);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Image.from_icon_set (Gtk.IconSet icon_set, Gtk.IconSize size);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Image.from_image (Gdk.Image image, Gdk.Bitmap mask);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Image.from_pixbuf (Gdk.Pixbuf pixbuf);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Image.from_pixmap (Gdk.Pixmap pixmap, Gdk.Bitmap mask);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Image.from_stock (string stock_id, Gtk.IconSize size);
+		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);
+		public weak Gdk.Pixbuf get_pixbuf ();
+		public int get_pixel_size ();
+		public void get_pixmap (out weak Gdk.Pixmap pixmap, out weak Gdk.Bitmap mask);
+		public void get_stock (out weak string stock_id, out Gtk.IconSize size);
+		public Gtk.ImageType get_storage_type ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Image ();
+		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);
+		public void set_from_pixbuf (Gdk.Pixbuf pixbuf);
+		public void set_from_pixmap (Gdk.Pixmap pixmap, Gdk.Bitmap mask);
+		public void set_from_stock (string stock_id, Gtk.IconSize size);
+		public void set_pixel_size (int pixel_size);
+		[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; }
+		[NoAccessorMethod]
+		public int icon_size { get; set; }
+		[NoAccessorMethod]
+		public Gdk.Image image { get; set; }
+		[NoAccessorMethod]
+		public Gdk.Pixmap mask { get; set; }
+		[NoAccessorMethod]
+		public Gdk.Pixbuf pixbuf { get; set; }
+		[NoAccessorMethod]
+		public Gdk.PixbufAnimation pixbuf_animation { get; set; }
+		public int pixel_size { get; set; }
+		[NoAccessorMethod]
+		public Gdk.Pixmap pixmap { get; set; }
+		[NoAccessorMethod]
+		public string stock { get; set; }
+		public Gtk.ImageType storage_type { get; }
 	}
-	[CCode (cprefix = "GTK_FILE_FILTER_", cheader_filename = "gtk/gtk.h")]
-	[Flags]
-	public enum FileFilterFlags {
-		FILENAME,
-		URI,
-		DISPLAY_NAME,
-		MIME_TYPE
+	[Compact]
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class ImageAnimationData {
+		public weak Gdk.PixbufAnimation anim;
+		public uint frame_timeout;
+		public weak Gdk.PixbufAnimationIter iter;
 	}
-	[CCode (cprefix = "GTK_ICON_LOOKUP_", cheader_filename = "gtk/gtk.h")]
-	[Flags]
-	public enum IconLookupFlags {
-		NO_SVG,
-		FORCE_SVG,
-		USE_BUILTIN,
-		GENERIC_FALLBACK,
-		FORCE_SIZE
+	[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;
 	}
-	[CCode (cprefix = "GTK_", cheader_filename = "gtk/gtk.h")]
-	[Flags]
-	public enum ObjectFlags {
-		IN_DESTRUCTION,
-		FLOATING,
-		RESERVED_1,
-		RESERVED_2
+	[Compact]
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class ImageIconNameData {
+		public weak string icon_name;
+		public weak Gdk.Pixbuf pixbuf;
+		public uint theme_change_id;
 	}
-	[CCode (cprefix = "PRIVATE_GTK_", cheader_filename = "gtk/gtk.h")]
-	[Flags]
-	public enum PrivateFlags {
-		USER_STYLE,
-		RESIZE_PENDING,
-		LEAVE_PENDING,
-		HAS_SHAPE_MASK,
-		IN_REPARENT,
-		DIRECTION_SET,
-		DIRECTION_LTR,
-		ANCHORED,
-		CHILD_VISIBLE,
-		REDRAW_ON_ALLOC,
-		ALLOC_NEEDED,
-		REQUEST_NEEDED
+	[Compact]
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class ImageIconSetData {
+		public weak Gtk.IconSet icon_set;
 	}
-	[CCode (cprefix = "GTK_RC_", cheader_filename = "gtk/gtk.h")]
-	[Flags]
-	public enum RcFlags {
-		FG,
-		BG,
-		TEXT,
-		BASE
+	[Compact]
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class ImageImageData {
+		public weak Gdk.Image image;
 	}
-	[CCode (cprefix = "GTK_RECENT_FILTER_", cheader_filename = "gtk/gtk.h")]
-	[Flags]
-	public enum RecentFilterFlags {
-		URI,
-		DISPLAY_NAME,
-		MIME_TYPE,
-		APPLICATION,
-		GROUP,
-		AGE
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class ImageMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public ImageMenuItem.from_stock (string stock_id, Gtk.AccelGroup? accel_group);
+		public weak Gtk.Widget get_image ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public ImageMenuItem ();
+		public void set_image (Gtk.Widget image);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public ImageMenuItem.with_label (string label);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public ImageMenuItem.with_mnemonic (string label);
+		public Gtk.Widget image { get; set; }
 	}
-	[CCode (cprefix = "GTK_RUN_", cheader_filename = "gtk/gtk.h")]
-	[Flags]
-	public enum SignalRunType {
-		FIRST,
-		LAST,
-		BOTH,
-		NO_RECURSE,
-		ACTION,
-		NO_HOOKS
+	[Compact]
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class ImagePixbufData {
+		public weak Gdk.Pixbuf pixbuf;
 	}
-	[CCode (cprefix = "GTK_TARGET_", cheader_filename = "gtk/gtk.h")]
-	[Flags]
-	public enum TargetFlags {
-		SAME_APP,
-		SAME_WIDGET,
-		OTHER_APP,
-		OTHER_WIDGET
+	[Compact]
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class ImagePixmapData {
+		public weak Gdk.Pixmap pixmap;
 	}
-	[CCode (cprefix = "GTK_TEXT_SEARCH_", cheader_filename = "gtk/gtk.h")]
-	[Flags]
-	public enum TextSearchFlags {
-		VISIBLE_ONLY,
-		TEXT_ONLY
+	[Compact]
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class ImageStockData {
+		public weak string stock_id;
 	}
-	[CCode (cprefix = "GTK_TREE_MODEL_", cheader_filename = "gtk/gtk.h")]
-	[Flags]
-	public enum TreeModelFlags {
-		ITERS_PERSIST,
-		LIST_ONLY
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class InputDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
+		[NoArrayLength]
+		public weak Gtk.Widget[] axis_items;
+		public weak Gtk.Widget axis_list;
+		public weak Gtk.Widget axis_listbox;
+		public weak Gtk.Widget close_button;
+		public weak Gdk.Device current_device;
+		public weak Gtk.Widget keys_list;
+		public weak Gtk.Widget keys_listbox;
+		public weak Gtk.Widget mode_optionmenu;
+		public weak Gtk.Widget save_button;
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public InputDialog ();
+		public virtual signal void disable_device (Gdk.Device device);
+		public virtual signal void enable_device (Gdk.Device device);
 	}
-	[CCode (cprefix = "GTK_UI_MANAGER_", cheader_filename = "gtk/gtk.h")]
-	[Flags]
-	public enum UIManagerItemType {
-		AUTO,
-		MENUBAR,
-		MENU,
-		TOOLBAR,
-		PLACEHOLDER,
-		POPUP,
-		MENUITEM,
-		TOOLITEM,
-		SEPARATOR,
-		ACCELERATOR
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Invisible : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
+		public bool has_user_ref_count;
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Invisible.for_screen (Gdk.Screen screen);
+		public weak Gdk.Screen get_screen ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Invisible ();
+		public void set_screen (Gdk.Screen screen);
+		public Gdk.Screen screen { get; set; }
 	}
-	[CCode (cprefix = "GTK_", cheader_filename = "gtk/gtk.h")]
-	[Flags]
-	public enum WidgetFlags {
-		TOPLEVEL,
-		NO_WINDOW,
-		REALIZED,
-		MAPPED,
-		VISIBLE,
-		SENSITIVE,
-		PARENT_SENSITIVE,
-		CAN_FOCUS,
-		HAS_FOCUS,
-		CAN_DEFAULT,
-		HAS_DEFAULT,
-		HAS_GRAB,
-		RC_STYLE,
-		COMPOSITE_CHILD,
-		NO_REPARENT,
-		APP_PAINTABLE,
-		RECEIVES_DEFAULT,
-		DOUBLE_BUFFERED,
-		NO_SHOW_ALL
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Item : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
+		[HasEmitter]
+		public virtual signal void deselect ();
+		[HasEmitter]
+		public virtual signal void select ();
+		[HasEmitter]
+		public virtual signal void toggle ();
 	}
-	[CCode (cprefix = "GTK_BUILDER_ERROR_", cheader_filename = "gtk/gtk.h")]
-	public errordomain BuilderError {
-		INVALID_TYPE_FUNCTION,
-		UNHANDLED_TAG,
-		MISSING_ATTRIBUTE,
-		INVALID_ATTRIBUTE,
-		INVALID_TAG,
-		MISSING_PROPERTY_VALUE,
-		INVALID_VALUE,
-		VERSION_MISMATCH,
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Label : Gtk.Misc, Atk.Implementor, Gtk.Buildable {
+		public weak Pango.AttrList attrs;
+		public weak Pango.AttrList effective_attrs;
+		public uint have_transform;
+		public uint in_click;
+		public uint jtype;
+		public weak Pango.Layout layout;
+		public weak Gtk.Window mnemonic_window;
+		public uint pattern_set;
+		public weak Gtk.LabelSelectionInfo select_info;
+		public weak string text;
+		public double get_angle ();
+		public weak Pango.AttrList get_attributes ();
+		public Pango.EllipsizeMode get_ellipsize ();
+		public Gtk.Justification get_justify ();
+		public weak string get_label ();
+		public weak Pango.Layout get_layout ();
+		public void get_layout_offsets (int x, int y);
+		public bool get_line_wrap ();
+		public Pango.WrapMode get_line_wrap_mode ();
+		public int get_max_width_chars ();
+		public uint get_mnemonic_keyval ();
+		public weak Gtk.Widget get_mnemonic_widget ();
+		public bool get_selectable ();
+		public bool get_selection_bounds (int start, int end);
+		public bool get_single_line_mode ();
+		public weak string get_text ();
+		public bool get_use_markup ();
+		public bool get_use_underline ();
+		public int get_width_chars ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Label (string? str);
+		public void select_region (int start_offset, int end_offset);
+		public void set_angle (double angle);
+		public void set_attributes (Pango.AttrList attrs);
+		public void set_ellipsize (Pango.EllipsizeMode mode);
+		public void set_justify (Gtk.Justification jtype);
+		public void set_label (string str);
+		public void set_line_wrap (bool wrap);
+		public void set_line_wrap_mode (Pango.WrapMode wrap_mode);
+		public void set_markup (string str);
+		public void set_markup_with_mnemonic (string str);
+		public void set_max_width_chars (int n_chars);
+		public void set_mnemonic_widget (Gtk.Widget widget);
+		public void set_pattern (string pattern);
+		public void set_selectable (bool setting);
+		public void set_single_line_mode (bool single_line_mode);
+		public void set_text (string str);
+		public void set_text_with_mnemonic (string str);
+		public void set_use_markup (bool setting);
+		public void set_use_underline (bool setting);
+		public void set_width_chars (int n_chars);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Label.with_mnemonic (string str);
+		public double angle { get; set; }
+		public Pango.AttrList attributes { get; set; }
+		[NoAccessorMethod]
+		public int cursor_position { get; }
+		public Pango.EllipsizeMode ellipsize { get; set; }
+		public Gtk.Justification justify { get; set; }
+		public string label { get; set; }
+		public int max_width_chars { get; set; }
+		public uint mnemonic_keyval { get; }
+		public Gtk.Widget mnemonic_widget { get; set; }
+		public string pattern { set; }
+		public bool selectable { get; set; }
+		[NoAccessorMethod]
+		public int selection_bound { get; }
+		public bool single_line_mode { get; set; }
+		public bool use_markup { get; set; }
+		public bool use_underline { get; set; }
+		public int width_chars { get; set; }
+		[NoAccessorMethod]
+		public bool wrap { get; set; }
+		[NoAccessorMethod]
+		public Pango.WrapMode wrap_mode { get; set; }
+		public virtual signal void copy_clipboard ();
+		public virtual signal void move_cursor (Gtk.MovementStep step, int count, bool extend_selection);
+		public virtual signal void populate_popup (Gtk.Menu menu);
 	}
+	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Widget : Gtk.Object, Atk.Implementor, Gtk.Buildable {
-		public uchar state;
-		public uchar saved_state;
-		public Gtk.Requisition requisition;
-		public Gtk.Allocation allocation;
-		public Gdk.Window window;
-		public Widget (GLib.Type type, ...);
-		[CCode (cname = "GTK_WIDGET_FLAGS")]
-		public Gtk.WidgetFlags get_flags ();
-		[CCode (cname = "GTK_WIDGET_SET_FLAGS")]
-		public void set_flags (Gtk.WidgetFlags flags);
-		[CCode (cname = "GTK_WIDGET_UNSET_FLAGS")]
-		public void unset_flags (Gtk.WidgetFlags flags);
-		public bool activate ();
-		public void add_accelerator (string accel_signal, Gtk.AccelGroup accel_group, uint accel_key, Gdk.ModifierType accel_mods, Gtk.AccelFlags accel_flags);
-		public void add_events (int events);
-		public void add_mnemonic_label (Gtk.Widget label);
-		public bool child_focus (Gtk.DirectionType direction);
-		[CCode (cname = "gtk_widget_class_find_style_property")]
-		public class weak GLib.ParamSpec find_style_property (string property_name);
-		[CCode (cname = "gtk_widget_class_install_style_property")]
-		public class void install_style_property (GLib.ParamSpec pspec);
-		[CCode (cname = "gtk_widget_class_install_style_property_parser")]
-		public class void install_style_property_parser (GLib.ParamSpec pspec, Gtk.RcPropertyParser parser);
-		[CCode (cname = "gtk_widget_class_list_style_properties")]
-		public class weak GLib.ParamSpec list_style_properties (uint n_properties);
-		public void class_path (out uint path_length, out weak string path, out weak string path_reversed);
-		public weak Pango.Context create_pango_context ();
-		public weak Pango.Layout create_pango_layout (string? text);
-		public void destroyed (out weak Gtk.Widget widget_pointer);
-		public void ensure_style ();
-		public void error_bell ();
-		public void freeze_child_notify ();
-		public weak Gtk.Action get_action ();
-		public weak Gtk.Widget get_ancestor (GLib.Type widget_type);
-		public void get_child_requisition (out Gtk.Requisition requisition);
-		public bool get_child_visible ();
-		public weak Gtk.Clipboard get_clipboard (Gdk.Atom selection);
-		public weak Gdk.Colormap get_colormap ();
-		public weak string get_composite_name ();
-		public static weak Gdk.Colormap get_default_colormap ();
-		public static Gtk.TextDirection get_default_direction ();
-		public static weak Gtk.Style get_default_style ();
-		public static weak Gdk.Visual get_default_visual ();
-		public Gtk.TextDirection get_direction ();
-		public weak Gdk.Display get_display ();
-		public int get_events ();
-		public Gdk.ExtensionMode get_extension_events ();
-		public bool get_has_tooltip ();
-		public weak Gtk.RcStyle get_modifier_style ();
-		public bool get_no_show_all ();
-		public weak Pango.Context get_pango_context ();
-		public weak Gtk.Widget get_parent ();
-		public weak Gdk.Window get_parent_window ();
-		public void get_pointer (out int x, out int y);
-		public weak Gdk.Window get_root_window ();
-		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 ();
-		public weak Gtk.Window get_tooltip_window ();
-		public weak Gtk.Widget get_toplevel ();
-		public weak Gdk.Visual get_visual ();
-		public void grab_default ();
-		public bool has_screen ();
-		public bool hide_on_delete ();
-		public void input_shape_combine_mask (Gdk.Bitmap? shape_mask, int offset_x, int offset_y);
-		public bool intersect (Gdk.Rectangle area, Gdk.Rectangle? intersection);
-		public bool is_ancestor (Gtk.Widget ancestor);
-		public bool is_composited ();
-		public weak GLib.List list_accel_closures ();
-		public weak GLib.List list_mnemonic_labels ();
-		public void modify_base (Gtk.StateType state, Gdk.Color? color);
-		public void modify_bg (Gtk.StateType state, Gdk.Color? color);
-		public void modify_cursor (Gdk.Color? primary, Gdk.Color? secondary);
-		public void modify_fg (Gtk.StateType state, Gdk.Color? color);
-		public void modify_font (Pango.FontDescription? font_desc);
-		public void modify_style (Gtk.RcStyle style);
-		public void modify_text (Gtk.StateType state, Gdk.Color? color);
-		public void path (out uint path_length, out weak string path, out weak string path_reversed);
-		public static void pop_colormap ();
-		public static void pop_composite_child ();
-		public static void push_colormap (Gdk.Colormap cmap);
-		public static void push_composite_child ();
-		public void queue_draw ();
-		public void queue_draw_area (int x, int y, int width, int height);
-		public void queue_resize ();
-		public void queue_resize_no_redraw ();
-		public weak Gdk.Region region_intersect (Gdk.Region region);
-		public bool remove_accelerator (Gtk.AccelGroup accel_group, uint accel_key, Gdk.ModifierType accel_mods);
-		public void remove_mnemonic_label (Gtk.Widget label);
-		public Gdk.Pixbuf render_icon (string stock_id, Gtk.IconSize size, string? detail);
-		public void reparent (Gtk.Widget new_parent);
-		public void reset_rc_styles ();
-		public void reset_shapes ();
-		public int send_expose (Gdk.Event event);
-		public void set_accel_path (string accel_path, Gtk.AccelGroup accel_group);
-		public void set_app_paintable (bool app_paintable);
-		public void set_child_visible (bool is_visible);
-		public void set_colormap (Gdk.Colormap colormap);
-		public void set_composite_name (string name);
-		public static void set_default_colormap (Gdk.Colormap colormap);
-		public static void set_default_direction (Gtk.TextDirection dir);
-		public void set_direction (Gtk.TextDirection dir);
-		public void set_double_buffered (bool double_buffered);
-		public void set_events (int events);
-		public void set_extension_events (Gdk.ExtensionMode mode);
-		public void set_has_tooltip (bool has_tooltip);
-		public void set_no_show_all (bool no_show_all);
-		public void set_parent (Gtk.Widget parent);
-		public void set_parent_window (Gdk.Window parent_window);
-		public void set_redraw_on_allocate (bool redraw_on_allocate);
-		public bool set_scroll_adjustments (Gtk.Adjustment? hadjustment, Gtk.Adjustment? vadjustment);
-		public void set_sensitive (bool sensitive);
-		public void set_size_request (int width, int height);
-		public void set_state (Gtk.StateType state);
-		public void set_style (Gtk.Style? style);
-		public void set_tooltip_markup (string markup);
-		public void set_tooltip_text (string text);
-		public void set_tooltip_window (Gtk.Window custom_window);
-		public void shape_combine_mask (Gdk.Bitmap? shape_mask, int offset_x, int offset_y);
-		public void show_now ();
-		public void style_get (...);
-		public void style_get_property (string property_name, GLib.Value value);
-		public void style_get_valist (string first_property_name, void* var_args);
-		public void thaw_child_notify ();
-		public bool translate_coordinates (Gtk.Widget dest_widget, int src_x, int src_y, out int dest_x, out int dest_y);
-		public void trigger_tooltip_query ();
-		public void unparent ();
-		[NoWrapper]
-		public virtual void dispatch_child_properties_changed (uint n_pspecs, out weak GLib.ParamSpec pspecs);
-		public virtual weak Atk.Object get_accessible ();
-		public virtual void hide_all ();
-		public virtual void show_all ();
-		[NoAccessorMethod]
-		public bool app_paintable { get; set; }
-		[NoAccessorMethod]
-		public bool can_default { get; set; }
-		[NoAccessorMethod]
-		public bool can_focus { get; set; }
-		[NoAccessorMethod]
-		public bool composite_child { get; }
-		public Gdk.EventMask events { get; set; }
-		public Gdk.ExtensionMode extension_events { get; set; }
-		[NoAccessorMethod]
-		public bool has_default { get; set; }
-		[NoAccessorMethod]
-		public bool has_focus { get; set; }
-		public bool has_tooltip { get; set; }
-		[NoAccessorMethod]
-		public int height_request { get; set; }
-		[NoAccessorMethod]
-		public bool is_focus { get; set; }
-		public string name { get; set; }
-		public bool no_show_all { get; set; }
-		public Gtk.Container parent { get; set; }
-		[NoAccessorMethod]
-		public bool receives_default { get; set; }
-		[NoAccessorMethod]
-		public bool sensitive { get; set; }
-		public Gtk.Style style { get; set; }
-		public string tooltip_markup { get; set; }
-		public string tooltip_text { get; set; }
-		[NoAccessorMethod]
-		public bool visible { get; set; }
-		[NoAccessorMethod]
-		public int width_request { get; set; }
-		public virtual signal void accel_closures_changed ();
-		public virtual signal bool button_press_event (Gdk.EventButton event);
-		public virtual signal bool button_release_event (Gdk.EventButton event);
-		[HasEmitter]
-		public virtual signal bool can_activate_accel (uint signal_id);
-		[HasEmitter]
-		public virtual signal void child_notify (GLib.ParamSpec pspec);
-		public virtual signal bool client_event (Gdk.EventClient event);
-		public virtual signal void composited_changed ();
-		public virtual signal bool configure_event (Gdk.EventConfigure 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);
-		public virtual signal void drag_begin (Gdk.DragContext context);
-		public virtual signal void drag_data_delete (Gdk.DragContext context);
-		public virtual signal void drag_data_get (Gdk.DragContext context, Gtk.SelectionData selection_data, uint info, uint time_);
-		public virtual signal void drag_data_received (Gdk.DragContext context, int x, int y, Gtk.SelectionData selection_data, uint info, uint time_);
-		public virtual signal bool drag_drop (Gdk.DragContext context, int x, int y, uint time_);
-		public virtual signal void drag_end (Gdk.DragContext context);
-		public virtual signal bool drag_failed (Gdk.DragContext p0, Gtk.DragResult p1);
-		public virtual signal void drag_leave (Gdk.DragContext context, uint time_);
-		public virtual signal bool drag_motion (Gdk.DragContext context, int x, int y, uint time_);
-		public virtual signal bool enter_notify_event (Gdk.EventCrossing event);
-		[HasEmitter]
-		public virtual signal bool event (Gdk.Event event);
-		public virtual signal void event_after (Gdk.Event p0);
-		public virtual signal bool expose_event (Gdk.EventExpose event);
-		public virtual signal bool focus (Gtk.DirectionType direction);
-		public virtual signal bool focus_in_event (Gdk.EventFocus event);
-		public virtual signal bool focus_out_event (Gdk.EventFocus event);
-		public virtual signal bool grab_broken_event (Gdk.Event event);
-		[HasEmitter]
-		public virtual signal void grab_focus ();
-		public virtual signal void grab_notify (bool was_grabbed);
-		[HasEmitter]
-		public virtual signal void hide ();
-		public virtual signal void hierarchy_changed (Gtk.Widget previous_toplevel);
-		public virtual signal bool key_press_event (Gdk.EventKey event);
-		public virtual signal bool key_release_event (Gdk.EventKey event);
-		[HasEmitter]
-		public virtual signal bool keynav_failed (Gtk.DirectionType p0);
-		public virtual signal bool leave_notify_event (Gdk.EventCrossing event);
-		[HasEmitter]
-		public virtual signal void map ();
-		public virtual signal bool map_event (Gdk.Event event);
-		[HasEmitter]
-		public virtual signal bool mnemonic_activate (bool group_cycling);
-		public virtual signal bool motion_notify_event (Gdk.EventMotion event);
-		public virtual signal void move_focus (Gtk.DirectionType p0);
-		public virtual signal bool no_expose_event (Gdk.EventNoExpose event);
-		public virtual signal void parent_set (Gtk.Widget previous_parent);
-		public virtual signal bool popup_menu ();
-		public virtual signal bool property_notify_event (Gdk.EventProperty event);
-		public virtual signal bool proximity_in_event (Gdk.EventProximity event);
-		public virtual signal bool proximity_out_event (Gdk.EventProximity event);
-		public virtual signal bool query_tooltip (int x, int y, bool keyboard_tooltip, Gtk.Tooltip tooltip);
-		[HasEmitter]
-		public virtual signal void realize ();
-		public virtual signal void screen_changed (Gdk.Screen previous_screen);
-		public virtual signal bool scroll_event (Gdk.EventScroll event);
-		public virtual signal bool selection_clear_event (Gdk.EventSelection event);
-		public virtual signal void selection_get (Gtk.SelectionData selection_data, uint info, uint time_);
-		public virtual signal bool selection_notify_event (Gdk.EventSelection event);
-		public virtual signal void selection_received (Gtk.SelectionData selection_data, uint time_);
-		public virtual signal bool selection_request_event (Gdk.EventSelection event);
-		[HasEmitter]
-		public virtual signal void show ();
-		public virtual signal bool show_help (Gtk.WidgetHelpType help_type);
-		[HasEmitter]
-		public virtual signal void size_allocate (Gdk.Rectangle allocation);
-		[HasEmitter]
-		public virtual signal void size_request (Gtk.Requisition requisition);
-		public virtual signal void state_changed (Gtk.StateType previous_state);
-		public virtual signal void style_set (Gtk.Style previous_style);
-		[HasEmitter]
-		public virtual signal void unmap ();
-		public virtual signal bool unmap_event (Gdk.Event event);
-		[HasEmitter]
-		public virtual signal void unrealize ();
-		public virtual signal bool visibility_notify_event (Gdk.Event event);
-		public virtual signal bool window_state_event (Gdk.EventWindowState event);
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class AccelGroupEntry {
-		public weak Gtk.AccelKey key;
-		public weak GLib.Closure closure;
-		public GLib.Quark accel_path_quark;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class AccelKey {
-		public uint accel_key;
-		public Gdk.ModifierType accel_mods;
-		public uint accel_flags;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class AccelMapClass {
+	public class LabelSelectionInfo {
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Arg {
-		public weak Gtk.Type type;
-		public weak string name;
+	public class Layout : Gtk.Container, Atk.Implementor, Gtk.Buildable {
+		public weak Gdk.Window bin_window;
+		public weak GLib.List children;
+		public uint freeze_count;
+		public int scroll_x;
+		public int scroll_y;
+		public Gdk.VisibilityState visibility;
+		public weak Gtk.Adjustment get_hadjustment ();
+		public void get_size (out uint width, out uint height);
+		public weak Gtk.Adjustment get_vadjustment ();
+		public void move (Gtk.Widget child_widget, int x, int y);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Layout (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
+		public void put (Gtk.Widget child_widget, int x, int y);
+		public void set_hadjustment (Gtk.Adjustment adjustment);
+		public void set_size (uint width, uint height);
+		public void set_vadjustment (Gtk.Adjustment adjustment);
+		public Gtk.Adjustment hadjustment { get; set; }
+		[NoAccessorMethod]
+		public uint height { get; set; }
+		public Gtk.Adjustment vadjustment { get; set; }
+		[NoAccessorMethod]
+		public uint width { get; set; }
+		public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class BindingArg {
-		public GLib.Type arg_type;
+	public class LinkButton : Gtk.Button, Atk.Implementor, Gtk.Buildable {
+		public weak string get_uri ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public LinkButton (string uri);
+		public void set_uri (string uri);
+		public static void set_uri_hook (Gtk.LinkButtonUriFunc# func);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public LinkButton.with_label (string uri, string label);
+		public string uri { get; set; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class BindingEntry {
-		public uint keyval;
-		public Gdk.ModifierType modifiers;
-		public weak Gtk.BindingSet binding_set;
-		public uint destroyed;
-		public uint in_emission;
-		public uint marks_unbound;
-		public weak Gtk.BindingEntry set_next;
-		public weak Gtk.BindingEntry hash_next;
-		public weak Gtk.BindingSignal signals;
-		public static void add_signal (Gtk.BindingSet binding_set, uint keyval, Gdk.ModifierType modifiers, string signal_name, uint n_args);
-		public static void remove (Gtk.BindingSet binding_set, uint keyval, Gdk.ModifierType modifiers);
-		public static void skip (Gtk.BindingSet binding_set, uint keyval, Gdk.ModifierType modifiers);
+	public class ListStore : GLib.Object, Gtk.Buildable, Gtk.TreeModel, Gtk.TreeSortable, Gtk.TreeDragSource, Gtk.TreeDragDest {
+		[NoArrayLength]
+		public weak GLib.Type[] column_headers;
+		public uint columns_dirty;
+		public void* default_sort_data;
+		public weak Gtk.DestroyNotify default_sort_destroy;
+		public weak Gtk.TreeIterCompareFunc default_sort_func;
+		public int length;
+		public int n_columns;
+		public Gtk.SortType order;
+		public void* seq;
+		public int sort_column_id;
+		public weak GLib.List sort_list;
+		public int stamp;
+		public void append (out Gtk.TreeIter iter);
+		public void clear ();
+		public void insert (out Gtk.TreeIter iter, int position);
+		public void insert_after (out Gtk.TreeIter iter, Gtk.TreeIter? sibling);
+		public void insert_before (out Gtk.TreeIter iter, Gtk.TreeIter? sibling);
+		[CCode (sentinel = "-1")]
+		public void insert_with_values (out Gtk.TreeIter iter, int position, ...);
+		public void insert_with_valuesv (out Gtk.TreeIter iter, int position, int columns, GLib.Value[] values);
+		public bool iter_is_valid (Gtk.TreeIter iter);
+		public void move_after (Gtk.TreeIter iter, Gtk.TreeIter? position);
+		public void move_before (Gtk.TreeIter iter, Gtk.TreeIter? position);
+		[CCode (has_construct_function = false)]
+		public ListStore (int n_columns, ...);
+		[CCode (cname = "gtk_list_store_newv", has_construct_function = false)]
+		public ListStore.newv (int n_columns, GLib.Type[] types);
+		public void prepend (out Gtk.TreeIter iter);
+		public bool remove (Gtk.TreeIter iter);
+		public void reorder (int new_order);
+		[CCode (sentinel = "-1")]
+		public void set (Gtk.TreeIter iter, ...);
+		public void set_column_types ([CCode (array_length_pos = 0.9)] GLib.Type[] types);
+		public void set_valist (Gtk.TreeIter iter, void* var_args);
+		public void set_value (Gtk.TreeIter iter, int column, GLib.Value value);
+		public void set_valuesv (Gtk.TreeIter iter, int columns, GLib.Value[] values);
+		public void swap (Gtk.TreeIter a, Gtk.TreeIter b);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class BindingSet {
-		public weak string set_name;
-		public int priority;
-		public weak GLib.SList widget_path_pspecs;
-		public weak GLib.SList widget_class_pspecs;
-		public weak GLib.SList class_branch_pspecs;
-		public weak Gtk.BindingEntry entries;
-		public weak Gtk.BindingEntry current;
-		public uint parsed;
-		public bool activate (uint keyval, Gdk.ModifierType modifiers, Gtk.Object object);
-		public void add_path (Gtk.PathType path_type, string path_pattern, Gtk.PathPriorityType priority);
-		public static weak Gtk.BindingSet by_class (void* object_class);
-		public static weak Gtk.BindingSet find (string set_name);
-		[CCode (has_construct_function = false)]
-		public BindingSet (string set_name);
+	public class Menu : Gtk.MenuShell, Atk.Implementor, Gtk.Buildable {
+		public weak Gtk.AccelGroup accel_group;
+		public weak string accel_path;
+		public weak Gdk.Window bin_window;
+		public uint lower_arrow_prelight;
+		public uint lower_arrow_visible;
+		public weak Gdk.Region navigation_region;
+		public uint navigation_timeout;
+		public uint needs_destruction_ref_count;
+		public weak Gtk.Widget old_active_menu_item;
+		public weak Gtk.Widget parent_menu_item;
+		public weak Gtk.MenuPositionFunc position_func;
+		public void* position_func_data;
+		public int saved_scroll_offset;
+		public uint scroll_fast;
+		public int scroll_offset;
+		public int scroll_step;
+		public uint tearoff_active;
+		public weak Gtk.Adjustment tearoff_adjustment;
+		public weak Gtk.Widget tearoff_hbox;
+		public weak Gtk.Widget tearoff_scrollbar;
+		public weak Gtk.Widget tearoff_window;
+		public uint timeout_id;
+		public uint toggle_size;
+		public weak Gtk.Widget toplevel;
+		public uint torn_off;
+		public uint upper_arrow_prelight;
+		public uint upper_arrow_visible;
+		public weak Gdk.Window view_window;
+		public void attach (Gtk.Widget child, uint left_attach, uint right_attach, uint top_attach, uint bottom_attach);
+		public void attach_to_widget (Gtk.Widget attach_widget, Gtk.MenuDetachFunc detacher);
+		public void detach ();
+		public weak Gtk.AccelGroup get_accel_group ();
+		public weak Gtk.Widget get_active ();
+		public weak Gtk.Widget get_attach_widget ();
+		public static weak GLib.List get_for_attach_widget (Gtk.Widget widget);
+		public bool get_tearoff_state ();
+		public weak string get_title ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Menu ();
+		public void popdown ();
+		public void popup (Gtk.Widget? parent_menu_shell, Gtk.Widget? parent_menu_item, Gtk.MenuPositionFunc? func, uint button, uint activate_time);
+		public void reorder_child (Gtk.Widget child, int position);
+		public void reposition ();
+		public void set_accel_group (Gtk.AccelGroup accel_group);
+		public void set_accel_path (string accel_path);
+		public void set_active (uint index_);
+		public void set_monitor (int monitor_num);
+		public void set_screen (Gdk.Screen screen);
+		public void set_tearoff_state (bool torn_off);
+		public void set_title (string title);
+		public bool tearoff_state { get; set; }
+		[NoAccessorMethod]
+		public string tearoff_title { get; set; }
+		public virtual signal void move_scroll (Gtk.ScrollType p0);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class BindingSignal {
-		public weak Gtk.BindingSignal next;
-		public weak string signal_name;
-		public uint n_args;
-		public weak Gtk.BindingArg args;
+	public class MenuBar : Gtk.MenuShell, Atk.Implementor, Gtk.Buildable {
+		public Gtk.PackDirection get_child_pack_direction ();
+		public Gtk.PackDirection get_pack_direction ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public MenuBar ();
+		public void set_child_pack_direction (Gtk.PackDirection child_pack_dir);
+		public void set_pack_direction (Gtk.PackDirection pack_dir);
+		public Gtk.PackDirection child_pack_direction { get; set; }
+		public Gtk.PackDirection pack_direction { get; set; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class BoxChild {
-		public weak Gtk.Widget widget;
-		public ushort padding;
-		public uint expand;
-		public uint fill;
-		public uint pack;
-		public uint is_secondary;
+	public class MenuItem : Gtk.Item, Atk.Implementor, Gtk.Buildable {
+		public weak string accel_path;
+		public ushort accelerator_width;
+		public weak Gdk.Window event_window;
+		public uint from_menubar;
+		public uint right_justify;
+		public uint show_submenu_indicator;
+		public uint submenu_direction;
+		public uint submenu_placement;
+		public uint timer;
+		public uint timer_from_keypress;
+		public ushort toggle_size;
+		public bool get_right_justified ();
+		public weak Gtk.Widget get_submenu ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public MenuItem ();
+		public void set_accel_path (string accel_path);
+		public void set_right_justified (bool right_justified);
+		public void set_submenu (Gtk.Widget submenu);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public MenuItem.with_label (string label);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public MenuItem.with_mnemonic (string label);
+		public Gtk.Menu submenu { get; set; }
+		[HasEmitter]
+		public virtual signal void activate ();
+		public virtual signal void activate_item ();
+		[HasEmitter]
+		public virtual signal void toggle_size_allocate (int allocation);
+		[HasEmitter]
+		public virtual signal void toggle_size_request (void* requisition);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class FileFilterInfo {
-		public Gtk.FileFilterFlags contains;
-		public weak string filename;
-		public weak string uri;
-		public weak string display_name;
-		public weak string mime_type;
+	public class MenuShell : Gtk.Container, Atk.Implementor, Gtk.Buildable {
+		public uint activate_time;
+		public uint active;
+		public weak Gtk.Widget active_menu_item;
+		public uint button;
+		public GLib.List<Gtk.MenuItem> children;
+		public uint have_grab;
+		public uint have_xgrab;
+		public uint ignore_enter;
+		public uint ignore_leave;
+		public uint menu_flag;
+		public weak Gtk.Widget parent_menu_shell;
+		public void activate_item (Gtk.Widget menu_item, bool force_deactivate);
+		public void append ([CCode (type = "GtkWidget*")] Gtk.MenuItem child);
+		public void deselect ();
+		[NoWrapper]
+		public virtual int get_popup_delay ();
+		public bool get_take_focus ();
+		public virtual void insert (Gtk.Widget child, int position);
+		public void prepend (Gtk.Widget child);
+		public void select_first (bool search_sensitive);
+		public virtual void select_item (Gtk.Widget menu_item);
+		public void set_take_focus (bool take_focus);
+		public bool take_focus { get; set; }
+		public virtual signal void activate_current (bool force_hide);
+		[HasEmitter]
+		public virtual signal void cancel ();
+		public virtual signal void cycle_focus (Gtk.DirectionType p0);
+		[HasEmitter]
+		public virtual signal void deactivate ();
+		public virtual signal void move_current (Gtk.MenuDirectionType direction);
+		public virtual signal bool move_selected (int distance);
+		public virtual signal void selection_done ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class FixedChild {
-		public weak Gtk.Widget widget;
-		public int x;
-		public int y;
+	public class MenuToolButton : Gtk.ToolButton, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		public MenuToolButton.from_stock (string stock_id);
+		public weak Gtk.Widget get_menu ();
+		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		public MenuToolButton (Gtk.Widget icon_widget, string label);
+		public void set_arrow_tooltip_markup (string markup);
+		public void set_arrow_tooltip_text (string text);
+		public void set_menu (Gtk.Widget menu);
+		public Gtk.Menu menu { get; set; }
+		public virtual signal void show_menu ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class IMContextInfo {
-		public weak string context_id;
-		public weak string context_name;
-		public weak string domain;
-		public weak string domain_dirname;
-		public weak string default_locales;
+	public class MessageDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
+		public weak Gtk.Widget label;
+		public void format_secondary_markup (string message_format, ...);
+		public void format_secondary_text (string message_format, ...);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public MessageDialog (Gtk.Window? parent, Gtk.DialogFlags flags, Gtk.MessageType type, Gtk.ButtonsType buttons, string message_format, ...);
+		public void set_image (Gtk.Widget image);
+		public void set_markup (string str);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public MessageDialog.with_markup (Gtk.Window? parent, Gtk.DialogFlags flags, Gtk.MessageType type, Gtk.ButtonsType buttons, string message_format, ...);
+		[NoAccessorMethod]
+		public Gtk.ButtonsType buttons { construct; }
+		[NoAccessorMethod]
+		public Gtk.Widget image { get; set; }
+		[NoAccessorMethod]
+		public Gtk.MessageType message_type { get; set construct; }
+		[NoAccessorMethod]
+		public string secondary_text { get; set; }
+		[NoAccessorMethod]
+		public bool secondary_use_markup { get; set; }
+		[NoAccessorMethod]
+		public string text { get; set; }
+		[NoAccessorMethod]
+		public bool use_markup { get; set; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ImageAnimationData {
-		public weak Gdk.PixbufAnimation anim;
-		public weak Gdk.PixbufAnimationIter iter;
-		public uint frame_timeout;
-	}
-	[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;
-		public uint theme_change_id;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ImageIconSetData {
-		public weak Gtk.IconSet icon_set;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ImageImageData {
-		public weak Gdk.Image image;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ImagePixbufData {
-		public weak Gdk.Pixbuf pixbuf;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ImagePixmapData {
-		public weak Gdk.Pixmap pixmap;
+	public class Misc : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
+		public void get_alignment (float xalign, float yalign);
+		public void get_padding (int xpad, int ypad);
+		public void set_alignment (float xalign, float yalign);
+		public void set_padding (int xpad, int ypad);
+		[NoAccessorMethod]
+		public float xalign { get; set; }
+		[NoAccessorMethod]
+		public int xpad { get; set; }
+		[NoAccessorMethod]
+		public float yalign { get; set; }
+		[NoAccessorMethod]
+		public int ypad { get; set; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ImageStockData {
-		public weak string stock_id;
+	public class MountOperation : GLib.MountOperation {
+		public weak Gtk.Window get_parent ();
+		public weak Gdk.Screen get_screen ();
+		[CCode (type = "GMountOperation*", has_construct_function = false)]
+		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; }
 	}
 	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class LabelSelectionInfo {
+	public class MountOperationClass {
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class MountOperationClass {
+	public class Notebook : Gtk.Container, Atk.Implementor, Gtk.Buildable {
+		public uint button;
+		public uint child_has_focus;
+		public weak GLib.List children;
+		public uint click_child;
+		public weak Gtk.NotebookPage cur_page;
+		public weak Gdk.Window event_window;
+		public weak GLib.List first_tab;
+		public uint focus_out;
+		public uint has_after_next;
+		public uint has_after_previous;
+		public uint has_before_next;
+		public uint has_before_previous;
+		public uint have_visible_child;
+		public uint in_child;
+		public weak Gtk.Widget menu;
+		public uint need_timer;
+		public uint timer;
+		public int append_page (Gtk.Widget child, Gtk.Widget? tab_label);
+		public int append_page_menu (Gtk.Widget child, Gtk.Widget tab_label, Gtk.Widget menu_label);
+		public int get_current_page ();
+		public void* get_group ();
+		public weak Gtk.Widget get_menu_label (Gtk.Widget child);
+		public weak string get_menu_label_text (Gtk.Widget child);
+		public int get_n_pages ();
+		public weak Gtk.Widget get_nth_page (int page_num);
+		public bool get_scrollable ();
+		public bool get_show_border ();
+		public bool get_show_tabs ();
+		public bool get_tab_detachable (Gtk.Widget child);
+		public weak Gtk.Widget get_tab_label (Gtk.Widget child);
+		public weak string get_tab_label_text (Gtk.Widget child);
+		public Gtk.PositionType get_tab_pos ();
+		public bool get_tab_reorderable (Gtk.Widget child);
+		public virtual int insert_page (Gtk.Widget child, Gtk.Widget tab_label, int position);
+		public int insert_page_menu (Gtk.Widget child, Gtk.Widget tab_label, Gtk.Widget menu_label, int position);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Notebook ();
+		public void next_page ();
+		public void popup_disable ();
+		public void popup_enable ();
+		public int prepend_page (Gtk.Widget child, Gtk.Widget tab_label);
+		public int prepend_page_menu (Gtk.Widget child, Gtk.Widget tab_label, Gtk.Widget menu_label);
+		public void prev_page ();
+		public void query_tab_label_packing (Gtk.Widget child, bool expand, bool fill, Gtk.PackType pack_type);
+		public void remove_page (int page_num);
+		public void reorder_child (Gtk.Widget child, int position);
+		public void set_current_page (int page_num);
+		public void set_group (void* group);
+		public void set_menu_label (Gtk.Widget child, Gtk.Widget menu_label);
+		public void set_menu_label_text (Gtk.Widget child, string menu_text);
+		public void set_scrollable (bool scrollable);
+		public void set_show_border (bool show_border);
+		public void set_show_tabs (bool show_tabs);
+		public void set_tab_detachable (Gtk.Widget child, bool detachable);
+		public void set_tab_label (Gtk.Widget child, Gtk.Widget tab_label);
+		public void set_tab_label_packing (Gtk.Widget child, bool expand, bool fill, Gtk.PackType pack_type);
+		public void set_tab_label_text (Gtk.Widget child, string tab_text);
+		public void set_tab_pos (Gtk.PositionType pos);
+		public void set_tab_reorderable (Gtk.Widget child, bool reorderable);
+		public static void set_window_creation_hook (Gtk.NotebookWindowCreationFunc func, void* data, GLib.DestroyNotify destroy);
+		[NoAccessorMethod]
+		public bool enable_popup { get; set; }
+		public void* group { get; set; }
+		[NoAccessorMethod]
+		public int group_id { get; set; }
+		[NoAccessorMethod]
+		public bool homogeneous { get; set; }
+		[NoAccessorMethod]
+		public int page { get; set; }
+		public bool scrollable { get; set; }
+		public bool show_border { get; set; }
+		public bool show_tabs { get; set; }
+		[NoAccessorMethod]
+		public uint tab_border { set; }
+		[NoAccessorMethod]
+		public uint tab_hborder { get; set; }
+		public Gtk.PositionType tab_pos { get; set; }
+		[NoAccessorMethod]
+		public uint tab_vborder { get; set; }
+		public virtual signal bool change_current_page (int offset);
+		public virtual signal weak Gtk.Notebook create_window (Gtk.Widget page, int x, int y);
+		public virtual signal bool focus_tab (Gtk.NotebookTab type);
+		public virtual signal void move_focus_out (Gtk.DirectionType direction);
+		public virtual signal void page_added (Gtk.Widget p0, uint p1);
+		public virtual signal void page_removed (Gtk.Widget p0, uint p1);
+		public virtual signal void page_reordered (Gtk.Widget p0, uint p1);
+		public virtual signal bool reorder_tab (Gtk.DirectionType direction, bool move_to_last);
+		public virtual signal bool select_page (bool move_focus);
+		public virtual signal void switch_page (void* page, uint page_num);
 	}
 	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class NotebookPage {
 		public static int num (Gtk.Notebook notebook, Gtk.Widget child);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class PageRange {
-		public int start;
-		public int end;
+	public class Object : GLib.InitiallyUnowned {
+		public uint flags;
+		[NoWrapper]
+		public virtual void get_arg (Gtk.Arg arg, uint arg_id);
+		[NoWrapper]
+		public virtual void set_arg (Gtk.Arg arg, uint arg_id);
+		[NoAccessorMethod]
+		public void* user_data { get; set; }
+		[HasEmitter]
+		public virtual signal void destroy ();
 	}
 	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RangeLayout {
+	public class PageRange {
+		public int end;
+		public int start;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RangeStepTimer {
+	public class PageSetup : GLib.Object {
+		public weak Gtk.PageSetup copy ();
+		[CCode (has_construct_function = false)]
+		public PageSetup.from_file (string file_name) throws GLib.Error;
+		[CCode (has_construct_function = false)]
+		public PageSetup.from_key_file (GLib.KeyFile key_file, string group_name) throws GLib.Error;
+		public double get_bottom_margin (Gtk.Unit unit);
+		public double get_left_margin (Gtk.Unit unit);
+		public Gtk.PageOrientation get_orientation ();
+		public double get_page_height (Gtk.Unit unit);
+		public double get_page_width (Gtk.Unit unit);
+		public double get_paper_height (Gtk.Unit unit);
+		public weak Gtk.PaperSize get_paper_size ();
+		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;
+		[CCode (has_construct_function = false)]
+		public PageSetup ();
+		public void set_bottom_margin (double margin, Gtk.Unit unit);
+		public void set_left_margin (double margin, Gtk.Unit unit);
+		public void set_orientation (Gtk.PageOrientation orientation);
+		public void set_paper_size (Gtk.PaperSize size);
+		public void set_paper_size_and_default_margins (Gtk.PaperSize size);
+		public void set_right_margin (double margin, Gtk.Unit unit);
+		public void set_top_margin (double margin, Gtk.Unit unit);
+		public bool to_file (string file_name) throws GLib.Error;
+		public void to_key_file (GLib.KeyFile key_file, string group_name);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RcContext {
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RcProperty {
-		public GLib.Quark type_name;
-		public GLib.Quark property_name;
-		public weak string origin;
-		public GLib.Value value;
-		public static bool parse_border (GLib.ParamSpec pspec, GLib.StringBuilder gstring, GLib.Value property_value);
-		public static bool parse_color (GLib.ParamSpec pspec, GLib.StringBuilder gstring, GLib.Value property_value);
-		public static bool parse_enum (GLib.ParamSpec pspec, GLib.StringBuilder gstring, GLib.Value property_value);
-		public static bool parse_flags (GLib.ParamSpec pspec, GLib.StringBuilder gstring, GLib.Value property_value);
-		public static bool parse_requisition (GLib.ParamSpec pspec, GLib.StringBuilder gstring, GLib.Value property_value);
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RecentFilterInfo {
-		public Gtk.RecentFilterFlags contains;
-		public weak string uri;
-		public weak string display_name;
-		public weak string mime_type;
-		public weak string applications;
-		public weak string groups;
-		public int age;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RulerMetric {
-		public weak string metric_name;
-		public weak string abbrev;
-		public double pixels_per_unit;
-		[NoArrayLength]
-		public weak double[] ruler_scale;
-		[NoArrayLength]
-		public weak int[] subdivide;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class SettingsPropertyValue {
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class SettingsValue {
-		public weak string origin;
-		public GLib.Value value;
-	}
-	[Compact]
-	[CCode (copy_function = "gtk_stock_item_copy", cheader_filename = "gtk/gtk.h")]
-	public class StockItem {
-		public weak string stock_id;
-		public weak string label;
-		public Gdk.ModifierType modifier;
-		public uint keyval;
-		public weak string translation_domain;
-		public weak Gtk.StockItem copy ();
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TableChild {
-		public weak Gtk.Widget widget;
-		public ushort left_attach;
-		public ushort right_attach;
-		public ushort top_attach;
-		public ushort bottom_attach;
-		public ushort xpadding;
-		public ushort ypadding;
-		public uint xexpand;
-		public uint yexpand;
-		public uint xshrink;
-		public uint yshrink;
-		public uint xfill;
-		public uint yfill;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TableRowCol {
-		public ushort requisition;
-		public ushort allocation;
-		public ushort spacing;
-		public uint need_expand;
-		public uint need_shrink;
-		public uint expand;
-		public uint shrink;
-		public uint empty;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TargetPair {
-		public Gdk.Atom target;
-		public uint flags;
-		public uint info;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TextAppearance {
-		public Gdk.Color bg_color;
-		public Gdk.Color fg_color;
-		public weak Gdk.Bitmap bg_stipple;
-		public weak Gdk.Bitmap fg_stipple;
-		public int rise;
-		public void* padding1;
-		public uint underline;
-		public uint strikethrough;
-		public uint draw_bg;
-		public uint inside_selection;
-		public uint is_text;
-		public uint pad1;
-		public uint pad2;
-		public uint pad3;
-		public uint pad4;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TextBTree {
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TextLogAttrCache {
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TextPendingScroll {
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TextWindow {
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ThemeEngine {
-	}
-	[Compact]
-	[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")]
-	public class WidgetAuxInfo {
-		public int x;
-		public int y;
-		public int width;
-		public int height;
-		public uint x_set;
-		public uint y_set;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class WidgetShapeInfo {
-		public short offset_x;
-		public short offset_y;
-		public weak Gdk.Bitmap shape_mask;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class WindowGeometryInfo {
-	}
-	[Compact]
-	[CCode (copy_function = "gtk_icon_info_copy", cheader_filename = "gtk/gtk.h")]
-	public class IconInfo {
-		public weak Gtk.IconInfo copy ();
-		public bool get_attach_points (Gdk.Point[] points);
-		public int get_base_size ();
-		public weak Gdk.Pixbuf get_builtin_pixbuf ();
-		public weak string get_display_name ();
-		public bool get_embedded_rect (out Gdk.Rectangle rectangle);
-		public weak string get_filename ();
-		public weak Gdk.Pixbuf load_icon () throws GLib.Error;
-		[CCode (has_construct_function = false)]
-		public IconInfo.for_pixbuf (Gtk.IconTheme icon_theme, Gdk.Pixbuf pixbuf);
-		public void set_raw_coordinates (bool raw_coordinates);
-	}
-	[Compact]
-	[CCode (ref_function = "gtk_icon_set_ref", unref_function = "gtk_icon_set_unref", cheader_filename = "gtk/gtk.h")]
-	public class IconSet {
-		public void add_source (Gtk.IconSource source);
-		public weak Gtk.IconSet copy ();
-		public void get_sizes (Gtk.IconSize[] sizes);
-		[CCode (has_construct_function = false)]
-		public IconSet ();
-		[CCode (has_construct_function = false)]
-		public IconSet.from_pixbuf (Gdk.Pixbuf pixbuf);
-		public weak Gdk.Pixbuf render_icon (Gtk.Style style, Gtk.TextDirection direction, Gtk.StateType state, Gtk.IconSize size, Gtk.Widget widget, string detail);
-	}
-	[Compact]
-	[CCode (copy_function = "gtk_icon_source_copy", cheader_filename = "gtk/gtk.h")]
-	public class IconSource {
-		public weak Gtk.IconSource copy ();
-		public Gtk.TextDirection get_direction ();
-		public bool get_direction_wildcarded ();
-		public weak string get_filename ();
-		public weak string get_icon_name ();
-		public weak Gdk.Pixbuf get_pixbuf ();
-		public Gtk.IconSize get_size ();
-		public bool get_size_wildcarded ();
-		public Gtk.StateType get_state ();
-		public bool get_state_wildcarded ();
-		[CCode (has_construct_function = false)]
-		public IconSource ();
-		public void set_direction (Gtk.TextDirection direction);
-		public void set_direction_wildcarded (bool setting);
-		public void set_filename (string filename);
-		public void set_icon_name (string icon_name);
-		public void set_pixbuf (Gdk.Pixbuf pixbuf);
-		public void set_size (Gtk.IconSize size);
-		public void set_size_wildcarded (bool setting);
-		public void set_state (Gtk.StateType state);
-		public void set_state_wildcarded (bool setting);
+	public class Paned : Gtk.Container, Atk.Implementor, Gtk.Buildable {
+		public weak Gtk.Widget child1;
+		public uint child1_resize;
+		public uint child1_shrink;
+		public int child1_size;
+		public weak Gtk.Widget child2;
+		public uint child2_resize;
+		public uint child2_shrink;
+		public Gdk.CursorType cursor_type;
+		public int drag_pos;
+		public weak Gdk.Window handle;
+		public Gdk.Rectangle handle_pos;
+		public uint handle_prelit;
+		public uint in_drag;
+		public uint in_recursion;
+		public int last_allocation;
+		public weak Gtk.Widget last_child1_focus;
+		public weak Gtk.Widget last_child2_focus;
+		public uint orientation;
+		public int original_position;
+		public weak Gdk.GC xor_gc;
+		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 ();
+		public void pack1 (Gtk.Widget child, bool resize, bool shrink);
+		public void pack2 (Gtk.Widget child, bool resize, bool shrink);
+		public void set_position (int position);
+		[NoAccessorMethod]
+		public int max_position { get; }
+		[NoAccessorMethod]
+		public int min_position { get; }
+		public int position { get; set; }
+		[NoAccessorMethod]
+		public bool position_set { get; set; }
+		public virtual signal bool accept_position ();
+		public virtual signal bool cancel_position ();
+		public virtual signal bool cycle_child_focus (bool reverse);
+		public virtual signal bool cycle_handle_focus (bool reverse);
+		public virtual signal bool move_handle (Gtk.ScrollType scroll);
+		public virtual signal bool toggle_handle_focus ();
 	}
 	[Compact]
 	[CCode (copy_function = "gtk_paper_size_copy", cheader_filename = "gtk/gtk.h")]
 	public class PaperSize {
 		public weak Gtk.PaperSize copy ();
+		[CCode (has_construct_function = false)]
+		public PaperSize.custom (string name, string display_name, double width, double height, Gtk.Unit unit);
+		[CCode (has_construct_function = false)]
+		public PaperSize.from_key_file (GLib.KeyFile key_file, string group_name) throws GLib.Error;
+		[CCode (has_construct_function = false)]
+		public PaperSize.from_ppd (string ppd_name, string ppd_display_name, double width, double height);
 		public static weak string get_default ();
 		public double get_default_bottom_margin (Gtk.Unit unit);
 		public double get_default_left_margin (Gtk.Unit unit);
@@ -1596,5031 +2519,4102 @@
 		public bool is_equal (Gtk.PaperSize size2);
 		[CCode (has_construct_function = false)]
 		public PaperSize (string name);
-		[CCode (has_construct_function = false)]
-		public PaperSize.custom (string name, string display_name, double width, double height, Gtk.Unit unit);
-		[CCode (has_construct_function = false)]
-		public PaperSize.from_key_file (GLib.KeyFile key_file, string group_name) throws GLib.Error;
-		[CCode (has_construct_function = false)]
-		public PaperSize.from_ppd (string ppd_name, string ppd_display_name, double width, double height);
 		public void set_size (double width, double height, Gtk.Unit unit);
 		public void to_key_file (GLib.KeyFile key_file, string group_name);
 	}
-	[Compact]
-	[CCode (ref_function = "gtk_recent_info_ref", unref_function = "gtk_recent_info_unref", cheader_filename = "gtk/gtk.h")]
-	public class RecentInfo {
-		public bool exists ();
-		public ulong get_added ();
-		public int get_age ();
-		public bool get_application_info (string app_name, string app_exec, uint count, ulong time_);
-		public weak string get_applications (ulong length);
-		public weak string get_description ();
-		public weak string get_display_name ();
-		public weak string get_groups (ulong length);
-		public weak Gdk.Pixbuf get_icon (int size);
-		public weak string get_mime_type ();
-		public ulong get_modified ();
-		public bool get_private_hint ();
-		public weak string get_short_name ();
-		public weak string get_uri ();
-		public weak string get_uri_display ();
-		public ulong get_visited ();
-		public bool has_application (string app_name);
-		public bool has_group (string group_name);
-		public bool is_local ();
-		public weak string last_application ();
-		public bool match (Gtk.RecentInfo info_b);
-	}
-	[Compact]
-	[CCode (copy_function = "gtk_selection_data_copy", cheader_filename = "gtk/gtk.h")]
-	public class SelectionData {
-		public Gdk.Atom selection;
-		public Gdk.Atom target;
-		public Gdk.Atom type;
-		public int format;
-		[NoArrayLength]
-		public weak uchar[] data;
-		public int length;
-		public weak Gdk.Display display;
-		public Gtk.SelectionData copy ();
-		public Gdk.Pixbuf? get_pixbuf ();
-		public bool get_targets (out Gdk.Atom targets, int n_atoms);
-		public string? get_text ();
-		[NoArrayLength]
-		public string[] get_uris ();
-		public void set (Gdk.Atom type, int format, uchar[] data);
-		public bool set_pixbuf (Gdk.Pixbuf pixbuf);
-		public bool set_text (string str, int len);
-		public bool set_uris (string uris);
-		public bool targets_include_image (bool writable);
-		public bool targets_include_rich_text (Gtk.TextBuffer buffer);
-		public bool targets_include_text ();
-		public bool targets_include_uri ();
-	}
-	[Compact]
-	[CCode (ref_function = "gtk_target_list_ref", unref_function = "gtk_target_list_unref", cheader_filename = "gtk/gtk.h")]
-	public class TargetList {
-		public weak GLib.List list;
-		public uint ref_count;
-		public void add (Gdk.Atom target, uint flags, uint info);
-		public void add_image_targets (uint info, bool writable);
-		public void add_rich_text_targets (uint info, bool deserializable, Gtk.TextBuffer buffer);
-		public void add_table (Gtk.TargetEntry[] targets, uint ntargets);
-		public void add_text_targets (uint info);
-		public void add_uri_targets (uint info);
-		public bool find (Gdk.Atom target, uint info);
-		[CCode (has_construct_function = false)]
-		public TargetList (Gtk.TargetEntry[] targets, uint ntargets);
-		public void remove (Gdk.Atom target);
-	}
-	[Compact]
-	[CCode (ref_function = "gtk_text_attributes_ref", unref_function = "gtk_text_attributes_unref", cheader_filename = "gtk/gtk.h")]
-	public class TextAttributes {
-		public uint refcount;
-		public weak Gtk.TextAppearance appearance;
-		public Gtk.Justification justification;
-		public Gtk.TextDirection direction;
-		public weak Pango.FontDescription font;
-		public double font_scale;
-		public int left_margin;
-		public int indent;
-		public int right_margin;
-		public int pixels_above_lines;
-		public int pixels_below_lines;
-		public int pixels_inside_wrap;
-		public weak Pango.TabArray tabs;
-		public Gtk.WrapMode wrap_mode;
-		public weak Pango.Language language;
-		public Gdk.Color pg_bg_color;
-		public uint invisible;
-		public uint bg_full_height;
-		public uint editable;
-		public uint realized;
-		public uint pad1;
-		public uint pad2;
-		public uint pad3;
-		public uint pad4;
-		public weak Gtk.TextAttributes copy ();
-		public void copy_values (Gtk.TextAttributes dest);
-		[CCode (has_construct_function = false)]
-		public TextAttributes ();
-	}
-	[Compact]
-	[CCode (copy_function = "gtk_tree_path_copy", cheader_filename = "gtk/gtk.h")]
-	public class TreePath {
-		public void append_index (int index_);
-		public int compare (Gtk.TreePath b);
-		public Gtk.TreePath copy ();
-		public void down ();
-		public int get_depth ();
-		[NoArrayLength]
-		public weak int[] get_indices ();
-		public bool is_ancestor (Gtk.TreePath descendant);
-		public bool is_descendant (Gtk.TreePath ancestor);
-		[CCode (has_construct_function = false)]
-		public TreePath ();
-		[CCode (has_construct_function = false)]
-		public TreePath.first ();
-		[CCode (sentinel = "-1", has_construct_function = false)]
-		public TreePath.from_indices (...);
-		[CCode (has_construct_function = false)]
-		public TreePath.from_string (string path);
-		public void next ();
-		public void prepend_index (int index_);
-		public bool prev ();
-		public weak string to_string ();
-		public bool up ();
-	}
-	[Compact]
-	[CCode (copy_function = "gtk_tree_row_reference_copy", cheader_filename = "gtk/gtk.h")]
-	public class TreeRowReference {
-		public weak Gtk.TreeRowReference copy ();
-		public static void deleted (GLib.Object proxy, Gtk.TreePath path);
-		public weak Gtk.TreeModel get_model ();
-		public Gtk.TreePath get_path ();
-		public static void inserted (GLib.Object proxy, Gtk.TreePath path);
-		[CCode (has_construct_function = false)]
-		public TreeRowReference (Gtk.TreeModel model, Gtk.TreePath path);
-		[CCode (has_construct_function = false)]
-		public TreeRowReference.proxy (GLib.Object proxy, Gtk.TreeModel model, Gtk.TreePath path);
-		public static void reordered (GLib.Object proxy, Gtk.TreePath path, Gtk.TreeIter iter, int[] new_order);
-		public bool valid ();
-	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class AboutDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		public weak string get_artists ();
-		public weak string get_authors ();
-		public weak string get_comments ();
-		public weak string get_copyright ();
-		public weak string get_documenters ();
-		public weak string get_license ();
-		public weak Gdk.Pixbuf get_logo ();
-		public weak string get_logo_icon_name ();
-		public weak string get_program_name ();
-		public weak string get_translator_credits ();
-		public weak string get_version ();
-		public weak string get_website ();
-		public weak string get_website_label ();
-		public bool get_wrap_license ();
+	public class Plug : Gtk.Window, Atk.Implementor, Gtk.Buildable {
+		public weak GLib.HashTable grabbed_keys;
+		public weak Gtk.WindowGroup modality_group;
+		public weak Gtk.Widget modality_window;
+		public uint same_app;
+		public weak Gdk.Window socket_window;
+		public void @construct (Gdk.NativeWindow socket_id);
+		public void construct_for_display (Gdk.Display display, Gdk.NativeWindow socket_id);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public AboutDialog ();
-		[NoArrayLength]
-		public void set_artists (string[] artists);
-		[NoArrayLength]
-		public void set_authors (string[] authors);
-		public void set_comments (string comments);
-		public void set_copyright (string copyright);
-		[NoArrayLength]
-		public void set_documenters (string[] documenters);
-		public static void set_email_hook (Gtk.AboutDialogActivateLinkFunc func, GLib.DestroyNotify? destroy);
-		public void set_license (string license);
-		public void set_logo (Gdk.Pixbuf logo);
-		public void set_logo_icon_name (string icon_name);
-		public void set_program_name (string name);
-		public void set_translator_credits (string translator_credits);
-		public static void set_url_hook (Gtk.AboutDialogActivateLinkFunc func, GLib.DestroyNotify? destroy);
-		public void set_version (string version);
-		public void set_website (string website);
-		public void set_website_label (string website_label);
-		public void set_wrap_license (bool wrap_license);
-		public string[] artists { get; set; }
-		public string[] authors { get; set; }
-		public string comments { get; set; }
-		public string copyright { get; set; }
-		public string[] documenters { get; set; }
-		public string license { get; set; }
-		public Gdk.Pixbuf logo { get; set; }
-		public string logo_icon_name { get; set; }
-		public string program_name { get; set; }
-		public string translator_credits { get; set; }
-		public string version { get; set; }
-		public string website { get; set; }
-		public string website_label { get; set; }
-		public bool wrap_license { get; set; }
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class AccelGroup : GLib.Object {
-		public uint lock_count;
-		public Gdk.ModifierType modifier_mask;
-		public weak GLib.SList acceleratables;
-		public uint n_accels;
-		public bool activate (GLib.Quark accel_quark, GLib.Object acceleratable, uint accel_key, Gdk.ModifierType accel_mods);
-		public void connect (uint accel_key, Gdk.ModifierType accel_mods, Gtk.AccelFlags accel_flags, GLib.Closure closure);
-		public void connect_by_path (string accel_path, GLib.Closure closure);
-		public bool disconnect (GLib.Closure closure);
-		public bool disconnect_key (uint accel_key, Gdk.ModifierType accel_mods);
-		public weak Gtk.AccelKey find (Gtk.AccelGroupFindFunc find_func, void* data);
-		public static weak Gtk.AccelGroup from_accel_closure (GLib.Closure closure);
-		public void @lock ();
-		[CCode (has_construct_function = false)]
-		public AccelGroup ();
-		public weak Gtk.AccelGroupEntry query (uint accel_key, Gdk.ModifierType accel_mods, uint n_entries);
-		public void unlock ();
-		public virtual signal bool accel_activate (GLib.Object p0, uint p1, Gdk.ModifierType p2);
-		public virtual signal void accel_changed (uint keyval, Gdk.ModifierType modifier, GLib.Closure accel_closure);
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class AccelLabel : Gtk.Label, Atk.Implementor, Gtk.Buildable {
-		public uint gtk_reserved;
-		public uint accel_padding;
-		public weak Gtk.AccelGroup accel_group;
-		public weak string accel_string;
-		public ushort accel_string_width;
-		public weak Gtk.Widget get_accel_widget ();
-		public uint get_accel_width ();
+		public Plug.for_display (Gdk.Display display, Gdk.NativeWindow socket_id);
+		public Gdk.NativeWindow get_id ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public AccelLabel (string str);
-		public bool refetch ();
-		public void set_accel_closure (GLib.Closure accel_closure);
-		public void set_accel_widget (Gtk.Widget accel_widget);
+		public Plug (Gdk.NativeWindow socket_id);
 		[NoAccessorMethod]
-		public GLib.Closure accel_closure { get; set; }
-		public Gtk.Widget accel_widget { get; set; }
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class AccelMap : GLib.Object {
-		public static void add_entry (string accel_path, uint accel_key, Gdk.ModifierType accel_mods);
-		public static void add_filter (string filter_pattern);
-		public static bool change_entry (string accel_path, uint accel_key, Gdk.ModifierType accel_mods, bool replace);
-		public static void @foreach (void* data, Gtk.AccelMapForeach foreach_func);
-		public static void foreach_unfiltered (void* data, Gtk.AccelMapForeach foreach_func);
-		public static weak Gtk.AccelMap get ();
-		public static void load (string file_name);
-		public static void load_fd (int fd);
-		public static void load_scanner (GLib.Scanner scanner);
-		public static void lock_path (string accel_path);
-		public static bool lookup_entry (string accel_path, Gtk.AccelKey key);
-		public static void save (string file_name);
-		public static void save_fd (int fd);
-		public static void unlock_path (string accel_path);
-		public virtual signal void changed (string p0, uint p1, Gdk.ModifierType p2);
+		public bool embedded { get; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Accessible : Atk.Object {
-		public weak Gtk.Widget widget;
-		public virtual void connect_widget_destroyed ();
+	public class PrintContext : GLib.Object {
+		public weak Pango.Context create_pango_context ();
+		public weak Pango.Layout create_pango_layout ();
+		public weak Cairo.Context get_cairo_context ();
+		public double get_dpi_x ();
+		public double get_dpi_y ();
+		public double get_height ();
+		public weak Gtk.PageSetup get_page_setup ();
+		public weak Pango.FontMap get_pango_fontmap ();
+		public double get_width ();
+		public void set_cairo_context (Cairo.Context cr, double dpi_x, double dpi_y);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Action : GLib.Object, Gtk.Buildable {
-		public void block_activate_from (Gtk.Widget proxy);
-		public void connect_accelerator ();
-		public weak Gtk.Widget create_icon (Gtk.IconSize icon_size);
-		public void disconnect_accelerator ();
-		public weak GLib.Closure get_accel_closure ();
-		public weak string get_accel_path ();
-		public weak GLib.SList get_proxies ();
-		public bool get_sensitive ();
-		public bool get_visible ();
-		public bool is_sensitive ();
-		public bool is_visible ();
+	public class PrintOperation : GLib.Object, Gtk.PrintOperationPreview {
+		public void cancel ();
+		public weak Gtk.PageSetup get_default_page_setup ();
+		public void get_error () throws GLib.Error;
+		public weak Gtk.PrintSettings get_print_settings ();
+		public Gtk.PrintStatus get_status ();
+		public weak string get_status_string ();
+		public bool is_finished ();
 		[CCode (has_construct_function = false)]
-		public Action (string name, string? label, string? tooltip, string? stock_id);
-		public void set_accel_group (Gtk.AccelGroup accel_group);
-		public void set_accel_path (string accel_path);
-		public void set_sensitive (bool sensitive);
-		public void set_visible (bool visible);
-		public void unblock_activate_from (Gtk.Widget proxy);
-		public virtual void connect_proxy (Gtk.Widget proxy);
-		public virtual weak Gtk.Widget create_menu ();
-		public virtual weak Gtk.Widget create_menu_item ();
-		public virtual weak Gtk.Widget create_tool_item ();
-		public virtual void disconnect_proxy (Gtk.Widget proxy);
-		[NoAccessorMethod]
-		public Gtk.ActionGroup action_group { get; set; }
-		[NoAccessorMethod]
-		public bool hide_if_empty { get; set; }
+		public PrintOperation ();
+		public Gtk.PrintOperationResult run (Gtk.PrintOperationAction action, Gtk.Window parent) throws GLib.Error;
+		public void set_allow_async (bool allow_async);
+		public void set_current_page (int current_page);
+		public void set_custom_tab_label (string label);
+		public void set_default_page_setup (Gtk.PageSetup default_page_setup);
+		public void set_export_filename (string filename);
+		public void set_job_name (string job_name);
+		public void set_n_pages (int n_pages);
+		public void set_print_settings (Gtk.PrintSettings print_settings);
+		public void set_show_progress (bool show_progress);
+		public void set_track_print_status (bool track_status);
+		public void set_unit (Gtk.Unit unit);
+		public void set_use_full_page (bool full_page);
 		[NoAccessorMethod]
-		public string icon_name { get; set; }
+		public bool allow_async { get; set; }
 		[NoAccessorMethod]
-		public bool is_important { get; set; }
+		public int current_page { get; set; }
 		[NoAccessorMethod]
-		public string label { get; set; }
+		public string custom_tab_label { get; set; }
+		public Gtk.PageSetup default_page_setup { get; set; }
 		[NoAccessorMethod]
-		public string name { get; construct; }
-		public bool sensitive { get; set; }
+		public string export_filename { get; set; }
 		[NoAccessorMethod]
-		public string short_label { get; set; }
+		public string job_name { get; set; }
 		[NoAccessorMethod]
-		public string stock_id { get; set; }
+		public int n_pages { get; set; }
+		public Gtk.PrintSettings print_settings { get; set; }
 		[NoAccessorMethod]
-		public string tooltip { get; set; }
-		public bool visible { get; set; }
+		public bool show_progress { get; set; }
+		public Gtk.PrintStatus status { get; }
+		public string status_string { get; }
 		[NoAccessorMethod]
-		public bool visible_horizontal { get; set; }
+		public bool track_print_status { get; set; }
 		[NoAccessorMethod]
-		public bool visible_overflown { get; set; }
+		public Gtk.Unit unit { get; set; }
 		[NoAccessorMethod]
-		public bool visible_vertical { get; set; }
-		[HasEmitter]
-		public virtual signal void activate ();
+		public bool use_full_page { get; set; }
+		public virtual signal void begin_print (Gtk.PrintContext context);
+		public virtual signal weak GLib.Object create_custom_widget ();
+		public virtual signal void custom_widget_apply (Gtk.Widget widget);
+		public virtual signal void done (Gtk.PrintOperationResult result);
+		public virtual signal void draw_page (Gtk.PrintContext context, int page_nr);
+		public virtual signal void end_print (Gtk.PrintContext context);
+		public virtual signal bool paginate (Gtk.PrintContext context);
+		public virtual signal bool preview (Gtk.PrintOperationPreview preview, Gtk.PrintContext context, Gtk.Window parent);
+		public virtual signal void request_page_setup (Gtk.PrintContext context, int page_nr, Gtk.PageSetup setup);
+		public virtual signal void status_changed ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ActionGroup : GLib.Object, Gtk.Buildable {
-		public void add_action (Gtk.Action action);
-		public void add_action_with_accel (Gtk.Action action, string? accelerator);
-		public void add_actions (Gtk.ActionEntry[] entries, void* user_data);
-		public void add_actions_full (Gtk.ActionEntry[] entries, void* user_data, GLib.DestroyNotify? destroy);
-		public void add_radio_actions (Gtk.RadioActionEntry[] entries, int value, Gtk.RadioActionCallback on_change);
-		public void add_radio_actions_full (Gtk.RadioActionEntry[] entries, int value, Gtk.RadioActionCallback on_change, GLib.DestroyNotify? destroy);
-		public void add_toggle_actions (Gtk.ToggleActionEntry[] entries, void* user_data);
-		public void add_toggle_actions_full (Gtk.ToggleActionEntry[] entries, void* user_data, GLib.DestroyNotify? destroy);
-		public bool get_sensitive ();
-		public bool get_visible ();
-		public weak GLib.List list_actions ();
+	public class PrintSettings : GLib.Object {
+		public weak Gtk.PrintSettings copy ();
+		public void @foreach (Gtk.PrintSettingsFunc func);
 		[CCode (has_construct_function = false)]
-		public ActionGroup (string name);
-		public void remove_action (Gtk.Action action);
-		public void set_sensitive (bool sensitive);
-		public void set_translate_func (Gtk.TranslateFunc func, void* data, Gtk.DestroyNotify notify);
-		public void set_translation_domain (string domain);
-		public void set_visible (bool visible);
-		public weak string translate_string (string str);
-		public virtual weak Gtk.Action get_action (string action_name);
-		[NoAccessorMethod]
-		public string name { get; construct; }
-		public bool sensitive { get; set; }
-		public bool visible { get; set; }
-		public virtual signal void connect_proxy (Gtk.Action p0, Gtk.Widget p1);
-		public virtual signal void disconnect_proxy (Gtk.Action p0, Gtk.Widget p1);
-		public virtual signal void post_activate (Gtk.Action p0);
-		public virtual signal void pre_activate (Gtk.Action p0);
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Adjustment : Gtk.Object {
-		public void clamp_page (double lower, double upper);
-		public double get_value ();
-		[CCode (type = "GtkObject*", has_construct_function = false)]
-		public Adjustment (double value, double lower, double upper, double step_increment, double page_increment, double page_size);
-		public void set_value (double value);
-		[NoAccessorMethod]
-		public double lower { get; set; }
-		[NoAccessorMethod]
-		public double page_increment { get; set; }
-		[NoAccessorMethod]
-		public double page_size { get; set; }
-		[NoAccessorMethod]
-		public double step_increment { get; set; }
-		[NoAccessorMethod]
-		public double upper { get; set; }
-		public double value { get; set; }
-		[HasEmitter]
-		public virtual signal void changed ();
-		[HasEmitter]
-		public virtual signal void value_changed ();
+		public PrintSettings.from_file (string file_name) throws GLib.Error;
+		[CCode (has_construct_function = false)]
+		public PrintSettings.from_key_file (GLib.KeyFile key_file, string group_name) throws GLib.Error;
+		public weak string get (string key);
+		public bool get_bool (string key);
+		public bool get_collate ();
+		public weak string get_default_source ();
+		public weak string get_dither ();
+		public double get_double (string key);
+		public double get_double_with_default (string key, double def);
+		public Gtk.PrintDuplex get_duplex ();
+		public weak string get_finishings ();
+		public int get_int (string key);
+		public int get_int_with_default (string key, int def);
+		public double get_length (string key, Gtk.Unit unit);
+		public weak string get_media_type ();
+		public int get_n_copies ();
+		public int get_number_up ();
+		public Gtk.PageOrientation get_orientation ();
+		public weak string get_output_bin ();
+		public weak Gtk.PageRange get_page_ranges (int num_ranges);
+		public Gtk.PageSet get_page_set ();
+		public double get_paper_height (Gtk.Unit unit);
+		public weak Gtk.PaperSize get_paper_size ();
+		public double get_paper_width (Gtk.Unit unit);
+		public Gtk.PrintPages get_print_pages ();
+		public weak string get_printer ();
+		public Gtk.PrintQuality get_quality ();
+		public int get_resolution ();
+		public bool get_reverse ();
+		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;
+		[CCode (has_construct_function = false)]
+		public PrintSettings ();
+		public void set (string key, string value);
+		public void set_bool (string key, bool value);
+		public void set_collate (bool collate);
+		public void set_default_source (string default_source);
+		public void set_dither (string dither);
+		public void set_double (string key, double value);
+		public void set_duplex (Gtk.PrintDuplex duplex);
+		public void set_finishings (string finishings);
+		public void set_int (string key, int value);
+		public void set_length (string key, double value, Gtk.Unit unit);
+		public void set_media_type (string media_type);
+		public void set_n_copies (int num_copies);
+		public void set_number_up (int number_up);
+		public void set_orientation (Gtk.PageOrientation orientation);
+		public void set_output_bin (string output_bin);
+		public void set_page_ranges (Gtk.PageRange page_ranges, int num_ranges);
+		public void set_page_set (Gtk.PageSet page_set);
+		public void set_paper_height (double height, Gtk.Unit unit);
+		public void set_paper_size (Gtk.PaperSize paper_size);
+		public void set_paper_width (double width, Gtk.Unit unit);
+		public void set_print_pages (Gtk.PrintPages pages);
+		public void set_printer (string printer);
+		public void set_quality (Gtk.PrintQuality quality);
+		public void set_resolution (int resolution);
+		public void set_reverse (bool reverse);
+		public void set_scale (double scale);
+		public void set_use_color (bool use_color);
+		public bool to_file (string file_name) throws GLib.Error;
+		public void to_key_file (GLib.KeyFile key_file, string group_name);
+		public void unset (string key);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Alignment : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
-		public void get_padding (uint padding_top, uint padding_bottom, uint padding_left, uint padding_right);
+	public class ProgressBar : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
+		public uint activity_dir;
+		public int activity_pos;
+		public uint blocks;
+		public uint dirty;
+		public int in_block;
+		public double pulse_fraction;
+		public Pango.EllipsizeMode get_ellipsize ();
+		public double get_fraction ();
+		public Gtk.ProgressBarOrientation get_orientation ();
+		public double get_pulse_step ();
+		public weak string get_text ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Alignment (float xalign, float yalign, float xscale, float yscale);
-		public void set (float xalign, float yalign, float xscale, float yscale);
-		public void set_padding (uint padding_top, uint padding_bottom, uint padding_left, uint padding_right);
-		[NoAccessorMethod]
-		public uint bottom_padding { get; set; }
-		[NoAccessorMethod]
-		public uint left_padding { get; set; }
-		[NoAccessorMethod]
-		public uint right_padding { get; set; }
+		public ProgressBar ();
+		public void pulse ();
+		public void set_ellipsize (Pango.EllipsizeMode mode);
+		public void set_fraction (double fraction);
+		public void set_orientation (Gtk.ProgressBarOrientation orientation);
+		public void set_pulse_step (double fraction);
+		public void set_text (string text);
 		[NoAccessorMethod]
-		public uint top_padding { get; set; }
+		public uint activity_blocks { get; set; }
 		[NoAccessorMethod]
-		public float xalign { get; set; }
+		public uint activity_step { get; set; }
 		[NoAccessorMethod]
-		public float xscale { get; set; }
+		public Gtk.Adjustment adjustment { get; set; }
 		[NoAccessorMethod]
-		public float yalign { get; set; }
+		public Gtk.ProgressBarStyle bar_style { get; set; }
 		[NoAccessorMethod]
-		public float yscale { get; set; }
+		public uint discrete_blocks { get; set; }
+		public Pango.EllipsizeMode ellipsize { get; set; }
+		public double fraction { get; set; }
+		public Gtk.ProgressBarOrientation orientation { get; set; }
+		public double pulse_step { get; set; }
+		public string text { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Arrow : Gtk.Misc, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Arrow (Gtk.ArrowType arrow_type, Gtk.ShadowType shadow_type);
-		public void set (Gtk.ArrowType arrow_type, Gtk.ShadowType shadow_type);
-		[NoAccessorMethod]
-		public Gtk.ArrowType arrow_type { get; set; }
+	public class RadioAction : Gtk.ToggleAction, Gtk.Buildable {
+		public int get_current_value ();
+		public weak GLib.SList get_group ();
+		[CCode (has_construct_function = false)]
+		public RadioAction (string name, string? label, string? tooltip, string? stock_id, int value);
+		public void set_current_value (int current_value);
+		public void set_group (GLib.SList group);
+		public int current_value { get; set; }
+		public Gtk.RadioAction group { set; }
 		[NoAccessorMethod]
-		public Gtk.ShadowType shadow_type { get; set; }
+		public int value { get; set; }
+		public virtual signal void changed (Gtk.RadioAction current);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class AspectFrame : Gtk.Frame, Atk.Implementor, Gtk.Buildable {
-		public Gtk.Allocation center_allocation;
+	public class RadioButton : Gtk.CheckButton, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public AspectFrame (string label, float xalign, float yalign, float ratio, bool obey_child);
-		public void set (float xalign, float yalign, float ratio, bool obey_child);
-		[NoAccessorMethod]
-		public bool obey_child { get; set; }
-		[NoAccessorMethod]
-		public float ratio { get; set; }
-		[NoAccessorMethod]
-		public float xalign { get; set; }
-		[NoAccessorMethod]
-		public float yalign { get; set; }
+		public RadioButton.from_widget (Gtk.RadioButton radio_group_member);
+		public weak GLib.SList get_group ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public RadioButton (GLib.SList? group);
+		public void set_group (GLib.SList group);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public RadioButton.with_label (GLib.SList? group, string label);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public RadioButton.with_label_from_widget (Gtk.RadioButton radio_group_member, string label);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public RadioButton.with_mnemonic (GLib.SList? group, string label);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public RadioButton.with_mnemonic_from_widget (Gtk.RadioButton radio_group_member, string label);
+		public Gtk.RadioButton group { set; }
+		public virtual signal void group_changed ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Assistant : Gtk.Window, Atk.Implementor, Gtk.Buildable {
-		public weak Gtk.Widget forward;
-		public weak Gtk.Widget back;
-		public weak Gtk.Widget last;
-		public void add_action_widget (Gtk.Widget child);
-		public int append_page (Gtk.Widget page);
-		public int get_current_page ();
-		public int get_n_pages ();
-		public weak Gtk.Widget get_nth_page (int page_num);
-		public bool get_page_complete (Gtk.Widget page);
-		public weak Gdk.Pixbuf get_page_header_image (Gtk.Widget page);
-		public weak Gdk.Pixbuf get_page_side_image (Gtk.Widget page);
-		public weak string get_page_title (Gtk.Widget page);
-		public Gtk.AssistantPageType get_page_type (Gtk.Widget page);
-		public int insert_page (Gtk.Widget page, int position);
+	public class RadioMenuItem : Gtk.CheckMenuItem, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Assistant ();
-		public int prepend_page (Gtk.Widget page);
-		public void remove_action_widget (Gtk.Widget child);
-		public void set_current_page (int page_num);
-		public void set_forward_page_func (Gtk.AssistantPageFunc page_func, void* data, GLib.DestroyNotify destroy);
-		public void set_page_complete (Gtk.Widget page, bool complete);
-		public void set_page_header_image (Gtk.Widget page, Gdk.Pixbuf pixbuf);
-		public void set_page_side_image (Gtk.Widget page, Gdk.Pixbuf pixbuf);
-		public void set_page_title (Gtk.Widget page, string title);
-		public void set_page_type (Gtk.Widget page, Gtk.AssistantPageType type);
-		public void update_buttons_state ();
-		public virtual signal void apply ();
-		public virtual signal void cancel ();
-		public virtual signal void close ();
-		public virtual signal void prepare (Gtk.Widget page);
+		public RadioMenuItem.from_widget (Gtk.RadioMenuItem group);
+		public weak GLib.SList get_group ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public RadioMenuItem (GLib.SList group);
+		public void set_group (GLib.SList group);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public RadioMenuItem.with_label (GLib.SList group, string label);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public RadioMenuItem.with_label_from_widget (Gtk.RadioMenuItem group, string label);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public RadioMenuItem.with_mnemonic (GLib.SList group, string label);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public RadioMenuItem.with_mnemonic_from_widget (Gtk.RadioMenuItem group, string label);
+		public Gtk.RadioMenuItem group { set; }
+		public virtual signal void group_changed ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Bin : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		public weak Gtk.Widget child;
-		public weak Gtk.Widget get_child ();
+	public class RadioToolButton : Gtk.ToggleToolButton, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		public RadioToolButton.from_stock (GLib.SList group, string stock_id);
+		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		public RadioToolButton.from_widget (Gtk.RadioToolButton group);
+		public weak GLib.SList get_group ();
+		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		public RadioToolButton (GLib.SList group);
+		public void set_group (GLib.SList group);
+		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		public RadioToolButton.with_stock_from_widget (Gtk.RadioToolButton group, string stock_id);
+		public Gtk.RadioToolButton group { set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Box : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		public weak GLib.List children;
-		public bool get_homogeneous ();
-		public int get_spacing ();
-		public void pack_end (Gtk.Widget child, bool expand, bool fill, uint padding);
-		public void pack_end_defaults (Gtk.Widget widget);
-		public void pack_start (Gtk.Widget child, bool expand, bool fill, uint padding);
-		public void pack_start_defaults (Gtk.Widget widget);
-		public void query_child_packing (Gtk.Widget child, out bool expand, out bool fill, out uint padding, out Gtk.PackType pack_type);
-		public void reorder_child (Gtk.Widget child, int position);
-		public void set_child_packing (Gtk.Widget child, bool expand, bool fill, uint padding, Gtk.PackType pack_type);
-		public void set_homogeneous (bool homogeneous);
-		public void set_spacing (int spacing);
-		public bool homogeneous { get; set; }
-		public int spacing { get; set; }
+	public class Range : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
+		public weak Gdk.Window event_window;
+		public uint flippable;
+		public uint has_stepper_a;
+		public uint has_stepper_b;
+		public uint has_stepper_c;
+		public uint has_stepper_d;
+		public weak Gtk.RangeLayout layout;
+		public int min_slider_size;
+		public uint need_recalc;
+		public Gtk.Orientation orientation;
+		public Gdk.Rectangle range_rect;
+		public int round_digits;
+		public int slide_initial_coordinate;
+		public int slide_initial_slider_position;
+		public int slider_end;
+		public uint slider_size_fixed;
+		public int slider_start;
+		public weak Gtk.RangeStepTimer timer;
+		public uint trough_click_forward;
+		public uint update_pending;
+		public uint update_timeout_id;
+		public weak Gtk.Adjustment get_adjustment ();
+		public double get_fill_level ();
+		public bool get_inverted ();
+		public Gtk.SensitivityType get_lower_stepper_sensitivity ();
+		[NoWrapper]
+		public virtual void get_range_border (Gtk.Border border_);
+		public bool get_restrict_to_fill_level ();
+		public bool get_show_fill_level ();
+		public Gtk.UpdateType get_update_policy ();
+		public Gtk.SensitivityType get_upper_stepper_sensitivity ();
+		public double get_value ();
+		public void set_adjustment (Gtk.Adjustment adjustment);
+		public void set_fill_level (double fill_level);
+		public void set_increments (double step, double page);
+		public void set_inverted (bool setting);
+		public void set_lower_stepper_sensitivity (Gtk.SensitivityType sensitivity);
+		public void set_range (double min, double max);
+		public void set_restrict_to_fill_level (bool restrict_to_fill_level);
+		public void set_show_fill_level (bool show_fill_level);
+		public void set_update_policy (Gtk.UpdateType policy);
+		public void set_upper_stepper_sensitivity (Gtk.SensitivityType sensitivity);
+		public void set_value (double value);
+		public Gtk.Adjustment adjustment { get; set construct; }
+		public double fill_level { get; set; }
+		public bool inverted { get; set; }
+		public Gtk.SensitivityType lower_stepper_sensitivity { get; set; }
+		public bool restrict_to_fill_level { get; set; }
+		public bool show_fill_level { get; set; }
+		public Gtk.UpdateType update_policy { get; set; }
+		public Gtk.SensitivityType upper_stepper_sensitivity { get; set; }
+		public virtual signal void adjust_bounds (double new_value);
+		public virtual signal bool change_value (Gtk.ScrollType scroll, double new_value);
+		public virtual signal void move_slider (Gtk.ScrollType scroll);
+		public virtual signal void value_changed ();
 	}
+	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Builder : GLib.Object {
-		public uint add_from_file (string filename) throws GLib.Error;
-		public uint add_from_string (string buffer, ulong length) throws GLib.Error;
-		public void connect_signals (void* user_data);
-		public void connect_signals_full (Gtk.BuilderConnectFunc func);
-		public static GLib.Quark error_quark ();
-		public weak GLib.Object get_object (string name);
-		public weak GLib.SList get_objects ();
-		public weak string get_translation_domain ();
-		[CCode (has_construct_function = false)]
-		public Builder ();
-		public void set_translation_domain (string domain);
-		public bool value_from_string (GLib.ParamSpec pspec, string str, GLib.Value value) throws GLib.Error;
-		public bool value_from_string_type (GLib.Type type, string str, GLib.Value value) throws GLib.Error;
-		public virtual GLib.Type get_type_from_name (string type_name);
-		public string translation_domain { get; set; }
+	public class RangeLayout {
 	}
+	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Button : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
-		public weak Gdk.Window event_window;
-		public weak string label_text;
-		public uint activate_timeout;
-		public uint constructed;
-		public uint in_button;
-		public uint button_down;
-		public uint depressed;
-		public uint depress_on_activate;
-		public void get_alignment (float xalign, float yalign);
-		public bool get_focus_on_click ();
-		public weak Gtk.Widget get_image ();
-		public Gtk.PositionType get_image_position ();
-		public weak string get_label ();
-		public Gtk.ReliefStyle get_relief ();
-		public bool get_use_stock ();
-		public bool get_use_underline ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Button ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Button.from_stock (string stock_id);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Button.with_label (string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Button.with_mnemonic (string label);
-		public void set_alignment (float xalign, float yalign);
-		public void set_focus_on_click (bool focus_on_click);
-		public void set_image (Gtk.Widget image);
-		public void set_image_position (Gtk.PositionType position);
-		public void set_label (string label);
-		public void set_relief (Gtk.ReliefStyle newstyle);
-		public void set_use_stock (bool use_stock);
-		public void set_use_underline (bool use_underline);
-		public bool focus_on_click { get; set; }
-		public Gtk.Widget image { get; set; }
-		public Gtk.PositionType image_position { get; set; }
-		public string label { get; set construct; }
-		public Gtk.ReliefStyle relief { get; set; }
-		public bool use_stock { get; set construct; }
-		public bool use_underline { get; set construct; }
-		[NoAccessorMethod]
-		public float xalign { get; set; }
-		[NoAccessorMethod]
-		public float yalign { get; set; }
-		public virtual signal void activate ();
-		[HasEmitter]
-		public virtual signal void clicked ();
-		[HasEmitter]
-		public virtual signal void enter ();
-		[HasEmitter]
-		public virtual signal void leave ();
-		[HasEmitter]
-		public virtual signal void pressed ();
-		[HasEmitter]
-		public virtual signal void released ();
+	public class RangeStepTimer {
 	}
+	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ButtonBox : Gtk.Box, Atk.Implementor, Gtk.Buildable {
-		public int child_min_width;
-		public int child_min_height;
-		public int child_ipad_x;
-		public int child_ipad_y;
-		public bool get_child_secondary (Gtk.Widget child);
-		public Gtk.ButtonBoxStyle get_layout ();
-		public void set_child_secondary (Gtk.Widget child, bool is_secondary);
-		public void set_layout (Gtk.ButtonBoxStyle layout_style);
-		[NoAccessorMethod]
-		public Gtk.ButtonBoxStyle layout_style { get; set; }
+	public class RcContext {
 	}
+	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Calendar : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
-		public weak Gtk.Style header_style;
-		public weak Gtk.Style label_style;
-		public int selected_day;
+	public class RcProperty {
+		public weak string origin;
+		public GLib.Quark property_name;
+		public GLib.Quark type_name;
+		public GLib.Value value;
+		public static bool parse_border (GLib.ParamSpec pspec, GLib.StringBuilder gstring, GLib.Value property_value);
+		public static bool parse_color (GLib.ParamSpec pspec, GLib.StringBuilder gstring, GLib.Value property_value);
+		public static bool parse_enum (GLib.ParamSpec pspec, GLib.StringBuilder gstring, GLib.Value property_value);
+		public static bool parse_flags (GLib.ParamSpec pspec, GLib.StringBuilder gstring, GLib.Value property_value);
+		public static bool parse_requisition (GLib.ParamSpec pspec, GLib.StringBuilder gstring, GLib.Value property_value);
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class RcStyle : GLib.Object {
 		[NoArrayLength]
-		public weak int[] day_month;
-		public int num_marked_dates;
+		public weak Gdk.Color[] @base;
 		[NoArrayLength]
-		public weak int[] marked_date;
-		public Gtk.CalendarDisplayOptions display_flags;
+		public weak Gdk.Color[] bg;
 		[NoArrayLength]
-		public weak Gdk.Color[] marked_date_color;
-		public weak Gdk.GC gc;
-		public weak Gdk.GC xor_gc;
-		public int focus_row;
-		public int focus_col;
-		public int highlight_row;
-		public int highlight_col;
+		public weak string[] bg_pixmap_name;
 		[NoArrayLength]
-		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);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		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]
-		public bool no_month_change { get; set; }
-		[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; }
-		[NoAccessorMethod]
-		public int year { get; set; }
-		public virtual signal void day_selected ();
-		public virtual signal void day_selected_double_click ();
-		public virtual signal void month_changed ();
-		public virtual signal void next_month ();
-		public virtual signal void next_year ();
-		public virtual signal void prev_month ();
-		public virtual signal void prev_year ();
+		public weak Gtk.RcFlags[] color_flags;
+		public uint engine_specified;
+		[NoArrayLength]
+		public weak Gdk.Color[] fg;
+		public weak Pango.FontDescription font_desc;
+		public weak GLib.SList icon_factories;
+		public weak string name;
+		public weak GLib.Array rc_properties;
+		public weak GLib.SList rc_style_lists;
+		[NoArrayLength]
+		public weak Gdk.Color[] text;
+		public int xthickness;
+		public int ythickness;
+		public weak Gtk.RcStyle copy ();
+		[NoWrapper]
+		public virtual weak Gtk.RcStyle create_rc_style ();
+		[NoWrapper]
+		public virtual weak Gtk.Style create_style ();
+		[NoWrapper]
+		public virtual void merge (Gtk.RcStyle src);
+		[CCode (has_construct_function = false)]
+		public RcStyle ();
+		[NoWrapper]
+		public virtual uint parse (Gtk.Settings settings, GLib.Scanner scanner);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public abstract class CellRenderer : Gtk.Object {
-		public uint editing;
-		public void get_fixed_size (int width, int height);
-		public void set_fixed_size (int width, int height);
-		public void stop_editing (bool canceled);
-		public virtual bool activate (Gdk.Event event, Gtk.Widget widget, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState flags);
-		public abstract void get_size (Gtk.Widget widget, Gdk.Rectangle? cell_area, out int x_offset, out int y_offset, out int width, out int height);
-		public abstract void render (Gdk.Window window, Gtk.Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, Gtk.CellRendererState flags);
-		public virtual weak Gtk.CellEditable start_editing (Gdk.Event event, Gtk.Widget widget, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState flags);
-		[NoAccessorMethod]
-		public string cell_background { set; }
-		[NoAccessorMethod]
-		public Gdk.Color cell_background_gdk { get; set; }
-		[NoAccessorMethod]
-		public bool cell_background_set { get; set; }
-		[NoAccessorMethod]
-		public int height { get; set; }
-		[NoAccessorMethod]
-		public bool is_expanded { get; set; }
-		[NoAccessorMethod]
-		public bool is_expander { get; set; }
-		[NoAccessorMethod]
-		public Gtk.CellRendererMode mode { get; set; }
-		[NoAccessorMethod]
-		public bool sensitive { get; set; }
-		[NoAccessorMethod]
-		public bool visible { get; set; }
-		[NoAccessorMethod]
-		public int width { get; set; }
-		[NoAccessorMethod]
-		public float xalign { get; set; }
-		[NoAccessorMethod]
-		public uint xpad { get; set; }
-		[NoAccessorMethod]
-		public float yalign { get; set; }
-		[NoAccessorMethod]
-		public uint ypad { get; set; }
-		[HasEmitter]
-		public virtual signal void editing_canceled ();
-		public virtual signal void editing_started (Gtk.CellEditable editable, string path);
+	public class RecentAction : Gtk.Action, Gtk.Buildable, Gtk.RecentChooser {
+		[CCode (type = "GtkAction*", has_construct_function = false)]
+		public RecentAction.for_manager (string name, string label, string tooltip, string stock_id, Gtk.RecentManager manager);
+		public bool get_show_numbers ();
+		[CCode (type = "GtkAction*", has_construct_function = false)]
+		public RecentAction (string name, string label, string tooltip, string stock_id);
+		public void set_show_numbers (bool show_numbers);
+		public bool show_numbers { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class CellRendererAccel : Gtk.CellRendererText {
-		public weak Gtk.Widget edit_widget;
-		public weak Gtk.Widget grab_widget;
-		public weak Gtk.Widget sizing_label;
-		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
-		public CellRendererAccel ();
-		[NoAccessorMethod]
-		public uint accel_key { get; set; }
-		[NoAccessorMethod]
-		public Gtk.CellRendererAccelMode accel_mode { get; set; }
-		[NoAccessorMethod]
-		public Gdk.ModifierType accel_mods { get; set; }
-		[NoAccessorMethod]
-		public uint keycode { get; set; }
-		public virtual signal void accel_cleared (string path_string);
-		public virtual signal void accel_edited (string path_string, uint accel_key, Gdk.ModifierType accel_mods, uint hardware_keycode);
+	public class RecentChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.RecentChooser {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public RecentChooserDialog.for_manager (string title, Gtk.Window parent, Gtk.RecentManager manager, ...);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public RecentChooserDialog (string title, Gtk.Window parent, ...);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class CellRendererCombo : Gtk.CellRendererText {
-		public uint focus_out_id;
-		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
-		public CellRendererCombo ();
-		[NoAccessorMethod]
-		public bool has_entry { get; set; }
-		[NoAccessorMethod]
-		public Gtk.TreeModel model { get; set; }
-		[NoAccessorMethod]
-		public int text_column { get; set; }
-		public virtual signal void changed (string p0, Gtk.TreeIter p1);
+	public class RecentChooserMenu : Gtk.Menu, Atk.Implementor, Gtk.Buildable, Gtk.RecentChooser {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public RecentChooserMenu.for_manager (Gtk.RecentManager manager);
+		public bool get_show_numbers ();
+		[NoWrapper]
+		public virtual void gtk_recent1 ();
+		[NoWrapper]
+		public virtual void gtk_recent2 ();
+		[NoWrapper]
+		public virtual void gtk_recent3 ();
+		[NoWrapper]
+		public virtual void gtk_recent4 ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public RecentChooserMenu ();
+		public void set_show_numbers (bool show_numbers);
+		public bool show_numbers { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class CellRendererPixbuf : Gtk.CellRenderer {
-		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
-		public CellRendererPixbuf ();
-		[NoAccessorMethod]
-		public bool follow_state { get; set; }
-		[NoAccessorMethod]
-		public string icon_name { get; set; }
-		[NoAccessorMethod]
-		public Gdk.Pixbuf pixbuf { get; set; }
-		[NoAccessorMethod]
-		public Gdk.Pixbuf pixbuf_expander_closed { get; set; }
-		[NoAccessorMethod]
-		public Gdk.Pixbuf pixbuf_expander_open { get; set; }
-		[NoAccessorMethod]
-		public string stock_detail { get; set; }
-		[NoAccessorMethod]
-		public string stock_id { get; set; }
-		[NoAccessorMethod]
-		public uint stock_size { get; set; }
+	public class RecentChooserWidget : Gtk.VBox, Atk.Implementor, Gtk.Buildable, Gtk.RecentChooser {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public RecentChooserWidget.for_manager (Gtk.RecentManager manager);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public RecentChooserWidget ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class CellRendererProgress : Gtk.CellRenderer {
-		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
-		public CellRendererProgress ();
-		[NoAccessorMethod]
-		public Gtk.ProgressBarOrientation orientation { get; set; }
-		[NoAccessorMethod]
-		public int pulse { get; set; }
-		[NoAccessorMethod]
-		public string text { get; set; }
-		[NoAccessorMethod]
-		public float text_xalign { get; set; }
-		[NoAccessorMethod]
-		public float text_yalign { get; set; }
-		[NoAccessorMethod]
-		public int value { get; set; }
+	public class RecentFilter : Gtk.Object {
+		public void add_age (int days);
+		public void add_application (string application);
+		public void add_custom (Gtk.RecentFilterFlags needed, Gtk.RecentFilterFunc func, void* data, GLib.DestroyNotify data_destroy);
+		public void add_group (string group);
+		public void add_mime_type (string mime_type);
+		public void add_pattern (string pattern);
+		public void add_pixbuf_formats ();
+		public bool filter (Gtk.RecentFilterInfo filter_info);
+		public weak string get_name ();
+		public Gtk.RecentFilterFlags get_needed ();
+		[CCode (has_construct_function = false)]
+		public RecentFilter ();
+		public void set_name (string name);
 	}
+	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class CellRendererSpin : Gtk.CellRendererText {
-		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
-		public CellRendererSpin ();
-		[NoAccessorMethod]
-		public Gtk.Adjustment adjustment { get; set; }
-		[NoAccessorMethod]
-		public double climb_rate { get; set; }
-		[NoAccessorMethod]
-		public uint digits { get; set; }
+	public class RecentFilterInfo {
+		public int age;
+		public weak string applications;
+		public Gtk.RecentFilterFlags contains;
+		public weak string display_name;
+		public weak string groups;
+		public weak string mime_type;
+		public weak string uri;
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class CellRendererText : Gtk.CellRenderer {
-		public double font_scale;
-		public weak Pango.AttrList extra_attrs;
-		public Pango.Underline underline_style;
-		public int fixed_height_rows;
-		public uint calc_fixed_height;
-		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
-		public CellRendererText ();
-		public void set_fixed_height_from_font (int number_of_rows);
+	[Compact]
+	[CCode (ref_function = "gtk_recent_info_ref", unref_function = "gtk_recent_info_unref", cheader_filename = "gtk/gtk.h")]
+	public class RecentInfo {
+		public bool exists ();
+		public ulong get_added ();
+		public int get_age ();
+		public bool get_application_info (string app_name, string app_exec, uint count, ulong time_);
+		public weak string get_applications (ulong length);
+		public weak string get_description ();
+		public weak string get_display_name ();
+		public weak string get_groups (ulong length);
+		public weak Gdk.Pixbuf get_icon (int size);
+		public weak string get_mime_type ();
+		public ulong get_modified ();
+		public bool get_private_hint ();
+		public weak string get_short_name ();
+		public weak string get_uri ();
+		public weak string get_uri_display ();
+		public ulong get_visited ();
+		public bool has_application (string app_name);
+		public bool has_group (string group_name);
+		public bool is_local ();
+		public weak string last_application ();
+		public bool match (Gtk.RecentInfo info_b);
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class RecentManager : GLib.Object {
+		public bool add_full (string uri, Gtk.RecentData recent_data);
+		public bool add_item (string uri);
+		public static GLib.Quark error_quark ();
+		public static weak Gtk.RecentManager get_default ();
+		public weak GLib.List get_items ();
+		public int get_limit ();
+		public bool has_item (string uri);
+		public weak Gtk.RecentInfo lookup_item (string uri) throws GLib.Error;
+		public bool move_item (string uri, string new_uri) throws GLib.Error;
+		[CCode (has_construct_function = false)]
+		public RecentManager ();
+		public int purge_items () throws GLib.Error;
+		public bool remove_item (string uri) throws GLib.Error;
+		public void set_limit (int limit);
 		[NoAccessorMethod]
-		public bool align_set { get; set; }
+		public string filename { get; construct; }
+		public int limit { get; set; }
 		[NoAccessorMethod]
-		public Pango.Alignment alignment { get; set; }
+		public int size { get; }
+		public virtual signal void changed ();
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Ruler : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
+		public weak Gdk.Pixmap backing_store;
+		public weak Gdk.GC non_gr_exp_gc;
+		public int slider_size;
+		public int xsrc;
+		public int ysrc;
+		public virtual void draw_pos ();
+		public virtual void draw_ticks ();
+		public Gtk.MetricType get_metric ();
+		public void get_range (double lower, double upper, double position, double max_size);
+		public void set_metric (Gtk.MetricType metric);
+		public void set_range (double lower, double upper, double position, double max_size);
 		[NoAccessorMethod]
-		public Pango.AttrList attributes { get; set; }
+		public double lower { get; set; }
 		[NoAccessorMethod]
-		public string background { set; }
+		public double max_size { get; set; }
+		public Gtk.MetricType metric { get; set; }
 		[NoAccessorMethod]
-		public Gdk.Color background_gdk { get; set; }
+		public double position { get; set; }
 		[NoAccessorMethod]
-		public bool background_set { get; set; }
+		public double upper { get; set; }
+	}
+	[Compact]
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class RulerMetric {
+		public weak string abbrev;
+		public weak string metric_name;
+		public double pixels_per_unit;
+		[NoArrayLength]
+		public weak double[] ruler_scale;
+		[NoArrayLength]
+		public weak int[] subdivide;
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Scale : Gtk.Range, Atk.Implementor, Gtk.Buildable {
+		public int get_digits ();
+		public bool get_draw_value ();
+		public weak Pango.Layout get_layout ();
+		public virtual void get_layout_offsets (int x, int y);
+		public Gtk.PositionType get_value_pos ();
+		public void set_digits (int digits);
+		public void set_draw_value (bool draw_value);
+		public void set_value_pos (Gtk.PositionType pos);
+		public int digits { get; set; }
+		public bool draw_value { get; set; }
+		public Gtk.PositionType value_pos { get; set; }
+		public virtual signal weak string format_value (double value);
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class ScaleButton : Gtk.Button, Atk.Implementor, Gtk.Buildable {
+		public weak Gtk.Widget minus_button;
+		public weak Gtk.Widget plus_button;
+		public weak Gtk.Adjustment get_adjustment ();
+		public double get_value ();
+		[NoArrayLength]
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public ScaleButton (Gtk.IconSize size, double min, double max, double step, string[] icons);
+		public void set_adjustment (Gtk.Adjustment adjustment);
+		[NoArrayLength]
+		public void set_icons (string[] icons);
+		public void set_value (double value);
+		public Gtk.Adjustment adjustment { get; set; }
 		[NoAccessorMethod]
-		public bool editable { get; set; }
+		public string[] icons { get; set; }
 		[NoAccessorMethod]
-		public bool editable_set { get; set; }
+		public Gtk.IconSize size { get; set; }
+		public double value { get; set; }
+		public virtual signal void popdown ();
+		public virtual signal void popup ();
+		public virtual signal void value_changed (double value);
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Scrollbar : Gtk.Range, Atk.Implementor, Gtk.Buildable {
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class ScrolledWindow : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
+		public uint focus_out;
+		public weak Gtk.Widget hscrollbar;
+		public uint hscrollbar_visible;
+		public weak Gtk.Widget vscrollbar;
+		public uint vscrollbar_visible;
+		public void add_with_viewport (Gtk.Widget child);
+		public weak Gtk.Adjustment get_hadjustment ();
+		public weak Gtk.Widget get_hscrollbar ();
+		public Gtk.CornerType get_placement ();
+		public void get_policy (Gtk.PolicyType hscrollbar_policy, Gtk.PolicyType vscrollbar_policy);
+		public Gtk.ShadowType get_shadow_type ();
+		public weak Gtk.Adjustment get_vadjustment ();
+		public weak Gtk.Widget get_vscrollbar ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public ScrolledWindow (Gtk.Adjustment? hadjustment, Gtk.Adjustment? vadjustment);
+		public void set_hadjustment (Gtk.Adjustment hadjustment);
+		public void set_placement (Gtk.CornerType window_placement);
+		public void set_policy (Gtk.PolicyType hscrollbar_policy, Gtk.PolicyType vscrollbar_policy);
+		public void set_shadow_type (Gtk.ShadowType type);
+		public void set_vadjustment (Gtk.Adjustment vadjustment);
+		public void unset_placement ();
+		public Gtk.Adjustment hadjustment { get; set construct; }
 		[NoAccessorMethod]
-		public Pango.EllipsizeMode ellipsize { get; set; }
+		public Gtk.PolicyType hscrollbar_policy { get; set; }
+		public Gtk.ShadowType shadow_type { get; set; }
+		public Gtk.Adjustment vadjustment { get; set construct; }
 		[NoAccessorMethod]
-		public bool ellipsize_set { get; set; }
+		public Gtk.PolicyType vscrollbar_policy { get; set; }
 		[NoAccessorMethod]
-		public string family { get; set; }
+		public Gtk.CornerType window_placement { get; set; }
 		[NoAccessorMethod]
-		public bool family_set { get; set; }
+		public bool window_placement_set { get; set; }
+		public virtual signal void move_focus_out (Gtk.DirectionType direction);
+		public virtual signal bool scroll_child (Gtk.ScrollType scroll, bool horizontal);
+	}
+	[Compact]
+	[CCode (copy_function = "gtk_selection_data_copy", cheader_filename = "gtk/gtk.h")]
+	public class SelectionData {
+		[NoArrayLength]
+		public weak uchar[] data;
+		public weak Gdk.Display display;
+		public int format;
+		public int length;
+		public Gdk.Atom selection;
+		public Gdk.Atom target;
+		public Gdk.Atom type;
+		public Gtk.SelectionData copy ();
+		public Gdk.Pixbuf? get_pixbuf ();
+		public bool get_targets (out Gdk.Atom targets, int n_atoms);
+		public string? get_text ();
+		[NoArrayLength]
+		public string[] get_uris ();
+		public void set (Gdk.Atom type, int format, uchar[] data);
+		public bool set_pixbuf (Gdk.Pixbuf pixbuf);
+		public bool set_text (string str, int len);
+		public bool set_uris (string uris);
+		public bool targets_include_image (bool writable);
+		public bool targets_include_rich_text (Gtk.TextBuffer buffer);
+		public bool targets_include_text ();
+		public bool targets_include_uri ();
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Separator : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class SeparatorMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public SeparatorMenuItem ();
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class SeparatorToolItem : Gtk.ToolItem, Atk.Implementor, Gtk.Buildable {
+		public bool get_draw ();
+		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		public SeparatorToolItem ();
+		public void set_draw (bool draw);
+		public bool draw { get; set; }
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Settings : GLib.Object {
+		public weak Gtk.SettingsPropertyValue property_values;
+		public weak Gtk.RcContext rc_context;
+		public weak Gdk.Screen screen;
+		public static weak Gtk.Settings get_default ();
+		public static weak Gtk.Settings get_for_screen (Gdk.Screen screen);
+		public static void install_property (GLib.ParamSpec pspec);
+		public static void install_property_parser (GLib.ParamSpec pspec, Gtk.RcPropertyParser parser);
+		public void set_double_property (string name, double v_double, string origin);
+		public void set_long_property (string name, long v_long, string origin);
+		public void set_property_value (string name, Gtk.SettingsValue svalue);
+		public void set_string_property (string name, string v_string, string origin);
 		[NoAccessorMethod]
-		public string font { get; set; }
+		public GLib.HashTable color_hash { get; }
 		[NoAccessorMethod]
-		public Pango.FontDescription font_desc { get; set; }
+		public bool gtk_alternative_button_order { get; set; }
 		[NoAccessorMethod]
-		public string foreground { set; }
+		public bool gtk_alternative_sort_arrows { get; set; }
 		[NoAccessorMethod]
-		public Gdk.Color foreground_gdk { get; set; }
+		public string gtk_color_scheme { get; set; }
 		[NoAccessorMethod]
-		public bool foreground_set { get; set; }
+		public bool gtk_cursor_blink { get; set; }
 		[NoAccessorMethod]
-		public string language { get; set; }
+		public int gtk_cursor_blink_time { get; set; }
 		[NoAccessorMethod]
-		public bool language_set { get; set; }
+		public int gtk_cursor_blink_timeout { get; set; }
 		[NoAccessorMethod]
-		public string markup { set; }
+		public string gtk_cursor_theme_name { get; set; }
 		[NoAccessorMethod]
-		public int rise { get; set; }
+		public int gtk_cursor_theme_size { get; set; }
 		[NoAccessorMethod]
-		public bool rise_set { get; set; }
+		public int gtk_dnd_drag_threshold { get; set; }
 		[NoAccessorMethod]
-		public double scale { get; set; }
+		public int gtk_double_click_distance { get; set; }
 		[NoAccessorMethod]
-		public bool scale_set { get; set; }
+		public int gtk_double_click_time { get; set; }
 		[NoAccessorMethod]
-		public bool single_paragraph_mode { get; set; }
+		public bool gtk_enable_accels { get; set; }
 		[NoAccessorMethod]
-		public int size { get; set; }
+		public bool gtk_enable_animations { get; set; }
 		[NoAccessorMethod]
-		public double size_points { get; set; }
+		public bool gtk_enable_mnemonics { get; set; }
 		[NoAccessorMethod]
-		public bool size_set { get; set; }
+		public bool gtk_error_bell { get; set; }
 		[NoAccessorMethod]
-		public Pango.Stretch stretch { get; set; }
+		public string gtk_fallback_icon_theme { get; set; }
 		[NoAccessorMethod]
-		public bool stretch_set { get; set; }
+		public string gtk_file_chooser_backend { get; set; }
 		[NoAccessorMethod]
-		public bool strikethrough { get; set; }
+		public string gtk_font_name { get; set; }
 		[NoAccessorMethod]
-		public bool strikethrough_set { get; set; }
+		public int gtk_fontconfig_timestamp { get; set; }
 		[NoAccessorMethod]
-		public Pango.Style style { get; set; }
+		public string gtk_icon_sizes { get; set; }
 		[NoAccessorMethod]
-		public bool style_set { get; set; }
+		public string gtk_icon_theme_name { get; set; }
 		[NoAccessorMethod]
-		public string text { get; set; }
+		public string gtk_im_module { get; set; }
 		[NoAccessorMethod]
-		public Pango.Underline underline { get; set; }
+		public string gtk_key_theme_name { get; set; }
 		[NoAccessorMethod]
-		public bool underline_set { get; set; }
+		public bool gtk_keynav_cursor_only { get; set; }
 		[NoAccessorMethod]
-		public Pango.Variant variant { get; set; }
+		public bool gtk_keynav_wrap_around { get; set; }
 		[NoAccessorMethod]
-		public bool variant_set { get; set; }
+		public string gtk_menu_bar_accel { get; set; }
 		[NoAccessorMethod]
-		public int weight { get; set; }
+		public string gtk_modules { get; set; }
 		[NoAccessorMethod]
-		public bool weight_set { get; set; }
+		public string gtk_print_backends { get; set; }
 		[NoAccessorMethod]
-		public int width_chars { get; set; }
+		public string gtk_print_preview_command { get; set; }
 		[NoAccessorMethod]
-		public Pango.WrapMode wrap_mode { get; set; }
+		public int gtk_recent_files_limit { get; set; }
 		[NoAccessorMethod]
-		public int wrap_width { get; set; }
-		public virtual signal void edited (string path, string new_text);
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class CellRendererToggle : Gtk.CellRenderer {
-		public bool get_active ();
-		public bool get_radio ();
-		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
-		public CellRendererToggle ();
-		public void set_active (bool setting);
-		public void set_radio (bool radio);
+		public int gtk_recent_files_max_age { get; set; }
 		[NoAccessorMethod]
-		public bool activatable { get; set; }
-		public bool active { get; set; }
+		public bool gtk_show_input_method_menu { get; set; }
 		[NoAccessorMethod]
-		public bool inconsistent { get; set; }
+		public bool gtk_show_unicode_menu { get; set; }
 		[NoAccessorMethod]
-		public int indicator_size { get; set; }
-		public bool radio { get; set; }
-		public virtual signal void toggled (string path);
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class CellView : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout {
-		public weak GLib.List get_cell_renderers ();
-		public weak Gtk.TreePath get_displayed_row ();
-		public bool get_size_of_row (Gtk.TreePath path, out Gtk.Requisition requisition);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public CellView ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public CellView.with_markup (string markup);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public CellView.with_pixbuf (Gdk.Pixbuf pixbuf);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public CellView.with_text (string text);
-		public void set_background_color (Gdk.Color color);
-		public void set_displayed_row (Gtk.TreePath path);
-		public void set_model (Gtk.TreeModel? model);
+		public bool gtk_split_cursor { get; set; }
 		[NoAccessorMethod]
-		public string background { set; }
+		public string gtk_theme_name { get; set; }
 		[NoAccessorMethod]
-		public Gdk.Color background_gdk { get; set; }
+		public int gtk_timeout_expand { get; set; }
 		[NoAccessorMethod]
-		public bool background_set { get; set; }
+		public int gtk_timeout_initial { get; set; }
 		[NoAccessorMethod]
-		public Gtk.TreeModel model { get; set; }
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class CheckButton : Gtk.ToggleButton, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public CheckButton ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public CheckButton.with_label (string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public CheckButton.with_mnemonic (string label);
-		[NoWrapper]
-		public virtual void draw_indicator (Gdk.Rectangle area);
+		public int gtk_timeout_repeat { get; set; }
+		[NoAccessorMethod]
+		public int gtk_tooltip_browse_mode_timeout { get; set; }
+		[NoAccessorMethod]
+		public int gtk_tooltip_browse_timeout { get; set; }
+		[NoAccessorMethod]
+		public int gtk_tooltip_timeout { get; set; }
+		[NoAccessorMethod]
+		public bool gtk_touchscreen_mode { get; set; }
+		[NoAccessorMethod]
+		public int gtk_xft_antialias { get; set; }
+		[NoAccessorMethod]
+		public int gtk_xft_dpi { get; set; }
+		[NoAccessorMethod]
+		public int gtk_xft_hinting { get; set; }
+		[NoAccessorMethod]
+		public string gtk_xft_hintstyle { get; set; }
+		[NoAccessorMethod]
+		public string gtk_xft_rgba { get; set; }
 	}
+	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class CheckMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable {
-		public uint always_show_toggle;
-		public bool get_active ();
-		public bool get_draw_as_radio ();
-		public bool get_inconsistent ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public CheckMenuItem ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public CheckMenuItem.with_label (string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public CheckMenuItem.with_mnemonic (string label);
-		public void set_active (bool is_active);
-		public void set_draw_as_radio (bool draw_as_radio);
-		public void set_inconsistent (bool setting);
-		[NoWrapper]
-		public virtual void draw_indicator (Gdk.Rectangle area);
-		public bool active { get; set; }
-		public bool draw_as_radio { get; set; }
-		public bool inconsistent { get; set; }
-		[HasEmitter]
-		public virtual signal void toggled ();
+	public class SettingsPropertyValue {
 	}
+	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Clipboard : GLib.Object {
-		public void clear ();
-		public static weak Gtk.Clipboard get (Gdk.Atom selection);
-		public weak Gdk.Display get_display ();
-		public static weak Gtk.Clipboard get_for_display (Gdk.Display display, Gdk.Atom selection);
-		public weak GLib.Object get_owner ();
-		public void request_contents (Gdk.Atom target, Gtk.ClipboardReceivedFunc callback);
-		public void request_image (Gtk.ClipboardImageReceivedFunc callback);
-		public void request_rich_text (Gtk.TextBuffer buffer, Gtk.ClipboardRichTextReceivedFunc callback);
-		public void request_targets (Gtk.ClipboardTargetsReceivedFunc callback);
-		public void request_text (Gtk.ClipboardTextReceivedFunc callback);
-		public void set_can_store (Gtk.TargetEntry[] targets);
-		public void set_image (Gdk.Pixbuf pixbuf);
-		public void set_text (string text, int len);
-		public bool set_with_data (Gtk.TargetEntry[] targets, Gtk.ClipboardGetFunc get_func, Gtk.ClipboardClearFunc clear_func);
-		public bool set_with_owner (Gtk.TargetEntry[] targets, Gtk.ClipboardGetFunc get_func, Gtk.ClipboardClearFunc clear_func, GLib.Object owner);
-		public void store ();
-		public weak Gtk.SelectionData wait_for_contents (Gdk.Atom target);
-		public weak Gdk.Pixbuf wait_for_image ();
-		public uchar wait_for_rich_text (Gtk.TextBuffer buffer, out Gdk.Atom format, ulong length);
-		public bool wait_for_targets (Gdk.Atom[] targets);
-		public weak string wait_for_text ();
-		public bool wait_is_image_available ();
-		public bool wait_is_rich_text_available (Gtk.TextBuffer buffer);
-		public bool wait_is_target_available (Gdk.Atom target);
-		public bool wait_is_text_available ();
-		public virtual signal void owner_change (Gdk.Event p0);
+	public class SettingsValue {
+		public weak string origin;
+		public GLib.Value value;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ColorButton : Gtk.Button, Atk.Implementor, Gtk.Buildable {
-		public ushort get_alpha ();
-		public void get_color (out Gdk.Color color);
-		public weak string get_title ();
-		public bool get_use_alpha ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public ColorButton ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public ColorButton.with_color (Gdk.Color color);
-		public void set_alpha (ushort alpha);
-		public void set_color (Gdk.Color color);
-		public void set_title (string title);
-		public void set_use_alpha (bool use_alpha);
-		public uint alpha { get; set; }
-		public Gdk.Color color { get; set; }
-		public string title { get; set; }
-		public bool use_alpha { get; set; }
-		public virtual signal void color_set ();
+	public class SizeGroup : GLib.Object, Gtk.Buildable {
+		public uint have_height;
+		public uint have_width;
+		public Gtk.Requisition requisition;
+		public weak GLib.SList widgets;
+		public void add_widget (Gtk.Widget widget);
+		public bool get_ignore_hidden ();
+		public Gtk.SizeGroupMode get_mode ();
+		public weak GLib.SList get_widgets ();
+		[CCode (has_construct_function = false)]
+		public SizeGroup (Gtk.SizeGroupMode mode);
+		public void remove_widget (Gtk.Widget widget);
+		public void set_ignore_hidden (bool ignore_hidden);
+		public void set_mode (Gtk.SizeGroupMode mode);
+		public bool ignore_hidden { get; set; }
+		public Gtk.SizeGroupMode mode { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ColorSelection : Gtk.VBox, Atk.Implementor, Gtk.Buildable {
-		public ushort get_current_alpha ();
-		public void get_current_color (out Gdk.Color color);
-		public bool get_has_opacity_control ();
-		public bool get_has_palette ();
-		public ushort get_previous_alpha ();
-		public void get_previous_color (out Gdk.Color color);
-		public bool is_adjusting ();
+	public class Socket : Gtk.Container, Atk.Implementor, Gtk.Buildable {
+		public weak Gtk.AccelGroup accel_group;
+		public uint active;
+		public ushort current_height;
+		public ushort current_width;
+		public uint focus_in;
+		public uint have_size;
+		public uint is_mapped;
+		public uint need_map;
+		public weak Gtk.Widget plug_widget;
+		public weak Gdk.Window plug_window;
+		public ushort request_height;
+		public ushort request_width;
+		public uint same_app;
+		public weak Gtk.Widget toplevel;
+		public short xembed_version;
+		public void add_id (Gdk.NativeWindow window_id);
+		public Gdk.NativeWindow get_id ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public ColorSelection ();
-		public static bool palette_from_string (string str, Gdk.Color[] colors);
-		public static weak string palette_to_string (Gdk.Color[] colors);
-		public static weak Gtk.ColorSelectionChangePaletteWithScreenFunc set_change_palette_with_screen_hook (Gtk.ColorSelectionChangePaletteWithScreenFunc func);
-		public void set_current_alpha (ushort alpha);
-		public void set_current_color (Gdk.Color color);
-		public void set_has_opacity_control (bool has_opacity);
-		public void set_has_palette (bool has_palette);
-		public void set_previous_alpha (ushort alpha);
-		public void set_previous_color (Gdk.Color color);
-		public uint current_alpha { get; set; }
-		public Gdk.Color current_color { get; set; }
-		public bool has_opacity_control { get; set; }
-		public bool has_palette { get; set; }
-		public virtual signal void color_changed ();
+		public Socket ();
+		public virtual signal void plug_added ();
+		public virtual signal bool plug_removed ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ColorSelectionDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		public weak Gtk.Widget colorsel;
-		public weak Gtk.Widget ok_button;
-		public weak Gtk.Widget cancel_button;
-		public weak Gtk.Widget help_button;
+	public class SpinButton : Gtk.Entry, Atk.Implementor, Gtk.Buildable, Gtk.CellEditable, Gtk.Editable {
+		public uint button;
+		public uint click_child;
+		public uint in_child;
+		public uint need_timer;
+		public weak Gdk.Window panel;
+		public uint timer;
+		public uint timer_calls;
+		public double timer_step;
+		public void configure (Gtk.Adjustment adjustment, double climb_rate, uint digits);
+		public weak Gtk.Adjustment get_adjustment ();
+		public uint get_digits ();
+		public void get_increments (double step, double page);
+		public bool get_numeric ();
+		public void get_range (out double min, out double max);
+		public bool get_snap_to_ticks ();
+		public Gtk.SpinButtonUpdatePolicy get_update_policy ();
+		public double get_value ();
+		public int get_value_as_int ();
+		public bool get_wrap ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public ColorSelectionDialog (string title);
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ComboBox : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.CellEditable, Gtk.CellLayout {
-		public void append_text (string text);
-		public int get_active ();
-		public bool get_active_iter (out Gtk.TreeIter iter);
-		public bool get_add_tearoffs ();
-		public int get_column_span_column ();
-		public bool get_focus_on_click ();
-		public weak Gtk.TreeModel get_model ();
-		public weak Atk.Object get_popup_accessible ();
-		public weak Gtk.TreeViewRowSeparatorFunc get_row_separator_func ();
-		public int get_row_span_column ();
-		public weak string get_title ();
-		public int get_wrap_width ();
-		public void insert_text (int position, string text);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public ComboBox ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public ComboBox.text ();
+		public SpinButton (Gtk.Adjustment adjustment, double climb_rate, uint digits);
+		public void set_adjustment (Gtk.Adjustment adjustment);
+		public void set_digits (uint digits);
+		public void set_increments (double step, double page);
+		public void set_numeric (bool numeric);
+		public void set_range (double min, double max);
+		public void set_snap_to_ticks (bool snap_to_ticks);
+		public void set_update_policy (Gtk.SpinButtonUpdatePolicy policy);
+		public void set_value (double value);
+		public void set_wrap (bool wrap);
+		public void spin (Gtk.SpinType direction, double increment);
+		public void update ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public ComboBox.with_model (Gtk.TreeModel model);
-		public void prepend_text (string text);
-		public void remove_text (int position);
-		public void set_active (int index_);
-		public void set_active_iter (Gtk.TreeIter iter);
-		public void set_add_tearoffs (bool add_tearoffs);
-		public void set_column_span_column (int column_span);
-		public void set_focus_on_click (bool focus_on_click);
-		public void set_model (Gtk.TreeModel? model);
-		public void set_row_separator_func (Gtk.TreeViewRowSeparatorFunc func, void* data, Gtk.DestroyNotify destroy);
-		public void set_row_span_column (int row_span);
-		public void set_title (string title);
-		public void set_wrap_width (int width);
-		public virtual weak string get_active_text ();
-		public int active { get; set; }
-		public bool add_tearoffs { get; set; }
-		public int column_span_column { get; set; }
-		public bool focus_on_click { get; set; }
-		[NoAccessorMethod]
-		public bool has_frame { get; set; }
-		public Gtk.TreeModel model { get; set; }
-		[NoAccessorMethod]
-		public bool popup_shown { get; }
-		public int row_span_column { get; set; }
+		public SpinButton.with_range (double min, double max, double step);
+		public Gtk.Adjustment adjustment { get; set; }
 		[NoAccessorMethod]
-		public string tearoff_title { get; set; }
-		public int wrap_width { get; set; }
-		public virtual signal void changed ();
-		public virtual signal void move_active (Gtk.ScrollType p0);
-		[HasEmitter]
-		public virtual signal bool popdown ();
-		[HasEmitter]
-		public virtual signal void popup ();
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ComboBoxEntry : Gtk.ComboBox, Atk.Implementor, Gtk.Buildable, Gtk.CellEditable, Gtk.CellLayout {
-		public int get_text_column ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public ComboBoxEntry ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public ComboBoxEntry.text ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public ComboBoxEntry.with_model (Gtk.TreeModel model, int text_column);
-		public void set_text_column (int text_column);
-		public int text_column { get; set; }
+		public double climb_rate { get; set; }
+		public uint digits { get; set; }
+		public bool numeric { get; set; }
+		public bool snap_to_ticks { get; set; }
+		public Gtk.SpinButtonUpdatePolicy update_policy { get; set; }
+		public double value { get; set; }
+		public bool wrap { get; set; }
+		public virtual signal void change_value (Gtk.ScrollType scroll);
+		public virtual signal int input (void* new_value);
+		public virtual signal bool output ();
+		public virtual signal void value_changed ();
+		public virtual signal void wrapped ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Container : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
-		public weak Gtk.Widget focus_child;
-		public uint need_resize;
-		public uint reallocate_redraws;
-		public uint has_focus_chain;
-		public void add_with_properties (Gtk.Widget widget, ...);
-		public void child_get (Gtk.Widget child, ...);
-		public void child_get_property (Gtk.Widget child, string property_name, GLib.Value value);
-		public void child_get_valist (Gtk.Widget child, string first_property_name, void* var_args);
-		public void child_set (Gtk.Widget child, ...);
-		public void child_set_property (Gtk.Widget child, string property_name, GLib.Value value);
-		public void child_set_valist (Gtk.Widget child, string first_property_name, void* var_args);
-		public static weak GLib.ParamSpec class_find_child_property (GLib.ObjectClass cclass, string property_name);
-		[CCode (cname = "gtk_container_class_install_child_property")]
-		public class void install_child_property (uint property_id, GLib.ParamSpec pspec);
-		public static weak GLib.ParamSpec class_list_child_properties (GLib.ObjectClass cclass, uint n_properties);
-		public void @foreach (Gtk.Callback callback);
-		public uint get_border_width ();
-		public weak GLib.List<Gtk.Widget> get_children ();
-		public bool get_focus_chain (GLib.List focusable_widgets);
-		public weak Gtk.Adjustment get_focus_hadjustment ();
-		public weak Gtk.Adjustment get_focus_vadjustment ();
-		public Gtk.ResizeMode get_resize_mode ();
-		public void propagate_expose (Gtk.Widget child, Gdk.EventExpose event);
-		public void resize_children ();
-		public void set_border_width (uint border_width);
-		public void set_focus_chain (GLib.List focusable_widgets);
-		public void set_focus_hadjustment (Gtk.Adjustment adjustment);
-		public void set_focus_vadjustment (Gtk.Adjustment adjustment);
-		public void set_reallocate_redraws (bool needs_redraws);
-		public void set_resize_mode (Gtk.ResizeMode resize_mode);
-		public void unset_focus_chain ();
-		public virtual GLib.Type child_type ();
-		[NoWrapper]
-		public virtual weak string composite_name (Gtk.Widget child);
-		public virtual void forall (Gtk.Callback callback, void* callback_data);
-		[NoWrapper]
-		public virtual void get_child_property (Gtk.Widget child, uint property_id, GLib.Value value, GLib.ParamSpec pspec);
-		[NoWrapper]
-		public virtual void set_child_property (Gtk.Widget child, uint property_id, GLib.Value value, GLib.ParamSpec pspec);
-		public uint border_width { get; set; }
+	public class StatusIcon : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public StatusIcon.from_file (string filename);
+		[CCode (has_construct_function = false)]
+		public StatusIcon.from_icon_name (string icon_name);
+		[CCode (has_construct_function = false)]
+		public StatusIcon.from_pixbuf (Gdk.Pixbuf pixbuf);
+		[CCode (has_construct_function = false)]
+		public StatusIcon.from_stock (string stock_id);
+		public bool get_blinking ();
+		public bool get_geometry (out weak Gdk.Screen screen, out Gdk.Rectangle area, out Gtk.Orientation orientation);
+		public weak string get_icon_name ();
+		public weak Gdk.Pixbuf get_pixbuf ();
+		public weak Gdk.Screen get_screen ();
+		public int get_size ();
+		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 ();
+		[CCode (has_construct_function = false)]
+		public StatusIcon ();
+		public static void position_menu (Gtk.Menu menu, int x, int y, bool push_in);
+		public void set_blinking (bool blinking);
+		public void set_from_file (string filename);
+		public void set_from_icon_name (string icon_name);
+		public void set_from_pixbuf (Gdk.Pixbuf pixbuf);
+		public void set_from_stock (string stock_id);
+		public void set_screen (Gdk.Screen screen);
+		public void set_tooltip (string tooltip_text);
+		public void set_visible (bool visible);
+		public bool blinking { get; set; }
 		[NoAccessorMethod]
-		public Gtk.Widget child { set; }
-		public Gtk.ResizeMode resize_mode { get; set; }
-		[HasEmitter]
-		public virtual signal void add (Gtk.Widget widget);
-		[HasEmitter]
-		public virtual signal void check_resize ();
-		[HasEmitter]
-		public virtual signal void remove (Gtk.Widget widget);
-		[HasEmitter]
-		public virtual signal void set_focus_child (Gtk.Widget widget);
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Curve : Gtk.DrawingArea, Atk.Implementor, Gtk.Buildable {
-		public int cursor_type;
-		public weak Gdk.Pixmap pixmap;
-		public int height;
-		public int grab_point;
-		public int last;
-		public int num_points;
-		public Gdk.Point point;
-		public int num_ctlpoints;
-		[NoArrayLength]
-		public weak float[] ctlpoint;
-		public void get_vector (int veclen, float[] vector);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Curve ();
-		public void reset ();
-		public void set_curve_type (Gtk.CurveType type);
-		public void set_gamma (float gamma_);
-		public void set_range (float min_x, float max_x, float min_y, float max_y);
-		public void set_vector (int veclen, float[] vector);
+		public bool embedded { get; }
 		[NoAccessorMethod]
-		public Gtk.CurveType curve_type { get; set; }
+		public string file { set; }
 		[NoAccessorMethod]
-		public float max_x { get; set; }
+		public string icon_name { get; set; }
 		[NoAccessorMethod]
-		public float max_y { get; set; }
+		public Gtk.Orientation orientation { get; }
 		[NoAccessorMethod]
-		public float min_x { get; set; }
+		public Gdk.Pixbuf pixbuf { get; set; }
+		public Gdk.Screen screen { get; set; }
+		public int size { get; }
 		[NoAccessorMethod]
-		public float min_y { get; set; }
-		public virtual signal void curve_type_changed ();
+		public string stock { get; set; }
+		public Gtk.ImageType storage_type { get; }
+		public bool visible { get; set; }
+		public virtual signal void activate ();
+		public virtual signal void popup_menu (uint button, uint activate_time);
+		public virtual signal bool size_changed (int size);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Dialog : Gtk.Window, Atk.Implementor, Gtk.Buildable {
-		public weak Gtk.VBox vbox;
-		public weak Gtk.HButtonBox action_area;
-		public weak Gtk.Widget separator;
-		public void add_action_widget (Gtk.Widget child, int response_id);
-		public weak Gtk.Widget add_button (string button_text, int response_id);
-		public void add_buttons (...);
-		public bool get_has_separator ();
-		public int get_response_for_widget (Gtk.Widget widget);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Dialog ();
+	public class Statusbar : Gtk.HBox, Atk.Implementor, Gtk.Buildable {
+		public weak Gtk.Widget frame;
+		public weak Gdk.Window grip_window;
+		public weak GLib.SList keys;
+		public weak Gtk.Widget label;
+		public weak GLib.SList messages;
+		public uint seq_context_id;
+		public uint seq_message_id;
+		public uint get_context_id (string context_description);
+		public bool get_has_resize_grip ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Dialog.with_buttons (string? title, Gtk.Window? parent, Gtk.DialogFlags flags, ...);
-		public int run ();
-		[CCode (sentinel = "-1")]
-		public void set_alternative_button_order (...);
-		public void set_alternative_button_order_from_array (int n_params, int new_order);
-		public void set_default_response (int response_id);
-		public void set_has_separator (bool setting);
-		public void set_response_sensitive (int response_id, bool setting);
-		public bool has_separator { get; set; }
-		public virtual signal void close ();
-		[HasEmitter]
-		public virtual signal void response (int response_id);
+		public Statusbar ();
+		public void pop (uint context_id);
+		public uint push (uint context_id, string text);
+		public void remove (uint context_id, uint message_id);
+		public void set_has_resize_grip (bool setting);
+		public bool has_resize_grip { get; set; }
+		public virtual signal void text_popped (uint context_id, string text);
+		public virtual signal void text_pushed (uint context_id, string text);
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class DrawingArea : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
-		public void* draw_data;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public DrawingArea ();
+	[Compact]
+	[CCode (copy_function = "gtk_stock_item_copy", cheader_filename = "gtk/gtk.h")]
+	public class StockItem {
+		public uint keyval;
+		public weak string label;
+		public Gdk.ModifierType modifier;
+		public weak string stock_id;
+		public weak string translation_domain;
+		public weak Gtk.StockItem copy ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Entry : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.CellEditable, Gtk.Editable {
-		public uint visible;
-		public uint overwrite_mode;
-		public uint in_drag;
-		public ushort text_length;
-		public ushort text_max_length;
-		public weak Gdk.Window text_area;
-		public weak Gtk.IMContext im_context;
-		public weak Gtk.Widget popup_menu;
-		public int current_pos;
-		public weak Pango.Layout cached_layout;
-		public uint cache_includes_preedit;
-		public uint need_im_reset;
-		public uint cursor_visible;
-		public uint in_click;
-		public uint is_cell_renderer;
-		public uint editing_canceled;
-		public uint mouse_cursor_obscured;
-		public uint select_words;
-		public uint select_lines;
-		public uint resolved_dir;
-		public uint button;
-		public uint blink_timeout;
-		public uint recompute_idle;
-		public int ascent;
-		public int descent;
-		public ushort text_size;
-		public ushort n_bytes;
-		public ushort preedit_length;
-		public ushort preedit_cursor;
-		public int dnd_position;
-		public int drag_start_x;
-		public int drag_start_y;
-		public bool get_activates_default ();
-		public float get_alignment ();
-		public weak Gtk.EntryCompletion get_completion ();
-		public weak Gtk.Adjustment get_cursor_hadjustment ();
-		public bool get_has_frame ();
-		public Gtk.Border get_inner_border ();
-		public unichar get_invisible_char ();
-		public weak Pango.Layout get_layout ();
-		public void get_layout_offsets (int x, int y);
-		public int get_max_length ();
-		public weak string get_text ();
-		public bool get_visibility ();
-		public int get_width_chars ();
-		public int layout_index_to_text_index (int layout_index);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Entry ();
-		public void set_activates_default (bool setting);
-		public void set_alignment (float xalign);
-		public void set_completion (Gtk.EntryCompletion completion);
-		public void set_cursor_hadjustment (Gtk.Adjustment adjustment);
-		public void set_has_frame (bool setting);
-		public void set_inner_border (Gtk.Border border);
-		public void set_invisible_char (unichar ch);
-		public void set_max_length (int max);
-		public void set_text (string text);
-		public void set_visibility (bool visible);
-		public void set_width_chars (int n_chars);
-		public int text_index_to_layout_index (int text_index);
+	public class Style : GLib.Object {
+		public int attach_count;
+		[NoArrayLength]
+		public Gdk.Color[] @base;
+		[NoArrayLength]
+		public Gdk.GC[] base_gc;
+		[NoArrayLength]
+		public Gdk.Color[] bg;
+		[NoArrayLength]
+		public Gdk.GC[] bg_gc;
+		[NoArrayLength]
+		public Gdk.Pixmap[] bg_pixmap;
+		public Gdk.Color black;
+		public weak Gdk.GC black_gc;
+		public weak Gdk.Colormap colormap;
+		[NoArrayLength]
+		public Gdk.Color[] dark;
+		[NoArrayLength]
+		public Gdk.GC[] dark_gc;
+		public int depth;
+		[NoArrayLength]
+		public Gdk.Color[] fg;
+		[NoArrayLength]
+		public Gdk.GC[] fg_gc;
+		public weak Pango.FontDescription font_desc;
+		public weak GLib.SList icon_factories;
+		[NoArrayLength]
+		public Gdk.Color[] light;
+		[NoArrayLength]
+		public Gdk.GC[] light_gc;
+		[NoArrayLength]
+		public Gdk.Color[] mid;
+		[NoArrayLength]
+		public Gdk.GC[] mid_gc;
+		public weak GLib.Array property_cache;
+		public weak Gtk.RcStyle rc_style;
+		public weak GLib.SList styles;
+		[NoArrayLength]
+		public Gdk.Color[] text;
+		[NoArrayLength]
+		public Gdk.Color[] text_aa;
+		[NoArrayLength]
+		public Gdk.GC[] text_aa_gc;
+		[NoArrayLength]
+		public Gdk.GC[] text_gc;
+		public Gdk.Color white;
+		public weak Gdk.GC white_gc;
+		public int xthickness;
+		public int ythickness;
+		public void apply_default_background (Gdk.Window window, bool set_bg, Gtk.StateType state_type, Gdk.Rectangle area, int x, int y, int width, int height);
+		public weak Gtk.Style attach (Gdk.Window window);
 		[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; }
-		[NoAccessorMethod]
-		public bool editable { get; set; }
-		public bool has_frame { get; set; }
-		public Gtk.Border inner_border { get; set; }
-		public uint invisible_char { get; set; }
-		public int max_length { get; set; }
-		[NoAccessorMethod]
-		public int scroll_offset { get; }
-		[NoAccessorMethod]
-		public int selection_bound { get; }
+		public virtual weak Gtk.Style clone ();
+		public virtual void copy ();
+		public void detach ();
+		[NoWrapper]
+		public virtual void draw_arrow (Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, Gtk.ArrowType arrow_type, bool fill, int x, int y, int width, int height);
+		[NoWrapper]
+		public virtual void draw_box (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);
+		[NoWrapper]
+		public virtual void draw_box_gap (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, Gtk.PositionType gap_side, int gap_x, int gap_width);
+		[NoWrapper]
+		public virtual void draw_check (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);
+		[NoWrapper]
+		public virtual void draw_diamond (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);
+		[NoWrapper]
+		public virtual void draw_expander (Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, Gtk.ExpanderStyle expander_style);
+		[NoWrapper]
+		public virtual void draw_extension (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, Gtk.PositionType gap_side);
+		[NoWrapper]
+		public virtual void draw_flat_box (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);
+		[NoWrapper]
+		public virtual void draw_focus (Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);
+		[NoWrapper]
+		public virtual void draw_handle (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, Gtk.Orientation orientation);
+		[NoWrapper]
+		public virtual void draw_hline (Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x1, int x2, int y);
+		[NoWrapper]
+		public virtual void draw_layout (Gdk.Window window, Gtk.StateType state_type, bool use_text, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, Pango.Layout layout);
+		[NoWrapper]
+		public virtual void draw_option (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);
+		[NoWrapper]
+		public virtual void draw_polygon (Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, Gdk.Point point, int npoints, bool fill);
+		[NoWrapper]
+		public virtual void draw_resize_grip (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);
+		[NoWrapper]
+		public virtual void draw_shadow (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);
+		[NoWrapper]
+		public virtual void draw_shadow_gap (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, Gtk.PositionType gap_side, int gap_x, int gap_width);
+		[NoWrapper]
+		public virtual void draw_slider (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, Gtk.Orientation orientation);
+		[NoWrapper]
+		public virtual void draw_string (Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, string str);
+		[NoWrapper]
+		public virtual void draw_tab (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);
+		[NoWrapper]
+		public virtual void draw_vline (Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int y1_, int y2_, int x);
+		[NoWrapper]
+		public virtual void init_from_rc (Gtk.RcStyle rc_style);
+		public bool lookup_color (string color_name, out Gdk.Color color);
+		public weak Gtk.IconSet lookup_icon_set (string stock_id);
+		[CCode (has_construct_function = false)]
+		public Style ();
+		public virtual weak Gdk.Pixbuf render_icon (Gtk.IconSource source, Gtk.TextDirection direction, Gtk.StateType state, Gtk.IconSize size, Gtk.Widget widget, string detail);
+		public virtual void set_background (Gdk.Window window, Gtk.StateType state_type);
+		public virtual signal void realize ();
+		public virtual signal void unrealize ();
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Table : Gtk.Container, Atk.Implementor, Gtk.Buildable {
+		public weak GLib.List children;
+		public weak Gtk.TableRowCol cols;
+		public ushort ncols;
+		public ushort nrows;
+		public weak Gtk.TableRowCol rows;
+		public void attach (Gtk.Widget child, uint left_attach, uint right_attach, uint top_attach, uint bottom_attach, Gtk.AttachOptions xoptions, Gtk.AttachOptions yoptions, uint xpadding, uint ypadding);
+		public void attach_defaults (Gtk.Widget widget, uint left_attach, uint right_attach, uint top_attach, uint bottom_attach);
+		public uint get_col_spacing (uint column);
+		public uint get_default_col_spacing ();
+		public uint get_default_row_spacing ();
+		public bool get_homogeneous ();
+		public uint get_row_spacing (uint row);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Table (uint rows, uint columns, bool homogeneous);
+		public void resize (uint rows, uint columns);
+		public void set_col_spacing (uint column, uint spacing);
+		public void set_col_spacings (uint spacing);
+		public void set_homogeneous (bool homogeneous);
+		public void set_row_spacing (uint row, uint spacing);
+		public void set_row_spacings (uint spacing);
 		[NoAccessorMethod]
-		public Gtk.ShadowType shadow_type { get; set; }
-		public string text { get; set; }
+		public uint column_spacing { get; set; }
+		public bool homogeneous { get; set; }
 		[NoAccessorMethod]
-		public bool truncate_multiline { get; set; }
-		public bool visibility { get; set; }
-		public int width_chars { get; set; }
+		public uint n_columns { get; set; }
 		[NoAccessorMethod]
-		public float xalign { get; set; }
-		public virtual signal void activate ();
-		public virtual signal void backspace ();
-		public virtual signal void copy_clipboard ();
-		public virtual signal void cut_clipboard ();
-		public virtual signal void delete_from_cursor (Gtk.DeleteType type, int count);
-		public virtual signal void insert_at_cursor (string str);
-		public virtual signal void move_cursor (Gtk.MovementStep step, int count, bool extend_selection);
-		public virtual signal void paste_clipboard ();
-		public virtual signal void populate_popup (Gtk.Menu menu);
-		public virtual signal void toggle_overwrite ();
+		public uint n_rows { get; set; }
+		public uint row_spacing { get; set; }
 	}
+	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class EntryCompletion : GLib.Object, Gtk.Buildable, Gtk.CellLayout {
-		public void complete ();
-		public void delete_action (int index_);
-		public weak string get_completion_prefix ();
-		public weak Gtk.Widget get_entry ();
-		public bool get_inline_completion ();
-		public bool get_inline_selection ();
-		public int get_minimum_key_length ();
-		public weak Gtk.TreeModel get_model ();
-		public bool get_popup_completion ();
-		public bool get_popup_set_width ();
-		public bool get_popup_single_match ();
-		public int get_text_column ();
-		public void insert_action_markup (int index_, string markup);
-		public void insert_action_text (int index_, string text);
-		[CCode (has_construct_function = false)]
-		public EntryCompletion ();
-		public void set_inline_completion (bool inline_completion);
-		public void set_inline_selection (bool inline_selection);
-		public void set_match_func (Gtk.EntryCompletionMatchFunc func, void* func_data, GLib.DestroyNotify func_notify);
-		public void set_minimum_key_length (int length);
-		public void set_model (Gtk.TreeModel? model);
-		public void set_popup_completion (bool popup_completion);
-		public void set_popup_set_width (bool popup_set_width);
-		public void set_popup_single_match (bool popup_single_match);
-		public void set_text_column (int column);
-		public bool inline_completion { get; set; }
-		public bool inline_selection { get; set; }
-		public int minimum_key_length { get; set; }
-		public Gtk.TreeModel model { get; set; }
-		public bool popup_completion { get; set; }
-		public bool popup_set_width { get; set; }
-		public bool popup_single_match { get; set; }
-		public int text_column { get; set; }
-		public virtual signal void action_activated (int index_);
-		public virtual signal bool cursor_on_match (Gtk.TreeModel model, Gtk.TreeIter iter);
-		[HasEmitter]
-		public virtual signal bool insert_prefix (string prefix);
-		public virtual signal bool match_selected (Gtk.TreeModel model, Gtk.TreeIter iter);
+	public class TableChild {
+		public ushort bottom_attach;
+		public ushort left_attach;
+		public ushort right_attach;
+		public ushort top_attach;
+		public weak Gtk.Widget widget;
+		public uint xexpand;
+		public uint xfill;
+		public ushort xpadding;
+		public uint xshrink;
+		public uint yexpand;
+		public uint yfill;
+		public ushort ypadding;
+		public uint yshrink;
 	}
+	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class EventBox : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
-		public bool get_above_child ();
-		public bool get_visible_window ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public EventBox ();
-		public void set_above_child (bool above_child);
-		public void set_visible_window (bool visible_window);
-		public bool above_child { get; set; }
-		public bool visible_window { get; set; }
+	public class TableRowCol {
+		public ushort allocation;
+		public uint empty;
+		public uint expand;
+		public uint need_expand;
+		public uint need_shrink;
+		public ushort requisition;
+		public uint shrink;
+		public ushort spacing;
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Expander : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
-		public bool get_expanded ();
-		public weak string get_label ();
-		public weak Gtk.Widget get_label_widget ();
-		public int get_spacing ();
-		public bool get_use_markup ();
-		public bool get_use_underline ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Expander (string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Expander.with_mnemonic (string label);
-		public void set_expanded (bool expanded);
-		public void set_label (string label);
-		public void set_label_widget (Gtk.Widget label_widget);
-		public void set_spacing (int spacing);
-		public void set_use_markup (bool use_markup);
-		public void set_use_underline (bool use_underline);
-		public bool expanded { get; set construct; }
-		public string label { get; set construct; }
-		public Gtk.Widget label_widget { get; set; }
-		public int spacing { get; set; }
-		public bool use_markup { get; set construct; }
-		public bool use_underline { get; set construct; }
-		public virtual signal void activate ();
+	[Compact]
+	[CCode (ref_function = "gtk_target_list_ref", unref_function = "gtk_target_list_unref", cheader_filename = "gtk/gtk.h")]
+	public class TargetList {
+		public weak GLib.List list;
+		public uint ref_count;
+		public void add (Gdk.Atom target, uint flags, uint info);
+		public void add_image_targets (uint info, bool writable);
+		public void add_rich_text_targets (uint info, bool deserializable, Gtk.TextBuffer buffer);
+		public void add_table (Gtk.TargetEntry[] targets, uint ntargets);
+		public void add_text_targets (uint info);
+		public void add_uri_targets (uint info);
+		public bool find (Gdk.Atom target, uint info);
+		[CCode (has_construct_function = false)]
+		public TargetList (Gtk.TargetEntry[] targets, uint ntargets);
+		public void remove (Gdk.Atom target);
 	}
+	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class FileChooserButton : Gtk.HBox, Atk.Implementor, Gtk.Buildable, Gtk.FileChooser {
-		public bool get_focus_on_click ();
-		public weak string get_title ();
-		public int get_width_chars ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public FileChooserButton (string title, Gtk.FileChooserAction action);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public FileChooserButton.with_backend (string title, Gtk.FileChooserAction action, string backend);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public FileChooserButton.with_dialog (Gtk.Widget dialog);
-		public void set_focus_on_click (bool focus_on_click);
-		public void set_title (string title);
-		public void set_width_chars (int n_chars);
-		[NoAccessorMethod]
-		public Gtk.FileChooser dialog { construct; }
-		public bool focus_on_click { get; set; }
-		public string title { get; set; }
-		public int width_chars { get; set; }
-		public virtual signal void file_set ();
+	public class TargetPair {
+		public uint flags;
+		public uint info;
+		public Gdk.Atom target;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class FileChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.FileChooser {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public FileChooserDialog (string? title, Gtk.Window? parent, Gtk.FileChooserAction action, ...);
+	public class TearoffMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable {
+		public uint torn_off;
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public FileChooserDialog.with_backend (string? title, Gtk.Window? parent, Gtk.FileChooserAction action, string backend, ...);
+		public TearoffMenuItem ();
 	}
+	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class FileChooserWidget : Gtk.VBox, Atk.Implementor, Gtk.Buildable, Gtk.FileChooser, Gtk.FileChooserEmbed {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public FileChooserWidget (Gtk.FileChooserAction action);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public FileChooserWidget.with_backend (Gtk.FileChooserAction action, string backend);
+	public class TextAppearance {
+		public Gdk.Color bg_color;
+		public weak Gdk.Bitmap bg_stipple;
+		public uint draw_bg;
+		public Gdk.Color fg_color;
+		public weak Gdk.Bitmap fg_stipple;
+		public uint inside_selection;
+		public uint is_text;
+		public uint pad1;
+		public uint pad2;
+		public uint pad3;
+		public uint pad4;
+		public void* padding1;
+		public int rise;
+		public uint strikethrough;
+		public uint underline;
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class FileFilter : Gtk.Object {
-		public void add_custom (Gtk.FileFilterFlags needed, Gtk.FileFilterFunc func, void* data, GLib.DestroyNotify notify);
-		public void add_mime_type (string mime_type);
-		public void add_pattern (string pattern);
-		public void add_pixbuf_formats ();
-		public bool filter (Gtk.FileFilterInfo filter_info);
-		public weak string get_name ();
-		public Gtk.FileFilterFlags get_needed ();
+	[Compact]
+	[CCode (ref_function = "gtk_text_attributes_ref", unref_function = "gtk_text_attributes_unref", cheader_filename = "gtk/gtk.h")]
+	public class TextAttributes {
+		public weak Gtk.TextAppearance appearance;
+		public uint bg_full_height;
+		public Gtk.TextDirection direction;
+		public uint editable;
+		public weak Pango.FontDescription font;
+		public double font_scale;
+		public int indent;
+		public uint invisible;
+		public Gtk.Justification justification;
+		public weak Pango.Language language;
+		public int left_margin;
+		public uint pad1;
+		public uint pad2;
+		public uint pad3;
+		public uint pad4;
+		public Gdk.Color pg_bg_color;
+		public int pixels_above_lines;
+		public int pixels_below_lines;
+		public int pixels_inside_wrap;
+		public uint realized;
+		public uint refcount;
+		public int right_margin;
+		public weak Pango.TabArray tabs;
+		public Gtk.WrapMode wrap_mode;
+		public weak Gtk.TextAttributes copy ();
+		public void copy_values (Gtk.TextAttributes dest);
 		[CCode (has_construct_function = false)]
-		public FileFilter ();
-		public void set_name (string name);
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Fixed : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		public weak GLib.List children;
-		public bool get_has_window ();
-		public void move (Gtk.Widget widget, int x, int y);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Fixed ();
-		public void put (Gtk.Widget widget, int x, int y);
-		public void set_has_window (bool has_window);
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class FontButton : Gtk.Button, Atk.Implementor, Gtk.Buildable {
-		public weak string get_font_name ();
-		public bool get_show_size ();
-		public bool get_show_style ();
-		public weak string get_title ();
-		public bool get_use_font ();
-		public bool get_use_size ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public FontButton ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public FontButton.with_font (string fontname);
-		public bool set_font_name (string fontname);
-		public void set_show_size (bool show_size);
-		public void set_show_style (bool show_style);
-		public void set_title (string title);
-		public void set_use_font (bool use_font);
-		public void set_use_size (bool use_size);
-		public string font_name { get; set; }
-		public bool show_size { get; set; }
-		public bool show_style { get; set; }
-		public string title { get; set; }
-		public bool use_font { get; set; }
-		public bool use_size { get; set; }
-		public virtual signal void font_set ();
+		public TextAttributes ();
 	}
+	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class FontSelection : Gtk.VBox, Atk.Implementor, Gtk.Buildable {
-		public weak Gtk.Widget font_entry;
-		public weak Gtk.Widget family_list;
-		public weak Gtk.Widget font_style_entry;
-		public weak Gtk.Widget face_list;
-		public weak Gtk.Widget size_entry;
-		public weak Gtk.Widget size_list;
-		public weak Gtk.Widget pixels_button;
-		public weak Gtk.Widget points_button;
-		public weak Gtk.Widget filter_button;
-		public weak Gtk.Widget preview_entry;
-		public weak Pango.FontFamily family;
-		public weak Pango.FontFace face;
-		public int size;
-		public weak string get_font_name ();
-		public weak string get_preview_text ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public FontSelection ();
-		public bool set_font_name (string fontname);
-		public void set_preview_text (string text);
-		[NoAccessorMethod]
-		public Gdk.Font font { get; }
-		public string font_name { get; set; }
-		public string preview_text { get; set; }
+	public class TextBTree {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class FontSelectionDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		public weak Gtk.Widget fontsel;
-		public weak Gtk.Widget main_vbox;
-		public weak Gtk.Widget action_area;
-		public weak Gtk.Widget ok_button;
-		public weak Gtk.Widget apply_button;
-		public weak Gtk.Widget cancel_button;
-		public int dialog_width;
-		public bool auto_resize;
-		public weak string get_font_name ();
-		public weak string get_preview_text ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public FontSelectionDialog (string title);
-		public bool set_font_name (string fontname);
-		public void set_preview_text (string text);
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Frame : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
-		public Gtk.Allocation child_allocation;
-		public weak string get_label ();
-		public void get_label_align (float xalign, float yalign);
-		public weak Gtk.Widget get_label_widget ();
-		public Gtk.ShadowType get_shadow_type ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Frame (string? label);
-		public void set_label (string label);
-		public void set_label_align (float xalign, float yalign);
-		public void set_label_widget (Gtk.Widget label_widget);
-		public void set_shadow_type (Gtk.ShadowType type);
-		[NoWrapper]
-		public virtual void compute_child_allocation (Gtk.Allocation allocation);
-		public string label { get; set; }
-		public Gtk.Widget label_widget { get; set; }
-		[NoAccessorMethod]
-		public float label_xalign { get; set; }
+	public class TextBuffer : GLib.Object {
+		public weak Gtk.TextBTree btree;
+		public weak GLib.SList clipboard_contents_buffers;
+		public weak Gtk.TextLogAttrCache log_attr_cache;
+		public uint modified;
+		public weak GLib.SList selection_clipboards;
+		public uint user_action_count;
+		public void add_mark (Gtk.TextMark mark, Gtk.TextIter where);
+		public void add_selection_clipboard (Gtk.Clipboard clipboard);
+		public void apply_tag_by_name (string name, Gtk.TextIter start, Gtk.TextIter end);
+		public bool backspace (Gtk.TextIter iter, bool interactive, bool default_editable);
+		public void copy_clipboard (Gtk.Clipboard clipboard);
+		public weak Gtk.TextChildAnchor create_child_anchor (Gtk.TextIter iter);
+		public weak Gtk.TextMark create_mark (string? mark_name, Gtk.TextIter where, bool left_gravity);
+		public weak Gtk.TextTag create_tag (string tag_name, ...);
+		public void cut_clipboard (Gtk.Clipboard clipboard, bool default_editable);
+		public void @delete (Gtk.TextIter start, Gtk.TextIter end);
+		public bool delete_interactive (Gtk.TextIter start_iter, Gtk.TextIter end_iter, bool default_editable);
+		public void delete_mark (Gtk.TextMark mark);
+		public void delete_mark_by_name (string name);
+		public bool delete_selection (bool interactive, bool default_editable);
+		public bool deserialize (Gtk.TextBuffer content_buffer, Gdk.Atom format, Gtk.TextIter iter, uchar data, ulong length) throws GLib.Error;
+		public bool deserialize_get_can_create_tags (Gdk.Atom format);
+		public void deserialize_set_can_create_tags (Gdk.Atom format, bool can_create_tags);
+		public void get_bounds (out Gtk.TextIter start, out Gtk.TextIter end);
+		public int get_char_count ();
+		public weak Gtk.TargetList get_copy_target_list ();
+		public Gdk.Atom get_deserialize_formats (int n_formats);
+		public void get_end_iter (out Gtk.TextIter iter);
+		public bool get_has_selection ();
+		public weak Gtk.TextMark get_insert ();
+		public void get_iter_at_child_anchor (out Gtk.TextIter iter, Gtk.TextChildAnchor anchor);
+		public void get_iter_at_line (out Gtk.TextIter iter, int line_number);
+		public void get_iter_at_line_index (out Gtk.TextIter iter, int line_number, int byte_index);
+		public void get_iter_at_line_offset (out Gtk.TextIter iter, int line_number, int char_offset);
+		public void get_iter_at_mark (out Gtk.TextIter iter, Gtk.TextMark mark);
+		public void get_iter_at_offset (out Gtk.TextIter iter, int char_offset);
+		public int get_line_count ();
+		public weak Gtk.TextMark get_mark (string name);
+		public bool get_modified ();
+		public weak Gtk.TargetList get_paste_target_list ();
+		public weak Gtk.TextMark get_selection_bound ();
+		public bool get_selection_bounds (out Gtk.TextIter start, out Gtk.TextIter end);
+		public Gdk.Atom get_serialize_formats (int n_formats);
+		public weak string get_slice (Gtk.TextIter start, Gtk.TextIter end, bool include_hidden_chars);
+		public void get_start_iter (out Gtk.TextIter iter);
+		public weak Gtk.TextTagTable get_tag_table ();
+		public weak string get_text (Gtk.TextIter start, Gtk.TextIter end, bool include_hidden_chars);
+		public void insert (Gtk.TextIter iter, string text, int len);
+		public void insert_at_cursor (string text, int len);
+		public bool insert_interactive (Gtk.TextIter iter, string text, int len, bool default_editable);
+		public bool insert_interactive_at_cursor (string text, int len, bool default_editable);
+		public void insert_range (Gtk.TextIter iter, Gtk.TextIter start, Gtk.TextIter end);
+		public bool insert_range_interactive (Gtk.TextIter iter, Gtk.TextIter start, Gtk.TextIter end, bool default_editable);
+		public void insert_with_tags (Gtk.TextIter iter, string text, int len, ...);
+		public void insert_with_tags_by_name (Gtk.TextIter iter, string text, int len, ...);
+		public void move_mark (Gtk.TextMark mark, Gtk.TextIter where);
+		public void move_mark_by_name (string name, Gtk.TextIter where);
+		[CCode (has_construct_function = false)]
+		public TextBuffer (Gtk.TextTagTable? table);
+		public void paste_clipboard (Gtk.Clipboard clipboard, Gtk.TextIter? override_location, bool default_editable);
+		public void place_cursor (Gtk.TextIter where);
+		public Gdk.Atom register_deserialize_format (string mime_type, Gtk.TextBufferDeserializeFunc function, GLib.DestroyNotify user_data_destroy);
+		public Gdk.Atom register_deserialize_tagset (string tagset_name);
+		public Gdk.Atom register_serialize_format (string mime_type, Gtk.TextBufferSerializeFunc function, GLib.DestroyNotify user_data_destroy);
+		public Gdk.Atom register_serialize_tagset (string tagset_name);
+		public void remove_all_tags (Gtk.TextIter start, Gtk.TextIter end);
+		public void remove_selection_clipboard (Gtk.Clipboard clipboard);
+		public void remove_tag_by_name (string name, Gtk.TextIter start, Gtk.TextIter end);
+		public void select_range (Gtk.TextIter ins, Gtk.TextIter bound);
+		public uchar serialize (Gtk.TextBuffer content_buffer, Gdk.Atom format, Gtk.TextIter start, Gtk.TextIter end, ulong length);
+		public void set_modified (bool setting);
+		public void set_text (string text, int len);
+		public void unregister_deserialize_format (Gdk.Atom format);
+		public void unregister_serialize_format (Gdk.Atom format);
+		public Gtk.TargetList copy_target_list { get; }
 		[NoAccessorMethod]
-		public float label_yalign { get; set; }
+		public int cursor_position { get; }
+		public bool has_selection { get; }
+		public Gtk.TargetList paste_target_list { get; }
 		[NoAccessorMethod]
-		public Gtk.ShadowType shadow { get; set; }
-		public Gtk.ShadowType shadow_type { get; set; }
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class GammaCurve : Gtk.VBox, Atk.Implementor, Gtk.Buildable {
-		public weak Gtk.Widget table;
-		public weak Gtk.Widget curve;
-		[NoArrayLength]
-		public weak Gtk.Widget[] button;
-		public float gamma;
-		public weak Gtk.Widget gamma_dialog;
-		public weak Gtk.Widget gamma_text;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public GammaCurve ();
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class HBox : Gtk.Box, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public HBox (bool homogeneous, int spacing);
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class HButtonBox : Gtk.ButtonBox, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public HButtonBox ();
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class HPaned : Gtk.Paned, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public HPaned ();
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class HRuler : Gtk.Ruler, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public HRuler ();
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class HScale : Gtk.Scale, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public HScale (Gtk.Adjustment adjustment);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public HScale.with_range (double min, double max, double step);
+		public Gtk.TextTagTable tag_table { get; construct; }
+		public string text { get; set; }
+		[HasEmitter]
+		public virtual signal void apply_tag (Gtk.TextTag tag, Gtk.TextIter start_char, Gtk.TextIter end_char);
+		[HasEmitter]
+		public virtual signal void begin_user_action ();
+		public virtual signal void changed ();
+		public virtual signal void delete_range (Gtk.TextIter start, Gtk.TextIter end);
+		[HasEmitter]
+		public virtual signal void end_user_action ();
+		[HasEmitter]
+		public virtual signal void insert_child_anchor (Gtk.TextIter pos, Gtk.TextChildAnchor anchor);
+		[HasEmitter]
+		public virtual signal void insert_pixbuf (Gtk.TextIter pos, Gdk.Pixbuf pixbuf);
+		public virtual signal void insert_text (Gtk.TextIter pos, string text, int length);
+		public virtual signal void mark_deleted (Gtk.TextMark mark);
+		public virtual signal void mark_set (Gtk.TextIter location, Gtk.TextMark mark);
+		public virtual signal void modified_changed ();
+		[HasEmitter]
+		public virtual signal void remove_tag (Gtk.TextTag tag, Gtk.TextIter start_char, Gtk.TextIter end_char);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class HScrollbar : Gtk.Scrollbar, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public HScrollbar (Gtk.Adjustment adjustment);
+	public class TextChildAnchor : GLib.Object {
+		public void* segment;
+		public bool get_deleted ();
+		public weak GLib.List get_widgets ();
+		[CCode (has_construct_function = false)]
+		public TextChildAnchor ();
 	}
+	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class HSeparator : Gtk.Separator, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public HSeparator ();
+	public class TextLogAttrCache {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class HandleBox : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
-		public weak Gdk.Window bin_window;
-		public weak Gdk.Window float_window;
-		public uint float_window_mapped;
-		public uint in_drag;
-		public uint shrink_on_detach;
-		public int deskoff_x;
-		public int deskoff_y;
-		public Gtk.Allocation attach_allocation;
-		public Gtk.Allocation float_allocation;
-		public Gtk.PositionType get_handle_position ();
-		public Gtk.ShadowType get_shadow_type ();
-		public Gtk.PositionType get_snap_edge ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public HandleBox ();
-		public void set_handle_position (Gtk.PositionType position);
-		public void set_shadow_type (Gtk.ShadowType type);
-		public void set_snap_edge (Gtk.PositionType edge);
-		public Gtk.PositionType handle_position { get; set; }
+	public class TextMark : GLib.Object {
+		public void* segment;
+		public weak Gtk.TextBuffer get_buffer ();
+		public bool get_deleted ();
+		public bool get_left_gravity ();
+		public weak string get_name ();
+		public bool get_visible ();
+		[CCode (has_construct_function = false)]
+		public TextMark (string name, bool left_gravity);
+		public void set_visible (bool setting);
 		[NoAccessorMethod]
-		public Gtk.ShadowType shadow { get; set; }
-		public Gtk.ShadowType shadow_type { get; set; }
-		public Gtk.PositionType snap_edge { get; set; }
+		public bool left_gravity { get; construct; }
 		[NoAccessorMethod]
-		public bool snap_edge_set { get; set; }
-		public virtual signal void child_attached (Gtk.Widget child);
-		public virtual signal void child_detached (Gtk.Widget child);
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class IMContext : GLib.Object {
-		public virtual bool filter_keypress (Gdk.EventKey event);
-		public virtual void focus_in ();
-		public virtual void focus_out ();
-		public virtual void get_preedit_string (string str, out weak Pango.AttrList attrs, int cursor_pos);
-		public virtual bool get_surrounding (string text, int cursor_index);
-		public virtual void reset ();
-		public virtual void set_client_window (Gdk.Window window);
-		public virtual void set_cursor_location (Gdk.Rectangle area);
-		public virtual void set_surrounding (string text, int len, int cursor_index);
-		public virtual void set_use_preedit (bool use_preedit);
-		public virtual signal void commit (string str);
-		[HasEmitter]
-		public virtual signal bool delete_surrounding (int offset, int n_chars);
-		public virtual signal void preedit_changed ();
-		public virtual signal void preedit_end ();
-		public virtual signal void preedit_start ();
-		public virtual signal bool retrieve_surrounding ();
+		public string name { get; construct; }
 	}
+	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class IMContextSimple : Gtk.IMContext {
-		public weak GLib.SList tables;
-		[NoArrayLength]
-		public weak uint[] compose_buffer;
-		public unichar tentative_match;
-		public int tentative_match_len;
-		public uint in_hex_sequence;
-		public uint modifiers_dropped;
-		public void add_table (ushort data, int max_seq_len, int n_seqs);
-		[CCode (type = "GtkIMContext*", has_construct_function = false)]
-		public IMContextSimple ();
+	public class TextPendingScroll {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class IMMulticontext : Gtk.IMContext {
-		public weak Gtk.IMContext slave;
-		public weak string context_id;
-		public void append_menuitems (Gtk.MenuShell menushell);
-		[CCode (type = "GtkIMContext*", has_construct_function = false)]
-		public IMMulticontext ();
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	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 ();
-		public weak Gtk.IconSet lookup (string stock_id);
-		public static weak Gtk.IconSet lookup_default (string stock_id);
-		[CCode (has_construct_function = false)]
-		public IconFactory ();
-		public void remove_default ();
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class IconTheme : GLib.Object {
-		public static void add_builtin_icon (string icon_name, int size, Gdk.Pixbuf pixbuf);
-		public void append_search_path (string path);
-		public weak Gtk.IconInfo choose_icon (string[] icon_names, int size, Gtk.IconLookupFlags flags);
-		public static GLib.Quark error_quark ();
-		public static weak Gtk.IconTheme get_default ();
-		public weak string get_example_icon_name ();
-		public static weak Gtk.IconTheme get_for_screen (Gdk.Screen screen);
-		public int get_icon_sizes (string icon_name);
-		public void get_search_path (string path, int n_elements);
-		public bool has_icon (string icon_name);
-		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 class TextTag : GLib.Object {
+		public uint bg_color_set;
+		public uint bg_full_height_set;
+		public uint bg_stipple_set;
+		public uint fg_color_set;
+		public uint fg_stipple_set;
+		public uint pad1;
+		public uint pg_bg_color_set;
+		public int priority;
+		public weak Gtk.TextTagTable table;
+		public weak Gtk.TextAttributes values;
+		public int get_priority ();
 		[CCode (has_construct_function = false)]
-		public IconTheme ();
-		public void prepend_search_path (string path);
-		public bool rescan_if_needed ();
-		public void set_custom_theme (string theme_name);
-		public void set_screen (Gdk.Screen screen);
-		public void set_search_path (string[] path, int n_elements);
-		public virtual signal void changed ();
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class IconView : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout {
-		public void convert_widget_to_bin_window_coords (int wx, int wy, int bx, int by);
-		public weak Gdk.Pixmap create_drag_icon (Gtk.TreePath path);
-		public void enable_model_drag_dest (Gtk.TargetEntry[] targets, Gdk.DragAction actions);
-		public void enable_model_drag_source (Gdk.ModifierType start_button_mask, Gtk.TargetEntry[] targets, Gdk.DragAction actions);
-		public int get_column_spacing ();
-		public int get_columns ();
-		public bool get_cursor (out Gtk.TreePath path, out weak Gtk.CellRenderer cell);
-		public bool get_dest_item_at_pos (int drag_x, int drag_y, out weak Gtk.TreePath path, Gtk.IconViewDropPosition pos);
-		public void get_drag_dest_item (out weak Gtk.TreePath path, Gtk.IconViewDropPosition pos);
-		public bool get_item_at_pos (int x, int y, out weak Gtk.TreePath path, out weak Gtk.CellRenderer cell);
-		public int get_item_width ();
-		public int get_margin ();
-		public int get_markup_column ();
-		public weak Gtk.TreeModel get_model ();
-		public Gtk.Orientation get_orientation ();
-		public weak Gtk.TreePath get_path_at_pos (int x, int y);
-		public int get_pixbuf_column ();
-		public bool get_reorderable ();
-		public int get_row_spacing ();
-		public weak GLib.List get_selected_items ();
-		public Gtk.SelectionMode get_selection_mode ();
-		public int get_spacing ();
-		public int get_text_column ();
-		public int get_tooltip_column ();
-		public bool get_tooltip_context (int x, int y, bool keyboard_tip, out weak Gtk.TreeModel model, out weak Gtk.TreePath path, out Gtk.TreeIter iter);
-		public bool get_visible_range (out weak Gtk.TreePath start_path, out weak Gtk.TreePath end_path);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public IconView ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public IconView.with_model (Gtk.TreeModel model);
-		public bool path_is_selected (Gtk.TreePath path);
-		public void scroll_to_path (Gtk.TreePath path, bool use_align, float row_align, float col_align);
-		public void select_path (Gtk.TreePath path);
-		public void selected_foreach (Gtk.IconViewForeachFunc func);
-		public void set_column_spacing (int column_spacing);
-		public void set_columns (int columns);
-		public void set_cursor (Gtk.TreePath path, Gtk.CellRenderer? cell, bool start_editing);
-		public void set_drag_dest_item (Gtk.TreePath path, Gtk.IconViewDropPosition pos);
-		public void set_item_width (int item_width);
-		public void set_margin (int margin);
-		public void set_markup_column (int column);
-		public void set_model (Gtk.TreeModel? model);
-		public void set_orientation (Gtk.Orientation orientation);
-		public void set_pixbuf_column (int column);
-		public void set_reorderable (bool reorderable);
-		public void set_row_spacing (int row_spacing);
-		public void set_selection_mode (Gtk.SelectionMode mode);
-		public void set_spacing (int spacing);
-		public void set_text_column (int column);
-		public void set_tooltip_cell (Gtk.Tooltip tooltip, Gtk.TreePath path, Gtk.CellRenderer cell);
-		public void set_tooltip_column (int column);
-		public void set_tooltip_item (Gtk.Tooltip tooltip, Gtk.TreePath path);
-		public void unselect_path (Gtk.TreePath path);
-		public void unset_model_drag_dest ();
-		public void unset_model_drag_source ();
-		public int column_spacing { get; set; }
-		public int columns { get; set; }
-		public int item_width { get; set; }
-		public int margin { get; set; }
-		public int markup_column { get; set; }
-		public Gtk.TreeModel model { get; set; }
-		public Gtk.Orientation orientation { get; set; }
-		public int pixbuf_column { get; set; }
-		public bool reorderable { get; set; }
-		public int row_spacing { get; set; }
-		public Gtk.SelectionMode selection_mode { get; set; }
-		public int spacing { get; set; }
-		public int text_column { get; set; }
-		public int tooltip_column { get; set; }
-		public virtual signal bool activate_cursor_item ();
-		[HasEmitter]
-		public virtual signal void item_activated (Gtk.TreePath path);
-		public virtual signal bool move_cursor (Gtk.MovementStep step, int count);
-		public virtual signal void select_all ();
-		public virtual signal void select_cursor_item ();
-		public virtual signal void selection_changed ();
-		public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
-		public virtual signal void toggle_cursor_item ();
-		public virtual signal void unselect_all ();
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	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);
-		public weak Gdk.Pixbuf get_pixbuf ();
-		public int get_pixel_size ();
-		public void get_pixmap (out weak Gdk.Pixmap pixmap, out weak Gdk.Bitmap mask);
-		public void get_stock (out weak string stock_id, out Gtk.IconSize size);
-		public Gtk.ImageType get_storage_type ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Image ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Image.from_animation (Gdk.PixbufAnimation animation);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Image.from_file (string filename);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Image.from_gicon (GLib.Icon icon, Gtk.IconSize size);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Image.from_icon_name (string icon_name, Gtk.IconSize size);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Image.from_icon_set (Gtk.IconSet icon_set, Gtk.IconSize size);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Image.from_image (Gdk.Image image, Gdk.Bitmap mask);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Image.from_pixbuf (Gdk.Pixbuf pixbuf);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Image.from_pixmap (Gdk.Pixmap pixmap, Gdk.Bitmap mask);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		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);
-		public void set_from_pixbuf (Gdk.Pixbuf pixbuf);
-		public void set_from_pixmap (Gdk.Pixmap pixmap, Gdk.Bitmap mask);
-		public void set_from_stock (string stock_id, Gtk.IconSize size);
-		public void set_pixel_size (int pixel_size);
+		public TextTag (string name);
+		public void set_priority (int priority);
 		[NoAccessorMethod]
-		public string file { get; set; }
+		public bool accumulative_margin { get; set; }
 		[NoAccessorMethod]
-		public GLib.Icon gicon { get; set; }
+		public string background { set; }
 		[NoAccessorMethod]
-		public string icon_name { get; set; }
+		public bool background_full_height { get; set; }
 		[NoAccessorMethod]
-		public Gtk.IconSet icon_set { get; set; }
+		public bool background_full_height_set { get; set; }
 		[NoAccessorMethod]
-		public int icon_size { get; set; }
+		public Gdk.Color background_gdk { get; set; }
 		[NoAccessorMethod]
-		public Gdk.Image image { get; set; }
+		public bool background_set { get; set; }
 		[NoAccessorMethod]
-		public Gdk.Pixmap mask { get; set; }
+		public Gdk.Pixmap background_stipple { get; set; }
 		[NoAccessorMethod]
-		public Gdk.Pixbuf pixbuf { get; set; }
+		public bool background_stipple_set { get; set; }
 		[NoAccessorMethod]
-		public Gdk.PixbufAnimation pixbuf_animation { get; set; }
-		public int pixel_size { get; set; }
+		public Gtk.TextDirection direction { get; set; }
 		[NoAccessorMethod]
-		public Gdk.Pixmap pixmap { get; set; }
+		public bool editable { get; set; }
 		[NoAccessorMethod]
-		public string stock { get; set; }
-		public Gtk.ImageType storage_type { get; }
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ImageMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable {
-		public weak Gtk.Widget get_image ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public ImageMenuItem ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public ImageMenuItem.from_stock (string stock_id, Gtk.AccelGroup? accel_group);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public ImageMenuItem.with_label (string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public ImageMenuItem.with_mnemonic (string label);
-		public void set_image (Gtk.Widget image);
-		public Gtk.Widget image { get; set; }
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class InputDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		public weak Gtk.Widget axis_list;
-		public weak Gtk.Widget axis_listbox;
-		public weak Gtk.Widget mode_optionmenu;
-		public weak Gtk.Widget close_button;
-		public weak Gtk.Widget save_button;
-		[NoArrayLength]
-		public weak Gtk.Widget[] axis_items;
-		public weak Gdk.Device current_device;
-		public weak Gtk.Widget keys_list;
-		public weak Gtk.Widget keys_listbox;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public InputDialog ();
-		public virtual signal void disable_device (Gdk.Device device);
-		public virtual signal void enable_device (Gdk.Device device);
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Invisible : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
-		public bool has_user_ref_count;
-		public weak Gdk.Screen get_screen ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Invisible ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Invisible.for_screen (Gdk.Screen screen);
-		public void set_screen (Gdk.Screen screen);
-		public Gdk.Screen screen { get; set; }
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Item : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
-		[HasEmitter]
-		public virtual signal void deselect ();
-		[HasEmitter]
-		public virtual signal void select ();
-		[HasEmitter]
-		public virtual signal void toggle ();
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Label : Gtk.Misc, Atk.Implementor, Gtk.Buildable {
-		public uint jtype;
-		public uint have_transform;
-		public uint in_click;
-		public uint pattern_set;
-		public weak string text;
-		public weak Pango.AttrList attrs;
-		public weak Pango.AttrList effective_attrs;
-		public weak Pango.Layout layout;
-		public weak Gtk.Window mnemonic_window;
-		public weak Gtk.LabelSelectionInfo select_info;
-		public double get_angle ();
-		public weak Pango.AttrList get_attributes ();
-		public Pango.EllipsizeMode get_ellipsize ();
-		public Gtk.Justification get_justify ();
-		public weak string get_label ();
-		public weak Pango.Layout get_layout ();
-		public void get_layout_offsets (int x, int y);
-		public bool get_line_wrap ();
-		public Pango.WrapMode get_line_wrap_mode ();
-		public int get_max_width_chars ();
-		public uint get_mnemonic_keyval ();
-		public weak Gtk.Widget get_mnemonic_widget ();
-		public bool get_selectable ();
-		public bool get_selection_bounds (int start, int end);
-		public bool get_single_line_mode ();
-		public weak string get_text ();
-		public bool get_use_markup ();
-		public bool get_use_underline ();
-		public int get_width_chars ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Label (string? str);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Label.with_mnemonic (string str);
-		public void select_region (int start_offset, int end_offset);
-		public void set_angle (double angle);
-		public void set_attributes (Pango.AttrList attrs);
-		public void set_ellipsize (Pango.EllipsizeMode mode);
-		public void set_justify (Gtk.Justification jtype);
-		public void set_label (string str);
-		public void set_line_wrap (bool wrap);
-		public void set_line_wrap_mode (Pango.WrapMode wrap_mode);
-		public void set_markup (string str);
-		public void set_markup_with_mnemonic (string str);
-		public void set_max_width_chars (int n_chars);
-		public void set_mnemonic_widget (Gtk.Widget widget);
-		public void set_pattern (string pattern);
-		public void set_selectable (bool setting);
-		public void set_single_line_mode (bool single_line_mode);
-		public void set_text (string str);
-		public void set_text_with_mnemonic (string str);
-		public void set_use_markup (bool setting);
-		public void set_use_underline (bool setting);
-		public void set_width_chars (int n_chars);
-		public double angle { get; set; }
-		public Pango.AttrList attributes { get; set; }
+		public bool editable_set { get; set; }
 		[NoAccessorMethod]
-		public int cursor_position { get; }
-		public Pango.EllipsizeMode ellipsize { get; set; }
-		public Gtk.Justification justify { get; set; }
-		public string label { get; set; }
-		public int max_width_chars { get; set; }
-		public uint mnemonic_keyval { get; }
-		public Gtk.Widget mnemonic_widget { get; set; }
-		public string pattern { set; }
-		public bool selectable { get; set; }
+		public string family { get; set; }
 		[NoAccessorMethod]
-		public int selection_bound { get; }
-		public bool single_line_mode { get; set; }
-		public bool use_markup { get; set; }
-		public bool use_underline { get; set; }
-		public int width_chars { get; set; }
+		public bool family_set { get; set; }
 		[NoAccessorMethod]
-		public bool wrap { get; set; }
+		public string font { get; set; }
 		[NoAccessorMethod]
-		public Pango.WrapMode wrap_mode { get; set; }
-		public virtual signal void copy_clipboard ();
-		public virtual signal void move_cursor (Gtk.MovementStep step, int count, bool extend_selection);
-		public virtual signal void populate_popup (Gtk.Menu menu);
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Layout : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		public weak GLib.List children;
-		public weak Gdk.Window bin_window;
-		public Gdk.VisibilityState visibility;
-		public int scroll_x;
-		public int scroll_y;
-		public uint freeze_count;
-		public weak Gtk.Adjustment get_hadjustment ();
-		public void get_size (out uint width, out uint height);
-		public weak Gtk.Adjustment get_vadjustment ();
-		public void move (Gtk.Widget child_widget, int x, int y);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Layout (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
-		public void put (Gtk.Widget child_widget, int x, int y);
-		public void set_hadjustment (Gtk.Adjustment adjustment);
-		public void set_size (uint width, uint height);
-		public void set_vadjustment (Gtk.Adjustment adjustment);
-		public Gtk.Adjustment hadjustment { get; set; }
+		public Pango.FontDescription font_desc { get; set; }
 		[NoAccessorMethod]
-		public uint height { get; set; }
-		public Gtk.Adjustment vadjustment { get; set; }
+		public string foreground { set; }
 		[NoAccessorMethod]
-		public uint width { get; set; }
-		public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
+		public Gdk.Color foreground_gdk { get; set; }
+		[NoAccessorMethod]
+		public bool foreground_set { get; set; }
+		[NoAccessorMethod]
+		public Gdk.Pixmap foreground_stipple { get; set; }
+		[NoAccessorMethod]
+		public bool foreground_stipple_set { get; set; }
+		[NoAccessorMethod]
+		public int indent { get; set; }
+		[NoAccessorMethod]
+		public bool indent_set { get; set; }
+		[NoAccessorMethod]
+		public bool invisible { get; set; }
+		[NoAccessorMethod]
+		public bool invisible_set { get; set; }
+		[NoAccessorMethod]
+		public Gtk.Justification justification { get; set; }
+		[NoAccessorMethod]
+		public bool justification_set { get; set; }
+		[NoAccessorMethod]
+		public string language { get; set; }
+		[NoAccessorMethod]
+		public bool language_set { get; set; }
+		[NoAccessorMethod]
+		public int left_margin { get; set; }
+		[NoAccessorMethod]
+		public bool left_margin_set { get; set; }
+		[NoAccessorMethod]
+		public string name { get; construct; }
+		[NoAccessorMethod]
+		public string paragraph_background { set; }
+		[NoAccessorMethod]
+		public Gdk.Color paragraph_background_gdk { get; set; }
+		[NoAccessorMethod]
+		public bool paragraph_background_set { get; set; }
+		[NoAccessorMethod]
+		public int pixels_above_lines { get; set; }
+		[NoAccessorMethod]
+		public bool pixels_above_lines_set { get; set; }
+		[NoAccessorMethod]
+		public int pixels_below_lines { get; set; }
+		[NoAccessorMethod]
+		public bool pixels_below_lines_set { get; set; }
+		[NoAccessorMethod]
+		public int pixels_inside_wrap { get; set; }
+		[NoAccessorMethod]
+		public bool pixels_inside_wrap_set { get; set; }
+		[NoAccessorMethod]
+		public int right_margin { get; set; }
+		[NoAccessorMethod]
+		public bool right_margin_set { get; set; }
+		[NoAccessorMethod]
+		public int rise { get; set; }
+		[NoAccessorMethod]
+		public bool rise_set { get; set; }
+		[NoAccessorMethod]
+		public double scale { get; set; }
+		[NoAccessorMethod]
+		public bool scale_set { get; set; }
+		[NoAccessorMethod]
+		public int size { get; set; }
+		[NoAccessorMethod]
+		public double size_points { get; set; }
+		[NoAccessorMethod]
+		public bool size_set { get; set; }
+		[NoAccessorMethod]
+		public Pango.Stretch stretch { get; set; }
+		[NoAccessorMethod]
+		public bool stretch_set { get; set; }
+		[NoAccessorMethod]
+		public bool strikethrough { get; set; }
+		[NoAccessorMethod]
+		public bool strikethrough_set { get; set; }
+		[NoAccessorMethod]
+		public Pango.Style style { get; set; }
+		[NoAccessorMethod]
+		public bool style_set { get; set; }
+		[NoAccessorMethod]
+		public Pango.TabArray tabs { get; set; }
+		[NoAccessorMethod]
+		public bool tabs_set { get; set; }
+		[NoAccessorMethod]
+		public Pango.Underline underline { get; set; }
+		[NoAccessorMethod]
+		public bool underline_set { get; set; }
+		[NoAccessorMethod]
+		public Pango.Variant variant { get; set; }
+		[NoAccessorMethod]
+		public bool variant_set { get; set; }
+		[NoAccessorMethod]
+		public int weight { get; set; }
+		[NoAccessorMethod]
+		public bool weight_set { get; set; }
+		[NoAccessorMethod]
+		public Gtk.WrapMode wrap_mode { get; set; }
+		[NoAccessorMethod]
+		public bool wrap_mode_set { get; set; }
+		[HasEmitter]
+		public virtual signal bool event (GLib.Object event_object, Gdk.Event event, Gtk.TextIter iter);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class LinkButton : Gtk.Button, Atk.Implementor, Gtk.Buildable {
-		public weak string get_uri ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public LinkButton (string uri);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public LinkButton.with_label (string uri, string label);
-		public void set_uri (string uri);
-		public static void set_uri_hook (Gtk.LinkButtonUriFunc# func);
-		public string uri { get; set; }
+	public class TextTagTable : GLib.Object {
+		public int anon_count;
+		public weak GLib.SList anonymous;
+		public weak GLib.SList buffers;
+		public weak GLib.HashTable hash;
+		public void add (Gtk.TextTag tag);
+		public void @foreach (Gtk.TextTagTableForeach func, void* data);
+		public int get_size ();
+		public weak Gtk.TextTag lookup (string name);
+		[CCode (has_construct_function = false)]
+		public TextTagTable ();
+		public void remove (Gtk.TextTag tag);
+		public virtual signal void tag_added (Gtk.TextTag tag);
+		public virtual signal void tag_changed (Gtk.TextTag tag, bool size_changed);
+		public virtual signal void tag_removed (Gtk.TextTag tag);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ListStore : GLib.Object, Gtk.Buildable, Gtk.TreeModel, Gtk.TreeSortable, Gtk.TreeDragSource, Gtk.TreeDragDest {
-		public int stamp;
-		public void* seq;
-		public weak GLib.List sort_list;
-		public int n_columns;
-		public int sort_column_id;
-		public Gtk.SortType order;
-		[NoArrayLength]
-		public weak GLib.Type[] column_headers;
-		public int length;
-		public weak Gtk.TreeIterCompareFunc default_sort_func;
-		public void* default_sort_data;
-		public weak Gtk.DestroyNotify default_sort_destroy;
-		public uint columns_dirty;
-		public void append (out Gtk.TreeIter iter);
-		public void clear ();
-		public void insert (out Gtk.TreeIter iter, int position);
-		public void insert_after (out Gtk.TreeIter iter, Gtk.TreeIter? sibling);
-		public void insert_before (out Gtk.TreeIter iter, Gtk.TreeIter? sibling);
-		[CCode (sentinel = "-1")]
-		public void insert_with_values (out Gtk.TreeIter iter, int position, ...);
-		public void insert_with_valuesv (out Gtk.TreeIter iter, int position, int columns, GLib.Value[] values);
-		public bool iter_is_valid (Gtk.TreeIter iter);
-		public void move_after (Gtk.TreeIter iter, Gtk.TreeIter? position);
-		public void move_before (Gtk.TreeIter iter, Gtk.TreeIter? position);
-		[CCode (has_construct_function = false)]
-		public ListStore (int n_columns, ...);
-		[CCode (cname = "gtk_list_store_newv", has_construct_function = false)]
-		public ListStore.newv (int n_columns, GLib.Type[] types);
-		public void prepend (out Gtk.TreeIter iter);
-		public bool remove (Gtk.TreeIter iter);
-		public void reorder (int new_order);
-		[CCode (sentinel = "-1")]
-		public void set (Gtk.TreeIter iter, ...);
-		public void set_column_types ([CCode (array_length_pos = 0.9)] GLib.Type[] types);
-		public void set_valist (Gtk.TreeIter iter, void* var_args);
-		public void set_value (Gtk.TreeIter iter, int column, GLib.Value value);
-		public void set_valuesv (Gtk.TreeIter iter, int columns, GLib.Value[] values);
-		public void swap (Gtk.TreeIter a, Gtk.TreeIter b);
+	public class TextView : Gtk.Container, Atk.Implementor, Gtk.Buildable {
+		public uint blink_timeout;
+		public weak Gtk.TextWindow bottom_window;
+		public weak GLib.SList children;
+		public weak Gtk.TextMark dnd_mark;
+		public int drag_start_x;
+		public int drag_start_y;
+		public weak Gtk.TextMark first_para_mark;
+		public int first_para_pixels;
+		public uint first_validate_idle;
+		public weak Gtk.Adjustment hadjustment;
+		public int height;
+		public weak Gtk.IMContext im_context;
+		public uint incremental_validate_idle;
+		public Gtk.Justification justify;
+		public weak Gtk.TextWindow left_window;
+		public uint mouse_cursor_obscured;
+		public uint need_im_reset;
+		public uint onscreen_validated;
+		public uint overwrite_mode;
+		public int pending_place_cursor_button;
+		public weak Gtk.TextPendingScroll pending_scroll;
+		public weak Gtk.Widget popup_menu;
+		public weak Gtk.TextWindow right_window;
+		public uint scroll_timeout;
+		public uint selection_drag_handler;
+		public weak Gtk.TextWindow text_window;
+		public weak Gtk.TextWindow top_window;
+		public weak Gtk.Adjustment vadjustment;
+		public int virtual_cursor_x;
+		public int virtual_cursor_y;
+		public int width;
+		public uint width_changed;
+		public int xoffset;
+		public int yoffset;
+		public void add_child_at_anchor (Gtk.Widget child, Gtk.TextChildAnchor anchor);
+		public void add_child_in_window (Gtk.Widget child, Gtk.TextWindowType which_window, int xpos, int ypos);
+		public bool backward_display_line (Gtk.TextIter iter);
+		public bool backward_display_line_start (Gtk.TextIter iter);
+		public void buffer_to_window_coords (Gtk.TextWindowType win, int buffer_x, int buffer_y, out int window_x, out int window_y);
+		public bool forward_display_line (Gtk.TextIter iter);
+		public bool forward_display_line_end (Gtk.TextIter iter);
+		public bool get_accepts_tab ();
+		public int get_border_window_size (Gtk.TextWindowType type);
+		public weak Gtk.TextBuffer get_buffer ();
+		public bool get_cursor_visible ();
+		public weak Gtk.TextAttributes get_default_attributes ();
+		public bool get_editable ();
+		public int get_indent ();
+		public void get_iter_at_location (out Gtk.TextIter iter, int x, int y);
+		public void get_iter_at_position (out Gtk.TextIter iter, out int trailing, int x, int y);
+		public void get_iter_location (Gtk.TextIter iter, out Gdk.Rectangle location);
+		public Gtk.Justification get_justification ();
+		public int get_left_margin ();
+		public void get_line_at_y (Gtk.TextIter target_iter, int y, int line_top);
+		public void get_line_yrange (Gtk.TextIter iter, int y, int height);
+		public bool get_overwrite ();
+		public int get_pixels_above_lines ();
+		public int get_pixels_below_lines ();
+		public int get_pixels_inside_wrap ();
+		public int get_right_margin ();
+		public weak Pango.TabArray get_tabs ();
+		public void get_visible_rect (out Gdk.Rectangle visible_rect);
+		public weak Gdk.Window get_window (Gtk.TextWindowType win);
+		public Gtk.TextWindowType get_window_type (Gdk.Window window);
+		public Gtk.WrapMode get_wrap_mode ();
+		public void move_child (Gtk.Widget child, int xpos, int ypos);
+		[NoWrapper]
+		public virtual void move_focus (Gtk.DirectionType direction);
+		public bool move_mark_onscreen (Gtk.TextMark mark);
+		public bool move_visually (Gtk.TextIter iter, int count);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public TextView ();
+		public bool place_cursor_onscreen ();
+		public void scroll_mark_onscreen (Gtk.TextMark mark);
+		public bool scroll_to_iter (Gtk.TextIter iter, double within_margin, bool use_align, double xalign, double yalign);
+		public void scroll_to_mark (Gtk.TextMark mark, double within_margin, bool use_align, double xalign, double yalign);
+		public void set_accepts_tab (bool accepts_tab);
+		public void set_border_window_size (Gtk.TextWindowType type, int size);
+		public void set_buffer (Gtk.TextBuffer buffer);
+		public void set_cursor_visible (bool setting);
+		public void set_editable (bool setting);
+		public void set_indent (int indent);
+		public void set_justification (Gtk.Justification justification);
+		public void set_left_margin (int left_margin);
+		public void set_overwrite (bool overwrite);
+		public void set_pixels_above_lines (int pixels_above_lines);
+		public void set_pixels_below_lines (int pixels_below_lines);
+		public void set_pixels_inside_wrap (int pixels_inside_wrap);
+		public void set_right_margin (int right_margin);
+		public void set_tabs (Pango.TabArray tabs);
+		public void set_wrap_mode (Gtk.WrapMode wrap_mode);
+		public bool starts_display_line (Gtk.TextIter iter);
+		public void window_to_buffer_coords (Gtk.TextWindowType win, int window_x, int window_y, out int buffer_x, out int buffer_y);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public TextView.with_buffer (Gtk.TextBuffer buffer);
+		public bool accepts_tab { get; set; }
+		public Gtk.TextBuffer buffer { get; set; }
+		public bool cursor_visible { get; set; }
+		public bool editable { get; set; }
+		public int indent { get; set; }
+		public Gtk.Justification justification { get; set; }
+		public int left_margin { get; set; }
+		public bool overwrite { get; set; }
+		public int pixels_above_lines { get; set; }
+		public int pixels_below_lines { get; set; }
+		public int pixels_inside_wrap { get; set; }
+		public int right_margin { get; set; }
+		public Pango.TabArray tabs { get; set; }
+		public Gtk.WrapMode wrap_mode { get; set; }
+		public virtual signal void backspace ();
+		public virtual signal void copy_clipboard ();
+		public virtual signal void cut_clipboard ();
+		public virtual signal void delete_from_cursor (Gtk.DeleteType type, int count);
+		public virtual signal void insert_at_cursor (string str);
+		public virtual signal void move_cursor (Gtk.MovementStep step, int count, bool extend_selection);
+		public virtual signal void move_viewport (Gtk.ScrollStep p0, int p1);
+		public virtual signal void page_horizontally (int count, bool extend_selection);
+		public virtual signal void paste_clipboard ();
+		public virtual signal void populate_popup (Gtk.Menu menu);
+		public virtual signal void select_all (bool p0);
+		public virtual signal void set_anchor ();
+		public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
+		public virtual signal void toggle_cursor_visible ();
+		public virtual signal void toggle_overwrite ();
 	}
+	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Menu : Gtk.MenuShell, Atk.Implementor, Gtk.Buildable {
-		public weak Gtk.Widget parent_menu_item;
-		public weak Gtk.Widget old_active_menu_item;
-		public weak Gtk.AccelGroup accel_group;
-		public weak string accel_path;
-		public weak Gtk.MenuPositionFunc position_func;
-		public void* position_func_data;
-		public uint toggle_size;
-		public weak Gtk.Widget toplevel;
-		public weak Gtk.Widget tearoff_window;
-		public weak Gtk.Widget tearoff_hbox;
-		public weak Gtk.Widget tearoff_scrollbar;
-		public weak Gtk.Adjustment tearoff_adjustment;
-		public weak Gdk.Window view_window;
-		public weak Gdk.Window bin_window;
-		public int scroll_offset;
-		public int saved_scroll_offset;
-		public int scroll_step;
-		public uint timeout_id;
-		public weak Gdk.Region navigation_region;
-		public uint navigation_timeout;
-		public uint needs_destruction_ref_count;
-		public uint torn_off;
-		public uint tearoff_active;
-		public uint scroll_fast;
-		public uint upper_arrow_visible;
-		public uint lower_arrow_visible;
-		public uint upper_arrow_prelight;
-		public uint lower_arrow_prelight;
-		public void attach (Gtk.Widget child, uint left_attach, uint right_attach, uint top_attach, uint bottom_attach);
-		public void attach_to_widget (Gtk.Widget attach_widget, Gtk.MenuDetachFunc detacher);
-		public void detach ();
-		public weak Gtk.AccelGroup get_accel_group ();
-		public weak Gtk.Widget get_active ();
-		public weak Gtk.Widget get_attach_widget ();
-		public static weak GLib.List get_for_attach_widget (Gtk.Widget widget);
-		public bool get_tearoff_state ();
-		public weak string get_title ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Menu ();
-		public void popdown ();
-		public void popup (Gtk.Widget? parent_menu_shell, Gtk.Widget? parent_menu_item, Gtk.MenuPositionFunc? func, uint button, uint activate_time);
-		public void reorder_child (Gtk.Widget child, int position);
-		public void reposition ();
-		public void set_accel_group (Gtk.AccelGroup accel_group);
-		public void set_accel_path (string accel_path);
-		public void set_active (uint index_);
-		public void set_monitor (int monitor_num);
-		public void set_screen (Gdk.Screen screen);
-		public void set_tearoff_state (bool torn_off);
-		public void set_title (string title);
-		public bool tearoff_state { get; set; }
-		[NoAccessorMethod]
-		public string tearoff_title { get; set; }
-		public virtual signal void move_scroll (Gtk.ScrollType p0);
+	public class TextWindow {
+	}
+	[Compact]
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class ThemeEngine {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class MenuBar : Gtk.MenuShell, Atk.Implementor, Gtk.Buildable {
-		public Gtk.PackDirection get_child_pack_direction ();
-		public Gtk.PackDirection get_pack_direction ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public MenuBar ();
-		public void set_child_pack_direction (Gtk.PackDirection child_pack_dir);
-		public void set_pack_direction (Gtk.PackDirection pack_dir);
-		public Gtk.PackDirection child_pack_direction { get; set; }
-		public Gtk.PackDirection pack_direction { get; set; }
+	public class ToggleAction : Gtk.Action, Gtk.Buildable {
+		public bool get_active ();
+		public bool get_draw_as_radio ();
+		[CCode (has_construct_function = false)]
+		public ToggleAction (string name, string? label, string? tooltip, string? stock_id);
+		public void set_active (bool is_active);
+		public void set_draw_as_radio (bool draw_as_radio);
+		public bool active { get; set; }
+		public bool draw_as_radio { get; set; }
+		[HasEmitter]
+		public virtual signal void toggled ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class MenuItem : Gtk.Item, Atk.Implementor, Gtk.Buildable {
-		public weak Gdk.Window event_window;
-		public ushort toggle_size;
-		public ushort accelerator_width;
-		public weak string accel_path;
-		public uint show_submenu_indicator;
-		public uint submenu_placement;
-		public uint submenu_direction;
-		public uint right_justify;
-		public uint timer_from_keypress;
-		public uint from_menubar;
-		public uint timer;
-		public bool get_right_justified ();
-		public weak Gtk.Widget get_submenu ();
+	public class ToggleButton : Gtk.Button, Atk.Implementor, Gtk.Buildable {
+		public bool get_active ();
+		public bool get_inconsistent ();
+		public bool get_mode ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public MenuItem ();
+		public ToggleButton ();
+		public void set_active (bool is_active);
+		public void set_inconsistent (bool setting);
+		public void set_mode (bool draw_indicator);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public MenuItem.with_label (string label);
+		public ToggleButton.with_label (string label);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public MenuItem.with_mnemonic (string label);
-		public void set_accel_path (string accel_path);
-		public void set_right_justified (bool right_justified);
-		public void set_submenu (Gtk.Widget submenu);
-		public Gtk.Menu submenu { get; set; }
-		[HasEmitter]
-		public virtual signal void activate ();
-		public virtual signal void activate_item ();
-		[HasEmitter]
-		public virtual signal void toggle_size_allocate (int allocation);
+		public ToggleButton.with_mnemonic (string label);
+		public bool active { get; set; }
+		[NoAccessorMethod]
+		public bool draw_indicator { get; set; }
+		public bool inconsistent { get; set; }
 		[HasEmitter]
-		public virtual signal void toggle_size_request (void* requisition);
+		public virtual signal void toggled ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class MenuShell : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		public GLib.List<Gtk.MenuItem> children;
-		public weak Gtk.Widget active_menu_item;
-		public weak Gtk.Widget parent_menu_shell;
-		public uint button;
-		public uint activate_time;
-		public uint active;
-		public uint have_grab;
-		public uint have_xgrab;
-		public uint ignore_leave;
-		public uint menu_flag;
-		public uint ignore_enter;
-		public void activate_item (Gtk.Widget menu_item, bool force_deactivate);
-		public void append ([CCode (type = "GtkWidget*")] Gtk.MenuItem child);
-		public void deselect ();
-		public bool get_take_focus ();
-		public void prepend (Gtk.Widget child);
-		public void select_first (bool search_sensitive);
-		public void set_take_focus (bool take_focus);
-		[NoWrapper]
-		public virtual int get_popup_delay ();
-		public virtual void insert (Gtk.Widget child, int position);
-		public virtual void select_item (Gtk.Widget menu_item);
-		public bool take_focus { get; set; }
-		public virtual signal void activate_current (bool force_hide);
-		[HasEmitter]
-		public virtual signal void cancel ();
-		public virtual signal void cycle_focus (Gtk.DirectionType p0);
-		[HasEmitter]
-		public virtual signal void deactivate ();
-		public virtual signal void move_current (Gtk.MenuDirectionType direction);
-		public virtual signal bool move_selected (int distance);
-		public virtual signal void selection_done ();
+	public class ToggleToolButton : Gtk.ToolButton, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		public ToggleToolButton.from_stock (string stock_id);
+		public bool get_active ();
+		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		public ToggleToolButton ();
+		public void set_active (bool is_active);
+		public bool active { get; set; }
+		public virtual signal void toggled ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class MenuToolButton : Gtk.ToolButton, Atk.Implementor, Gtk.Buildable {
-		public weak Gtk.Widget get_menu ();
+	public class ToolButton : Gtk.ToolItem, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
-		public MenuToolButton (Gtk.Widget icon_widget, string label);
+		public ToolButton.from_stock (string stock_id);
+		public weak string get_icon_name ();
+		public weak Gtk.Widget get_icon_widget ();
+		public weak string get_label ();
+		public weak Gtk.Widget get_label_widget ();
+		public weak string get_stock_id ();
+		public bool get_use_underline ();
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
-		public MenuToolButton.from_stock (string stock_id);
-		public void set_arrow_tooltip_markup (string markup);
-		public void set_arrow_tooltip_text (string text);
-		public void set_menu (Gtk.Widget menu);
-		public Gtk.Menu menu { get; set; }
-		public virtual signal void show_menu ();
+		public ToolButton (Gtk.Widget icon_widget, string label);
+		public void set_icon_name (string icon_name);
+		public void set_icon_widget (Gtk.Widget icon_widget);
+		public void set_label (string label);
+		public void set_label_widget (Gtk.Widget label_widget);
+		public void set_stock_id (string stock_id);
+		public void set_use_underline (bool use_underline);
+		public string icon_name { get; set; }
+		public Gtk.Widget icon_widget { get; set; }
+		public string label { get; set; }
+		public Gtk.Widget label_widget { get; set; }
+		public string stock_id { get; set; }
+		public bool use_underline { get; set; }
+		public virtual signal void clicked ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class MessageDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		public weak Gtk.Widget label;
-		public void format_secondary_markup (string message_format, ...);
-		public void format_secondary_text (string message_format, ...);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public MessageDialog (Gtk.Window? parent, Gtk.DialogFlags flags, Gtk.MessageType type, Gtk.ButtonsType buttons, string message_format, ...);
+	public class ToolItem : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
+		public bool get_expand ();
+		public bool get_homogeneous ();
+		public Gtk.IconSize get_icon_size ();
+		public bool get_is_important ();
+		public Gtk.Orientation get_orientation ();
+		public weak Gtk.Widget get_proxy_menu_item (string menu_item_id);
+		public Gtk.ReliefStyle get_relief_style ();
+		public Gtk.ToolbarStyle get_toolbar_style ();
+		public bool get_use_drag_window ();
+		public bool get_visible_horizontal ();
+		public bool get_visible_vertical ();
+		[CCode (has_construct_function = false)]
+		public ToolItem ();
+		public void rebuild_menu ();
+		public weak Gtk.Widget retrieve_proxy_menu_item ();
+		public void set_expand (bool expand);
+		public void set_homogeneous (bool homogeneous);
+		public void set_is_important (bool is_important);
+		public void set_proxy_menu_item (string menu_item_id, Gtk.Widget menu_item);
+		public void set_tooltip_markup (string markup);
+		public void set_tooltip_text (string text);
+		public void set_use_drag_window (bool use_drag_window);
+		public void set_visible_horizontal (bool visible_horizontal);
+		public void set_visible_vertical (bool visible_vertical);
+		public bool is_important { get; set; }
+		public bool visible_horizontal { get; set; }
+		public bool visible_vertical { get; set; }
+		public virtual signal bool create_menu_proxy ();
+		public virtual signal void toolbar_reconfigured ();
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Toolbar : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.ToolShell {
+		public int button_maxh;
+		public int button_maxw;
+		public weak GLib.List children;
+		public int num_children;
+		public Gtk.ToolbarStyle style;
+		public uint style_set;
+		public int get_drop_index (int x, int y);
+		public int get_item_index (Gtk.ToolItem item);
+		public int get_n_items ();
+		public weak Gtk.ToolItem get_nth_item (int n);
+		public bool get_show_arrow ();
+		public bool get_tooltips ();
+		public void insert (Gtk.ToolItem item, int pos);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public MessageDialog.with_markup (Gtk.Window? parent, Gtk.DialogFlags flags, Gtk.MessageType type, Gtk.ButtonsType buttons, string message_format, ...);
-		public void set_image (Gtk.Widget image);
-		public void set_markup (string str);
-		[NoAccessorMethod]
-		public Gtk.ButtonsType buttons { construct; }
-		[NoAccessorMethod]
-		public Gtk.Widget image { get; set; }
-		[NoAccessorMethod]
-		public Gtk.MessageType message_type { get; set construct; }
-		[NoAccessorMethod]
-		public string secondary_text { get; set; }
-		[NoAccessorMethod]
-		public bool secondary_use_markup { get; set; }
+		public Toolbar ();
+		public void set_drop_highlight_item (Gtk.ToolItem tool_item, int index_);
+		public void set_icon_size (Gtk.IconSize icon_size);
+		public void set_orientation (Gtk.Orientation orientation);
+		public void set_show_arrow (bool show_arrow);
+		public void set_style (Gtk.ToolbarStyle style);
+		public void set_tooltips (bool enable);
+		public void unset_icon_size ();
+		public void unset_style ();
+		public Gtk.IconSize icon_size { get; set; }
 		[NoAccessorMethod]
-		public string text { get; set; }
+		public bool icon_size_set { get; set; }
+		public Gtk.Orientation orientation { get; set; }
+		public bool show_arrow { get; set; }
 		[NoAccessorMethod]
-		public bool use_markup { get; set; }
+		public Gtk.ToolbarStyle toolbar_style { get; set; }
+		public bool tooltips { get; set; }
+		public virtual signal bool focus_home_or_end (bool p0);
+		public virtual signal void orientation_changed (Gtk.Orientation orientation);
+		public virtual signal bool popup_context_menu (int x, int y, int button_number);
+		public virtual signal void style_changed (Gtk.ToolbarStyle style);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Misc : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
-		public void get_alignment (float xalign, float yalign);
-		public void get_padding (int xpad, int ypad);
-		public void set_alignment (float xalign, float yalign);
-		public void set_padding (int xpad, int ypad);
-		[NoAccessorMethod]
-		public float xalign { get; set; }
-		[NoAccessorMethod]
-		public int xpad { get; set; }
+	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);
+		public void set_tip_area (Gdk.Rectangle rect);
+		public static void trigger_tooltip_query (Gdk.Display display);
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class TreeModelFilter : GLib.Object, Gtk.TreeModel, Gtk.TreeDragSource {
+		public void clear_cache ();
+		public bool convert_child_iter_to_iter (out Gtk.TreeIter filter_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 filter_iter);
+		public weak Gtk.TreePath convert_path_to_child_path (Gtk.TreePath filter_path);
+		public weak Gtk.TreeModel get_model ();
+		[CCode (type = "GtkTreeModel*", has_construct_function = false)]
+		public TreeModelFilter (Gtk.TreeModel child_model, Gtk.TreePath? root);
+		public void refilter ();
+		public void set_modify_func (int n_columns, GLib.Type[] types, Gtk.TreeModelFilterModifyFunc func, void* data, Gtk.DestroyNotify destroy);
+		public void set_visible_column (int column);
+		public void set_visible_func (Gtk.TreeModelFilterVisibleFunc# func);
 		[NoAccessorMethod]
-		public float yalign { get; set; }
+		public Gtk.TreeModel child_model { get; construct; }
 		[NoAccessorMethod]
-		public int ypad { get; set; }
+		public Gtk.TreePath virtual_root { get; construct; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class MountOperation : GLib.MountOperation {
-		public weak Gtk.Window get_parent ();
-		public weak Gdk.Screen get_screen ();
-		[CCode (type = "GMountOperation*", has_construct_function = false)]
-		public MountOperation (Gtk.Window parent);
-		public void set_parent (Gtk.Window parent);
-		public void set_screen (Gdk.Screen screen);
+	public class TreeModelSort : GLib.Object, Gtk.TreeModel, Gtk.TreeSortable, Gtk.TreeDragSource {
+		public uint changed_id;
+		public uint child_flags;
+		public weak Gtk.TreeModel child_model;
+		public void* default_sort_data;
+		public weak Gtk.DestroyNotify default_sort_destroy;
+		public weak Gtk.TreeIterCompareFunc default_sort_func;
+		public uint deleted_id;
+		public uint has_child_toggled_id;
+		public uint inserted_id;
+		public Gtk.SortType order;
+		public uint reordered_id;
+		public void* root;
+		public int sort_column_id;
+		public weak GLib.List sort_list;
+		public int stamp;
+		public int zero_ref_count;
+		public void clear_cache ();
+		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);
+		public weak Gtk.TreeModel get_model ();
+		public bool iter_is_valid (Gtk.TreeIter iter);
+		public void reset_default_sort_func ();
+		[CCode (type = "GtkTreeModel*", has_construct_function = false)]
+		public TreeModelSort.with_model (Gtk.TreeModel child_model);
 		[NoAccessorMethod]
-		public bool is_showing { get; }
-		public Gtk.Window parent { get; set; }
-		public Gtk.Window screen { get; set; }
+		public Gtk.TreeModel model { get; construct; }
 	}
-	[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;
-		public weak GLib.List first_tab;
-		public weak Gtk.Widget menu;
-		public weak Gdk.Window event_window;
-		public uint timer;
-		public uint in_child;
-		public uint click_child;
-		public uint button;
-		public uint need_timer;
-		public uint child_has_focus;
-		public uint have_visible_child;
-		public uint focus_out;
-		public uint has_before_previous;
-		public uint has_before_next;
-		public uint has_after_previous;
-		public uint has_after_next;
-		public int append_page (Gtk.Widget child, Gtk.Widget? tab_label);
-		public int append_page_menu (Gtk.Widget child, Gtk.Widget tab_label, Gtk.Widget menu_label);
-		public int get_current_page ();
-		public void* get_group ();
-		public weak Gtk.Widget get_menu_label (Gtk.Widget child);
-		public weak string get_menu_label_text (Gtk.Widget child);
-		public int get_n_pages ();
-		public weak Gtk.Widget get_nth_page (int page_num);
-		public bool get_scrollable ();
-		public bool get_show_border ();
-		public bool get_show_tabs ();
-		public bool get_tab_detachable (Gtk.Widget child);
-		public weak Gtk.Widget get_tab_label (Gtk.Widget child);
-		public weak string get_tab_label_text (Gtk.Widget child);
-		public Gtk.PositionType get_tab_pos ();
-		public bool get_tab_reorderable (Gtk.Widget child);
-		public int insert_page_menu (Gtk.Widget child, Gtk.Widget tab_label, Gtk.Widget menu_label, int position);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Notebook ();
-		public void next_page ();
-		public void popup_disable ();
-		public void popup_enable ();
-		public int prepend_page (Gtk.Widget child, Gtk.Widget tab_label);
-		public int prepend_page_menu (Gtk.Widget child, Gtk.Widget tab_label, Gtk.Widget menu_label);
-		public void prev_page ();
-		public void query_tab_label_packing (Gtk.Widget child, bool expand, bool fill, Gtk.PackType pack_type);
-		public void remove_page (int page_num);
-		public void reorder_child (Gtk.Widget child, int position);
-		public void set_current_page (int page_num);
-		public void set_group (void* group);
-		public void set_menu_label (Gtk.Widget child, Gtk.Widget menu_label);
-		public void set_menu_label_text (Gtk.Widget child, string menu_text);
-		public void set_scrollable (bool scrollable);
-		public void set_show_border (bool show_border);
-		public void set_show_tabs (bool show_tabs);
-		public void set_tab_detachable (Gtk.Widget child, bool detachable);
-		public void set_tab_label (Gtk.Widget child, Gtk.Widget tab_label);
-		public void set_tab_label_packing (Gtk.Widget child, bool expand, bool fill, Gtk.PackType pack_type);
-		public void set_tab_label_text (Gtk.Widget child, string tab_text);
-		public void set_tab_pos (Gtk.PositionType pos);
-		public void set_tab_reorderable (Gtk.Widget child, bool reorderable);
-		public static void set_window_creation_hook (Gtk.NotebookWindowCreationFunc func, void* data, GLib.DestroyNotify destroy);
-		public virtual int insert_page (Gtk.Widget child, Gtk.Widget tab_label, int position);
-		[NoAccessorMethod]
-		public bool enable_popup { get; set; }
-		public void* group { get; set; }
-		[NoAccessorMethod]
-		public int group_id { get; set; }
-		[NoAccessorMethod]
-		public bool homogeneous { get; set; }
-		[NoAccessorMethod]
-		public int page { get; set; }
-		public bool scrollable { get; set; }
-		public bool show_border { get; set; }
-		public bool show_tabs { get; set; }
-		[NoAccessorMethod]
-		public uint tab_border { set; }
-		[NoAccessorMethod]
-		public uint tab_hborder { get; set; }
-		public Gtk.PositionType tab_pos { get; set; }
-		[NoAccessorMethod]
-		public uint tab_vborder { get; set; }
-		public virtual signal bool change_current_page (int offset);
-		public virtual signal weak Gtk.Notebook create_window (Gtk.Widget page, int x, int y);
-		public virtual signal bool focus_tab (Gtk.NotebookTab type);
-		public virtual signal void move_focus_out (Gtk.DirectionType direction);
-		public virtual signal void page_added (Gtk.Widget p0, uint p1);
-		public virtual signal void page_removed (Gtk.Widget p0, uint p1);
-		public virtual signal void page_reordered (Gtk.Widget p0, uint p1);
-		public virtual signal bool reorder_tab (Gtk.DirectionType direction, bool move_to_last);
-		public virtual signal bool select_page (bool move_focus);
-		public virtual signal void switch_page (void* page, uint page_num);
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Object : GLib.InitiallyUnowned {
-		public uint flags;
-		[NoWrapper]
-		public virtual void get_arg (Gtk.Arg arg, uint arg_id);
-		[NoWrapper]
-		public virtual void set_arg (Gtk.Arg arg, uint arg_id);
-		[NoAccessorMethod]
-		public void* user_data { get; set; }
-		[HasEmitter]
-		public virtual signal void destroy ();
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class PageSetup : GLib.Object {
-		public weak Gtk.PageSetup copy ();
-		public double get_bottom_margin (Gtk.Unit unit);
-		public double get_left_margin (Gtk.Unit unit);
-		public Gtk.PageOrientation get_orientation ();
-		public double get_page_height (Gtk.Unit unit);
-		public double get_page_width (Gtk.Unit unit);
-		public double get_paper_height (Gtk.Unit unit);
-		public weak Gtk.PaperSize get_paper_size ();
-		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;
+	[Compact]
+	[CCode (copy_function = "gtk_tree_path_copy", cheader_filename = "gtk/gtk.h")]
+	public class TreePath {
+		public void append_index (int index_);
+		public int compare (Gtk.TreePath b);
+		public Gtk.TreePath copy ();
+		public void down ();
 		[CCode (has_construct_function = false)]
-		public PageSetup ();
+		public TreePath.first ();
+		[CCode (sentinel = "-1", has_construct_function = false)]
+		public TreePath.from_indices (...);
 		[CCode (has_construct_function = false)]
-		public PageSetup.from_file (string file_name) throws GLib.Error;
+		public TreePath.from_string (string path);
+		public int get_depth ();
+		[NoArrayLength]
+		public weak int[] get_indices ();
+		public bool is_ancestor (Gtk.TreePath descendant);
+		public bool is_descendant (Gtk.TreePath ancestor);
 		[CCode (has_construct_function = false)]
-		public PageSetup.from_key_file (GLib.KeyFile key_file, string group_name) throws GLib.Error;
-		public void set_bottom_margin (double margin, Gtk.Unit unit);
-		public void set_left_margin (double margin, Gtk.Unit unit);
-		public void set_orientation (Gtk.PageOrientation orientation);
-		public void set_paper_size (Gtk.PaperSize size);
-		public void set_paper_size_and_default_margins (Gtk.PaperSize size);
-		public void set_right_margin (double margin, Gtk.Unit unit);
-		public void set_top_margin (double margin, Gtk.Unit unit);
-		public bool to_file (string file_name) throws GLib.Error;
-		public void to_key_file (GLib.KeyFile key_file, string group_name);
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Paned : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		public weak Gtk.Widget child1;
-		public weak Gtk.Widget child2;
-		public weak Gdk.Window handle;
-		public weak Gdk.GC xor_gc;
-		public Gdk.CursorType cursor_type;
-		public Gdk.Rectangle handle_pos;
-		public int child1_size;
-		public int last_allocation;
-		public uint in_drag;
-		public uint child1_shrink;
-		public uint child1_resize;
-		public uint child2_shrink;
-		public uint child2_resize;
-		public uint orientation;
-		public uint in_recursion;
-		public uint handle_prelit;
-		public weak Gtk.Widget last_child1_focus;
-		public weak Gtk.Widget last_child2_focus;
-		public int drag_pos;
-		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 ();
-		public void pack1 (Gtk.Widget child, bool resize, bool shrink);
-		public void pack2 (Gtk.Widget child, bool resize, bool shrink);
-		public void set_position (int position);
-		[NoAccessorMethod]
-		public int max_position { get; }
-		[NoAccessorMethod]
-		public int min_position { get; }
-		public int position { get; set; }
-		[NoAccessorMethod]
-		public bool position_set { get; set; }
-		public virtual signal bool accept_position ();
-		public virtual signal bool cancel_position ();
-		public virtual signal bool cycle_child_focus (bool reverse);
-		public virtual signal bool cycle_handle_focus (bool reverse);
-		public virtual signal bool move_handle (Gtk.ScrollType scroll);
-		public virtual signal bool toggle_handle_focus ();
+		public TreePath ();
+		public void next ();
+		public void prepend_index (int index_);
+		public bool prev ();
+		public weak string to_string ();
+		public bool up ();
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Plug : Gtk.Window, Atk.Implementor, Gtk.Buildable {
-		public weak Gdk.Window socket_window;
-		public weak Gtk.Widget modality_window;
-		public weak Gtk.WindowGroup modality_group;
-		public weak GLib.HashTable grabbed_keys;
-		public uint same_app;
-		public void @construct (Gdk.NativeWindow socket_id);
-		public void construct_for_display (Gdk.Display display, Gdk.NativeWindow socket_id);
-		public Gdk.NativeWindow get_id ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Plug (Gdk.NativeWindow socket_id);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Plug.for_display (Gdk.Display display, Gdk.NativeWindow socket_id);
-		[NoAccessorMethod]
-		public bool embedded { get; }
+	[Compact]
+	[CCode (copy_function = "gtk_tree_row_reference_copy", cheader_filename = "gtk/gtk.h")]
+	public class TreeRowReference {
+		public weak Gtk.TreeRowReference copy ();
+		public static void deleted (GLib.Object proxy, Gtk.TreePath path);
+		public weak Gtk.TreeModel get_model ();
+		public Gtk.TreePath get_path ();
+		public static void inserted (GLib.Object proxy, Gtk.TreePath path);
+		[CCode (has_construct_function = false)]
+		public TreeRowReference (Gtk.TreeModel model, Gtk.TreePath path);
+		[CCode (has_construct_function = false)]
+		public TreeRowReference.proxy (GLib.Object proxy, Gtk.TreeModel model, Gtk.TreePath path);
+		public static void reordered (GLib.Object proxy, Gtk.TreePath path, Gtk.TreeIter iter, int[] new_order);
+		public bool valid ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class PrintContext : GLib.Object {
-		public weak Pango.Context create_pango_context ();
-		public weak Pango.Layout create_pango_layout ();
-		public weak Cairo.Context get_cairo_context ();
-		public double get_dpi_x ();
-		public double get_dpi_y ();
-		public double get_height ();
-		public weak Gtk.PageSetup get_page_setup ();
-		public weak Pango.FontMap get_pango_fontmap ();
-		public double get_width ();
-		public void set_cairo_context (Cairo.Context cr, double dpi_x, double dpi_y);
+	public class TreeSelection : GLib.Object {
+		public weak Gtk.DestroyNotify destroy;
+		public weak Gtk.TreeView tree_view;
+		public Gtk.SelectionMode type;
+		public void* user_data;
+		public weak Gtk.TreeSelectionFunc user_func;
+		public int count_selected_rows ();
+		public Gtk.SelectionMode get_mode ();
+		public bool get_selected (out weak Gtk.TreeModel model, out Gtk.TreeIter iter);
+		public GLib.List<Gtk.TreePath> get_selected_rows (out weak Gtk.TreeModel model);
+		public weak Gtk.TreeView get_tree_view ();
+		public void* get_user_data ();
+		public bool iter_is_selected (Gtk.TreeIter iter);
+		public bool path_is_selected (Gtk.TreePath path);
+		public void select_all ();
+		public void select_iter (Gtk.TreeIter iter);
+		public void select_path (Gtk.TreePath path);
+		public void select_range (Gtk.TreePath start_path, Gtk.TreePath end_path);
+		public void selected_foreach (Gtk.TreeSelectionForeachFunc func);
+		public void set_mode (Gtk.SelectionMode type);
+		public void set_select_function (Gtk.TreeSelectionFunc func, void* data, Gtk.DestroyNotify destroy);
+		public void unselect_all ();
+		public void unselect_iter (Gtk.TreeIter iter);
+		public void unselect_path (Gtk.TreePath path);
+		public void unselect_range (Gtk.TreePath start_path, Gtk.TreePath end_path);
+		public virtual signal void changed ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class PrintOperation : GLib.Object, Gtk.PrintOperationPreview {
-		public void cancel ();
-		public weak Gtk.PageSetup get_default_page_setup ();
-		public void get_error () throws GLib.Error;
-		public weak Gtk.PrintSettings get_print_settings ();
-		public Gtk.PrintStatus get_status ();
-		public weak string get_status_string ();
-		public bool is_finished ();
-		[CCode (has_construct_function = false)]
-		public PrintOperation ();
-		public Gtk.PrintOperationResult run (Gtk.PrintOperationAction action, Gtk.Window parent) throws GLib.Error;
-		public void set_allow_async (bool allow_async);
-		public void set_current_page (int current_page);
-		public void set_custom_tab_label (string label);
-		public void set_default_page_setup (Gtk.PageSetup default_page_setup);
-		public void set_export_filename (string filename);
-		public void set_job_name (string job_name);
-		public void set_n_pages (int n_pages);
-		public void set_print_settings (Gtk.PrintSettings print_settings);
-		public void set_show_progress (bool show_progress);
-		public void set_track_print_status (bool track_status);
-		public void set_unit (Gtk.Unit unit);
-		public void set_use_full_page (bool full_page);
-		[NoAccessorMethod]
-		public bool allow_async { get; set; }
-		[NoAccessorMethod]
-		public int current_page { get; set; }
-		[NoAccessorMethod]
-		public string custom_tab_label { get; set; }
-		public Gtk.PageSetup default_page_setup { get; set; }
-		[NoAccessorMethod]
-		public string export_filename { get; set; }
-		[NoAccessorMethod]
-		public string job_name { get; set; }
-		[NoAccessorMethod]
-		public int n_pages { get; set; }
-		public Gtk.PrintSettings print_settings { get; set; }
-		[NoAccessorMethod]
-		public bool show_progress { get; set; }
-		public Gtk.PrintStatus status { get; }
-		public string status_string { get; }
-		[NoAccessorMethod]
-		public bool track_print_status { get; set; }
-		[NoAccessorMethod]
-		public Gtk.Unit unit { get; set; }
-		[NoAccessorMethod]
-		public bool use_full_page { get; set; }
-		public virtual signal void begin_print (Gtk.PrintContext context);
-		public virtual signal weak GLib.Object create_custom_widget ();
-		public virtual signal void custom_widget_apply (Gtk.Widget widget);
-		public virtual signal void done (Gtk.PrintOperationResult result);
-		public virtual signal void draw_page (Gtk.PrintContext context, int page_nr);
-		public virtual signal void end_print (Gtk.PrintContext context);
-		public virtual signal bool paginate (Gtk.PrintContext context);
-		public virtual signal bool preview (Gtk.PrintOperationPreview preview, Gtk.PrintContext context, Gtk.Window parent);
-		public virtual signal void request_page_setup (Gtk.PrintContext context, int page_nr, Gtk.PageSetup setup);
-		public virtual signal void status_changed ();
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class PrintSettings : GLib.Object {
-		public weak Gtk.PrintSettings copy ();
-		public void @foreach (Gtk.PrintSettingsFunc func);
-		public weak string get (string key);
-		public bool get_bool (string key);
-		public bool get_collate ();
-		public weak string get_default_source ();
-		public weak string get_dither ();
-		public double get_double (string key);
-		public double get_double_with_default (string key, double def);
-		public Gtk.PrintDuplex get_duplex ();
-		public weak string get_finishings ();
-		public int get_int (string key);
-		public int get_int_with_default (string key, int def);
-		public double get_length (string key, Gtk.Unit unit);
-		public weak string get_media_type ();
-		public int get_n_copies ();
-		public int get_number_up ();
-		public Gtk.PageOrientation get_orientation ();
-		public weak string get_output_bin ();
-		public weak Gtk.PageRange get_page_ranges (int num_ranges);
-		public Gtk.PageSet get_page_set ();
-		public double get_paper_height (Gtk.Unit unit);
-		public weak Gtk.PaperSize get_paper_size ();
-		public double get_paper_width (Gtk.Unit unit);
-		public Gtk.PrintPages get_print_pages ();
-		public weak string get_printer ();
-		public Gtk.PrintQuality get_quality ();
-		public int get_resolution ();
-		public bool get_reverse ();
-		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;
-		[CCode (has_construct_function = false)]
-		public PrintSettings ();
-		[CCode (has_construct_function = false)]
-		public PrintSettings.from_file (string file_name) throws GLib.Error;
+	public class TreeStore : GLib.Object, Gtk.Buildable, Gtk.TreeModel, Gtk.TreeSortable, Gtk.TreeDragSource, Gtk.TreeDragDest {
+		[NoArrayLength]
+		public weak GLib.Type[] column_headers;
+		public uint columns_dirty;
+		public void* default_sort_data;
+		public weak Gtk.DestroyNotify default_sort_destroy;
+		public weak Gtk.TreeIterCompareFunc default_sort_func;
+		public void* last;
+		public int n_columns;
+		public Gtk.SortType order;
+		public void* root;
+		public int sort_column_id;
+		public weak GLib.List sort_list;
+		public int stamp;
+		public void append (out Gtk.TreeIter iter, Gtk.TreeIter? parent);
+		public void clear ();
+		public void insert (out Gtk.TreeIter iter, Gtk.TreeIter? parent, int position);
+		public void insert_after (out Gtk.TreeIter iter, Gtk.TreeIter? parent, Gtk.TreeIter? sibling);
+		public void insert_before (out Gtk.TreeIter iter, Gtk.TreeIter? parent, Gtk.TreeIter? sibling);
+		[CCode (sentinel = "-1")]
+		public void insert_with_values (out Gtk.TreeIter iter, Gtk.TreeIter? parent, int position, ...);
+		public void insert_with_valuesv (out Gtk.TreeIter iter, Gtk.TreeIter? parent, int position, int columns, GLib.Value[] values);
+		public bool is_ancestor (Gtk.TreeIter iter, Gtk.TreeIter descendant);
+		public int iter_depth (Gtk.TreeIter iter);
+		public bool iter_is_valid (Gtk.TreeIter iter);
+		public void move_after (Gtk.TreeIter iter, Gtk.TreeIter? position);
+		public void move_before (Gtk.TreeIter iter, Gtk.TreeIter? position);
 		[CCode (has_construct_function = false)]
-		public PrintSettings.from_key_file (GLib.KeyFile key_file, string group_name) throws GLib.Error;
-		public void set (string key, string value);
-		public void set_bool (string key, bool value);
-		public void set_collate (bool collate);
-		public void set_default_source (string default_source);
-		public void set_dither (string dither);
-		public void set_double (string key, double value);
-		public void set_duplex (Gtk.PrintDuplex duplex);
-		public void set_finishings (string finishings);
-		public void set_int (string key, int value);
-		public void set_length (string key, double value, Gtk.Unit unit);
-		public void set_media_type (string media_type);
-		public void set_n_copies (int num_copies);
-		public void set_number_up (int number_up);
-		public void set_orientation (Gtk.PageOrientation orientation);
-		public void set_output_bin (string output_bin);
-		public void set_page_ranges (Gtk.PageRange page_ranges, int num_ranges);
-		public void set_page_set (Gtk.PageSet page_set);
-		public void set_paper_height (double height, Gtk.Unit unit);
-		public void set_paper_size (Gtk.PaperSize paper_size);
-		public void set_paper_width (double width, Gtk.Unit unit);
-		public void set_print_pages (Gtk.PrintPages pages);
-		public void set_printer (string printer);
-		public void set_quality (Gtk.PrintQuality quality);
-		public void set_resolution (int resolution);
-		public void set_reverse (bool reverse);
-		public void set_scale (double scale);
-		public void set_use_color (bool use_color);
-		public bool to_file (string file_name) throws GLib.Error;
-		public void to_key_file (GLib.KeyFile key_file, string group_name);
-		public void unset (string key);
+		public TreeStore (int n_columns, ...);
+		[CCode (cname = "gtk_tree_store_newv", has_construct_function = false)]
+		public TreeStore.newv (int n_columns, GLib.Type[] types);
+		public void prepend (out Gtk.TreeIter iter, Gtk.TreeIter? parent);
+		public bool remove (Gtk.TreeIter iter);
+		public void reorder (Gtk.TreeIter? parent, int new_order);
+		[CCode (sentinel = "-1")]
+		public void set (Gtk.TreeIter iter, ...);
+		public void set_column_types ([CCode (array_length_pos = 0.9)] GLib.Type[] types);
+		public void set_valist (Gtk.TreeIter iter, void* var_args);
+		public void set_value (Gtk.TreeIter iter, int column, GLib.Value value);
+		public void set_valuesv (Gtk.TreeIter iter, int columns, GLib.Value[] values);
+		public void swap (Gtk.TreeIter a, Gtk.TreeIter b);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ProgressBar : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
-		public uint blocks;
-		public int in_block;
-		public int activity_pos;
-		public double pulse_fraction;
-		public uint activity_dir;
-		public uint dirty;
-		public Pango.EllipsizeMode get_ellipsize ();
-		public double get_fraction ();
-		public Gtk.ProgressBarOrientation get_orientation ();
-		public double get_pulse_step ();
-		public weak string get_text ();
+	public class TreeView : Gtk.Container, Atk.Implementor, Gtk.Buildable {
+		public int append_column (Gtk.TreeViewColumn column);
+		public void collapse_all ();
+		public bool collapse_row (Gtk.TreePath path);
+		public void columns_autosize ();
+		public void convert_bin_window_to_tree_coords (int bx, int by, int tx, int ty);
+		public void convert_bin_window_to_widget_coords (int bx, int by, int wx, int wy);
+		public void convert_tree_to_bin_window_coords (int tx, int ty, int bx, int by);
+		public void convert_tree_to_widget_coords (int tx, int ty, int wx, int wy);
+		public void convert_widget_to_bin_window_coords (int wx, int wy, int bx, int by);
+		public void convert_widget_to_tree_coords (int wx, int wy, int tx, int ty);
+		public weak Gdk.Pixmap create_row_drag_icon (Gtk.TreePath path);
+		public void enable_model_drag_dest (Gtk.TargetEntry[] targets, Gdk.DragAction actions);
+		public void enable_model_drag_source (Gdk.ModifierType start_button_mask, Gtk.TargetEntry[] targets, Gdk.DragAction actions);
+		public void expand_all ();
+		public bool expand_row (Gtk.TreePath path, bool open_all);
+		public void expand_to_path (Gtk.TreePath path);
+		public void get_background_area (Gtk.TreePath path, Gtk.TreeViewColumn column, out Gdk.Rectangle rect);
+		public weak Gdk.Window get_bin_window ();
+		public void get_cell_area (Gtk.TreePath path, Gtk.TreeViewColumn column, out Gdk.Rectangle rect);
+		public weak Gtk.TreeViewColumn get_column (int n);
+		public weak GLib.List get_columns ();
+		public void get_cursor (out Gtk.TreePath? path, out weak Gtk.TreeViewColumn? focus_column);
+		public bool get_dest_row_at_pos (int drag_x, int drag_y, out Gtk.TreePath? path, out Gtk.TreeViewDropPosition pos);
+		public void get_drag_dest_row (out Gtk.TreePath? path, out Gtk.TreeViewDropPosition pos);
+		public bool get_enable_search ();
+		public bool get_enable_tree_lines ();
+		public weak Gtk.TreeViewColumn get_expander_column ();
+		public bool get_fixed_height_mode ();
+		public Gtk.TreeViewGridLines get_grid_lines ();
+		public weak Gtk.Adjustment get_hadjustment ();
+		public bool get_headers_clickable ();
+		public bool get_headers_visible ();
+		public bool get_hover_expand ();
+		public bool get_hover_selection ();
+		public int get_level_indentation ();
+		public weak Gtk.TreeModel get_model ();
+		public bool get_path_at_pos (int x, int y, out Gtk.TreePath? path, out weak Gtk.TreeViewColumn? column, out int cell_x, out int cell_y);
+		public bool get_reorderable ();
+		public weak Gtk.TreeViewRowSeparatorFunc get_row_separator_func ();
+		public bool get_rubber_banding ();
+		public bool get_rules_hint ();
+		public int get_search_column ();
+		public weak Gtk.Entry get_search_entry ();
+		public weak Gtk.TreeViewSearchEqualFunc get_search_equal_func ();
+		public weak Gtk.TreeViewSearchPositionFunc get_search_position_func ();
+		public weak Gtk.TreeSelection get_selection ();
+		public bool get_show_expanders ();
+		public int get_tooltip_column ();
+		public bool get_tooltip_context (int x, int y, bool keyboard_tip, out weak Gtk.TreeModel model, out weak Gtk.TreePath path, out Gtk.TreeIter iter);
+		public weak Gtk.Adjustment get_vadjustment ();
+		public bool get_visible_range (out weak Gtk.TreePath start_path, out weak Gtk.TreePath end_path);
+		public void get_visible_rect (out Gdk.Rectangle visible_rect);
+		public int insert_column (Gtk.TreeViewColumn column, int position);
+		public int insert_column_with_attributes (int position, string? title, Gtk.CellRenderer cell, ...);
+		public int insert_column_with_data_func (int position, string title, Gtk.CellRenderer cell, Gtk.TreeCellDataFunc func, void* data, GLib.DestroyNotify dnotify);
+		public bool is_rubber_banding_active ();
+		public void map_expanded_rows (Gtk.TreeViewMappingFunc func, void* data);
+		public void move_column_after (Gtk.TreeViewColumn column, Gtk.TreeViewColumn base_column);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public ProgressBar ();
-		public void pulse ();
-		public void set_ellipsize (Pango.EllipsizeMode mode);
-		public void set_fraction (double fraction);
-		public void set_orientation (Gtk.ProgressBarOrientation orientation);
-		public void set_pulse_step (double fraction);
-		public void set_text (string text);
-		[NoAccessorMethod]
-		public uint activity_blocks { get; set; }
-		[NoAccessorMethod]
-		public uint activity_step { get; set; }
-		[NoAccessorMethod]
-		public Gtk.Adjustment adjustment { get; set; }
-		[NoAccessorMethod]
-		public Gtk.ProgressBarStyle bar_style { get; set; }
-		[NoAccessorMethod]
-		public uint discrete_blocks { get; set; }
-		public Pango.EllipsizeMode ellipsize { get; set; }
-		public double fraction { get; set; }
-		public Gtk.ProgressBarOrientation orientation { get; set; }
-		public double pulse_step { get; set; }
-		public string text { get; set; }
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RadioAction : Gtk.ToggleAction, Gtk.Buildable {
-		public int get_current_value ();
-		public weak GLib.SList get_group ();
-		[CCode (has_construct_function = false)]
-		public RadioAction (string name, string? label, string? tooltip, string? stock_id, int value);
-		public void set_current_value (int current_value);
-		public void set_group (GLib.SList group);
-		public int current_value { get; set; }
-		public Gtk.RadioAction group { set; }
+		public TreeView ();
+		public int remove_column (Gtk.TreeViewColumn column);
+		public void scroll_to_cell (Gtk.TreePath? path, Gtk.TreeViewColumn? column, bool use_align, float row_align, float col_align);
+		public void scroll_to_point (int tree_x, int tree_y);
+		public void set_column_drag_function (Gtk.TreeViewColumnDropFunc func, Gtk.DestroyNotify destroy);
+		public void set_cursor (Gtk.TreePath path, Gtk.TreeViewColumn? focus_column, bool start_editing);
+		public void set_cursor_on_cell (Gtk.TreePath path, Gtk.TreeViewColumn focus_column, Gtk.CellRenderer focus_cell, bool start_editing);
+		public void set_destroy_count_func (Gtk.TreeDestroyCountFunc func, void* data, Gtk.DestroyNotify destroy);
+		public void set_drag_dest_row (Gtk.TreePath? path, Gtk.TreeViewDropPosition pos);
+		public void set_enable_search (bool enable_search);
+		public void set_enable_tree_lines (bool enabled);
+		public void set_expander_column (Gtk.TreeViewColumn column);
+		public void set_fixed_height_mode (bool enable);
+		public void set_grid_lines (Gtk.TreeViewGridLines grid_lines);
+		public void set_hadjustment (Gtk.Adjustment adjustment);
+		public void set_headers_clickable (bool setting);
+		public void set_headers_visible (bool headers_visible);
+		public void set_hover_expand (bool expand);
+		public void set_hover_selection (bool hover);
+		public void set_level_indentation (int indentation);
+		public void set_model (Gtk.TreeModel? model);
+		public void set_reorderable (bool reorderable);
+		public void set_row_separator_func (Gtk.TreeViewRowSeparatorFunc func, void* data, Gtk.DestroyNotify destroy);
+		public void set_rubber_banding (bool enable);
+		public void set_rules_hint (bool setting);
+		public void set_search_column (int column);
+		public void set_search_entry (Gtk.Entry entry);
+		public void set_search_equal_func (Gtk.TreeViewSearchEqualFunc search_equal_func, void* search_user_data, Gtk.DestroyNotify search_destroy);
+		public void set_search_position_func (Gtk.TreeViewSearchPositionFunc func, void* data, GLib.DestroyNotify destroy);
+		public void set_show_expanders (bool enabled);
+		public void set_tooltip_cell (Gtk.Tooltip tooltip, Gtk.TreePath path, Gtk.TreeViewColumn column, Gtk.CellRenderer cell);
+		public void set_tooltip_column (int column);
+		public void set_tooltip_row (Gtk.Tooltip tooltip, Gtk.TreePath path);
+		public void set_vadjustment (Gtk.Adjustment adjustment);
+		public void unset_rows_drag_dest ();
+		public void unset_rows_drag_source ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public TreeView.with_model (Gtk.TreeModel model);
 		[NoAccessorMethod]
-		public int value { get; set; }
-		public virtual signal void changed (Gtk.RadioAction current);
+		public Gtk.TreeViewGridLines enable_grid_lines { get; set; }
+		public bool enable_search { get; set; }
+		public bool enable_tree_lines { get; set; }
+		public Gtk.TreeViewColumn expander_column { get; set; }
+		public bool fixed_height_mode { get; set; }
+		public Gtk.Adjustment hadjustment { get; set; }
+		public bool headers_clickable { get; set; }
+		public bool headers_visible { get; set; }
+		public bool hover_expand { get; set; }
+		public bool hover_selection { get; set; }
+		public int level_indentation { get; set; }
+		public Gtk.TreeModel model { get; set; }
+		public bool reorderable { get; set; }
+		public bool rubber_banding { get; set; }
+		public bool rules_hint { get; set; }
+		public int search_column { get; set; }
+		public bool show_expanders { get; set; }
+		public int tooltip_column { get; set; }
+		public Gtk.Adjustment vadjustment { get; set; }
+		public virtual signal void columns_changed ();
+		public virtual signal void cursor_changed ();
+		public virtual signal bool expand_collapse_cursor_row (bool logical, bool expand, bool open_all);
+		public virtual signal bool move_cursor (Gtk.MovementStep step, int count);
+		[HasEmitter]
+		public virtual signal void row_activated (Gtk.TreePath path, Gtk.TreeViewColumn column);
+		public virtual signal void row_collapsed (Gtk.TreeIter iter, Gtk.TreePath path);
+		[HasEmitter]
+		public virtual signal void row_expanded (Gtk.TreeIter iter, Gtk.TreePath path);
+		public virtual signal bool select_all ();
+		public virtual signal bool select_cursor_parent ();
+		public virtual signal bool select_cursor_row (bool start_editing);
+		public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
+		public virtual signal bool start_interactive_search ();
+		public virtual signal bool test_collapse_row (Gtk.TreeIter iter, Gtk.TreePath path);
+		public virtual signal bool test_expand_row (Gtk.TreeIter iter, Gtk.TreePath path);
+		public virtual signal bool toggle_cursor_row ();
+		public virtual signal bool unselect_all ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RadioButton : Gtk.CheckButton, Atk.Implementor, Gtk.Buildable {
-		public weak GLib.SList get_group ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public RadioButton (GLib.SList? group);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public RadioButton.from_widget (Gtk.RadioButton radio_group_member);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public RadioButton.with_label (GLib.SList? group, string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public RadioButton.with_label_from_widget (Gtk.RadioButton radio_group_member, string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public RadioButton.with_mnemonic (GLib.SList? group, string label);
+	public class TreeViewColumn : Gtk.Object, Gtk.Buildable, Gtk.CellLayout {
+		public weak Gtk.Widget arrow;
+		public weak Gtk.Widget button;
+		public int button_request;
+		public weak GLib.List cell_list;
+		public weak Gtk.Widget child;
+		public Gtk.TreeViewColumnSizing column_type;
+		public uint dirty;
+		public int drag_x;
+		public int drag_y;
+		public weak Gtk.CellEditable editable_widget;
+		public uint maybe_reordered;
+		public uint property_changed_signal;
+		public int requested_width;
+		public int resized_width;
+		public uint show_sort_indicator;
+		public uint sort_clicked_signal;
+		public uint sort_column_changed_signal;
+		public int sort_column_id;
+		public weak Gtk.Widget tree_view;
+		public uint use_resized_width;
+		public weak Gdk.Window window;
+		public float xalign;
+		public bool cell_get_position (Gtk.CellRenderer cell_renderer, int start_pos, int width);
+		public void cell_get_size (out Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height);
+		public bool cell_is_visible ();
+		public void cell_set_cell_data (Gtk.TreeModel tree_model, Gtk.TreeIter iter, bool is_expander, bool is_expanded);
+		public void focus_cell (Gtk.CellRenderer cell);
+		public float get_alignment ();
+		public weak GLib.List get_cell_renderers ();
+		public bool get_clickable ();
+		public bool get_expand ();
+		public int get_fixed_width ();
+		public int get_max_width ();
+		public int get_min_width ();
+		public bool get_reorderable ();
+		public bool get_resizable ();
+		public Gtk.TreeViewColumnSizing get_sizing ();
+		public int get_sort_column_id ();
+		public bool get_sort_indicator ();
+		public Gtk.SortType get_sort_order ();
+		public int get_spacing ();
+		public weak string get_title ();
+		public weak Gtk.Widget get_tree_view ();
+		public bool get_visible ();
+		public weak Gtk.Widget get_widget ();
+		public int get_width ();
+		[CCode (has_construct_function = false)]
+		public TreeViewColumn ();
+		public void queue_resize ();
+		public void set_alignment (float xalign);
+		public void set_attributes (Gtk.CellRenderer cell_renderer, ...);
+		public void set_clickable (bool clickable);
+		public void set_expand (bool expand);
+		public void set_fixed_width (int fixed_width);
+		public void set_max_width (int max_width);
+		public void set_min_width (int min_width);
+		public void set_reorderable (bool reorderable);
+		public void set_resizable (bool resizable);
+		public void set_sizing (Gtk.TreeViewColumnSizing type);
+		public void set_sort_column_id (int sort_column_id);
+		public void set_sort_indicator (bool setting);
+		public void set_sort_order (Gtk.SortType order);
+		public void set_spacing (int spacing);
+		public void set_title (string title);
+		public void set_visible (bool visible);
+		public void set_widget (Gtk.Widget widget);
+		[CCode (has_construct_function = false)]
+		public TreeViewColumn.with_attributes (string? title, Gtk.CellRenderer cell, ...);
+		public float alignment { get; set; }
+		public bool clickable { get; set; }
+		public bool expand { get; set; }
+		public int fixed_width { get; set; }
+		public int max_width { get; set; }
+		public int min_width { get; set; }
+		public bool reorderable { get; set; }
+		public bool resizable { get; set; }
+		public Gtk.TreeViewColumnSizing sizing { get; set; }
+		public bool sort_indicator { get; set; }
+		public Gtk.SortType sort_order { get; set; }
+		public int spacing { get; set; }
+		public string title { get; set; }
+		public bool visible { get; set; }
+		public Gtk.Widget widget { get; set; }
+		public int width { get; }
+		[HasEmitter]
+		public virtual signal void clicked ();
+	}
+	[Compact]
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class Type {
+		public void* @class ();
+		public static void init (GLib.TypeDebugFlags debug_flags);
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class UIManager : GLib.Object, Gtk.Buildable {
+		public void add_ui (uint merge_id, string path, string name, string action, Gtk.UIManagerItemType type, bool top);
+		public uint add_ui_from_file (string filename) throws GLib.Error;
+		public uint add_ui_from_string (string buffer, long length) throws GLib.Error;
+		public void ensure_update ();
+		public weak Gtk.AccelGroup get_accel_group ();
+		public virtual weak Gtk.Action get_action (string path);
+		public weak GLib.List get_action_groups ();
+		public bool get_add_tearoffs ();
+		public weak GLib.SList get_toplevels (Gtk.UIManagerItemType types);
+		public weak string get_ui ();
+		public virtual weak Gtk.Widget get_widget (string path);
+		public void insert_action_group (Gtk.ActionGroup action_group, int pos);
+		[CCode (type = "guint", has_construct_function = false)]
+		public UIManager.merge_id (Gtk.UIManager self);
+		[CCode (has_construct_function = false)]
+		public UIManager ();
+		public void remove_action_group (Gtk.ActionGroup action_group);
+		public void remove_ui (uint merge_id);
+		public void set_add_tearoffs (bool add_tearoffs);
+		public bool add_tearoffs { get; set; }
+		public string ui { get; }
+		public virtual signal void actions_changed ();
+		public virtual signal void add_widget (Gtk.Widget widget);
+		public virtual signal void connect_proxy (Gtk.Action action, Gtk.Widget proxy);
+		public virtual signal void disconnect_proxy (Gtk.Action action, Gtk.Widget proxy);
+		public virtual signal void post_activate (Gtk.Action action);
+		public virtual signal void pre_activate (Gtk.Action action);
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class VBox : Gtk.Box, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public RadioButton.with_mnemonic_from_widget (Gtk.RadioButton radio_group_member, string label);
-		public void set_group (GLib.SList group);
-		public Gtk.RadioButton group { set; }
-		public virtual signal void group_changed ();
+		public VBox (bool homogeneous, int spacing);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RadioMenuItem : Gtk.CheckMenuItem, Atk.Implementor, Gtk.Buildable {
-		public weak GLib.SList get_group ();
+	public class VButtonBox : Gtk.ButtonBox, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public RadioMenuItem (GLib.SList group);
+		public VButtonBox ();
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class VPaned : Gtk.Paned, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public RadioMenuItem.from_widget (Gtk.RadioMenuItem group);
+		public VPaned ();
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class VRuler : Gtk.Ruler, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public RadioMenuItem.with_label (GLib.SList group, string label);
+		public VRuler ();
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class VScale : Gtk.Scale, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public RadioMenuItem.with_label_from_widget (Gtk.RadioMenuItem group, string label);
+		public VScale (Gtk.Adjustment adjustment);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public RadioMenuItem.with_mnemonic (GLib.SList group, string label);
+		public VScale.with_range (double min, double max, double step);
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class VScrollbar : Gtk.Scrollbar, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public RadioMenuItem.with_mnemonic_from_widget (Gtk.RadioMenuItem group, string label);
-		public void set_group (GLib.SList group);
-		public Gtk.RadioMenuItem group { set; }
-		public virtual signal void group_changed ();
+		public VScrollbar (Gtk.Adjustment adjustment);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RadioToolButton : Gtk.ToggleToolButton, Atk.Implementor, Gtk.Buildable {
-		public weak GLib.SList get_group ();
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
-		public RadioToolButton (GLib.SList group);
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
-		public RadioToolButton.from_stock (GLib.SList group, string stock_id);
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
-		public RadioToolButton.from_widget (Gtk.RadioToolButton group);
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
-		public RadioToolButton.with_stock_from_widget (Gtk.RadioToolButton group, string stock_id);
-		public void set_group (GLib.SList group);
-		public Gtk.RadioToolButton group { set; }
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Range : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
-		public uint flippable;
-		public uint has_stepper_a;
-		public uint has_stepper_b;
-		public uint has_stepper_c;
-		public uint has_stepper_d;
-		public uint need_recalc;
-		public uint slider_size_fixed;
-		public int min_slider_size;
-		public Gtk.Orientation orientation;
-		public Gdk.Rectangle range_rect;
-		public int slider_start;
-		public int slider_end;
-		public int round_digits;
-		public uint trough_click_forward;
-		public uint update_pending;
-		public weak Gtk.RangeLayout layout;
-		public weak Gtk.RangeStepTimer timer;
-		public int slide_initial_slider_position;
-		public int slide_initial_coordinate;
-		public uint update_timeout_id;
-		public weak Gdk.Window event_window;
-		public weak Gtk.Adjustment get_adjustment ();
-		public double get_fill_level ();
-		public bool get_inverted ();
-		public Gtk.SensitivityType get_lower_stepper_sensitivity ();
-		public bool get_restrict_to_fill_level ();
-		public bool get_show_fill_level ();
-		public Gtk.UpdateType get_update_policy ();
-		public Gtk.SensitivityType get_upper_stepper_sensitivity ();
-		public double get_value ();
-		public void set_adjustment (Gtk.Adjustment adjustment);
-		public void set_fill_level (double fill_level);
-		public void set_increments (double step, double page);
-		public void set_inverted (bool setting);
-		public void set_lower_stepper_sensitivity (Gtk.SensitivityType sensitivity);
-		public void set_range (double min, double max);
-		public void set_restrict_to_fill_level (bool restrict_to_fill_level);
-		public void set_show_fill_level (bool show_fill_level);
-		public void set_update_policy (Gtk.UpdateType policy);
-		public void set_upper_stepper_sensitivity (Gtk.SensitivityType sensitivity);
-		public void set_value (double value);
-		[NoWrapper]
-		public virtual void get_range_border (Gtk.Border border_);
-		public Gtk.Adjustment adjustment { get; set construct; }
-		public double fill_level { get; set; }
-		public bool inverted { get; set; }
-		public Gtk.SensitivityType lower_stepper_sensitivity { get; set; }
-		public bool restrict_to_fill_level { get; set; }
-		public bool show_fill_level { get; set; }
-		public Gtk.UpdateType update_policy { get; set; }
-		public Gtk.SensitivityType upper_stepper_sensitivity { get; set; }
-		public virtual signal void adjust_bounds (double new_value);
-		public virtual signal bool change_value (Gtk.ScrollType scroll, double new_value);
-		public virtual signal void move_slider (Gtk.ScrollType scroll);
-		public virtual signal void value_changed ();
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RcStyle : GLib.Object {
-		public weak string name;
-		[NoArrayLength]
-		public weak string[] bg_pixmap_name;
-		public weak Pango.FontDescription font_desc;
-		[NoArrayLength]
-		public weak Gtk.RcFlags[] color_flags;
-		[NoArrayLength]
-		public weak Gdk.Color[] fg;
-		[NoArrayLength]
-		public weak Gdk.Color[] bg;
-		[NoArrayLength]
-		public weak Gdk.Color[] text;
-		[NoArrayLength]
-		public weak Gdk.Color[] @base;
-		public int xthickness;
-		public int ythickness;
-		public weak GLib.Array rc_properties;
-		public weak GLib.SList rc_style_lists;
-		public weak GLib.SList icon_factories;
-		public uint engine_specified;
-		public weak Gtk.RcStyle copy ();
-		[CCode (has_construct_function = false)]
-		public RcStyle ();
-		[NoWrapper]
-		public virtual weak Gtk.RcStyle create_rc_style ();
-		[NoWrapper]
-		public virtual weak Gtk.Style create_style ();
-		[NoWrapper]
-		public virtual void merge (Gtk.RcStyle src);
-		[NoWrapper]
-		public virtual uint parse (Gtk.Settings settings, GLib.Scanner scanner);
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RecentAction : Gtk.Action, Gtk.Buildable, Gtk.RecentChooser {
-		public bool get_show_numbers ();
-		[CCode (type = "GtkAction*", has_construct_function = false)]
-		public RecentAction (string name, string label, string tooltip, string stock_id);
-		[CCode (type = "GtkAction*", has_construct_function = false)]
-		public RecentAction.for_manager (string name, string label, string tooltip, string stock_id, Gtk.RecentManager manager);
-		public void set_show_numbers (bool show_numbers);
-		public bool show_numbers { get; set; }
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RecentChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.RecentChooser {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public RecentChooserDialog (string title, Gtk.Window parent, ...);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public RecentChooserDialog.for_manager (string title, Gtk.Window parent, Gtk.RecentManager manager, ...);
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RecentChooserMenu : Gtk.Menu, Atk.Implementor, Gtk.Buildable, Gtk.RecentChooser {
-		public bool get_show_numbers ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public RecentChooserMenu ();
+	public class VSeparator : Gtk.Separator, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public RecentChooserMenu.for_manager (Gtk.RecentManager manager);
-		public void set_show_numbers (bool show_numbers);
-		[NoWrapper]
-		public virtual void gtk_recent1 ();
-		[NoWrapper]
-		public virtual void gtk_recent2 ();
-		[NoWrapper]
-		public virtual void gtk_recent3 ();
-		[NoWrapper]
-		public virtual void gtk_recent4 ();
-		public bool show_numbers { get; set; }
+		public VSeparator ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RecentChooserWidget : Gtk.VBox, Atk.Implementor, Gtk.Buildable, Gtk.RecentChooser {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public RecentChooserWidget ();
+	public class Viewport : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
+		public weak Gdk.Window bin_window;
+		public weak Gdk.Window view_window;
+		public weak Gtk.Adjustment get_hadjustment ();
+		public Gtk.ShadowType get_shadow_type ();
+		public weak Gtk.Adjustment get_vadjustment ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public RecentChooserWidget.for_manager (Gtk.RecentManager manager);
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RecentFilter : Gtk.Object {
-		public void add_age (int days);
-		public void add_application (string application);
-		public void add_custom (Gtk.RecentFilterFlags needed, Gtk.RecentFilterFunc func, void* data, GLib.DestroyNotify data_destroy);
-		public void add_group (string group);
-		public void add_mime_type (string mime_type);
-		public void add_pattern (string pattern);
-		public void add_pixbuf_formats ();
-		public bool filter (Gtk.RecentFilterInfo filter_info);
-		public weak string get_name ();
-		public Gtk.RecentFilterFlags get_needed ();
-		[CCode (has_construct_function = false)]
-		public RecentFilter ();
-		public void set_name (string name);
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RecentManager : GLib.Object {
-		public bool add_full (string uri, Gtk.RecentData recent_data);
-		public bool add_item (string uri);
-		public static GLib.Quark error_quark ();
-		public static weak Gtk.RecentManager get_default ();
-		public weak GLib.List get_items ();
-		public int get_limit ();
-		public bool has_item (string uri);
-		public weak Gtk.RecentInfo lookup_item (string uri) throws GLib.Error;
-		public bool move_item (string uri, string new_uri) throws GLib.Error;
-		[CCode (has_construct_function = false)]
-		public RecentManager ();
-		public int purge_items () throws GLib.Error;
-		public bool remove_item (string uri) throws GLib.Error;
-		public void set_limit (int limit);
-		[NoAccessorMethod]
-		public string filename { get; construct; }
-		public int limit { get; set; }
-		[NoAccessorMethod]
-		public int size { get; }
-		public virtual signal void changed ();
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Ruler : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
-		public weak Gdk.Pixmap backing_store;
-		public weak Gdk.GC non_gr_exp_gc;
-		public int xsrc;
-		public int ysrc;
-		public int slider_size;
-		public Gtk.MetricType get_metric ();
-		public void get_range (double lower, double upper, double position, double max_size);
-		public void set_metric (Gtk.MetricType metric);
-		public void set_range (double lower, double upper, double position, double max_size);
-		public virtual void draw_pos ();
-		public virtual void draw_ticks ();
-		[NoAccessorMethod]
-		public double lower { get; set; }
-		[NoAccessorMethod]
-		public double max_size { get; set; }
-		public Gtk.MetricType metric { get; set; }
-		[NoAccessorMethod]
-		public double position { get; set; }
-		[NoAccessorMethod]
-		public double upper { get; set; }
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Scale : Gtk.Range, Atk.Implementor, Gtk.Buildable {
-		public int get_digits ();
-		public bool get_draw_value ();
-		public weak Pango.Layout get_layout ();
-		public Gtk.PositionType get_value_pos ();
-		public void set_digits (int digits);
-		public void set_draw_value (bool draw_value);
-		public void set_value_pos (Gtk.PositionType pos);
-		public virtual void get_layout_offsets (int x, int y);
-		public int digits { get; set; }
-		public bool draw_value { get; set; }
-		public Gtk.PositionType value_pos { get; set; }
-		public virtual signal weak string format_value (double value);
+		public Viewport (Gtk.Adjustment? hadjustment, Gtk.Adjustment? vadjustment);
+		public void set_hadjustment (Gtk.Adjustment adjustment);
+		public void set_shadow_type (Gtk.ShadowType type);
+		public void set_vadjustment (Gtk.Adjustment adjustment);
+		public Gtk.Adjustment hadjustment { get; set construct; }
+		public Gtk.ShadowType shadow_type { get; set; }
+		public Gtk.Adjustment vadjustment { get; set construct; }
+		public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ScaleButton : Gtk.Button, Atk.Implementor, Gtk.Buildable {
-		public weak Gtk.Widget plus_button;
-		public weak Gtk.Widget minus_button;
-		public weak Gtk.Adjustment get_adjustment ();
-		public double get_value ();
-		[NoArrayLength]
+	public class VolumeButton : Gtk.ScaleButton, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public ScaleButton (Gtk.IconSize size, double min, double max, double step, string[] icons);
-		public void set_adjustment (Gtk.Adjustment adjustment);
-		[NoArrayLength]
-		public void set_icons (string[] icons);
-		public void set_value (double value);
-		public Gtk.Adjustment adjustment { get; set; }
-		[NoAccessorMethod]
-		public string[] icons { get; set; }
-		[NoAccessorMethod]
-		public Gtk.IconSize size { get; set; }
-		public double value { get; set; }
-		public virtual signal void popdown ();
-		public virtual signal void popup ();
-		public virtual signal void value_changed (double value);
+		public VolumeButton ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Scrollbar : Gtk.Range, Atk.Implementor, Gtk.Buildable {
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ScrolledWindow : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
-		public weak Gtk.Widget hscrollbar;
-		public weak Gtk.Widget vscrollbar;
-		public uint hscrollbar_visible;
-		public uint vscrollbar_visible;
-		public uint focus_out;
-		public void add_with_viewport (Gtk.Widget child);
-		public weak Gtk.Adjustment get_hadjustment ();
-		public weak Gtk.Widget get_hscrollbar ();
-		public Gtk.CornerType get_placement ();
-		public void get_policy (Gtk.PolicyType hscrollbar_policy, Gtk.PolicyType vscrollbar_policy);
-		public Gtk.ShadowType get_shadow_type ();
-		public weak Gtk.Adjustment get_vadjustment ();
-		public weak Gtk.Widget get_vscrollbar ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public ScrolledWindow (Gtk.Adjustment? hadjustment, Gtk.Adjustment? vadjustment);
-		public void set_hadjustment (Gtk.Adjustment hadjustment);
-		public void set_placement (Gtk.CornerType window_placement);
-		public void set_policy (Gtk.PolicyType hscrollbar_policy, Gtk.PolicyType vscrollbar_policy);
-		public void set_shadow_type (Gtk.ShadowType type);
-		public void set_vadjustment (Gtk.Adjustment vadjustment);
-		public void unset_placement ();
-		public Gtk.Adjustment hadjustment { get; set construct; }
-		[NoAccessorMethod]
-		public Gtk.PolicyType hscrollbar_policy { get; set; }
-		public Gtk.ShadowType shadow_type { get; set; }
-		public Gtk.Adjustment vadjustment { get; set construct; }
-		[NoAccessorMethod]
-		public Gtk.PolicyType vscrollbar_policy { get; set; }
-		[NoAccessorMethod]
-		public Gtk.CornerType window_placement { get; set; }
-		[NoAccessorMethod]
-		public bool window_placement_set { get; set; }
-		public virtual signal void move_focus_out (Gtk.DirectionType direction);
-		public virtual signal bool scroll_child (Gtk.ScrollType scroll, bool horizontal);
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Separator : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class SeparatorMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public SeparatorMenuItem ();
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class SeparatorToolItem : Gtk.ToolItem, Atk.Implementor, Gtk.Buildable {
-		public bool get_draw ();
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
-		public SeparatorToolItem ();
-		public void set_draw (bool draw);
-		public bool draw { get; set; }
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Settings : GLib.Object {
-		public weak Gtk.SettingsPropertyValue property_values;
-		public weak Gtk.RcContext rc_context;
-		public weak Gdk.Screen screen;
-		public static weak Gtk.Settings get_default ();
-		public static weak Gtk.Settings get_for_screen (Gdk.Screen screen);
-		public static void install_property (GLib.ParamSpec pspec);
-		public static void install_property_parser (GLib.ParamSpec pspec, Gtk.RcPropertyParser parser);
-		public void set_double_property (string name, double v_double, string origin);
-		public void set_long_property (string name, long v_long, string origin);
-		public void set_property_value (string name, Gtk.SettingsValue svalue);
-		public void set_string_property (string name, string v_string, string origin);
-		[NoAccessorMethod]
-		public GLib.HashTable color_hash { get; }
-		[NoAccessorMethod]
-		public bool gtk_alternative_button_order { get; set; }
-		[NoAccessorMethod]
-		public bool gtk_alternative_sort_arrows { get; set; }
-		[NoAccessorMethod]
-		public string gtk_color_scheme { get; set; }
-		[NoAccessorMethod]
-		public bool gtk_cursor_blink { get; set; }
-		[NoAccessorMethod]
-		public int gtk_cursor_blink_time { get; set; }
-		[NoAccessorMethod]
-		public int gtk_cursor_blink_timeout { get; set; }
-		[NoAccessorMethod]
-		public string gtk_cursor_theme_name { get; set; }
-		[NoAccessorMethod]
-		public int gtk_cursor_theme_size { get; set; }
-		[NoAccessorMethod]
-		public int gtk_dnd_drag_threshold { get; set; }
+	public class Widget : Gtk.Object, Atk.Implementor, Gtk.Buildable {
+		public Gtk.Allocation allocation;
+		public Gtk.Requisition requisition;
+		public uchar saved_state;
+		public uchar state;
+		public Gdk.Window window;
+		public bool activate ();
+		public void add_accelerator (string accel_signal, Gtk.AccelGroup accel_group, uint accel_key, Gdk.ModifierType accel_mods, Gtk.AccelFlags accel_flags);
+		public void add_events (int events);
+		public void add_mnemonic_label (Gtk.Widget label);
+		public bool child_focus (Gtk.DirectionType direction);
+		public void class_path (out uint path_length, out weak string path, out weak string path_reversed);
+		public weak Pango.Context create_pango_context ();
+		public weak Pango.Layout create_pango_layout (string? text);
+		public void destroyed (out weak Gtk.Widget widget_pointer);
+		[NoWrapper]
+		public virtual void dispatch_child_properties_changed (uint n_pspecs, out weak GLib.ParamSpec pspecs);
+		public void ensure_style ();
+		public void error_bell ();
+		[CCode (cname = "gtk_widget_class_find_style_property")]
+		public class weak GLib.ParamSpec find_style_property (string property_name);
+		public void freeze_child_notify ();
+		public virtual weak Atk.Object get_accessible ();
+		public weak Gtk.Action get_action ();
+		public weak Gtk.Widget get_ancestor (GLib.Type widget_type);
+		public void get_child_requisition (out Gtk.Requisition requisition);
+		public bool get_child_visible ();
+		public weak Gtk.Clipboard get_clipboard (Gdk.Atom selection);
+		public weak Gdk.Colormap get_colormap ();
+		public weak string get_composite_name ();
+		public static weak Gdk.Colormap get_default_colormap ();
+		public static Gtk.TextDirection get_default_direction ();
+		public static weak Gtk.Style get_default_style ();
+		public static weak Gdk.Visual get_default_visual ();
+		public Gtk.TextDirection get_direction ();
+		public weak Gdk.Display get_display ();
+		public int get_events ();
+		public Gdk.ExtensionMode get_extension_events ();
+		[CCode (cname = "GTK_WIDGET_FLAGS")]
+		public Gtk.WidgetFlags get_flags ();
+		public bool get_has_tooltip ();
+		public weak Gtk.RcStyle get_modifier_style ();
+		public bool get_no_show_all ();
+		public weak Pango.Context get_pango_context ();
+		public weak Gtk.Widget get_parent ();
+		public weak Gdk.Window get_parent_window ();
+		public void get_pointer (out int x, out int y);
+		public weak Gdk.Window get_root_window ();
+		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 ();
+		public weak Gtk.Window get_tooltip_window ();
+		public weak Gtk.Widget get_toplevel ();
+		public weak Gdk.Visual get_visual ();
+		public void grab_default ();
+		public bool has_screen ();
+		public virtual void hide_all ();
+		public bool hide_on_delete ();
+		public void input_shape_combine_mask (Gdk.Bitmap? shape_mask, int offset_x, int offset_y);
+		[CCode (cname = "gtk_widget_class_install_style_property")]
+		public class void install_style_property (GLib.ParamSpec pspec);
+		[CCode (cname = "gtk_widget_class_install_style_property_parser")]
+		public class void install_style_property_parser (GLib.ParamSpec pspec, Gtk.RcPropertyParser parser);
+		public bool intersect (Gdk.Rectangle area, Gdk.Rectangle? intersection);
+		public bool is_ancestor (Gtk.Widget ancestor);
+		public bool is_composited ();
+		public weak GLib.List list_accel_closures ();
+		public weak GLib.List list_mnemonic_labels ();
+		[CCode (cname = "gtk_widget_class_list_style_properties")]
+		public class weak GLib.ParamSpec list_style_properties (uint n_properties);
+		public void modify_base (Gtk.StateType state, Gdk.Color? color);
+		public void modify_bg (Gtk.StateType state, Gdk.Color? color);
+		public void modify_cursor (Gdk.Color? primary, Gdk.Color? secondary);
+		public void modify_fg (Gtk.StateType state, Gdk.Color? color);
+		public void modify_font (Pango.FontDescription? font_desc);
+		public void modify_style (Gtk.RcStyle style);
+		public void modify_text (Gtk.StateType state, Gdk.Color? color);
+		public Widget (GLib.Type type, ...);
+		public void path (out uint path_length, out weak string path, out weak string path_reversed);
+		public static void pop_colormap ();
+		public static void pop_composite_child ();
+		public static void push_colormap (Gdk.Colormap cmap);
+		public static void push_composite_child ();
+		public void queue_draw ();
+		public void queue_draw_area (int x, int y, int width, int height);
+		public void queue_resize ();
+		public void queue_resize_no_redraw ();
+		public weak Gdk.Region region_intersect (Gdk.Region region);
+		public bool remove_accelerator (Gtk.AccelGroup accel_group, uint accel_key, Gdk.ModifierType accel_mods);
+		public void remove_mnemonic_label (Gtk.Widget label);
+		public Gdk.Pixbuf render_icon (string stock_id, Gtk.IconSize size, string? detail);
+		public void reparent (Gtk.Widget new_parent);
+		public void reset_rc_styles ();
+		public void reset_shapes ();
+		public int send_expose (Gdk.Event event);
+		public void set_accel_path (string accel_path, Gtk.AccelGroup accel_group);
+		public void set_app_paintable (bool app_paintable);
+		public void set_child_visible (bool is_visible);
+		public void set_colormap (Gdk.Colormap colormap);
+		public void set_composite_name (string name);
+		public static void set_default_colormap (Gdk.Colormap colormap);
+		public static void set_default_direction (Gtk.TextDirection dir);
+		public void set_direction (Gtk.TextDirection dir);
+		public void set_double_buffered (bool double_buffered);
+		public void set_events (int events);
+		public void set_extension_events (Gdk.ExtensionMode mode);
+		[CCode (cname = "GTK_WIDGET_SET_FLAGS")]
+		public void set_flags (Gtk.WidgetFlags flags);
+		public void set_has_tooltip (bool has_tooltip);
+		public void set_no_show_all (bool no_show_all);
+		public void set_parent (Gtk.Widget parent);
+		public void set_parent_window (Gdk.Window parent_window);
+		public void set_redraw_on_allocate (bool redraw_on_allocate);
+		public bool set_scroll_adjustments (Gtk.Adjustment? hadjustment, Gtk.Adjustment? vadjustment);
+		public void set_sensitive (bool sensitive);
+		public void set_size_request (int width, int height);
+		public void set_state (Gtk.StateType state);
+		public void set_style (Gtk.Style? style);
+		public void set_tooltip_markup (string markup);
+		public void set_tooltip_text (string text);
+		public void set_tooltip_window (Gtk.Window custom_window);
+		public void shape_combine_mask (Gdk.Bitmap? shape_mask, int offset_x, int offset_y);
+		public virtual void show_all ();
+		public void show_now ();
+		public void style_get (...);
+		public void style_get_property (string property_name, GLib.Value value);
+		public void style_get_valist (string first_property_name, void* var_args);
+		public void thaw_child_notify ();
+		public bool translate_coordinates (Gtk.Widget dest_widget, int src_x, int src_y, out int dest_x, out int dest_y);
+		public void trigger_tooltip_query ();
+		public void unparent ();
+		[CCode (cname = "GTK_WIDGET_UNSET_FLAGS")]
+		public void unset_flags (Gtk.WidgetFlags flags);
 		[NoAccessorMethod]
-		public int gtk_double_click_distance { get; set; }
+		public bool app_paintable { get; set; }
 		[NoAccessorMethod]
-		public int gtk_double_click_time { get; set; }
+		public bool can_default { get; set; }
 		[NoAccessorMethod]
-		public bool gtk_enable_accels { get; set; }
+		public bool can_focus { get; set; }
 		[NoAccessorMethod]
-		public bool gtk_enable_animations { get; set; }
+		public bool composite_child { get; }
+		public Gdk.EventMask events { get; set; }
+		public Gdk.ExtensionMode extension_events { get; set; }
 		[NoAccessorMethod]
-		public bool gtk_enable_mnemonics { get; set; }
+		public bool has_default { get; set; }
 		[NoAccessorMethod]
-		public bool gtk_error_bell { get; set; }
+		public bool has_focus { get; set; }
+		public bool has_tooltip { get; set; }
 		[NoAccessorMethod]
-		public string gtk_fallback_icon_theme { get; set; }
+		public int height_request { get; set; }
 		[NoAccessorMethod]
-		public string gtk_file_chooser_backend { get; set; }
+		public bool is_focus { get; set; }
+		public string name { get; set; }
+		public bool no_show_all { get; set; }
+		public Gtk.Container parent { get; set; }
 		[NoAccessorMethod]
-		public string gtk_font_name { get; set; }
+		public bool receives_default { get; set; }
 		[NoAccessorMethod]
-		public int gtk_fontconfig_timestamp { get; set; }
+		public bool sensitive { get; set; }
+		public Gtk.Style style { get; set; }
+		public string tooltip_markup { get; set; }
+		public string tooltip_text { get; set; }
 		[NoAccessorMethod]
-		public string gtk_icon_sizes { get; set; }
+		public bool visible { 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; }
-		[NoAccessorMethod]
-		public bool gtk_keynav_wrap_around { get; set; }
-		[NoAccessorMethod]
-		public string gtk_menu_bar_accel { get; set; }
-		[NoAccessorMethod]
-		public string gtk_modules { get; set; }
-		[NoAccessorMethod]
-		public string gtk_print_backends { get; set; }
-		[NoAccessorMethod]
-		public string gtk_print_preview_command { get; set; }
-		[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; }
-		[NoAccessorMethod]
-		public bool gtk_split_cursor { get; set; }
-		[NoAccessorMethod]
-		public string gtk_theme_name { get; set; }
-		[NoAccessorMethod]
-		public int gtk_timeout_expand { get; set; }
-		[NoAccessorMethod]
-		public int gtk_timeout_initial { get; set; }
-		[NoAccessorMethod]
-		public int gtk_timeout_repeat { get; set; }
-		[NoAccessorMethod]
-		public int gtk_tooltip_browse_mode_timeout { get; set; }
-		[NoAccessorMethod]
-		public int gtk_tooltip_browse_timeout { get; set; }
-		[NoAccessorMethod]
-		public int gtk_tooltip_timeout { get; set; }
-		[NoAccessorMethod]
-		public bool gtk_touchscreen_mode { get; set; }
-		[NoAccessorMethod]
-		public int gtk_xft_antialias { get; set; }
-		[NoAccessorMethod]
-		public int gtk_xft_dpi { get; set; }
-		[NoAccessorMethod]
-		public int gtk_xft_hinting { get; set; }
-		[NoAccessorMethod]
-		public string gtk_xft_hintstyle { get; set; }
-		[NoAccessorMethod]
-		public string gtk_xft_rgba { get; set; }
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class SizeGroup : GLib.Object, Gtk.Buildable {
-		public weak GLib.SList widgets;
-		public uint have_width;
-		public uint have_height;
-		public Gtk.Requisition requisition;
-		public void add_widget (Gtk.Widget widget);
-		public bool get_ignore_hidden ();
-		public Gtk.SizeGroupMode get_mode ();
-		public weak GLib.SList get_widgets ();
-		[CCode (has_construct_function = false)]
-		public SizeGroup (Gtk.SizeGroupMode mode);
-		public void remove_widget (Gtk.Widget widget);
-		public void set_ignore_hidden (bool ignore_hidden);
-		public void set_mode (Gtk.SizeGroupMode mode);
-		public bool ignore_hidden { get; set; }
-		public Gtk.SizeGroupMode mode { get; set; }
+		public int width_request { get; set; }
+		public virtual signal void accel_closures_changed ();
+		public virtual signal bool button_press_event (Gdk.EventButton event);
+		public virtual signal bool button_release_event (Gdk.EventButton event);
+		[HasEmitter]
+		public virtual signal bool can_activate_accel (uint signal_id);
+		[HasEmitter]
+		public virtual signal void child_notify (GLib.ParamSpec pspec);
+		public virtual signal bool client_event (Gdk.EventClient event);
+		public virtual signal void composited_changed ();
+		public virtual signal bool configure_event (Gdk.EventConfigure 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);
+		public virtual signal void drag_begin (Gdk.DragContext context);
+		public virtual signal void drag_data_delete (Gdk.DragContext context);
+		public virtual signal void drag_data_get (Gdk.DragContext context, Gtk.SelectionData selection_data, uint info, uint time_);
+		public virtual signal void drag_data_received (Gdk.DragContext context, int x, int y, Gtk.SelectionData selection_data, uint info, uint time_);
+		public virtual signal bool drag_drop (Gdk.DragContext context, int x, int y, uint time_);
+		public virtual signal void drag_end (Gdk.DragContext context);
+		public virtual signal bool drag_failed (Gdk.DragContext p0, Gtk.DragResult p1);
+		public virtual signal void drag_leave (Gdk.DragContext context, uint time_);
+		public virtual signal bool drag_motion (Gdk.DragContext context, int x, int y, uint time_);
+		public virtual signal bool enter_notify_event (Gdk.EventCrossing event);
+		[HasEmitter]
+		public virtual signal bool event (Gdk.Event event);
+		public virtual signal void event_after (Gdk.Event p0);
+		public virtual signal bool expose_event (Gdk.EventExpose event);
+		public virtual signal bool focus (Gtk.DirectionType direction);
+		public virtual signal bool focus_in_event (Gdk.EventFocus event);
+		public virtual signal bool focus_out_event (Gdk.EventFocus event);
+		public virtual signal bool grab_broken_event (Gdk.Event event);
+		[HasEmitter]
+		public virtual signal void grab_focus ();
+		public virtual signal void grab_notify (bool was_grabbed);
+		[HasEmitter]
+		public virtual signal void hide ();
+		public virtual signal void hierarchy_changed (Gtk.Widget previous_toplevel);
+		public virtual signal bool key_press_event (Gdk.EventKey event);
+		public virtual signal bool key_release_event (Gdk.EventKey event);
+		[HasEmitter]
+		public virtual signal bool keynav_failed (Gtk.DirectionType p0);
+		public virtual signal bool leave_notify_event (Gdk.EventCrossing event);
+		[HasEmitter]
+		public virtual signal void map ();
+		public virtual signal bool map_event (Gdk.Event event);
+		[HasEmitter]
+		public virtual signal bool mnemonic_activate (bool group_cycling);
+		public virtual signal bool motion_notify_event (Gdk.EventMotion event);
+		public virtual signal void move_focus (Gtk.DirectionType p0);
+		public virtual signal bool no_expose_event (Gdk.EventNoExpose event);
+		public virtual signal void parent_set (Gtk.Widget previous_parent);
+		public virtual signal bool popup_menu ();
+		public virtual signal bool property_notify_event (Gdk.EventProperty event);
+		public virtual signal bool proximity_in_event (Gdk.EventProximity event);
+		public virtual signal bool proximity_out_event (Gdk.EventProximity event);
+		public virtual signal bool query_tooltip (int x, int y, bool keyboard_tooltip, Gtk.Tooltip tooltip);
+		[HasEmitter]
+		public virtual signal void realize ();
+		public virtual signal void screen_changed (Gdk.Screen previous_screen);
+		public virtual signal bool scroll_event (Gdk.EventScroll event);
+		public virtual signal bool selection_clear_event (Gdk.EventSelection event);
+		public virtual signal void selection_get (Gtk.SelectionData selection_data, uint info, uint time_);
+		public virtual signal bool selection_notify_event (Gdk.EventSelection event);
+		public virtual signal void selection_received (Gtk.SelectionData selection_data, uint time_);
+		public virtual signal bool selection_request_event (Gdk.EventSelection event);
+		[HasEmitter]
+		public virtual signal void show ();
+		public virtual signal bool show_help (Gtk.WidgetHelpType help_type);
+		[HasEmitter]
+		public virtual signal void size_allocate (Gdk.Rectangle allocation);
+		[HasEmitter]
+		public virtual signal void size_request (Gtk.Requisition requisition);
+		public virtual signal void state_changed (Gtk.StateType previous_state);
+		public virtual signal void style_set (Gtk.Style previous_style);
+		[HasEmitter]
+		public virtual signal void unmap ();
+		public virtual signal bool unmap_event (Gdk.Event event);
+		[HasEmitter]
+		public virtual signal void unrealize ();
+		public virtual signal bool visibility_notify_event (Gdk.Event event);
+		public virtual signal bool window_state_event (Gdk.EventWindowState event);
 	}
+	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Socket : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		public ushort request_width;
-		public ushort request_height;
-		public ushort current_width;
-		public ushort current_height;
-		public weak Gdk.Window plug_window;
-		public weak Gtk.Widget plug_widget;
-		public short xembed_version;
-		public uint same_app;
-		public uint focus_in;
-		public uint have_size;
-		public uint need_map;
-		public uint is_mapped;
-		public uint active;
-		public weak Gtk.AccelGroup accel_group;
-		public weak Gtk.Widget toplevel;
-		public void add_id (Gdk.NativeWindow window_id);
-		public Gdk.NativeWindow get_id ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Socket ();
-		public virtual signal void plug_added ();
-		public virtual signal bool plug_removed ();
+	public class WidgetAuxInfo {
+		public int height;
+		public int width;
+		public int x;
+		public uint x_set;
+		public int y;
+		public uint y_set;
 	}
+	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class SpinButton : Gtk.Entry, Atk.Implementor, Gtk.Buildable, Gtk.CellEditable, Gtk.Editable {
-		public weak Gdk.Window panel;
-		public uint timer;
-		public double timer_step;
-		public uint in_child;
-		public uint click_child;
-		public uint button;
-		public uint need_timer;
-		public uint timer_calls;
-		public void configure (Gtk.Adjustment adjustment, double climb_rate, uint digits);
-		public weak Gtk.Adjustment get_adjustment ();
-		public uint get_digits ();
-		public void get_increments (double step, double page);
-		public bool get_numeric ();
-		public void get_range (out double min, out double max);
-		public bool get_snap_to_ticks ();
-		public Gtk.SpinButtonUpdatePolicy get_update_policy ();
-		public double get_value ();
-		public int get_value_as_int ();
-		public bool get_wrap ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public SpinButton (Gtk.Adjustment adjustment, double climb_rate, uint digits);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public SpinButton.with_range (double min, double max, double step);
-		public void set_adjustment (Gtk.Adjustment adjustment);
-		public void set_digits (uint digits);
-		public void set_increments (double step, double page);
-		public void set_numeric (bool numeric);
-		public void set_range (double min, double max);
-		public void set_snap_to_ticks (bool snap_to_ticks);
-		public void set_update_policy (Gtk.SpinButtonUpdatePolicy policy);
-		public void set_value (double value);
-		public void set_wrap (bool wrap);
-		public void spin (Gtk.SpinType direction, double increment);
-		public void update ();
-		public Gtk.Adjustment adjustment { get; set; }
-		[NoAccessorMethod]
-		public double climb_rate { get; set; }
-		public uint digits { get; set; }
-		public bool numeric { get; set; }
-		public bool snap_to_ticks { get; set; }
-		public Gtk.SpinButtonUpdatePolicy update_policy { get; set; }
-		public double value { get; set; }
-		public bool wrap { get; set; }
-		public virtual signal void change_value (Gtk.ScrollType scroll);
-		public virtual signal int input (void* new_value);
-		public virtual signal bool output ();
-		public virtual signal void value_changed ();
-		public virtual signal void wrapped ();
+	public class WidgetShapeInfo {
+		public short offset_x;
+		public short offset_y;
+		public weak Gdk.Bitmap shape_mask;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class StatusIcon : GLib.Object {
-		public bool get_blinking ();
-		public bool get_geometry (out weak Gdk.Screen screen, out Gdk.Rectangle area, out Gtk.Orientation orientation);
-		public weak string get_icon_name ();
-		public weak Gdk.Pixbuf get_pixbuf ();
-		public weak Gdk.Screen get_screen ();
-		public int get_size ();
-		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 ();
-		[CCode (has_construct_function = false)]
-		public StatusIcon ();
-		[CCode (has_construct_function = false)]
-		public StatusIcon.from_file (string filename);
-		[CCode (has_construct_function = false)]
-		public StatusIcon.from_icon_name (string icon_name);
-		[CCode (has_construct_function = false)]
-		public StatusIcon.from_pixbuf (Gdk.Pixbuf pixbuf);
-		[CCode (has_construct_function = false)]
-		public StatusIcon.from_stock (string stock_id);
-		public static void position_menu (Gtk.Menu menu, int x, int y, bool push_in);
-		public void set_blinking (bool blinking);
-		public void set_from_file (string filename);
-		public void set_from_icon_name (string icon_name);
-		public void set_from_pixbuf (Gdk.Pixbuf pixbuf);
-		public void set_from_stock (string stock_id);
+	public class Window : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
+		public uint configure_notify_received;
+		public ushort configure_request_count;
+		public weak Gtk.Widget default_widget;
+		public weak Gtk.Widget focus_widget;
+		public weak Gdk.Window frame;
+		public uint frame_bottom;
+		public uint frame_left;
+		public uint frame_right;
+		public uint frame_top;
+		public weak Gtk.WindowGeometryInfo geometry_info;
+		public weak Gtk.WindowGroup group;
+		public uint has_focus;
+		public uint has_frame;
+		public uint has_user_ref_count;
+		public uint iconify_initially;
+		public uint keys_changed_handler;
+		public uint maximize_initially;
+		public Gdk.ModifierType mnemonic_modifier;
+		public uint need_default_position;
+		public uint need_default_size;
+		public uint position;
+		public uint stick_initially;
+		public weak Gtk.Window transient_parent;
+		public weak string wm_role;
+		public weak string wmclass_class;
+		public weak string wmclass_name;
+		public bool activate_default ();
+		public bool activate_focus ();
+		public bool activate_key (Gdk.EventKey event);
+		public void add_accel_group (Gtk.AccelGroup accel_group);
+		public void add_embedded_xid (uint xid);
+		public void add_mnemonic (uint keyval, Gtk.Widget target);
+		public void begin_move_drag (int button, int root_x, int root_y, uint timestamp);
+		public void begin_resize_drag (Gdk.WindowEdge edge, int button, int root_x, int root_y, uint timestamp);
+		public void deiconify ();
+		public void fullscreen ();
+		public bool get_accept_focus ();
+		public bool get_decorated ();
+		public static weak GLib.List get_default_icon_list ();
+		public void get_default_size (out int width, out int height);
+		public bool get_deletable ();
+		public bool get_destroy_with_parent ();
+		public weak Gtk.Widget get_focus ();
+		public bool get_focus_on_map ();
+		public void get_frame_dimensions (int left, int top, int right, int bottom);
+		public Gdk.Gravity get_gravity ();
+		public weak Gtk.WindowGroup get_group ();
+		public bool get_has_frame ();
+		public weak Gdk.Pixbuf get_icon ();
+		public weak GLib.List get_icon_list ();
+		public weak string get_icon_name ();
+		public Gdk.ModifierType get_mnemonic_modifier ();
+		public bool get_modal ();
+		public double get_opacity ();
+		public void get_position (out int root_x, out int root_y);
+		public bool get_resizable ();
+		public weak string get_role ();
+		public weak Gdk.Screen get_screen ();
+		public void get_size (out int width, out int height);
+		public bool get_skip_pager_hint ();
+		public bool get_skip_taskbar_hint ();
+		public weak string get_title ();
+		public weak Gtk.Window get_transient_for ();
+		public Gdk.WindowTypeHint get_type_hint ();
+		public bool get_urgency_hint ();
+		public void iconify ();
+		public static weak GLib.List list_toplevels ();
+		public void maximize ();
+		public bool mnemonic_activate (uint keyval, Gdk.ModifierType modifier);
+		public void move (int x, int y);
+		[NoWrapper]
+		public virtual void move_focus (Gtk.DirectionType direction);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Window (Gtk.WindowType type);
+		public bool parse_geometry (string geometry);
+		public void present ();
+		public void present_with_time (uint timestamp);
+		public bool propagate_key_event (Gdk.EventKey event);
+		public void remove_accel_group (Gtk.AccelGroup accel_group);
+		public void remove_embedded_xid (uint xid);
+		public void remove_mnemonic (uint keyval, Gtk.Widget target);
+		public void reshow_with_initial_size ();
+		public void resize (int width, int height);
+		public void set_accept_focus (bool setting);
+		public static void set_auto_startup_notification (bool setting);
+		public void set_decorated (bool setting);
+		public void set_default (Gtk.Widget default_widget);
+		public static void set_default_icon (Gdk.Pixbuf icon);
+		public static bool set_default_icon_from_file (string filename) throws GLib.Error;
+		public static void set_default_icon_list (GLib.List list);
+		public static void set_default_icon_name (string name);
+		public void set_default_size (int width, int height);
+		public void set_deletable (bool setting);
+		public void set_destroy_with_parent (bool setting);
+		public void set_focus_on_map (bool setting);
+		public void set_frame_dimensions (int left, int top, int right, int bottom);
+		public void set_geometry_hints (Gtk.Widget geometry_widget, Gdk.Geometry geometry, Gdk.WindowHints geom_mask);
+		public void set_gravity (Gdk.Gravity gravity);
+		public void set_has_frame (bool setting);
+		public void set_icon (Gdk.Pixbuf icon);
+		public bool set_icon_from_file (string filename) throws GLib.Error;
+		public void set_icon_list (GLib.List list);
+		public void set_icon_name (string name);
+		public void set_keep_above (bool setting);
+		public void set_keep_below (bool setting);
+		public void set_mnemonic_modifier (Gdk.ModifierType modifier);
+		public void set_modal (bool modal);
+		public void set_opacity (double opacity);
+		public void set_position (Gtk.WindowPosition position);
+		public void set_resizable (bool resizable);
+		public void set_role (string role);
 		public void set_screen (Gdk.Screen screen);
-		public void set_tooltip (string tooltip_text);
-		public void set_visible (bool visible);
-		public bool blinking { get; set; }
+		public void set_skip_pager_hint (bool setting);
+		public void set_skip_taskbar_hint (bool setting);
+		public void set_startup_id (string startup_id);
+		public void set_title (string title);
+		public void set_transient_for (Gtk.Window parent);
+		public void set_type_hint (Gdk.WindowTypeHint hint);
+		public void set_urgency_hint (bool setting);
+		public void set_wmclass (string wmclass_name, string wmclass_class);
+		public void stick ();
+		public void unfullscreen ();
+		public void unmaximize ();
+		public void unstick ();
+		public bool accept_focus { get; set; }
 		[NoAccessorMethod]
-		public bool embedded { get; }
+		public bool allow_grow { get; set; }
 		[NoAccessorMethod]
-		public string file { set; }
+		public bool allow_shrink { get; set; }
+		public bool decorated { get; set; }
 		[NoAccessorMethod]
-		public string icon_name { get; set; }
+		public int default_height { get; set; }
 		[NoAccessorMethod]
-		public Gtk.Orientation orientation { get; }
+		public int default_width { get; set; }
+		public bool deletable { get; set; }
+		public bool destroy_with_parent { get; set; }
+		public bool focus_on_map { get; set; }
+		public Gdk.Gravity gravity { get; set; }
 		[NoAccessorMethod]
-		public Gdk.Pixbuf pixbuf { get; set; }
+		public bool has_toplevel_focus { get; }
+		public Gdk.Pixbuf icon { get; set; }
+		public string icon_name { get; set; }
+		[NoAccessorMethod]
+		public bool is_active { get; }
+		public bool modal { get; set; }
+		public double opacity { get; set; }
+		public bool resizable { get; set; }
+		public string role { get; set; }
 		public Gdk.Screen screen { get; set; }
-		public int size { get; }
+		public bool skip_pager_hint { get; set; }
+		public bool skip_taskbar_hint { get; set; }
+		public string startup_id { set; }
+		public string title { get; set; }
+		public Gtk.Window transient_for { get; set construct; }
 		[NoAccessorMethod]
-		public string stock { get; set; }
-		public Gtk.ImageType storage_type { get; }
-		public bool visible { get; set; }
-		public virtual signal void activate ();
-		public virtual signal void popup_menu (uint button, uint activate_time);
-		public virtual signal bool size_changed (int size);
+		public Gtk.WindowType type { get; construct; }
+		public Gdk.WindowTypeHint type_hint { get; set; }
+		public bool urgency_hint { get; set; }
+		[NoAccessorMethod]
+		public Gtk.WindowPosition window_position { get; set; }
+		public virtual signal void default_activated ();
+		public virtual signal void focus_activated ();
+		public virtual signal bool frame_event (Gdk.Event event);
+		public virtual signal void keys_changed ();
+		[HasEmitter]
+		public virtual signal void set_focus (Gtk.Widget focus);
 	}
+	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Statusbar : Gtk.HBox, Atk.Implementor, Gtk.Buildable {
-		public weak Gtk.Widget frame;
-		public weak Gtk.Widget label;
-		public weak GLib.SList messages;
-		public weak GLib.SList keys;
-		public uint seq_context_id;
-		public uint seq_message_id;
-		public weak Gdk.Window grip_window;
-		public uint get_context_id (string context_description);
-		public bool get_has_resize_grip ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Statusbar ();
-		public void pop (uint context_id);
-		public uint push (uint context_id, string text);
-		public void remove (uint context_id, uint message_id);
-		public void set_has_resize_grip (bool setting);
-		public bool has_resize_grip { get; set; }
-		public virtual signal void text_popped (uint context_id, string text);
-		public virtual signal void text_pushed (uint context_id, string text);
+	public class WindowGeometryInfo {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Style : GLib.Object {
-		[NoArrayLength]
-		public Gdk.Color[] fg;
-		[NoArrayLength]
-		public Gdk.Color[] bg;
-		[NoArrayLength]
-		public Gdk.Color[] light;
-		[NoArrayLength]
-		public Gdk.Color[] dark;
-		[NoArrayLength]
-		public Gdk.Color[] mid;
-		[NoArrayLength]
-		public Gdk.Color[] text;
-		[NoArrayLength]
-		public Gdk.Color[] @base;
-		[NoArrayLength]
-		public Gdk.Color[] text_aa;
-		public Gdk.Color black;
-		public Gdk.Color white;
-		public weak Pango.FontDescription font_desc;
-		public int xthickness;
-		public int ythickness;
-		[NoArrayLength]
-		public Gdk.GC[] fg_gc;
-		[NoArrayLength]
-		public Gdk.GC[] bg_gc;
-		[NoArrayLength]
-		public Gdk.GC[] light_gc;
-		[NoArrayLength]
-		public Gdk.GC[] dark_gc;
-		[NoArrayLength]
-		public Gdk.GC[] mid_gc;
-		[NoArrayLength]
-		public Gdk.GC[] text_gc;
-		[NoArrayLength]
-		public Gdk.GC[] base_gc;
-		[NoArrayLength]
-		public Gdk.GC[] text_aa_gc;
-		public weak Gdk.GC black_gc;
-		public weak Gdk.GC white_gc;
-		[NoArrayLength]
-		public Gdk.Pixmap[] bg_pixmap;
-		public int attach_count;
-		public int depth;
-		public weak Gdk.Colormap colormap;
-		public weak Gtk.RcStyle rc_style;
-		public weak GLib.SList styles;
-		public weak GLib.Array property_cache;
-		public weak GLib.SList icon_factories;
-		public void apply_default_background (Gdk.Window window, bool set_bg, Gtk.StateType state_type, Gdk.Rectangle area, int x, int y, int width, int height);
-		public weak Gtk.Style attach (Gdk.Window window);
-		public void detach ();
-		public bool lookup_color (string color_name, out Gdk.Color color);
-		public weak Gtk.IconSet lookup_icon_set (string stock_id);
+	public class WindowGroup : GLib.Object {
+		public weak GLib.SList grabs;
+		public void add_window (Gtk.Window window);
 		[CCode (has_construct_function = false)]
-		public Style ();
-		[NoWrapper]
-		public virtual weak Gtk.Style clone ();
-		public virtual void copy ();
-		[NoWrapper]
-		public virtual void draw_arrow (Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, Gtk.ArrowType arrow_type, bool fill, int x, int y, int width, int height);
-		[NoWrapper]
-		public virtual void draw_box (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);
-		[NoWrapper]
-		public virtual void draw_box_gap (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, Gtk.PositionType gap_side, int gap_x, int gap_width);
-		[NoWrapper]
-		public virtual void draw_check (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);
-		[NoWrapper]
-		public virtual void draw_diamond (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);
-		[NoWrapper]
-		public virtual void draw_expander (Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, Gtk.ExpanderStyle expander_style);
-		[NoWrapper]
-		public virtual void draw_extension (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, Gtk.PositionType gap_side);
-		[NoWrapper]
-		public virtual void draw_flat_box (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);
-		[NoWrapper]
-		public virtual void draw_focus (Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);
-		[NoWrapper]
-		public virtual void draw_handle (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, Gtk.Orientation orientation);
-		[NoWrapper]
-		public virtual void draw_hline (Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x1, int x2, int y);
-		[NoWrapper]
-		public virtual void draw_layout (Gdk.Window window, Gtk.StateType state_type, bool use_text, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, Pango.Layout layout);
-		[NoWrapper]
-		public virtual void draw_option (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);
-		[NoWrapper]
-		public virtual void draw_polygon (Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, Gdk.Point point, int npoints, bool fill);
-		[NoWrapper]
-		public virtual void draw_resize_grip (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);
-		[NoWrapper]
-		public virtual void draw_shadow (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);
-		[NoWrapper]
-		public virtual void draw_shadow_gap (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, Gtk.PositionType gap_side, int gap_x, int gap_width);
-		[NoWrapper]
-		public virtual void draw_slider (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, Gtk.Orientation orientation);
-		[NoWrapper]
-		public virtual void draw_string (Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, string str);
-		[NoWrapper]
-		public virtual void draw_tab (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);
-		[NoWrapper]
-		public virtual void draw_vline (Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int y1_, int y2_, int x);
-		[NoWrapper]
-		public virtual void init_from_rc (Gtk.RcStyle rc_style);
-		public virtual weak Gdk.Pixbuf render_icon (Gtk.IconSource source, Gtk.TextDirection direction, Gtk.StateType state, Gtk.IconSize size, Gtk.Widget widget, string detail);
-		public virtual void set_background (Gdk.Window window, Gtk.StateType state_type);
-		public virtual signal void realize ();
-		public virtual signal void unrealize ();
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Table : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		public weak GLib.List children;
-		public weak Gtk.TableRowCol rows;
-		public weak Gtk.TableRowCol cols;
-		public ushort nrows;
-		public ushort ncols;
-		public void attach (Gtk.Widget child, uint left_attach, uint right_attach, uint top_attach, uint bottom_attach, Gtk.AttachOptions xoptions, Gtk.AttachOptions yoptions, uint xpadding, uint ypadding);
-		public void attach_defaults (Gtk.Widget widget, uint left_attach, uint right_attach, uint top_attach, uint bottom_attach);
-		public uint get_col_spacing (uint column);
-		public uint get_default_col_spacing ();
-		public uint get_default_row_spacing ();
-		public bool get_homogeneous ();
-		public uint get_row_spacing (uint row);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Table (uint rows, uint columns, bool homogeneous);
-		public void resize (uint rows, uint columns);
-		public void set_col_spacing (uint column, uint spacing);
-		public void set_col_spacings (uint spacing);
-		public void set_homogeneous (bool homogeneous);
-		public void set_row_spacing (uint row, uint spacing);
-		public void set_row_spacings (uint spacing);
-		[NoAccessorMethod]
-		public uint column_spacing { get; set; }
-		public bool homogeneous { get; set; }
-		[NoAccessorMethod]
-		public uint n_columns { get; set; }
-		[NoAccessorMethod]
-		public uint n_rows { get; set; }
-		public uint row_spacing { get; set; }
+		public WindowGroup ();
+		public void remove_window (Gtk.Window window);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TearoffMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable {
-		public uint torn_off;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public TearoffMenuItem ();
+	public interface Buildable {
+		public abstract void add_child (Gtk.Builder builder, GLib.Object child, string type);
+		public abstract weak GLib.Object construct_child (Gtk.Builder builder, string name);
+		public abstract void custom_finished (Gtk.Builder builder, GLib.Object child, string tagname, void* data);
+		public abstract void custom_tag_end (Gtk.Builder builder, GLib.Object child, string tagname, void* data);
+		public abstract bool custom_tag_start (Gtk.Builder builder, GLib.Object child, string tagname, GLib.MarkupParser parser, void* data);
+		public abstract weak GLib.Object get_internal_child (Gtk.Builder builder, string childname);
+		public abstract weak string get_name ();
+		public abstract void parser_finished (Gtk.Builder builder);
+		public abstract void set_buildable_property (Gtk.Builder builder, string name, GLib.Value value);
+		public abstract void set_name (string name);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TextBuffer : GLib.Object {
-		public weak Gtk.TextBTree btree;
-		public weak GLib.SList clipboard_contents_buffers;
-		public weak GLib.SList selection_clipboards;
-		public weak Gtk.TextLogAttrCache log_attr_cache;
-		public uint user_action_count;
-		public uint modified;
-		public void add_mark (Gtk.TextMark mark, Gtk.TextIter where);
-		public void add_selection_clipboard (Gtk.Clipboard clipboard);
-		public void apply_tag_by_name (string name, Gtk.TextIter start, Gtk.TextIter end);
-		public bool backspace (Gtk.TextIter iter, bool interactive, bool default_editable);
-		public void copy_clipboard (Gtk.Clipboard clipboard);
-		public weak Gtk.TextChildAnchor create_child_anchor (Gtk.TextIter iter);
-		public weak Gtk.TextMark create_mark (string? mark_name, Gtk.TextIter where, bool left_gravity);
-		public weak Gtk.TextTag create_tag (string tag_name, ...);
-		public void cut_clipboard (Gtk.Clipboard clipboard, bool default_editable);
-		public void @delete (Gtk.TextIter start, Gtk.TextIter end);
-		public bool delete_interactive (Gtk.TextIter start_iter, Gtk.TextIter end_iter, bool default_editable);
-		public void delete_mark (Gtk.TextMark mark);
-		public void delete_mark_by_name (string name);
-		public bool delete_selection (bool interactive, bool default_editable);
-		public bool deserialize (Gtk.TextBuffer content_buffer, Gdk.Atom format, Gtk.TextIter iter, uchar data, ulong length) throws GLib.Error;
-		public bool deserialize_get_can_create_tags (Gdk.Atom format);
-		public void deserialize_set_can_create_tags (Gdk.Atom format, bool can_create_tags);
-		public void get_bounds (out Gtk.TextIter start, out Gtk.TextIter end);
-		public int get_char_count ();
-		public weak Gtk.TargetList get_copy_target_list ();
-		public Gdk.Atom get_deserialize_formats (int n_formats);
-		public void get_end_iter (out Gtk.TextIter iter);
-		public bool get_has_selection ();
-		public weak Gtk.TextMark get_insert ();
-		public void get_iter_at_child_anchor (out Gtk.TextIter iter, Gtk.TextChildAnchor anchor);
-		public void get_iter_at_line (out Gtk.TextIter iter, int line_number);
-		public void get_iter_at_line_index (out Gtk.TextIter iter, int line_number, int byte_index);
-		public void get_iter_at_line_offset (out Gtk.TextIter iter, int line_number, int char_offset);
-		public void get_iter_at_mark (out Gtk.TextIter iter, Gtk.TextMark mark);
-		public void get_iter_at_offset (out Gtk.TextIter iter, int char_offset);
-		public int get_line_count ();
-		public weak Gtk.TextMark get_mark (string name);
-		public bool get_modified ();
-		public weak Gtk.TargetList get_paste_target_list ();
-		public weak Gtk.TextMark get_selection_bound ();
-		public bool get_selection_bounds (out Gtk.TextIter start, out Gtk.TextIter end);
-		public Gdk.Atom get_serialize_formats (int n_formats);
-		public weak string get_slice (Gtk.TextIter start, Gtk.TextIter end, bool include_hidden_chars);
-		public void get_start_iter (out Gtk.TextIter iter);
-		public weak Gtk.TextTagTable get_tag_table ();
-		public weak string get_text (Gtk.TextIter start, Gtk.TextIter end, bool include_hidden_chars);
-		public void insert (Gtk.TextIter iter, string text, int len);
-		public void insert_at_cursor (string text, int len);
-		public bool insert_interactive (Gtk.TextIter iter, string text, int len, bool default_editable);
-		public bool insert_interactive_at_cursor (string text, int len, bool default_editable);
-		public void insert_range (Gtk.TextIter iter, Gtk.TextIter start, Gtk.TextIter end);
-		public bool insert_range_interactive (Gtk.TextIter iter, Gtk.TextIter start, Gtk.TextIter end, bool default_editable);
-		public void insert_with_tags (Gtk.TextIter iter, string text, int len, ...);
-		public void insert_with_tags_by_name (Gtk.TextIter iter, string text, int len, ...);
-		public void move_mark (Gtk.TextMark mark, Gtk.TextIter where);
-		public void move_mark_by_name (string name, Gtk.TextIter where);
-		[CCode (has_construct_function = false)]
-		public TextBuffer (Gtk.TextTagTable? table);
-		public void paste_clipboard (Gtk.Clipboard clipboard, Gtk.TextIter? override_location, bool default_editable);
-		public void place_cursor (Gtk.TextIter where);
-		public Gdk.Atom register_deserialize_format (string mime_type, Gtk.TextBufferDeserializeFunc function, GLib.DestroyNotify user_data_destroy);
-		public Gdk.Atom register_deserialize_tagset (string tagset_name);
-		public Gdk.Atom register_serialize_format (string mime_type, Gtk.TextBufferSerializeFunc function, GLib.DestroyNotify user_data_destroy);
-		public Gdk.Atom register_serialize_tagset (string tagset_name);
-		public void remove_all_tags (Gtk.TextIter start, Gtk.TextIter end);
-		public void remove_selection_clipboard (Gtk.Clipboard clipboard);
-		public void remove_tag_by_name (string name, Gtk.TextIter start, Gtk.TextIter end);
-		public void select_range (Gtk.TextIter ins, Gtk.TextIter bound);
-		public uchar serialize (Gtk.TextBuffer content_buffer, Gdk.Atom format, Gtk.TextIter start, Gtk.TextIter end, ulong length);
-		public void set_modified (bool setting);
-		public void set_text (string text, int len);
-		public void unregister_deserialize_format (Gdk.Atom format);
-		public void unregister_serialize_format (Gdk.Atom format);
-		public Gtk.TargetList copy_target_list { get; }
-		[NoAccessorMethod]
-		public int cursor_position { get; }
-		public bool has_selection { get; }
-		public Gtk.TargetList paste_target_list { get; }
-		[NoAccessorMethod]
-		public Gtk.TextTagTable tag_table { get; construct; }
-		public string text { get; set; }
+	public interface CellEditable : Gtk.Widget {
 		[HasEmitter]
-		public virtual signal void apply_tag (Gtk.TextTag tag, Gtk.TextIter start_char, Gtk.TextIter end_char);
+		public virtual signal void editing_done ();
 		[HasEmitter]
-		public virtual signal void begin_user_action ();
+		public virtual signal void remove_widget ();
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public interface CellLayout : GLib.Object {
+		public abstract void add_attribute (Gtk.CellRenderer cell, string attribute, int column);
+		public abstract void clear ();
+		public abstract void clear_attributes (Gtk.CellRenderer cell);
+		public abstract weak GLib.List get_cells ();
+		public abstract void pack_end (Gtk.CellRenderer cell, bool expand);
+		public abstract void pack_start (Gtk.CellRenderer cell, bool expand);
+		public abstract void reorder (Gtk.CellRenderer cell, int position);
+		public void set_attributes (Gtk.CellRenderer cell, ...);
+		public abstract void set_cell_data_func (Gtk.CellRenderer cell, Gtk.CellLayoutDataFunc# func);
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public interface Editable {
+		public void copy_clipboard ();
+		public void cut_clipboard ();
+		public void delete_selection ();
+		[NoWrapper]
+		public abstract void do_delete_text (int start_pos, int end_pos);
+		[NoWrapper]
+		public abstract void do_insert_text (string text, int length, int position);
+		public abstract weak string get_chars (int start_pos, int end_pos);
+		public bool get_editable ();
+		public abstract int get_position ();
+		public abstract bool get_selection_bounds (int start, int end);
+		public void paste_clipboard ();
+		public void select_region (int start, int end);
+		public void set_editable (bool is_editable);
+		public abstract void set_position (int position);
+		[NoWrapper]
+		public abstract void set_selection_bounds (int start_pos, int end_pos);
 		public virtual signal void changed ();
-		public virtual signal void delete_range (Gtk.TextIter start, Gtk.TextIter end);
-		[HasEmitter]
-		public virtual signal void end_user_action ();
-		[HasEmitter]
-		public virtual signal void insert_child_anchor (Gtk.TextIter pos, Gtk.TextChildAnchor anchor);
 		[HasEmitter]
-		public virtual signal void insert_pixbuf (Gtk.TextIter pos, Gdk.Pixbuf pixbuf);
-		public virtual signal void insert_text (Gtk.TextIter pos, string text, int length);
-		public virtual signal void mark_deleted (Gtk.TextMark mark);
-		public virtual signal void mark_set (Gtk.TextIter location, Gtk.TextMark mark);
-		public virtual signal void modified_changed ();
+		public virtual signal void delete_text (int start_pos, int end_pos);
 		[HasEmitter]
-		public virtual signal void remove_tag (Gtk.TextTag tag, Gtk.TextIter start_char, Gtk.TextIter end_char);
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TextChildAnchor : GLib.Object {
-		public void* segment;
-		public bool get_deleted ();
-		public weak GLib.List get_widgets ();
-		[CCode (has_construct_function = false)]
-		public TextChildAnchor ();
+		public virtual signal void insert_text (string text, int length, void* position);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TextMark : GLib.Object {
-		public void* segment;
-		public weak Gtk.TextBuffer get_buffer ();
-		public bool get_deleted ();
-		public bool get_left_gravity ();
-		public weak string get_name ();
-		public bool get_visible ();
-		[CCode (has_construct_function = false)]
-		public TextMark (string name, bool left_gravity);
-		public void set_visible (bool setting);
-		[NoAccessorMethod]
-		public bool left_gravity { get; construct; }
-		[NoAccessorMethod]
-		public string name { get; construct; }
+	public interface FileChooser : Gtk.Widget {
+		public void add_filter (Gtk.FileFilter filter);
+		public bool add_shortcut_folder (string folder) throws GLib.Error;
+		public bool add_shortcut_folder_uri (string uri) throws GLib.Error;
+		public static GLib.Quark error_quark ();
+		public Gtk.FileChooserAction get_action ();
+		public weak string get_current_folder ();
+		public weak string get_current_folder_uri ();
+		public bool get_do_overwrite_confirmation ();
+		public weak Gtk.Widget get_extra_widget ();
+		public weak string get_filename ();
+		public weak GLib.SList get_filenames ();
+		public weak Gtk.FileFilter get_filter ();
+		public bool get_local_only ();
+		public weak string get_preview_filename ();
+		public weak string get_preview_uri ();
+		public weak Gtk.Widget get_preview_widget ();
+		public bool get_preview_widget_active ();
+		public bool get_select_multiple ();
+		public bool get_show_hidden ();
+		public weak string get_uri ();
+		public weak GLib.SList get_uris ();
+		public bool get_use_preview_label ();
+		public weak GLib.SList list_filters ();
+		public weak GLib.SList list_shortcut_folder_uris ();
+		public weak GLib.SList list_shortcut_folders ();
+		public void remove_filter (Gtk.FileFilter filter);
+		public bool remove_shortcut_folder (string folder) throws GLib.Error;
+		public bool remove_shortcut_folder_uri (string uri) throws GLib.Error;
+		public void select_all ();
+		public bool select_filename (string filename);
+		public bool select_uri (string uri);
+		public void set_action (Gtk.FileChooserAction action);
+		public bool set_current_folder (string filename);
+		public bool set_current_folder_uri (string uri);
+		public void set_current_name (string name);
+		public void set_do_overwrite_confirmation (bool do_overwrite_confirmation);
+		public void set_extra_widget (Gtk.Widget extra_widget);
+		public bool set_filename (string filename);
+		public void set_filter (Gtk.FileFilter filter);
+		public void set_local_only (bool local_only);
+		public void set_preview_widget (Gtk.Widget preview_widget);
+		public void set_preview_widget_active (bool active);
+		public void set_select_multiple (bool select_multiple);
+		public void set_show_hidden (bool show_hidden);
+		public bool set_uri (string uri);
+		public void set_use_preview_label (bool use_label);
+		public void unselect_all ();
+		public void unselect_filename (string filename);
+		public void unselect_uri (string uri);
+		public Gtk.FileChooserAction action { get; set; }
+		public bool do_overwrite_confirmation { get; set; }
+		public Gtk.Widget extra_widget { get; set; }
+		public string file_system_backend { construct; }
+		public Gtk.FileFilter filter { get; set; }
+		public bool local_only { get; set; }
+		public Gtk.Widget preview_widget { get; set; }
+		public bool preview_widget_active { get; set; }
+		public bool select_multiple { get; set; }
+		public bool show_hidden { get; set; }
+		public bool use_preview_label { get; set; }
+		public virtual signal Gtk.FileChooserConfirmation confirm_overwrite ();
+		public virtual signal void current_folder_changed ();
+		public virtual signal void file_activated ();
+		public virtual signal void selection_changed ();
+		public virtual signal void update_preview ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TextTag : GLib.Object {
-		public weak Gtk.TextTagTable table;
-		public int priority;
-		public weak Gtk.TextAttributes values;
-		public uint bg_color_set;
-		public uint bg_stipple_set;
-		public uint fg_color_set;
-		public uint fg_stipple_set;
-		public uint bg_full_height_set;
-		public uint pg_bg_color_set;
-		public uint pad1;
-		public int get_priority ();
-		[CCode (has_construct_function = false)]
-		public TextTag (string name);
-		public void set_priority (int priority);
-		[NoAccessorMethod]
-		public bool accumulative_margin { get; set; }
-		[NoAccessorMethod]
-		public string background { set; }
-		[NoAccessorMethod]
-		public bool background_full_height { get; set; }
-		[NoAccessorMethod]
-		public bool background_full_height_set { get; set; }
-		[NoAccessorMethod]
-		public Gdk.Color background_gdk { get; set; }
-		[NoAccessorMethod]
-		public bool background_set { get; set; }
-		[NoAccessorMethod]
-		public Gdk.Pixmap background_stipple { get; set; }
-		[NoAccessorMethod]
-		public bool background_stipple_set { get; set; }
-		[NoAccessorMethod]
-		public Gtk.TextDirection direction { get; set; }
-		[NoAccessorMethod]
-		public bool editable { get; set; }
-		[NoAccessorMethod]
-		public bool editable_set { get; set; }
-		[NoAccessorMethod]
-		public string family { get; set; }
-		[NoAccessorMethod]
-		public bool family_set { get; set; }
-		[NoAccessorMethod]
-		public string font { get; set; }
-		[NoAccessorMethod]
-		public Pango.FontDescription font_desc { get; set; }
-		[NoAccessorMethod]
-		public string foreground { set; }
-		[NoAccessorMethod]
-		public Gdk.Color foreground_gdk { get; set; }
-		[NoAccessorMethod]
-		public bool foreground_set { get; set; }
-		[NoAccessorMethod]
-		public Gdk.Pixmap foreground_stipple { get; set; }
-		[NoAccessorMethod]
-		public bool foreground_stipple_set { get; set; }
-		[NoAccessorMethod]
-		public int indent { get; set; }
-		[NoAccessorMethod]
-		public bool indent_set { get; set; }
-		[NoAccessorMethod]
-		public bool invisible { get; set; }
-		[NoAccessorMethod]
-		public bool invisible_set { get; set; }
-		[NoAccessorMethod]
-		public Gtk.Justification justification { get; set; }
-		[NoAccessorMethod]
-		public bool justification_set { get; set; }
-		[NoAccessorMethod]
-		public string language { get; set; }
-		[NoAccessorMethod]
-		public bool language_set { get; set; }
-		[NoAccessorMethod]
-		public int left_margin { get; set; }
-		[NoAccessorMethod]
-		public bool left_margin_set { get; set; }
-		[NoAccessorMethod]
-		public string name { get; construct; }
-		[NoAccessorMethod]
-		public string paragraph_background { set; }
-		[NoAccessorMethod]
-		public Gdk.Color paragraph_background_gdk { get; set; }
-		[NoAccessorMethod]
-		public bool paragraph_background_set { get; set; }
-		[NoAccessorMethod]
-		public int pixels_above_lines { get; set; }
-		[NoAccessorMethod]
-		public bool pixels_above_lines_set { get; set; }
-		[NoAccessorMethod]
-		public int pixels_below_lines { get; set; }
-		[NoAccessorMethod]
-		public bool pixels_below_lines_set { get; set; }
-		[NoAccessorMethod]
-		public int pixels_inside_wrap { get; set; }
-		[NoAccessorMethod]
-		public bool pixels_inside_wrap_set { get; set; }
-		[NoAccessorMethod]
-		public int right_margin { get; set; }
-		[NoAccessorMethod]
-		public bool right_margin_set { get; set; }
-		[NoAccessorMethod]
-		public int rise { get; set; }
-		[NoAccessorMethod]
-		public bool rise_set { get; set; }
-		[NoAccessorMethod]
-		public double scale { get; set; }
-		[NoAccessorMethod]
-		public bool scale_set { get; set; }
-		[NoAccessorMethod]
-		public int size { get; set; }
-		[NoAccessorMethod]
-		public double size_points { get; set; }
-		[NoAccessorMethod]
-		public bool size_set { get; set; }
-		[NoAccessorMethod]
-		public Pango.Stretch stretch { get; set; }
-		[NoAccessorMethod]
-		public bool stretch_set { get; set; }
-		[NoAccessorMethod]
-		public bool strikethrough { get; set; }
-		[NoAccessorMethod]
-		public bool strikethrough_set { get; set; }
-		[NoAccessorMethod]
-		public Pango.Style style { get; set; }
-		[NoAccessorMethod]
-		public bool style_set { get; set; }
-		[NoAccessorMethod]
-		public Pango.TabArray tabs { get; set; }
-		[NoAccessorMethod]
-		public bool tabs_set { get; set; }
-		[NoAccessorMethod]
-		public Pango.Underline underline { get; set; }
-		[NoAccessorMethod]
-		public bool underline_set { get; set; }
-		[NoAccessorMethod]
-		public Pango.Variant variant { get; set; }
-		[NoAccessorMethod]
-		public bool variant_set { get; set; }
-		[NoAccessorMethod]
-		public int weight { get; set; }
-		[NoAccessorMethod]
-		public bool weight_set { get; set; }
-		[NoAccessorMethod]
-		public Gtk.WrapMode wrap_mode { get; set; }
-		[NoAccessorMethod]
-		public bool wrap_mode_set { get; set; }
-		[HasEmitter]
-		public virtual signal bool event (GLib.Object event_object, Gdk.Event event, Gtk.TextIter iter);
+	public interface FileChooserEmbed {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TextTagTable : GLib.Object {
-		public weak GLib.HashTable hash;
-		public weak GLib.SList anonymous;
-		public int anon_count;
-		public weak GLib.SList buffers;
-		public void add (Gtk.TextTag tag);
-		public void @foreach (Gtk.TextTagTableForeach func, void* data);
-		public int get_size ();
-		public weak Gtk.TextTag lookup (string name);
-		[CCode (has_construct_function = false)]
-		public TextTagTable ();
-		public void remove (Gtk.TextTag tag);
-		public virtual signal void tag_added (Gtk.TextTag tag);
-		public virtual signal void tag_changed (Gtk.TextTag tag, bool size_changed);
-		public virtual signal void tag_removed (Gtk.TextTag tag);
+	public interface PrintOperationPreview : GLib.Object {
+		public abstract void end_preview ();
+		public abstract bool is_selected (int page_nr);
+		public abstract void render_page (int page_nr);
+		public virtual signal void got_page_size (Gtk.PrintContext context, Gtk.PageSetup page_setup);
+		public virtual signal void ready (Gtk.PrintContext context);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TextView : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		public uint selection_drag_handler;
-		public uint scroll_timeout;
-		public Gtk.Justification justify;
-		public uint overwrite_mode;
-		public uint need_im_reset;
-		public uint width_changed;
-		public uint onscreen_validated;
-		public uint mouse_cursor_obscured;
-		public weak Gtk.TextWindow text_window;
-		public weak Gtk.TextWindow left_window;
-		public weak Gtk.TextWindow right_window;
-		public weak Gtk.TextWindow top_window;
-		public weak Gtk.TextWindow bottom_window;
-		public weak Gtk.Adjustment hadjustment;
-		public weak Gtk.Adjustment vadjustment;
-		public int xoffset;
-		public int yoffset;
-		public int width;
-		public int height;
-		public int virtual_cursor_x;
-		public int virtual_cursor_y;
-		public weak Gtk.TextMark first_para_mark;
-		public int first_para_pixels;
-		public weak Gtk.TextMark dnd_mark;
-		public uint blink_timeout;
-		public uint first_validate_idle;
-		public uint incremental_validate_idle;
-		public weak Gtk.IMContext im_context;
-		public weak Gtk.Widget popup_menu;
-		public int drag_start_x;
-		public int drag_start_y;
-		public weak GLib.SList children;
-		public weak Gtk.TextPendingScroll pending_scroll;
-		public int pending_place_cursor_button;
-		public void add_child_at_anchor (Gtk.Widget child, Gtk.TextChildAnchor anchor);
-		public void add_child_in_window (Gtk.Widget child, Gtk.TextWindowType which_window, int xpos, int ypos);
-		public bool backward_display_line (Gtk.TextIter iter);
-		public bool backward_display_line_start (Gtk.TextIter iter);
-		public void buffer_to_window_coords (Gtk.TextWindowType win, int buffer_x, int buffer_y, out int window_x, out int window_y);
-		public bool forward_display_line (Gtk.TextIter iter);
-		public bool forward_display_line_end (Gtk.TextIter iter);
-		public bool get_accepts_tab ();
-		public int get_border_window_size (Gtk.TextWindowType type);
-		public weak Gtk.TextBuffer get_buffer ();
-		public bool get_cursor_visible ();
-		public weak Gtk.TextAttributes get_default_attributes ();
-		public bool get_editable ();
-		public int get_indent ();
-		public void get_iter_at_location (out Gtk.TextIter iter, int x, int y);
-		public void get_iter_at_position (out Gtk.TextIter iter, out int trailing, int x, int y);
-		public void get_iter_location (Gtk.TextIter iter, out Gdk.Rectangle location);
-		public Gtk.Justification get_justification ();
-		public int get_left_margin ();
-		public void get_line_at_y (Gtk.TextIter target_iter, int y, int line_top);
-		public void get_line_yrange (Gtk.TextIter iter, int y, int height);
-		public bool get_overwrite ();
-		public int get_pixels_above_lines ();
-		public int get_pixels_below_lines ();
-		public int get_pixels_inside_wrap ();
-		public int get_right_margin ();
-		public weak Pango.TabArray get_tabs ();
-		public void get_visible_rect (out Gdk.Rectangle visible_rect);
-		public weak Gdk.Window get_window (Gtk.TextWindowType win);
-		public Gtk.TextWindowType get_window_type (Gdk.Window window);
-		public Gtk.WrapMode get_wrap_mode ();
-		public void move_child (Gtk.Widget child, int xpos, int ypos);
-		public bool move_mark_onscreen (Gtk.TextMark mark);
-		public bool move_visually (Gtk.TextIter iter, int count);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public TextView ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public TextView.with_buffer (Gtk.TextBuffer buffer);
-		public bool place_cursor_onscreen ();
-		public void scroll_mark_onscreen (Gtk.TextMark mark);
-		public bool scroll_to_iter (Gtk.TextIter iter, double within_margin, bool use_align, double xalign, double yalign);
-		public void scroll_to_mark (Gtk.TextMark mark, double within_margin, bool use_align, double xalign, double yalign);
-		public void set_accepts_tab (bool accepts_tab);
-		public void set_border_window_size (Gtk.TextWindowType type, int size);
-		public void set_buffer (Gtk.TextBuffer buffer);
-		public void set_cursor_visible (bool setting);
-		public void set_editable (bool setting);
-		public void set_indent (int indent);
-		public void set_justification (Gtk.Justification justification);
-		public void set_left_margin (int left_margin);
-		public void set_overwrite (bool overwrite);
-		public void set_pixels_above_lines (int pixels_above_lines);
-		public void set_pixels_below_lines (int pixels_below_lines);
-		public void set_pixels_inside_wrap (int pixels_inside_wrap);
-		public void set_right_margin (int right_margin);
-		public void set_tabs (Pango.TabArray tabs);
-		public void set_wrap_mode (Gtk.WrapMode wrap_mode);
-		public bool starts_display_line (Gtk.TextIter iter);
-		public void window_to_buffer_coords (Gtk.TextWindowType win, int window_x, int window_y, out int buffer_x, out int buffer_y);
+	public interface RecentChooser : GLib.Object {
+		public abstract void add_filter (Gtk.RecentFilter filter);
+		public static GLib.Quark error_quark ();
+		public weak Gtk.RecentInfo get_current_item ();
+		public abstract weak string get_current_uri ();
+		public weak Gtk.RecentFilter get_filter ();
+		public abstract weak GLib.List get_items ();
+		public int get_limit ();
+		public bool get_local_only ();
 		[NoWrapper]
-		public virtual void move_focus (Gtk.DirectionType direction);
-		public bool accepts_tab { get; set; }
-		public Gtk.TextBuffer buffer { get; set; }
-		public bool cursor_visible { get; set; }
-		public bool editable { get; set; }
-		public int indent { get; set; }
-		public Gtk.Justification justification { get; set; }
-		public int left_margin { get; set; }
-		public bool overwrite { get; set; }
-		public int pixels_above_lines { get; set; }
-		public int pixels_below_lines { get; set; }
-		public int pixels_inside_wrap { get; set; }
-		public int right_margin { get; set; }
-		public Pango.TabArray tabs { get; set; }
-		public Gtk.WrapMode wrap_mode { get; set; }
-		public virtual signal void backspace ();
-		public virtual signal void copy_clipboard ();
-		public virtual signal void cut_clipboard ();
-		public virtual signal void delete_from_cursor (Gtk.DeleteType type, int count);
-		public virtual signal void insert_at_cursor (string str);
-		public virtual signal void move_cursor (Gtk.MovementStep step, int count, bool extend_selection);
-		public virtual signal void move_viewport (Gtk.ScrollStep p0, int p1);
-		public virtual signal void page_horizontally (int count, bool extend_selection);
-		public virtual signal void paste_clipboard ();
-		public virtual signal void populate_popup (Gtk.Menu menu);
-		public virtual signal void select_all (bool p0);
-		public virtual signal void set_anchor ();
-		public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
-		public virtual signal void toggle_cursor_visible ();
-		public virtual signal void toggle_overwrite ();
+		public abstract weak Gtk.RecentManager get_recent_manager ();
+		public bool get_select_multiple ();
+		public bool get_show_icons ();
+		public bool get_show_not_found ();
+		public bool get_show_private ();
+		public bool get_show_tips ();
+		public Gtk.RecentSortType get_sort_type ();
+		public weak string get_uris (ulong length);
+		public abstract weak GLib.SList list_filters ();
+		public abstract void remove_filter (Gtk.RecentFilter filter);
+		public abstract void select_all ();
+		public abstract bool select_uri (string uri) throws GLib.Error;
+		public abstract bool set_current_uri (string uri) throws GLib.Error;
+		public void set_filter (Gtk.RecentFilter filter);
+		public void set_limit (int limit);
+		public void set_local_only (bool local_only);
+		public void set_select_multiple (bool select_multiple);
+		public void set_show_icons (bool show_icons);
+		public void set_show_not_found (bool show_not_found);
+		public void set_show_private (bool show_private);
+		public void set_show_tips (bool show_tips);
+		public abstract void set_sort_func (Gtk.RecentSortFunc sort_func, void* sort_data, GLib.DestroyNotify data_destroy);
+		public void set_sort_type (Gtk.RecentSortType sort_type);
+		public abstract void unselect_all ();
+		public abstract void unselect_uri (string uri);
+		public Gtk.RecentFilter filter { get; set; }
+		public int limit { get; set; }
+		public bool local_only { get; set; }
+		public Gtk.RecentManager recent_manager { construct; }
+		public bool select_multiple { get; set; }
+		public bool show_icons { get; set; }
+		public bool show_not_found { get; set; }
+		public bool show_private { get; set; }
+		public bool show_tips { get; set; }
+		public Gtk.RecentSortType sort_type { get; set; }
+		public virtual signal void item_activated ();
+		public virtual signal void selection_changed ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ToggleAction : Gtk.Action, Gtk.Buildable {
-		public bool get_active ();
-		public bool get_draw_as_radio ();
-		[CCode (has_construct_function = false)]
-		public ToggleAction (string name, string? label, string? tooltip, string? stock_id);
-		public void set_active (bool is_active);
-		public void set_draw_as_radio (bool draw_as_radio);
-		public bool active { get; set; }
-		public bool draw_as_radio { get; set; }
+	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);
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public interface TreeDragSource {
+		public abstract bool drag_data_delete (Gtk.TreePath path);
+		public abstract bool drag_data_get (Gtk.TreePath path, Gtk.SelectionData selection_data);
+		public abstract bool row_draggable (Gtk.TreePath path);
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public interface TreeModel : GLib.Object {
+		public void @foreach (Gtk.TreeModelForeachFunc func);
+		[CCode (sentinel = "-1")]
+		public void get (Gtk.TreeIter iter, ...);
+		public abstract GLib.Type get_column_type (int index_);
+		public abstract Gtk.TreeModelFlags get_flags ();
+		public abstract bool get_iter (out Gtk.TreeIter iter, Gtk.TreePath path);
+		public bool get_iter_first (out Gtk.TreeIter iter);
+		public bool get_iter_from_string (out Gtk.TreeIter iter, string path_string);
+		public abstract int get_n_columns ();
+		public abstract Gtk.TreePath get_path (Gtk.TreeIter iter);
+		public string get_string_from_iter (Gtk.TreeIter iter);
+		public void get_valist (Gtk.TreeIter iter, void* var_args);
+		public abstract void get_value (Gtk.TreeIter iter, int column, ref GLib.Value value);
+		public abstract bool iter_children (out Gtk.TreeIter iter, Gtk.TreeIter? parent);
+		public abstract bool iter_has_child (Gtk.TreeIter iter);
+		public abstract int iter_n_children (Gtk.TreeIter? iter);
+		public abstract bool iter_next (ref Gtk.TreeIter iter);
+		public abstract bool iter_nth_child (out Gtk.TreeIter iter, Gtk.TreeIter? parent, int n);
+		public abstract bool iter_parent (out Gtk.TreeIter iter, Gtk.TreeIter child);
+		public abstract void ref_node (Gtk.TreeIter iter);
+		public abstract void unref_node (Gtk.TreeIter iter);
 		[HasEmitter]
-		public virtual signal void toggled ();
+		public virtual signal void row_changed (Gtk.TreePath path, Gtk.TreeIter iter);
+		[HasEmitter]
+		public virtual signal void row_deleted (Gtk.TreePath path);
+		[HasEmitter]
+		public virtual signal void row_has_child_toggled (Gtk.TreePath path, Gtk.TreeIter iter);
+		[HasEmitter]
+		public virtual signal void row_inserted (Gtk.TreePath path, Gtk.TreeIter iter);
+		[HasEmitter]
+		public virtual signal void rows_reordered (Gtk.TreePath path, Gtk.TreeIter iter, void* new_order);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ToggleButton : Gtk.Button, Atk.Implementor, Gtk.Buildable {
-		public bool get_active ();
-		public bool get_inconsistent ();
-		public bool get_mode ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public ToggleButton ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public ToggleButton.with_label (string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public ToggleButton.with_mnemonic (string label);
-		public void set_active (bool is_active);
-		public void set_inconsistent (bool setting);
-		public void set_mode (bool draw_indicator);
-		public bool active { get; set; }
-		[NoAccessorMethod]
-		public bool draw_indicator { get; set; }
-		public bool inconsistent { get; set; }
+	public interface TreeSortable : Gtk.TreeModel, GLib.Object {
+		public abstract bool get_sort_column_id (out int sort_column_id, out Gtk.SortType order);
+		public abstract bool has_default_sort_func ();
+		public abstract void set_default_sort_func (Gtk.TreeIterCompareFunc# sort_func);
+		public abstract void set_sort_column_id (int sort_column_id, Gtk.SortType order);
+		public abstract void set_sort_func (int sort_column_id, Gtk.TreeIterCompareFunc# sort_func);
 		[HasEmitter]
-		public virtual signal void toggled ();
+		public virtual signal void sort_column_changed ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ToggleToolButton : Gtk.ToolButton, Atk.Implementor, Gtk.Buildable {
-		public bool get_active ();
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
-		public ToggleToolButton ();
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
-		public ToggleToolButton.from_stock (string stock_id);
-		public void set_active (bool is_active);
-		public bool active { get; set; }
-		public virtual signal void toggled ();
+	public struct ActionEntry {
+		public weak string accelerator;
+		[CCode (type = "GCallback")]
+		public weak Gtk.ActionCallback callback;
+		public weak string label;
+		public weak string name;
+		public weak string stock_id;
+		public weak string tooltip;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ToolButton : Gtk.ToolItem, Atk.Implementor, Gtk.Buildable {
-		public weak string get_icon_name ();
-		public weak Gtk.Widget get_icon_widget ();
-		public weak string get_label ();
-		public weak Gtk.Widget get_label_widget ();
-		public weak string get_stock_id ();
-		public bool get_use_underline ();
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
-		public ToolButton (Gtk.Widget icon_widget, string label);
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
-		public ToolButton.from_stock (string stock_id);
-		public void set_icon_name (string icon_name);
-		public void set_icon_widget (Gtk.Widget icon_widget);
-		public void set_label (string label);
-		public void set_label_widget (Gtk.Widget label_widget);
-		public void set_stock_id (string stock_id);
-		public void set_use_underline (bool use_underline);
-		public string icon_name { get; set; }
-		public Gtk.Widget icon_widget { get; set; }
-		public string label { get; set; }
-		public Gtk.Widget label_widget { get; set; }
-		public string stock_id { get; set; }
-		public bool use_underline { get; set; }
-		public virtual signal void clicked ();
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ToolItem : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
-		public bool get_expand ();
-		public bool get_homogeneous ();
-		public Gtk.IconSize get_icon_size ();
-		public bool get_is_important ();
-		public Gtk.Orientation get_orientation ();
-		public weak Gtk.Widget get_proxy_menu_item (string menu_item_id);
-		public Gtk.ReliefStyle get_relief_style ();
-		public Gtk.ToolbarStyle get_toolbar_style ();
-		public bool get_use_drag_window ();
-		public bool get_visible_horizontal ();
-		public bool get_visible_vertical ();
-		[CCode (has_construct_function = false)]
-		public ToolItem ();
-		public void rebuild_menu ();
-		public weak Gtk.Widget retrieve_proxy_menu_item ();
-		public void set_expand (bool expand);
-		public void set_homogeneous (bool homogeneous);
-		public void set_is_important (bool is_important);
-		public void set_proxy_menu_item (string menu_item_id, Gtk.Widget menu_item);
-		public void set_tooltip_markup (string markup);
-		public void set_tooltip_text (string text);
-		public void set_use_drag_window (bool use_drag_window);
-		public void set_visible_horizontal (bool visible_horizontal);
-		public void set_visible_vertical (bool visible_vertical);
-		public bool is_important { get; set; }
-		public bool visible_horizontal { get; set; }
-		public bool visible_vertical { get; set; }
-		public virtual signal bool create_menu_proxy ();
-		public virtual signal void toolbar_reconfigured ();
+	public struct Allocation {
+		public int height;
+		public int width;
+		public int x;
+		public int y;
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Toolbar : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.ToolShell {
-		public int num_children;
-		public weak GLib.List children;
-		public Gtk.ToolbarStyle style;
-		public int button_maxw;
-		public int button_maxh;
-		public uint style_set;
-		public int get_drop_index (int x, int y);
-		public int get_item_index (Gtk.ToolItem item);
-		public int get_n_items ();
-		public weak Gtk.ToolItem get_nth_item (int n);
-		public bool get_show_arrow ();
-		public bool get_tooltips ();
-		public void insert (Gtk.ToolItem item, int pos);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Toolbar ();
-		public void set_drop_highlight_item (Gtk.ToolItem tool_item, int index_);
-		public void set_icon_size (Gtk.IconSize icon_size);
-		public void set_orientation (Gtk.Orientation orientation);
-		public void set_show_arrow (bool show_arrow);
-		public void set_style (Gtk.ToolbarStyle style);
-		public void set_tooltips (bool enable);
-		public void unset_icon_size ();
-		public void unset_style ();
-		public Gtk.IconSize icon_size { get; set; }
-		[NoAccessorMethod]
-		public bool icon_size_set { get; set; }
-		public Gtk.Orientation orientation { get; set; }
-		public bool show_arrow { get; set; }
-		[NoAccessorMethod]
-		public Gtk.ToolbarStyle toolbar_style { get; set; }
-		public bool tooltips { get; set; }
-		public virtual signal bool focus_home_or_end (bool p0);
-		public virtual signal void orientation_changed (Gtk.Orientation orientation);
-		public virtual signal bool popup_context_menu (int x, int y, int button_number);
-		public virtual signal void style_changed (Gtk.ToolbarStyle style);
+	[CCode (type_id = "GTK_TYPE_BORDER", cheader_filename = "gtk/gtk.h")]
+	public struct Border {
+		public int bottom;
+		public int left;
+		public int right;
+		public int top;
+		public Gtk.Border copy ();
+		public void free ();
+		[CCode (cname = "gtk_border_new", has_construct_function = false)]
+		public Border ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	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);
-		public void set_tip_area (Gdk.Rectangle rect);
-		public static void trigger_tooltip_query (Gdk.Display display);
+	public struct RadioActionEntry {
+		public weak string accelerator;
+		public weak string label;
+		public weak string name;
+		public weak string stock_id;
+		public weak string tooltip;
+		public int value;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TreeModelFilter : GLib.Object, Gtk.TreeModel, Gtk.TreeDragSource {
-		public void clear_cache ();
-		public bool convert_child_iter_to_iter (out Gtk.TreeIter filter_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 filter_iter);
-		public weak Gtk.TreePath convert_path_to_child_path (Gtk.TreePath filter_path);
-		public weak Gtk.TreeModel get_model ();
-		[CCode (type = "GtkTreeModel*", has_construct_function = false)]
-		public TreeModelFilter (Gtk.TreeModel child_model, Gtk.TreePath? root);
-		public void refilter ();
-		public void set_modify_func (int n_columns, GLib.Type[] types, Gtk.TreeModelFilterModifyFunc func, void* data, Gtk.DestroyNotify destroy);
-		public void set_visible_column (int column);
-		public void set_visible_func (Gtk.TreeModelFilterVisibleFunc# func);
-		[NoAccessorMethod]
-		public Gtk.TreeModel child_model { get; construct; }
-		[NoAccessorMethod]
-		public Gtk.TreePath virtual_root { get; construct; }
+	public struct RecentData {
+		public string app_exec;
+		public string app_name;
+		public string description;
+		public string display_name;
+		[NoArrayLength]
+		public string[] groups;
+		public bool is_private;
+		public string mime_type;
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TreeModelSort : GLib.Object, Gtk.TreeModel, Gtk.TreeSortable, Gtk.TreeDragSource {
-		public void* root;
-		public int stamp;
-		public uint child_flags;
-		public weak Gtk.TreeModel child_model;
-		public int zero_ref_count;
-		public weak GLib.List sort_list;
-		public int sort_column_id;
-		public Gtk.SortType order;
-		public weak Gtk.TreeIterCompareFunc default_sort_func;
-		public void* default_sort_data;
-		public weak Gtk.DestroyNotify default_sort_destroy;
-		public uint changed_id;
-		public uint inserted_id;
-		public uint has_child_toggled_id;
-		public uint deleted_id;
-		public uint reordered_id;
-		public void clear_cache ();
-		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);
-		public weak Gtk.TreeModel get_model ();
-		public bool iter_is_valid (Gtk.TreeIter iter);
-		[CCode (type = "GtkTreeModel*", has_construct_function = false)]
-		public TreeModelSort.with_model (Gtk.TreeModel child_model);
-		public void reset_default_sort_func ();
-		[NoAccessorMethod]
-		public Gtk.TreeModel model { get; construct; }
+	[CCode (type_id = "GTK_TYPE_REQUISITION", cheader_filename = "gtk/gtk.h")]
+	public struct Requisition {
+		public int height;
+		public int width;
+		public Gtk.Requisition copy ();
+		public void free ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TreeSelection : GLib.Object {
-		public weak Gtk.TreeView tree_view;
-		public Gtk.SelectionMode type;
-		public weak Gtk.TreeSelectionFunc user_func;
-		public void* user_data;
-		public weak Gtk.DestroyNotify destroy;
-		public int count_selected_rows ();
-		public Gtk.SelectionMode get_mode ();
-		public bool get_selected (out weak Gtk.TreeModel model, out Gtk.TreeIter iter);
-		public GLib.List<Gtk.TreePath> get_selected_rows (out weak Gtk.TreeModel model);
-		public weak Gtk.TreeView get_tree_view ();
-		public void* get_user_data ();
-		public bool iter_is_selected (Gtk.TreeIter iter);
-		public bool path_is_selected (Gtk.TreePath path);
-		public void select_all ();
-		public void select_iter (Gtk.TreeIter iter);
-		public void select_path (Gtk.TreePath path);
-		public void select_range (Gtk.TreePath start_path, Gtk.TreePath end_path);
-		public void selected_foreach (Gtk.TreeSelectionForeachFunc func);
-		public void set_mode (Gtk.SelectionMode type);
-		public void set_select_function (Gtk.TreeSelectionFunc func, void* data, Gtk.DestroyNotify destroy);
-		public void unselect_all ();
-		public void unselect_iter (Gtk.TreeIter iter);
-		public void unselect_path (Gtk.TreePath path);
-		public void unselect_range (Gtk.TreePath start_path, Gtk.TreePath end_path);
-		public virtual signal void changed ();
+	public struct TargetEntry {
+		public uint flags;
+		public uint info;
+		public weak string target;
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TreeStore : GLib.Object, Gtk.Buildable, Gtk.TreeModel, Gtk.TreeSortable, Gtk.TreeDragSource, Gtk.TreeDragDest {
-		public int stamp;
-		public void* root;
-		public void* last;
-		public int n_columns;
-		public int sort_column_id;
-		public weak GLib.List sort_list;
-		public Gtk.SortType order;
-		[NoArrayLength]
-		public weak GLib.Type[] column_headers;
-		public weak Gtk.TreeIterCompareFunc default_sort_func;
-		public void* default_sort_data;
-		public weak Gtk.DestroyNotify default_sort_destroy;
-		public uint columns_dirty;
-		public void append (out Gtk.TreeIter iter, Gtk.TreeIter? parent);
-		public void clear ();
-		public void insert (out Gtk.TreeIter iter, Gtk.TreeIter? parent, int position);
-		public void insert_after (out Gtk.TreeIter iter, Gtk.TreeIter? parent, Gtk.TreeIter? sibling);
-		public void insert_before (out Gtk.TreeIter iter, Gtk.TreeIter? parent, Gtk.TreeIter? sibling);
-		[CCode (sentinel = "-1")]
-		public void insert_with_values (out Gtk.TreeIter iter, Gtk.TreeIter? parent, int position, ...);
-		public void insert_with_valuesv (out Gtk.TreeIter iter, Gtk.TreeIter? parent, int position, int columns, GLib.Value[] values);
-		public bool is_ancestor (Gtk.TreeIter iter, Gtk.TreeIter descendant);
-		public int iter_depth (Gtk.TreeIter iter);
-		public bool iter_is_valid (Gtk.TreeIter iter);
-		public void move_after (Gtk.TreeIter iter, Gtk.TreeIter? position);
-		public void move_before (Gtk.TreeIter iter, Gtk.TreeIter? position);
-		[CCode (has_construct_function = false)]
-		public TreeStore (int n_columns, ...);
-		[CCode (cname = "gtk_tree_store_newv", has_construct_function = false)]
-		public TreeStore.newv (int n_columns, GLib.Type[] types);
-		public void prepend (out Gtk.TreeIter iter, Gtk.TreeIter? parent);
-		public bool remove (Gtk.TreeIter iter);
-		public void reorder (Gtk.TreeIter? parent, int new_order);
-		[CCode (sentinel = "-1")]
-		public void set (Gtk.TreeIter iter, ...);
-		public void set_column_types ([CCode (array_length_pos = 0.9)] GLib.Type[] types);
-		public void set_valist (Gtk.TreeIter iter, void* var_args);
-		public void set_value (Gtk.TreeIter iter, int column, GLib.Value value);
-		public void set_valuesv (Gtk.TreeIter iter, int columns, GLib.Value[] values);
-		public void swap (Gtk.TreeIter a, Gtk.TreeIter b);
+	[CCode (type_id = "GTK_TYPE_TEXT_ITER", cheader_filename = "gtk/gtk.h")]
+	public struct TextIter {
+		public void* dummy1;
+		public void* dummy10;
+		public int dummy11;
+		public int dummy12;
+		public int dummy13;
+		public void* dummy14;
+		public void* dummy2;
+		public int dummy3;
+		public int dummy4;
+		public int dummy5;
+		public int dummy6;
+		public int dummy7;
+		public int dummy8;
+		public void* dummy9;
+		public bool backward_char ();
+		public bool backward_chars (int count);
+		public bool backward_cursor_position ();
+		public bool backward_cursor_positions (int count);
+		public bool backward_find_char (Gtk.TextCharPredicate pred, Gtk.TextIter limit);
+		public bool backward_line ();
+		public bool backward_lines (int count);
+		public bool backward_search (string str, Gtk.TextSearchFlags flags, out Gtk.TextIter match_start, out Gtk.TextIter match_end, Gtk.TextIter? limit);
+		public bool backward_sentence_start ();
+		public bool backward_sentence_starts (int count);
+		public bool backward_to_tag_toggle (Gtk.TextTag? tag);
+		public bool backward_visible_cursor_position ();
+		public bool backward_visible_cursor_positions (int count);
+		public bool backward_visible_line ();
+		public bool backward_visible_lines (int count);
+		public bool backward_visible_word_start ();
+		public bool backward_visible_word_starts (int count);
+		public bool backward_word_start ();
+		public bool backward_word_starts (int count);
+		public bool begins_tag (Gtk.TextTag tag);
+		public bool can_insert (bool default_editability);
+		public int compare (Gtk.TextIter rhs);
+		public Gtk.TextIter copy ();
+		public bool editable (bool default_setting);
+		public bool ends_line ();
+		public bool ends_sentence ();
+		public bool ends_tag (Gtk.TextTag tag);
+		public bool ends_word ();
+		public bool equal (Gtk.TextIter rhs);
+		public bool forward_char ();
+		public bool forward_chars (int count);
+		public bool forward_cursor_position ();
+		public bool forward_cursor_positions (int count);
+		public bool forward_find_char (Gtk.TextCharPredicate pred, Gtk.TextIter limit);
+		public bool forward_line ();
+		public bool forward_lines (int count);
+		public bool forward_search (string str, Gtk.TextSearchFlags flags, out Gtk.TextIter match_start, out Gtk.TextIter match_end, Gtk.TextIter? limit);
+		public bool forward_sentence_end ();
+		public bool forward_sentence_ends (int count);
+		public void forward_to_end ();
+		public bool forward_to_line_end ();
+		public bool forward_to_tag_toggle (Gtk.TextTag? tag);
+		public bool forward_visible_cursor_position ();
+		public bool forward_visible_cursor_positions (int count);
+		public bool forward_visible_line ();
+		public bool forward_visible_lines (int count);
+		public bool forward_visible_word_end ();
+		public bool forward_visible_word_ends (int count);
+		public bool forward_word_end ();
+		public bool forward_word_ends (int count);
+		public void free ();
+		public bool get_attributes (Gtk.TextAttributes values);
+		public weak Gtk.TextBuffer get_buffer ();
+		public int get_bytes_in_line ();
+		public unichar get_char ();
+		public int get_chars_in_line ();
+		public weak Gtk.TextChildAnchor get_child_anchor ();
+		public weak Pango.Language get_language ();
+		public int get_line ();
+		public int get_line_index ();
+		public int get_line_offset ();
+		public weak GLib.SList get_marks ();
+		public int get_offset ();
+		public weak Gdk.Pixbuf get_pixbuf ();
+		public weak string get_slice (Gtk.TextIter end);
+		public weak GLib.SList get_tags ();
+		public weak string get_text (Gtk.TextIter end);
+		public weak GLib.SList get_toggled_tags (bool toggled_on);
+		public int get_visible_line_index ();
+		public int get_visible_line_offset ();
+		public weak string get_visible_slice (Gtk.TextIter end);
+		public weak string get_visible_text (Gtk.TextIter end);
+		public bool has_tag (Gtk.TextTag tag);
+		public bool in_range (Gtk.TextIter start, Gtk.TextIter end);
+		public bool inside_sentence ();
+		public bool inside_word ();
+		public bool is_cursor_position ();
+		public bool is_end ();
+		public bool is_start ();
+		public void order (Gtk.TextIter second);
+		public void set_line (int line_number);
+		public void set_line_index (int byte_on_line);
+		public void set_line_offset (int char_on_line);
+		public void set_offset (int char_offset);
+		public void set_visible_line_index (int byte_on_line);
+		public void set_visible_line_offset (int char_on_line);
+		public bool starts_line ();
+		public bool starts_sentence ();
+		public bool starts_word ();
+		public bool toggles_tag (Gtk.TextTag tag);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TreeView : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		public int append_column (Gtk.TreeViewColumn column);
-		public void collapse_all ();
-		public bool collapse_row (Gtk.TreePath path);
-		public void columns_autosize ();
-		public void convert_bin_window_to_tree_coords (int bx, int by, int tx, int ty);
-		public void convert_bin_window_to_widget_coords (int bx, int by, int wx, int wy);
-		public void convert_tree_to_bin_window_coords (int tx, int ty, int bx, int by);
-		public void convert_tree_to_widget_coords (int tx, int ty, int wx, int wy);
-		public void convert_widget_to_bin_window_coords (int wx, int wy, int bx, int by);
-		public void convert_widget_to_tree_coords (int wx, int wy, int tx, int ty);
-		public weak Gdk.Pixmap create_row_drag_icon (Gtk.TreePath path);
-		public void enable_model_drag_dest (Gtk.TargetEntry[] targets, Gdk.DragAction actions);
-		public void enable_model_drag_source (Gdk.ModifierType start_button_mask, Gtk.TargetEntry[] targets, Gdk.DragAction actions);
-		public void expand_all ();
-		public bool expand_row (Gtk.TreePath path, bool open_all);
-		public void expand_to_path (Gtk.TreePath path);
-		public void get_background_area (Gtk.TreePath path, Gtk.TreeViewColumn column, out Gdk.Rectangle rect);
-		public weak Gdk.Window get_bin_window ();
-		public void get_cell_area (Gtk.TreePath path, Gtk.TreeViewColumn column, out Gdk.Rectangle rect);
-		public weak Gtk.TreeViewColumn get_column (int n);
-		public weak GLib.List get_columns ();
-		public void get_cursor (out Gtk.TreePath? path, out weak Gtk.TreeViewColumn? focus_column);
-		public bool get_dest_row_at_pos (int drag_x, int drag_y, out Gtk.TreePath? path, out Gtk.TreeViewDropPosition pos);
-		public void get_drag_dest_row (out Gtk.TreePath? path, out Gtk.TreeViewDropPosition pos);
-		public bool get_enable_search ();
-		public bool get_enable_tree_lines ();
-		public weak Gtk.TreeViewColumn get_expander_column ();
-		public bool get_fixed_height_mode ();
-		public Gtk.TreeViewGridLines get_grid_lines ();
-		public weak Gtk.Adjustment get_hadjustment ();
-		public bool get_headers_clickable ();
-		public bool get_headers_visible ();
-		public bool get_hover_expand ();
-		public bool get_hover_selection ();
-		public int get_level_indentation ();
-		public weak Gtk.TreeModel get_model ();
-		public bool get_path_at_pos (int x, int y, out Gtk.TreePath? path, out weak Gtk.TreeViewColumn? column, out int cell_x, out int cell_y);
-		public bool get_reorderable ();
-		public weak Gtk.TreeViewRowSeparatorFunc get_row_separator_func ();
-		public bool get_rubber_banding ();
-		public bool get_rules_hint ();
-		public int get_search_column ();
-		public weak Gtk.Entry get_search_entry ();
-		public weak Gtk.TreeViewSearchEqualFunc get_search_equal_func ();
-		public weak Gtk.TreeViewSearchPositionFunc get_search_position_func ();
-		public weak Gtk.TreeSelection get_selection ();
-		public bool get_show_expanders ();
-		public int get_tooltip_column ();
-		public bool get_tooltip_context (int x, int y, bool keyboard_tip, out weak Gtk.TreeModel model, out weak Gtk.TreePath path, out Gtk.TreeIter iter);
-		public weak Gtk.Adjustment get_vadjustment ();
-		public bool get_visible_range (out weak Gtk.TreePath start_path, out weak Gtk.TreePath end_path);
-		public void get_visible_rect (out Gdk.Rectangle visible_rect);
-		public int insert_column (Gtk.TreeViewColumn column, int position);
-		public int insert_column_with_attributes (int position, string? title, Gtk.CellRenderer cell, ...);
-		public int insert_column_with_data_func (int position, string title, Gtk.CellRenderer cell, Gtk.TreeCellDataFunc func, void* data, GLib.DestroyNotify dnotify);
-		public bool is_rubber_banding_active ();
-		public void map_expanded_rows (Gtk.TreeViewMappingFunc func, void* data);
-		public void move_column_after (Gtk.TreeViewColumn column, Gtk.TreeViewColumn base_column);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public TreeView ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public TreeView.with_model (Gtk.TreeModel model);
-		public int remove_column (Gtk.TreeViewColumn column);
-		public void scroll_to_cell (Gtk.TreePath? path, Gtk.TreeViewColumn? column, bool use_align, float row_align, float col_align);
-		public void scroll_to_point (int tree_x, int tree_y);
-		public void set_column_drag_function (Gtk.TreeViewColumnDropFunc func, Gtk.DestroyNotify destroy);
-		public void set_cursor (Gtk.TreePath path, Gtk.TreeViewColumn? focus_column, bool start_editing);
-		public void set_cursor_on_cell (Gtk.TreePath path, Gtk.TreeViewColumn focus_column, Gtk.CellRenderer focus_cell, bool start_editing);
-		public void set_destroy_count_func (Gtk.TreeDestroyCountFunc func, void* data, Gtk.DestroyNotify destroy);
-		public void set_drag_dest_row (Gtk.TreePath? path, Gtk.TreeViewDropPosition pos);
-		public void set_enable_search (bool enable_search);
-		public void set_enable_tree_lines (bool enabled);
-		public void set_expander_column (Gtk.TreeViewColumn column);
-		public void set_fixed_height_mode (bool enable);
-		public void set_grid_lines (Gtk.TreeViewGridLines grid_lines);
-		public void set_hadjustment (Gtk.Adjustment adjustment);
-		public void set_headers_clickable (bool setting);
-		public void set_headers_visible (bool headers_visible);
-		public void set_hover_expand (bool expand);
-		public void set_hover_selection (bool hover);
-		public void set_level_indentation (int indentation);
-		public void set_model (Gtk.TreeModel? model);
-		public void set_reorderable (bool reorderable);
-		public void set_row_separator_func (Gtk.TreeViewRowSeparatorFunc func, void* data, Gtk.DestroyNotify destroy);
-		public void set_rubber_banding (bool enable);
-		public void set_rules_hint (bool setting);
-		public void set_search_column (int column);
-		public void set_search_entry (Gtk.Entry entry);
-		public void set_search_equal_func (Gtk.TreeViewSearchEqualFunc search_equal_func, void* search_user_data, Gtk.DestroyNotify search_destroy);
-		public void set_search_position_func (Gtk.TreeViewSearchPositionFunc func, void* data, GLib.DestroyNotify destroy);
-		public void set_show_expanders (bool enabled);
-		public void set_tooltip_cell (Gtk.Tooltip tooltip, Gtk.TreePath path, Gtk.TreeViewColumn column, Gtk.CellRenderer cell);
-		public void set_tooltip_column (int column);
-		public void set_tooltip_row (Gtk.Tooltip tooltip, Gtk.TreePath path);
-		public void set_vadjustment (Gtk.Adjustment adjustment);
-		public void unset_rows_drag_dest ();
-		public void unset_rows_drag_source ();
-		[NoAccessorMethod]
-		public Gtk.TreeViewGridLines enable_grid_lines { get; set; }
-		public bool enable_search { get; set; }
-		public bool enable_tree_lines { get; set; }
-		public Gtk.TreeViewColumn expander_column { get; set; }
-		public bool fixed_height_mode { get; set; }
-		public Gtk.Adjustment hadjustment { get; set; }
-		public bool headers_clickable { get; set; }
-		public bool headers_visible { get; set; }
-		public bool hover_expand { get; set; }
-		public bool hover_selection { get; set; }
-		public int level_indentation { get; set; }
-		public Gtk.TreeModel model { get; set; }
-		public bool reorderable { get; set; }
-		public bool rubber_banding { get; set; }
-		public bool rules_hint { get; set; }
-		public int search_column { get; set; }
-		public bool show_expanders { get; set; }
-		public int tooltip_column { get; set; }
-		public Gtk.Adjustment vadjustment { get; set; }
-		public virtual signal void columns_changed ();
-		public virtual signal void cursor_changed ();
-		public virtual signal bool expand_collapse_cursor_row (bool logical, bool expand, bool open_all);
-		public virtual signal bool move_cursor (Gtk.MovementStep step, int count);
-		[HasEmitter]
-		public virtual signal void row_activated (Gtk.TreePath path, Gtk.TreeViewColumn column);
-		public virtual signal void row_collapsed (Gtk.TreeIter iter, Gtk.TreePath path);
-		[HasEmitter]
-		public virtual signal void row_expanded (Gtk.TreeIter iter, Gtk.TreePath path);
-		public virtual signal bool select_all ();
-		public virtual signal bool select_cursor_parent ();
-		public virtual signal bool select_cursor_row (bool start_editing);
-		public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
-		public virtual signal bool start_interactive_search ();
-		public virtual signal bool test_collapse_row (Gtk.TreeIter iter, Gtk.TreePath path);
-		public virtual signal bool test_expand_row (Gtk.TreeIter iter, Gtk.TreePath path);
-		public virtual signal bool toggle_cursor_row ();
-		public virtual signal bool unselect_all ();
+	public struct ToggleActionEntry {
+		public weak string accelerator;
+		[CCode (type = "GCallback")]
+		public weak Gtk.ActionCallback callback;
+		public bool is_active;
+		public weak string label;
+		public weak string name;
+		public weak string stock_id;
+		public weak string tooltip;
+	}
+	[CCode (type_id = "GTK_TYPE_TREE_ITER", cheader_filename = "gtk/gtk.h")]
+	public struct TreeIter {
+		public int stamp;
+		public void* user_data;
+		public void* user_data2;
+		public void* user_data3;
+		public Gtk.TreeIter copy ();
+		public void free ();
+	}
+	[CCode (cprefix = "GTK_ACCEL_", cheader_filename = "gtk/gtk.h")]
+	[Flags]
+	public enum AccelFlags {
+		VISIBLE,
+		LOCKED,
+		MASK
+	}
+	[CCode (cprefix = "GTK_ANCHOR_", cheader_filename = "gtk/gtk.h")]
+	public enum AnchorType {
+		CENTER,
+		NORTH,
+		NORTH_WEST,
+		NORTH_EAST,
+		SOUTH,
+		SOUTH_WEST,
+		SOUTH_EAST,
+		WEST,
+		EAST,
+		N,
+		NW,
+		NE,
+		S,
+		SW,
+		SE,
+		W,
+		E
+	}
+	[CCode (cprefix = "GTK_ARG_", cheader_filename = "gtk/gtk.h")]
+	[Flags]
+	public enum ArgFlags {
+		READABLE,
+		WRITABLE,
+		CONSTRUCT,
+		CONSTRUCT_ONLY,
+		CHILD_ARG
+	}
+	[CCode (cprefix = "GTK_ARROW_", cheader_filename = "gtk/gtk.h")]
+	public enum ArrowType {
+		UP,
+		DOWN,
+		LEFT,
+		RIGHT,
+		NONE
+	}
+	[CCode (cprefix = "GTK_ASSISTANT_PAGE_", cheader_filename = "gtk/gtk.h")]
+	public enum AssistantPageType {
+		CONTENT,
+		INTRO,
+		CONFIRM,
+		SUMMARY,
+		PROGRESS
+	}
+	[CCode (cprefix = "GTK_", cheader_filename = "gtk/gtk.h")]
+	[Flags]
+	public enum AttachOptions {
+		EXPAND,
+		SHRINK,
+		FILL
+	}
+	[CCode (cprefix = "GTK_BUTTON_", cheader_filename = "gtk/gtk.h")]
+	[Flags]
+	public enum ButtonAction {
+		IGNORED,
+		SELECTS,
+		DRAGS,
+		EXPANDS
+	}
+	[CCode (cprefix = "GTK_BUTTONBOX_", cheader_filename = "gtk/gtk.h")]
+	public enum ButtonBoxStyle {
+		DEFAULT_STYLE,
+		SPREAD,
+		EDGE,
+		START,
+		END,
+		CENTER
+	}
+	[CCode (cprefix = "GTK_BUTTONS_", cheader_filename = "gtk/gtk.h")]
+	public enum ButtonsType {
+		NONE,
+		OK,
+		CLOSE,
+		CANCEL,
+		YES_NO,
+		OK_CANCEL
+	}
+	[CCode (cprefix = "GTK_CLIST_DRAG_", cheader_filename = "gtk/gtk.h")]
+	public enum CListDragPos {
+		NONE,
+		BEFORE,
+		INTO,
+		AFTER
+	}
+	[CCode (cprefix = "GTK_CTREE_EXPANDER_", cheader_filename = "gtk/gtk.h")]
+	public enum CTreeExpanderStyle {
+		NONE,
+		SQUARE,
+		TRIANGLE,
+		CIRCULAR
+	}
+	[CCode (cprefix = "GTK_CTREE_EXPANSION_", cheader_filename = "gtk/gtk.h")]
+	public enum CTreeExpansionType {
+		EXPAND,
+		EXPAND_RECURSIVE,
+		COLLAPSE,
+		COLLAPSE_RECURSIVE,
+		TOGGLE,
+		TOGGLE_RECURSIVE
+	}
+	[CCode (cprefix = "GTK_CTREE_LINES_", cheader_filename = "gtk/gtk.h")]
+	public enum CTreeLineStyle {
+		NONE,
+		SOLID,
+		DOTTED,
+		TABBED
+	}
+	[CCode (cprefix = "GTK_CTREE_POS_", cheader_filename = "gtk/gtk.h")]
+	public enum CTreePos {
+		BEFORE,
+		AS_CHILD,
+		AFTER
+	}
+	[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,
+		SHOW_DETAILS
+	}
+	[CCode (cprefix = "GTK_CELL_RENDERER_ACCEL_MODE_", cheader_filename = "gtk/gtk.h")]
+	public enum CellRendererAccelMode {
+		GTK,
+		OTHER
+	}
+	[CCode (cprefix = "GTK_CELL_RENDERER_MODE_", cheader_filename = "gtk/gtk.h")]
+	public enum CellRendererMode {
+		INERT,
+		ACTIVATABLE,
+		EDITABLE
+	}
+	[CCode (cprefix = "GTK_CELL_RENDERER_", cheader_filename = "gtk/gtk.h")]
+	[Flags]
+	public enum CellRendererState {
+		SELECTED,
+		PRELIT,
+		INSENSITIVE,
+		SORTED,
+		FOCUSED
+	}
+	[CCode (cprefix = "GTK_CELL_", cheader_filename = "gtk/gtk.h")]
+	public enum CellType {
+		EMPTY,
+		TEXT,
+		PIXMAP,
+		PIXTEXT,
+		WIDGET
+	}
+	[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_", cheader_filename = "gtk/gtk.h")]
+	public enum CurveType {
+		LINEAR,
+		SPLINE,
+		FREE
+	}
+	[CCode (cprefix = "GTK_DEBUG_", cheader_filename = "gtk/gtk.h")]
+	[Flags]
+	public enum DebugFlag {
+		MISC,
+		PLUGSOCKET,
+		TEXT,
+		TREE,
+		UPDATES,
+		KEYBINDINGS,
+		MULTIHEAD,
+		MODULES,
+		GEOMETRY,
+		ICONTHEME,
+		PRINTING,
+		BUILDER
+	}
+	[CCode (cprefix = "GTK_DELETE_", cheader_filename = "gtk/gtk.h")]
+	public enum DeleteType {
+		CHARS,
+		WORD_ENDS,
+		WORDS,
+		DISPLAY_LINES,
+		DISPLAY_LINE_ENDS,
+		PARAGRAPH_ENDS,
+		PARAGRAPHS,
+		WHITESPACE
+	}
+	[CCode (cprefix = "GTK_DEST_DEFAULT_", cheader_filename = "gtk/gtk.h")]
+	[Flags]
+	public enum DestDefaults {
+		MOTION,
+		HIGHLIGHT,
+		DROP,
+		ALL
+	}
+	[CCode (cprefix = "GTK_DIALOG_", cheader_filename = "gtk/gtk.h")]
+	[Flags]
+	public enum DialogFlags {
+		MODAL,
+		DESTROY_WITH_PARENT,
+		NO_SEPARATOR
+	}
+	[CCode (cprefix = "GTK_DIR_", cheader_filename = "gtk/gtk.h")]
+	public enum DirectionType {
+		TAB_FORWARD,
+		TAB_BACKWARD,
+		UP,
+		DOWN,
+		LEFT,
+		RIGHT
+	}
+	[CCode (cprefix = "GTK_DRAG_RESULT_", cheader_filename = "gtk/gtk.h")]
+	public enum DragResult {
+		SUCCESS,
+		NO_TARGET,
+		USER_CANCELLED,
+		TIMEOUT_EXPIRED,
+		GRAB_BROKEN,
+		ERROR
+	}
+	[CCode (cprefix = "GTK_EXPANDER_", cheader_filename = "gtk/gtk.h")]
+	public enum ExpanderStyle {
+		COLLAPSED,
+		SEMI_COLLAPSED,
+		SEMI_EXPANDED,
+		EXPANDED
+	}
+	[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_", cheader_filename = "gtk/gtk.h")]
+	public enum FileChooserConfirmation {
+		CONFIRM,
+		ACCEPT_FILENAME,
+		SELECT_AGAIN
+	}
+	[CCode (cprefix = "GTK_FILE_CHOOSER_ERROR_", cheader_filename = "gtk/gtk.h")]
+	public enum FileChooserError {
+		NONEXISTENT,
+		BAD_FILENAME,
+		ALREADY_EXISTS
+	}
+	[CCode (cprefix = "GTK_FILE_FILTER_", cheader_filename = "gtk/gtk.h")]
+	[Flags]
+	public enum FileFilterFlags {
+		FILENAME,
+		URI,
+		DISPLAY_NAME,
+		MIME_TYPE
+	}
+	[CCode (cprefix = "GTK_IM_PREEDIT_", cheader_filename = "gtk/gtk.h")]
+	public enum IMPreeditStyle {
+		NOTHING,
+		CALLBACK,
+		NONE
+	}
+	[CCode (cprefix = "GTK_IM_STATUS_", cheader_filename = "gtk/gtk.h")]
+	public enum IMStatusStyle {
+		NOTHING,
+		CALLBACK,
+		NONE
+	}
+	[CCode (cprefix = "GTK_ICON_LOOKUP_", cheader_filename = "gtk/gtk.h")]
+	[Flags]
+	public enum IconLookupFlags {
+		NO_SVG,
+		FORCE_SVG,
+		USE_BUILTIN,
+		GENERIC_FALLBACK,
+		FORCE_SIZE
+	}
+	[CCode (cprefix = "GTK_ICON_SIZE_", cheader_filename = "gtk/gtk.h")]
+	public enum IconSize {
+		INVALID,
+		MENU,
+		SMALL_TOOLBAR,
+		LARGE_TOOLBAR,
+		BUTTON,
+		DND,
+		DIALOG
+	}
+	[CCode (cprefix = "GTK_ICON_THEME_", cheader_filename = "gtk/gtk.h")]
+	public enum IconThemeError {
+		NOT_FOUND,
+		FAILED
+	}
+	[CCode (cprefix = "GTK_ICON_VIEW_", cheader_filename = "gtk/gtk.h")]
+	public enum IconViewDropPosition {
+		NO_DROP,
+		DROP_INTO,
+		DROP_LEFT,
+		DROP_RIGHT,
+		DROP_ABOVE,
+		DROP_BELOW
+	}
+	[CCode (cprefix = "GTK_IMAGE_", cheader_filename = "gtk/gtk.h")]
+	public enum ImageType {
+		EMPTY,
+		PIXMAP,
+		IMAGE,
+		PIXBUF,
+		STOCK,
+		ICON_SET,
+		ANIMATION,
+		ICON_NAME,
+		GICON
+	}
+	[CCode (cprefix = "GTK_JUSTIFY_", cheader_filename = "gtk/gtk.h")]
+	public enum Justification {
+		LEFT,
+		RIGHT,
+		CENTER,
+		FILL
+	}
+	[CCode (cprefix = "GTK_MATCH_", cheader_filename = "gtk/gtk.h")]
+	public enum MatchType {
+		ALL,
+		ALL_TAIL,
+		HEAD,
+		TAIL,
+		EXACT,
+		LAST
+	}
+	[CCode (cprefix = "GTK_MENU_DIR_", cheader_filename = "gtk/gtk.h")]
+	public enum MenuDirectionType {
+		PARENT,
+		CHILD,
+		NEXT,
+		PREV
+	}
+	[CCode (cprefix = "GTK_MESSAGE_", cheader_filename = "gtk/gtk.h")]
+	public enum MessageType {
+		INFO,
+		WARNING,
+		QUESTION,
+		ERROR,
+		OTHER
+	}
+	[CCode (cprefix = "GTK_", cheader_filename = "gtk/gtk.h")]
+	public enum MetricType {
+		PIXELS,
+		INCHES,
+		CENTIMETERS
+	}
+	[CCode (cprefix = "GTK_MOVEMENT_", cheader_filename = "gtk/gtk.h")]
+	public enum MovementStep {
+		LOGICAL_POSITIONS,
+		VISUAL_POSITIONS,
+		WORDS,
+		DISPLAY_LINES,
+		DISPLAY_LINE_ENDS,
+		PARAGRAPHS,
+		PARAGRAPH_ENDS,
+		PAGES,
+		BUFFER_ENDS,
+		HORIZONTAL_PAGES
+	}
+	[CCode (cprefix = "GTK_NOTEBOOK_TAB_", cheader_filename = "gtk/gtk.h")]
+	public enum NotebookTab {
+		FIRST,
+		LAST
+	}
+	[CCode (cprefix = "GTK_", cheader_filename = "gtk/gtk.h")]
+	[Flags]
+	public enum ObjectFlags {
+		IN_DESTRUCTION,
+		FLOATING,
+		RESERVED_1,
+		RESERVED_2
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TreeViewColumn : Gtk.Object, Gtk.Buildable, Gtk.CellLayout {
-		public weak Gtk.Widget tree_view;
-		public weak Gtk.Widget button;
-		public weak Gtk.Widget child;
-		public weak Gtk.Widget arrow;
-		public weak Gdk.Window window;
-		public weak Gtk.CellEditable editable_widget;
-		public float xalign;
-		public uint property_changed_signal;
-		public Gtk.TreeViewColumnSizing column_type;
-		public int requested_width;
-		public int button_request;
-		public int resized_width;
-		public int drag_x;
-		public int drag_y;
-		public weak GLib.List cell_list;
-		public uint sort_clicked_signal;
-		public uint sort_column_changed_signal;
-		public int sort_column_id;
-		public uint dirty;
-		public uint show_sort_indicator;
-		public uint maybe_reordered;
-		public uint use_resized_width;
-		public bool cell_get_position (Gtk.CellRenderer cell_renderer, int start_pos, int width);
-		public void cell_get_size (out Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height);
-		public bool cell_is_visible ();
-		public void cell_set_cell_data (Gtk.TreeModel tree_model, Gtk.TreeIter iter, bool is_expander, bool is_expanded);
-		public void focus_cell (Gtk.CellRenderer cell);
-		public float get_alignment ();
-		public weak GLib.List get_cell_renderers ();
-		public bool get_clickable ();
-		public bool get_expand ();
-		public int get_fixed_width ();
-		public int get_max_width ();
-		public int get_min_width ();
-		public bool get_reorderable ();
-		public bool get_resizable ();
-		public Gtk.TreeViewColumnSizing get_sizing ();
-		public int get_sort_column_id ();
-		public bool get_sort_indicator ();
-		public Gtk.SortType get_sort_order ();
-		public int get_spacing ();
-		public weak string get_title ();
-		public weak Gtk.Widget get_tree_view ();
-		public bool get_visible ();
-		public weak Gtk.Widget get_widget ();
-		public int get_width ();
-		[CCode (has_construct_function = false)]
-		public TreeViewColumn ();
-		[CCode (has_construct_function = false)]
-		public TreeViewColumn.with_attributes (string? title, Gtk.CellRenderer cell, ...);
-		public void queue_resize ();
-		public void set_alignment (float xalign);
-		public void set_attributes (Gtk.CellRenderer cell_renderer, ...);
-		public void set_clickable (bool clickable);
-		public void set_expand (bool expand);
-		public void set_fixed_width (int fixed_width);
-		public void set_max_width (int max_width);
-		public void set_min_width (int min_width);
-		public void set_reorderable (bool reorderable);
-		public void set_resizable (bool resizable);
-		public void set_sizing (Gtk.TreeViewColumnSizing type);
-		public void set_sort_column_id (int sort_column_id);
-		public void set_sort_indicator (bool setting);
-		public void set_sort_order (Gtk.SortType order);
-		public void set_spacing (int spacing);
-		public void set_title (string title);
-		public void set_visible (bool visible);
-		public void set_widget (Gtk.Widget widget);
-		public float alignment { get; set; }
-		public bool clickable { get; set; }
-		public bool expand { get; set; }
-		public int fixed_width { get; set; }
-		public int max_width { get; set; }
-		public int min_width { get; set; }
-		public bool reorderable { get; set; }
-		public bool resizable { get; set; }
-		public Gtk.TreeViewColumnSizing sizing { get; set; }
-		public bool sort_indicator { get; set; }
-		public Gtk.SortType sort_order { get; set; }
-		public int spacing { get; set; }
-		public string title { get; set; }
-		public bool visible { get; set; }
-		public Gtk.Widget widget { get; set; }
-		public int width { get; }
-		[HasEmitter]
-		public virtual signal void clicked ();
+	[CCode (cprefix = "GTK_ORIENTATION_", cheader_filename = "gtk/gtk.h")]
+	public enum Orientation {
+		HORIZONTAL,
+		VERTICAL
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class UIManager : GLib.Object, Gtk.Buildable {
-		public void add_ui (uint merge_id, string path, string name, string action, Gtk.UIManagerItemType type, bool top);
-		public uint add_ui_from_file (string filename) throws GLib.Error;
-		public uint add_ui_from_string (string buffer, long length) throws GLib.Error;
-		public void ensure_update ();
-		public weak Gtk.AccelGroup get_accel_group ();
-		public weak GLib.List get_action_groups ();
-		public bool get_add_tearoffs ();
-		public weak GLib.SList get_toplevels (Gtk.UIManagerItemType types);
-		public weak string get_ui ();
-		public void insert_action_group (Gtk.ActionGroup action_group, int pos);
-		[CCode (has_construct_function = false)]
-		public UIManager ();
-		[CCode (type = "guint", has_construct_function = false)]
-		public UIManager.merge_id (Gtk.UIManager self);
-		public void remove_action_group (Gtk.ActionGroup action_group);
-		public void remove_ui (uint merge_id);
-		public void set_add_tearoffs (bool add_tearoffs);
-		public virtual weak Gtk.Action get_action (string path);
-		public virtual weak Gtk.Widget get_widget (string path);
-		public bool add_tearoffs { get; set; }
-		public string ui { get; }
-		public virtual signal void actions_changed ();
-		public virtual signal void add_widget (Gtk.Widget widget);
-		public virtual signal void connect_proxy (Gtk.Action action, Gtk.Widget proxy);
-		public virtual signal void disconnect_proxy (Gtk.Action action, Gtk.Widget proxy);
-		public virtual signal void post_activate (Gtk.Action action);
-		public virtual signal void pre_activate (Gtk.Action action);
+	[CCode (cprefix = "GTK_PACK_DIRECTION_", cheader_filename = "gtk/gtk.h")]
+	public enum PackDirection {
+		LTR,
+		RTL,
+		TTB,
+		BTT
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class VBox : Gtk.Box, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public VBox (bool homogeneous, int spacing);
+	[CCode (cprefix = "GTK_PACK_", cheader_filename = "gtk/gtk.h")]
+	public enum PackType {
+		START,
+		END
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class VButtonBox : Gtk.ButtonBox, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public VButtonBox ();
+	[CCode (cprefix = "GTK_PAGE_ORIENTATION_", cheader_filename = "gtk/gtk.h")]
+	public enum PageOrientation {
+		PORTRAIT,
+		LANDSCAPE,
+		REVERSE_PORTRAIT,
+		REVERSE_LANDSCAPE
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class VPaned : Gtk.Paned, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public VPaned ();
+	[CCode (cprefix = "GTK_PAGE_SET_", cheader_filename = "gtk/gtk.h")]
+	public enum PageSet {
+		ALL,
+		EVEN,
+		ODD
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class VRuler : Gtk.Ruler, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public VRuler ();
+	[CCode (cprefix = "GTK_PATH_PRIO_", cheader_filename = "gtk/gtk.h")]
+	public enum PathPriorityType {
+		LOWEST,
+		GTK,
+		APPLICATION,
+		THEME,
+		RC,
+		HIGHEST
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class VScale : Gtk.Scale, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public VScale (Gtk.Adjustment adjustment);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public VScale.with_range (double min, double max, double step);
+	[CCode (cprefix = "GTK_PATH_", cheader_filename = "gtk/gtk.h")]
+	public enum PathType {
+		WIDGET,
+		WIDGET_CLASS,
+		CLASS
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class VScrollbar : Gtk.Scrollbar, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public VScrollbar (Gtk.Adjustment adjustment);
+	[CCode (cprefix = "GTK_POLICY_", cheader_filename = "gtk/gtk.h")]
+	public enum PolicyType {
+		ALWAYS,
+		AUTOMATIC,
+		NEVER
+	}
+	[CCode (cprefix = "GTK_POS_", cheader_filename = "gtk/gtk.h")]
+	public enum PositionType {
+		LEFT,
+		RIGHT,
+		TOP,
+		BOTTOM
+	}
+	[CCode (cprefix = "GTK_PREVIEW_", cheader_filename = "gtk/gtk.h")]
+	public enum PreviewType {
+		COLOR,
+		GRAYSCALE
+	}
+	[CCode (cprefix = "GTK_PRINT_DUPLEX_", cheader_filename = "gtk/gtk.h")]
+	public enum PrintDuplex {
+		SIMPLEX,
+		HORIZONTAL,
+		VERTICAL
+	}
+	[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_", cheader_filename = "gtk/gtk.h")]
+	public enum PrintOperationAction {
+		PRINT_DIALOG,
+		PRINT,
+		PREVIEW,
+		EXPORT
+	}
+	[CCode (cprefix = "GTK_PRINT_OPERATION_RESULT_", cheader_filename = "gtk/gtk.h")]
+	public enum PrintOperationResult {
+		ERROR,
+		APPLY,
+		CANCEL,
+		IN_PROGRESS
+	}
+	[CCode (cprefix = "GTK_PRINT_PAGES_", cheader_filename = "gtk/gtk.h")]
+	public enum PrintPages {
+		ALL,
+		CURRENT,
+		RANGES
+	}
+	[CCode (cprefix = "GTK_PRINT_QUALITY_", cheader_filename = "gtk/gtk.h")]
+	public enum PrintQuality {
+		LOW,
+		NORMAL,
+		HIGH,
+		DRAFT
+	}
+	[CCode (cprefix = "GTK_PRINT_STATUS_", cheader_filename = "gtk/gtk.h")]
+	public enum PrintStatus {
+		INITIAL,
+		PREPARING,
+		GENERATING_DATA,
+		SENDING_DATA,
+		PENDING,
+		PENDING_ISSUE,
+		PRINTING,
+		FINISHED,
+		FINISHED_ABORTED
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class VSeparator : Gtk.Separator, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public VSeparator ();
+	[CCode (cprefix = "PRIVATE_GTK_", cheader_filename = "gtk/gtk.h")]
+	[Flags]
+	public enum PrivateFlags {
+		USER_STYLE,
+		RESIZE_PENDING,
+		LEAVE_PENDING,
+		HAS_SHAPE_MASK,
+		IN_REPARENT,
+		DIRECTION_SET,
+		DIRECTION_LTR,
+		ANCHORED,
+		CHILD_VISIBLE,
+		REDRAW_ON_ALLOC,
+		ALLOC_NEEDED,
+		REQUEST_NEEDED
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Viewport : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
-		public weak Gdk.Window view_window;
-		public weak Gdk.Window bin_window;
-		public weak Gtk.Adjustment get_hadjustment ();
-		public Gtk.ShadowType get_shadow_type ();
-		public weak Gtk.Adjustment get_vadjustment ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Viewport (Gtk.Adjustment? hadjustment, Gtk.Adjustment? vadjustment);
-		public void set_hadjustment (Gtk.Adjustment adjustment);
-		public void set_shadow_type (Gtk.ShadowType type);
-		public void set_vadjustment (Gtk.Adjustment adjustment);
-		public Gtk.Adjustment hadjustment { get; set construct; }
-		public Gtk.ShadowType shadow_type { get; set; }
-		public Gtk.Adjustment vadjustment { get; set construct; }
-		public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
+	[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 (cheader_filename = "gtk/gtk.h")]
-	public class VolumeButton : Gtk.ScaleButton, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public VolumeButton ();
+	[CCode (cprefix = "GTK_PROGRESS_", cheader_filename = "gtk/gtk.h")]
+	public enum ProgressBarStyle {
+		CONTINUOUS,
+		DISCRETE
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Window : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
-		public weak string wmclass_name;
-		public weak string wmclass_class;
-		public weak string wm_role;
-		public weak Gtk.Widget focus_widget;
-		public weak Gtk.Widget default_widget;
-		public weak Gtk.Window transient_parent;
-		public weak Gtk.WindowGeometryInfo geometry_info;
-		public weak Gdk.Window frame;
-		public weak Gtk.WindowGroup group;
-		public ushort configure_request_count;
-		public uint configure_notify_received;
-		public uint need_default_position;
-		public uint need_default_size;
-		public uint position;
-		public uint has_user_ref_count;
-		public uint has_focus;
-		public uint has_frame;
-		public uint iconify_initially;
-		public uint stick_initially;
-		public uint maximize_initially;
-		public uint frame_left;
-		public uint frame_top;
-		public uint frame_right;
-		public uint frame_bottom;
-		public uint keys_changed_handler;
-		public Gdk.ModifierType mnemonic_modifier;
-		public bool activate_default ();
-		public bool activate_focus ();
-		public bool activate_key (Gdk.EventKey event);
-		public void add_accel_group (Gtk.AccelGroup accel_group);
-		public void add_embedded_xid (uint xid);
-		public void add_mnemonic (uint keyval, Gtk.Widget target);
-		public void begin_move_drag (int button, int root_x, int root_y, uint timestamp);
-		public void begin_resize_drag (Gdk.WindowEdge edge, int button, int root_x, int root_y, uint timestamp);
-		public void deiconify ();
-		public void fullscreen ();
-		public bool get_accept_focus ();
-		public bool get_decorated ();
-		public static weak GLib.List get_default_icon_list ();
-		public void get_default_size (out int width, out int height);
-		public bool get_deletable ();
-		public bool get_destroy_with_parent ();
-		public weak Gtk.Widget get_focus ();
-		public bool get_focus_on_map ();
-		public void get_frame_dimensions (int left, int top, int right, int bottom);
-		public Gdk.Gravity get_gravity ();
-		public weak Gtk.WindowGroup get_group ();
-		public bool get_has_frame ();
-		public weak Gdk.Pixbuf get_icon ();
-		public weak GLib.List get_icon_list ();
-		public weak string get_icon_name ();
-		public Gdk.ModifierType get_mnemonic_modifier ();
-		public bool get_modal ();
-		public double get_opacity ();
-		public void get_position (out int root_x, out int root_y);
-		public bool get_resizable ();
-		public weak string get_role ();
-		public weak Gdk.Screen get_screen ();
-		public void get_size (out int width, out int height);
-		public bool get_skip_pager_hint ();
-		public bool get_skip_taskbar_hint ();
-		public weak string get_title ();
-		public weak Gtk.Window get_transient_for ();
-		public Gdk.WindowTypeHint get_type_hint ();
-		public bool get_urgency_hint ();
-		public void iconify ();
-		public static weak GLib.List list_toplevels ();
-		public void maximize ();
-		public bool mnemonic_activate (uint keyval, Gdk.ModifierType modifier);
-		public void move (int x, int y);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Window (Gtk.WindowType type);
-		public bool parse_geometry (string geometry);
-		public void present ();
-		public void present_with_time (uint timestamp);
-		public bool propagate_key_event (Gdk.EventKey event);
-		public void remove_accel_group (Gtk.AccelGroup accel_group);
-		public void remove_embedded_xid (uint xid);
-		public void remove_mnemonic (uint keyval, Gtk.Widget target);
-		public void reshow_with_initial_size ();
-		public void resize (int width, int height);
-		public void set_accept_focus (bool setting);
-		public static void set_auto_startup_notification (bool setting);
-		public void set_decorated (bool setting);
-		public void set_default (Gtk.Widget default_widget);
-		public static void set_default_icon (Gdk.Pixbuf icon);
-		public static bool set_default_icon_from_file (string filename) throws GLib.Error;
-		public static void set_default_icon_list (GLib.List list);
-		public static void set_default_icon_name (string name);
-		public void set_default_size (int width, int height);
-		public void set_deletable (bool setting);
-		public void set_destroy_with_parent (bool setting);
-		public void set_focus_on_map (bool setting);
-		public void set_frame_dimensions (int left, int top, int right, int bottom);
-		public void set_geometry_hints (Gtk.Widget geometry_widget, Gdk.Geometry geometry, Gdk.WindowHints geom_mask);
-		public void set_gravity (Gdk.Gravity gravity);
-		public void set_has_frame (bool setting);
-		public void set_icon (Gdk.Pixbuf icon);
-		public bool set_icon_from_file (string filename) throws GLib.Error;
-		public void set_icon_list (GLib.List list);
-		public void set_icon_name (string name);
-		public void set_keep_above (bool setting);
-		public void set_keep_below (bool setting);
-		public void set_mnemonic_modifier (Gdk.ModifierType modifier);
-		public void set_modal (bool modal);
-		public void set_opacity (double opacity);
-		public void set_position (Gtk.WindowPosition position);
-		public void set_resizable (bool resizable);
-		public void set_role (string role);
-		public void set_screen (Gdk.Screen screen);
-		public void set_skip_pager_hint (bool setting);
-		public void set_skip_taskbar_hint (bool setting);
-		public void set_startup_id (string startup_id);
-		public void set_title (string title);
-		public void set_transient_for (Gtk.Window parent);
-		public void set_type_hint (Gdk.WindowTypeHint hint);
-		public void set_urgency_hint (bool setting);
-		public void set_wmclass (string wmclass_name, string wmclass_class);
-		public void stick ();
-		public void unfullscreen ();
-		public void unmaximize ();
-		public void unstick ();
-		[NoWrapper]
-		public virtual void move_focus (Gtk.DirectionType direction);
-		public bool accept_focus { get; set; }
-		[NoAccessorMethod]
-		public bool allow_grow { get; set; }
-		[NoAccessorMethod]
-		public bool allow_shrink { get; set; }
-		public bool decorated { get; set; }
-		[NoAccessorMethod]
-		public int default_height { get; set; }
-		[NoAccessorMethod]
-		public int default_width { get; set; }
-		public bool deletable { get; set; }
-		public bool destroy_with_parent { get; set; }
-		public bool focus_on_map { get; set; }
-		public Gdk.Gravity gravity { get; set; }
-		[NoAccessorMethod]
-		public bool has_toplevel_focus { get; }
-		public Gdk.Pixbuf icon { get; set; }
-		public string icon_name { get; set; }
-		[NoAccessorMethod]
-		public bool is_active { get; }
-		public bool modal { get; set; }
-		public double opacity { get; set; }
-		public bool resizable { get; set; }
-		public string role { get; set; }
-		public Gdk.Screen screen { get; set; }
-		public bool skip_pager_hint { get; set; }
-		public bool skip_taskbar_hint { get; set; }
-		public string startup_id { set; }
-		public string title { get; set; }
-		public Gtk.Window transient_for { get; set construct; }
-		[NoAccessorMethod]
-		public Gtk.WindowType type { get; construct; }
-		public Gdk.WindowTypeHint type_hint { get; set; }
-		public bool urgency_hint { get; set; }
-		[NoAccessorMethod]
-		public Gtk.WindowPosition window_position { get; set; }
-		public virtual signal void default_activated ();
-		public virtual signal void focus_activated ();
-		public virtual signal bool frame_event (Gdk.Event event);
-		public virtual signal void keys_changed ();
-		[HasEmitter]
-		public virtual signal void set_focus (Gtk.Widget focus);
+	[CCode (cprefix = "GTK_RC_", cheader_filename = "gtk/gtk.h")]
+	[Flags]
+	public enum RcFlags {
+		FG,
+		BG,
+		TEXT,
+		BASE
+	}
+	[CCode (cprefix = "GTK_RC_TOKEN_", cheader_filename = "gtk/gtk.h")]
+	public enum RcTokenType {
+		INVALID,
+		INCLUDE,
+		NORMAL,
+		ACTIVE,
+		PRELIGHT,
+		SELECTED,
+		INSENSITIVE,
+		FG,
+		BG,
+		TEXT,
+		BASE,
+		XTHICKNESS,
+		YTHICKNESS,
+		FONT,
+		FONTSET,
+		FONT_NAME,
+		BG_PIXMAP,
+		PIXMAP_PATH,
+		STYLE,
+		BINDING,
+		BIND,
+		WIDGET,
+		WIDGET_CLASS,
+		CLASS,
+		LOWEST,
+		GTK,
+		APPLICATION,
+		THEME,
+		RC,
+		HIGHEST,
+		ENGINE,
+		MODULE_PATH,
+		IM_MODULE_PATH,
+		IM_MODULE_FILE,
+		STOCK,
+		LTR,
+		RTL,
+		COLOR,
+		UNBIND,
+		LAST
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class WindowGroup : GLib.Object {
-		public weak GLib.SList grabs;
-		public void add_window (Gtk.Window window);
-		[CCode (has_construct_function = false)]
-		public WindowGroup ();
-		public void remove_window (Gtk.Window window);
+	[CCode (cprefix = "GTK_RECENT_CHOOSER_ERROR_", cheader_filename = "gtk/gtk.h")]
+	public enum RecentChooserError {
+		NOT_FOUND,
+		INVALID_URI
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public interface FileChooserEmbed {
+	[CCode (cprefix = "GTK_RECENT_FILTER_", cheader_filename = "gtk/gtk.h")]
+	[Flags]
+	public enum RecentFilterFlags {
+		URI,
+		DISPLAY_NAME,
+		MIME_TYPE,
+		APPLICATION,
+		GROUP,
+		AGE
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public interface Buildable {
-		public abstract void add_child (Gtk.Builder builder, GLib.Object child, string type);
-		public abstract weak GLib.Object construct_child (Gtk.Builder builder, string name);
-		public abstract void custom_finished (Gtk.Builder builder, GLib.Object child, string tagname, void* data);
-		public abstract void custom_tag_end (Gtk.Builder builder, GLib.Object child, string tagname, void* data);
-		public abstract bool custom_tag_start (Gtk.Builder builder, GLib.Object child, string tagname, GLib.MarkupParser parser, void* data);
-		public abstract weak GLib.Object get_internal_child (Gtk.Builder builder, string childname);
-		public abstract weak string get_name ();
-		public abstract void parser_finished (Gtk.Builder builder);
-		public abstract void set_buildable_property (Gtk.Builder builder, string name, GLib.Value value);
-		public abstract void set_name (string name);
+	[CCode (cprefix = "GTK_RECENT_MANAGER_ERROR_", cheader_filename = "gtk/gtk.h")]
+	public enum RecentManagerError {
+		NOT_FOUND,
+		INVALID_URI,
+		INVALID_ENCODING,
+		NOT_REGISTERED,
+		READ,
+		WRITE,
+		UNKNOWN
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public interface CellEditable : Gtk.Widget {
-		[HasEmitter]
-		public virtual signal void editing_done ();
-		[HasEmitter]
-		public virtual signal void remove_widget ();
+	[CCode (cprefix = "GTK_RECENT_SORT_", cheader_filename = "gtk/gtk.h")]
+	public enum RecentSortType {
+		NONE,
+		MRU,
+		LRU,
+		CUSTOM
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public interface CellLayout : GLib.Object {
-		public void set_attributes (Gtk.CellRenderer cell, ...);
-		public abstract void add_attribute (Gtk.CellRenderer cell, string attribute, int column);
-		public abstract void clear ();
-		public abstract void clear_attributes (Gtk.CellRenderer cell);
-		public abstract weak GLib.List get_cells ();
-		public abstract void pack_end (Gtk.CellRenderer cell, bool expand);
-		public abstract void pack_start (Gtk.CellRenderer cell, bool expand);
-		public abstract void reorder (Gtk.CellRenderer cell, int position);
-		public abstract void set_cell_data_func (Gtk.CellRenderer cell, Gtk.CellLayoutDataFunc# func);
+	[CCode (cprefix = "GTK_RELIEF_", cheader_filename = "gtk/gtk.h")]
+	public enum ReliefStyle {
+		NORMAL,
+		HALF,
+		NONE
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public interface Editable {
-		public void copy_clipboard ();
-		public void cut_clipboard ();
-		public void delete_selection ();
-		public bool get_editable ();
-		public void paste_clipboard ();
-		public void select_region (int start, int end);
-		public void set_editable (bool is_editable);
-		[NoWrapper]
-		public abstract void do_delete_text (int start_pos, int end_pos);
-		[NoWrapper]
-		public abstract void do_insert_text (string text, int length, int position);
-		public abstract weak string get_chars (int start_pos, int end_pos);
-		public abstract int get_position ();
-		public abstract bool get_selection_bounds (int start, int end);
-		public abstract void set_position (int position);
-		[NoWrapper]
-		public abstract void set_selection_bounds (int start_pos, int end_pos);
-		public virtual signal void changed ();
-		[HasEmitter]
-		public virtual signal void delete_text (int start_pos, int end_pos);
-		[HasEmitter]
-		public virtual signal void insert_text (string text, int length, void* position);
+	[CCode (cprefix = "GTK_RESIZE_", cheader_filename = "gtk/gtk.h")]
+	public enum ResizeMode {
+		PARENT,
+		QUEUE,
+		IMMEDIATE
+	}
+	[CCode (cprefix = "GTK_RESPONSE_", cheader_filename = "gtk/gtk.h")]
+	public enum ResponseType {
+		NONE,
+		REJECT,
+		ACCEPT,
+		DELETE_EVENT,
+		OK,
+		CANCEL,
+		CLOSE,
+		YES,
+		NO,
+		APPLY,
+		HELP
+	}
+	[CCode (cprefix = "GTK_SCROLL_", cheader_filename = "gtk/gtk.h")]
+	public enum ScrollStep {
+		STEPS,
+		PAGES,
+		ENDS,
+		HORIZONTAL_STEPS,
+		HORIZONTAL_PAGES,
+		HORIZONTAL_ENDS
+	}
+	[CCode (cprefix = "GTK_SCROLL_", cheader_filename = "gtk/gtk.h")]
+	public enum ScrollType {
+		NONE,
+		JUMP,
+		STEP_BACKWARD,
+		STEP_FORWARD,
+		PAGE_BACKWARD,
+		PAGE_FORWARD,
+		STEP_UP,
+		STEP_DOWN,
+		PAGE_UP,
+		PAGE_DOWN,
+		STEP_LEFT,
+		STEP_RIGHT,
+		PAGE_LEFT,
+		PAGE_RIGHT,
+		START,
+		END
+	}
+	[CCode (cprefix = "GTK_SELECTION_", cheader_filename = "gtk/gtk.h")]
+	public enum SelectionMode {
+		NONE,
+		SINGLE,
+		BROWSE,
+		MULTIPLE,
+		EXTENDED
+	}
+	[CCode (cprefix = "GTK_SENSITIVITY_", cheader_filename = "gtk/gtk.h")]
+	public enum SensitivityType {
+		AUTO,
+		ON,
+		OFF
+	}
+	[CCode (cprefix = "GTK_SHADOW_", cheader_filename = "gtk/gtk.h")]
+	public enum ShadowType {
+		NONE,
+		IN,
+		OUT,
+		ETCHED_IN,
+		ETCHED_OUT
+	}
+	[CCode (cprefix = "GTK_SIDE_", cheader_filename = "gtk/gtk.h")]
+	public enum SideType {
+		TOP,
+		BOTTOM,
+		LEFT,
+		RIGHT
+	}
+	[CCode (cprefix = "GTK_RUN_", cheader_filename = "gtk/gtk.h")]
+	[Flags]
+	public enum SignalRunType {
+		FIRST,
+		LAST,
+		BOTH,
+		NO_RECURSE,
+		ACTION,
+		NO_HOOKS
+	}
+	[CCode (cprefix = "GTK_SIZE_GROUP_", cheader_filename = "gtk/gtk.h")]
+	public enum SizeGroupMode {
+		NONE,
+		HORIZONTAL,
+		VERTICAL,
+		BOTH
+	}
+	[CCode (cprefix = "GTK_SORT_", cheader_filename = "gtk/gtk.h")]
+	public enum SortType {
+		ASCENDING,
+		DESCENDING
+	}
+	[CCode (cprefix = "GTK_UPDATE_", cheader_filename = "gtk/gtk.h")]
+	public enum SpinButtonUpdatePolicy {
+		ALWAYS,
+		IF_VALID
+	}
+	[CCode (cprefix = "GTK_SPIN_", cheader_filename = "gtk/gtk.h")]
+	public enum SpinType {
+		STEP_FORWARD,
+		STEP_BACKWARD,
+		PAGE_FORWARD,
+		PAGE_BACKWARD,
+		HOME,
+		END,
+		USER_DEFINED
+	}
+	[CCode (cprefix = "GTK_STATE_", cheader_filename = "gtk/gtk.h")]
+	public enum StateType {
+		NORMAL,
+		ACTIVE,
+		PRELIGHT,
+		SELECTED,
+		INSENSITIVE
+	}
+	[CCode (cprefix = "GTK_DIRECTION_", cheader_filename = "gtk/gtk.h")]
+	public enum SubmenuDirection {
+		LEFT,
+		RIGHT
+	}
+	[CCode (cprefix = "GTK_", cheader_filename = "gtk/gtk.h")]
+	public enum SubmenuPlacement {
+		TOP_BOTTOM,
+		LEFT_RIGHT
+	}
+	[CCode (cprefix = "GTK_TARGET_", cheader_filename = "gtk/gtk.h")]
+	[Flags]
+	public enum TargetFlags {
+		SAME_APP,
+		SAME_WIDGET,
+		OTHER_APP,
+		OTHER_WIDGET
+	}
+	[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_", cheader_filename = "gtk/gtk.h")]
+	public enum TextDirection {
+		NONE,
+		LTR,
+		RTL
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public interface FileChooser : Gtk.Widget {
-		public void add_filter (Gtk.FileFilter filter);
-		public bool add_shortcut_folder (string folder) throws GLib.Error;
-		public bool add_shortcut_folder_uri (string uri) throws GLib.Error;
-		public static GLib.Quark error_quark ();
-		public Gtk.FileChooserAction get_action ();
-		public weak string get_current_folder ();
-		public weak string get_current_folder_uri ();
-		public bool get_do_overwrite_confirmation ();
-		public weak Gtk.Widget get_extra_widget ();
-		public weak string get_filename ();
-		public weak GLib.SList get_filenames ();
-		public weak Gtk.FileFilter get_filter ();
-		public bool get_local_only ();
-		public weak string get_preview_filename ();
-		public weak string get_preview_uri ();
-		public weak Gtk.Widget get_preview_widget ();
-		public bool get_preview_widget_active ();
-		public bool get_select_multiple ();
-		public bool get_show_hidden ();
-		public weak string get_uri ();
-		public weak GLib.SList get_uris ();
-		public bool get_use_preview_label ();
-		public weak GLib.SList list_filters ();
-		public weak GLib.SList list_shortcut_folder_uris ();
-		public weak GLib.SList list_shortcut_folders ();
-		public void remove_filter (Gtk.FileFilter filter);
-		public bool remove_shortcut_folder (string folder) throws GLib.Error;
-		public bool remove_shortcut_folder_uri (string uri) throws GLib.Error;
-		public void select_all ();
-		public bool select_filename (string filename);
-		public bool select_uri (string uri);
-		public void set_action (Gtk.FileChooserAction action);
-		public bool set_current_folder (string filename);
-		public bool set_current_folder_uri (string uri);
-		public void set_current_name (string name);
-		public void set_do_overwrite_confirmation (bool do_overwrite_confirmation);
-		public void set_extra_widget (Gtk.Widget extra_widget);
-		public bool set_filename (string filename);
-		public void set_filter (Gtk.FileFilter filter);
-		public void set_local_only (bool local_only);
-		public void set_preview_widget (Gtk.Widget preview_widget);
-		public void set_preview_widget_active (bool active);
-		public void set_select_multiple (bool select_multiple);
-		public void set_show_hidden (bool show_hidden);
-		public bool set_uri (string uri);
-		public void set_use_preview_label (bool use_label);
-		public void unselect_all ();
-		public void unselect_filename (string filename);
-		public void unselect_uri (string uri);
-		public Gtk.FileChooserAction action { get; set; }
-		public bool do_overwrite_confirmation { get; set; }
-		public Gtk.Widget extra_widget { get; set; }
-		public string file_system_backend { construct; }
-		public Gtk.FileFilter filter { get; set; }
-		public bool local_only { get; set; }
-		public Gtk.Widget preview_widget { get; set; }
-		public bool preview_widget_active { get; set; }
-		public bool select_multiple { get; set; }
-		public bool show_hidden { get; set; }
-		public bool use_preview_label { get; set; }
-		public virtual signal Gtk.FileChooserConfirmation confirm_overwrite ();
-		public virtual signal void current_folder_changed ();
-		public virtual signal void file_activated ();
-		public virtual signal void selection_changed ();
-		public virtual signal void update_preview ();
+	[CCode (cprefix = "GTK_TEXT_SEARCH_", cheader_filename = "gtk/gtk.h")]
+	[Flags]
+	public enum TextSearchFlags {
+		VISIBLE_ONLY,
+		TEXT_ONLY
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public interface PrintOperationPreview : GLib.Object {
-		public abstract void end_preview ();
-		public abstract bool is_selected (int page_nr);
-		public abstract void render_page (int page_nr);
-		public virtual signal void got_page_size (Gtk.PrintContext context, Gtk.PageSetup page_setup);
-		public virtual signal void ready (Gtk.PrintContext context);
+	[CCode (cprefix = "GTK_TEXT_WINDOW_", cheader_filename = "gtk/gtk.h")]
+	public enum TextWindowType {
+		PRIVATE,
+		WIDGET,
+		TEXT,
+		LEFT,
+		RIGHT,
+		TOP,
+		BOTTOM
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public interface RecentChooser : GLib.Object {
-		public static GLib.Quark error_quark ();
-		public weak Gtk.RecentInfo get_current_item ();
-		public weak Gtk.RecentFilter get_filter ();
-		public int get_limit ();
-		public bool get_local_only ();
-		public bool get_select_multiple ();
-		public bool get_show_icons ();
-		public bool get_show_not_found ();
-		public bool get_show_private ();
-		public bool get_show_tips ();
-		public Gtk.RecentSortType get_sort_type ();
-		public weak string get_uris (ulong length);
-		public void set_filter (Gtk.RecentFilter filter);
-		public void set_limit (int limit);
-		public void set_local_only (bool local_only);
-		public void set_select_multiple (bool select_multiple);
-		public void set_show_icons (bool show_icons);
-		public void set_show_not_found (bool show_not_found);
-		public void set_show_private (bool show_private);
-		public void set_show_tips (bool show_tips);
-		public void set_sort_type (Gtk.RecentSortType sort_type);
-		public abstract void add_filter (Gtk.RecentFilter filter);
-		public abstract weak string get_current_uri ();
-		public abstract weak GLib.List get_items ();
-		[NoWrapper]
-		public abstract weak Gtk.RecentManager get_recent_manager ();
-		public abstract weak GLib.SList list_filters ();
-		public abstract void remove_filter (Gtk.RecentFilter filter);
-		public abstract void select_all ();
-		public abstract bool select_uri (string uri) throws GLib.Error;
-		public abstract bool set_current_uri (string uri) throws GLib.Error;
-		public abstract void set_sort_func (Gtk.RecentSortFunc sort_func, void* sort_data, GLib.DestroyNotify data_destroy);
-		public abstract void unselect_all ();
-		public abstract void unselect_uri (string uri);
-		public Gtk.RecentFilter filter { get; set; }
-		public int limit { get; set; }
-		public bool local_only { get; set; }
-		public Gtk.RecentManager recent_manager { construct; }
-		public bool select_multiple { get; set; }
-		public bool show_icons { get; set; }
-		public bool show_not_found { get; set; }
-		public bool show_private { get; set; }
-		public bool show_tips { get; set; }
-		public Gtk.RecentSortType sort_type { get; set; }
-		public virtual signal void item_activated ();
-		public virtual signal void selection_changed ();
+	[CCode (cprefix = "GTK_TOOLBAR_CHILD_", cheader_filename = "gtk/gtk.h")]
+	public enum ToolbarChildType {
+		SPACE,
+		BUTTON,
+		TOGGLEBUTTON,
+		RADIOBUTTON,
+		WIDGET
 	}
-	[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 (cprefix = "GTK_TOOLBAR_SPACE_", cheader_filename = "gtk/gtk.h")]
+	public enum ToolbarSpaceStyle {
+		EMPTY,
+		LINE
 	}
-	[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);
+	[CCode (cprefix = "GTK_TOOLBAR_", cheader_filename = "gtk/gtk.h")]
+	public enum ToolbarStyle {
+		ICONS,
+		TEXT,
+		BOTH,
+		BOTH_HORIZ
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public interface TreeDragSource {
-		public abstract bool drag_data_delete (Gtk.TreePath path);
-		public abstract bool drag_data_get (Gtk.TreePath path, Gtk.SelectionData selection_data);
-		public abstract bool row_draggable (Gtk.TreePath path);
+	[CCode (cprefix = "GTK_TREE_MODEL_", cheader_filename = "gtk/gtk.h")]
+	[Flags]
+	public enum TreeModelFlags {
+		ITERS_PERSIST,
+		LIST_ONLY
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public interface TreeModel : GLib.Object {
-		public void @foreach (Gtk.TreeModelForeachFunc func);
-		[CCode (sentinel = "-1")]
-		public void get (Gtk.TreeIter iter, ...);
-		public bool get_iter_first (out Gtk.TreeIter iter);
-		public bool get_iter_from_string (out Gtk.TreeIter iter, string path_string);
-		public string get_string_from_iter (Gtk.TreeIter iter);
-		public void get_valist (Gtk.TreeIter iter, void* var_args);
-		public abstract GLib.Type get_column_type (int index_);
-		public abstract Gtk.TreeModelFlags get_flags ();
-		public abstract bool get_iter (out Gtk.TreeIter iter, Gtk.TreePath path);
-		public abstract int get_n_columns ();
-		public abstract Gtk.TreePath get_path (Gtk.TreeIter iter);
-		public abstract void get_value (Gtk.TreeIter iter, int column, ref GLib.Value value);
-		public abstract bool iter_children (out Gtk.TreeIter iter, Gtk.TreeIter? parent);
-		public abstract bool iter_has_child (Gtk.TreeIter iter);
-		public abstract int iter_n_children (Gtk.TreeIter? iter);
-		public abstract bool iter_next (ref Gtk.TreeIter iter);
-		public abstract bool iter_nth_child (out Gtk.TreeIter iter, Gtk.TreeIter? parent, int n);
-		public abstract bool iter_parent (out Gtk.TreeIter iter, Gtk.TreeIter child);
-		public abstract void ref_node (Gtk.TreeIter iter);
-		public abstract void unref_node (Gtk.TreeIter iter);
-		[HasEmitter]
-		public virtual signal void row_changed (Gtk.TreePath path, Gtk.TreeIter iter);
-		[HasEmitter]
-		public virtual signal void row_deleted (Gtk.TreePath path);
-		[HasEmitter]
-		public virtual signal void row_has_child_toggled (Gtk.TreePath path, Gtk.TreeIter iter);
-		[HasEmitter]
-		public virtual signal void row_inserted (Gtk.TreePath path, Gtk.TreeIter iter);
-		[HasEmitter]
-		public virtual signal void rows_reordered (Gtk.TreePath path, Gtk.TreeIter iter, void* new_order);
+	[CCode (cprefix = "GTK_TREE_VIEW_COLUMN_", cheader_filename = "gtk/gtk.h")]
+	public enum TreeViewColumnSizing {
+		GROW_ONLY,
+		AUTOSIZE,
+		FIXED
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public interface TreeSortable : Gtk.TreeModel, GLib.Object {
-		public abstract bool get_sort_column_id (out int sort_column_id, out Gtk.SortType order);
-		public abstract bool has_default_sort_func ();
-		public abstract void set_default_sort_func (Gtk.TreeIterCompareFunc# sort_func);
-		public abstract void set_sort_column_id (int sort_column_id, Gtk.SortType order);
-		public abstract void set_sort_func (int sort_column_id, Gtk.TreeIterCompareFunc# sort_func);
-		[HasEmitter]
-		public virtual signal void sort_column_changed ();
+	[CCode (cprefix = "GTK_TREE_VIEW_DROP_", cheader_filename = "gtk/gtk.h")]
+	public enum TreeViewDropPosition {
+		BEFORE,
+		AFTER,
+		INTO_OR_BEFORE,
+		INTO_OR_AFTER
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public struct Allocation {
-		public int x;
-		public int y;
-		public int width;
-		public int height;
+	[CCode (cprefix = "GTK_TREE_VIEW_GRID_LINES_", cheader_filename = "gtk/gtk.h")]
+	public enum TreeViewGridLines {
+		NONE,
+		HORIZONTAL,
+		VERTICAL,
+		BOTH
+	}
+	[CCode (cprefix = "GTK_TREE_VIEW_", cheader_filename = "gtk/gtk.h")]
+	public enum TreeViewMode {
+		LINE,
+		ITEM
+	}
+	[CCode (cprefix = "GTK_UI_MANAGER_", cheader_filename = "gtk/gtk.h")]
+	[Flags]
+	public enum UIManagerItemType {
+		AUTO,
+		MENUBAR,
+		MENU,
+		TOOLBAR,
+		PLACEHOLDER,
+		POPUP,
+		MENUITEM,
+		TOOLITEM,
+		SEPARATOR,
+		ACCELERATOR
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public struct ActionEntry {
-		public weak string name;
-		public weak string stock_id;
-		public weak string label;
-		public weak string accelerator;
-		public weak string tooltip;
-		[CCode (type = "GCallback")]
-		public weak Gtk.ActionCallback callback;
+	[CCode (cprefix = "GTK_UNIT_", cheader_filename = "gtk/gtk.h")]
+	public enum Unit {
+		PIXEL,
+		POINTS,
+		INCH,
+		MM
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public struct RadioActionEntry {
-		public weak string name;
-		public weak string stock_id;
-		public weak string label;
-		public weak string accelerator;
-		public weak string tooltip;
-		public int value;
+	[CCode (cprefix = "GTK_UPDATE_", cheader_filename = "gtk/gtk.h")]
+	public enum UpdateType {
+		CONTINUOUS,
+		DISCONTINUOUS,
+		DELAYED
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public struct RecentData {
-		public string display_name;
-		public string description;
-		public string mime_type;
-		public string app_name;
-		public string app_exec;
-		[NoArrayLength]
-		public string[] groups;
-		public bool is_private;
+	[CCode (cprefix = "GTK_VISIBILITY_", cheader_filename = "gtk/gtk.h")]
+	public enum Visibility {
+		NONE,
+		PARTIAL,
+		FULL
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public struct TargetEntry {
-		public weak string target;
-		public uint flags;
-		public uint info;
+	[CCode (cprefix = "GTK_", cheader_filename = "gtk/gtk.h")]
+	[Flags]
+	public enum WidgetFlags {
+		TOPLEVEL,
+		NO_WINDOW,
+		REALIZED,
+		MAPPED,
+		VISIBLE,
+		SENSITIVE,
+		PARENT_SENSITIVE,
+		CAN_FOCUS,
+		HAS_FOCUS,
+		CAN_DEFAULT,
+		HAS_DEFAULT,
+		HAS_GRAB,
+		RC_STYLE,
+		COMPOSITE_CHILD,
+		NO_REPARENT,
+		APP_PAINTABLE,
+		RECEIVES_DEFAULT,
+		DOUBLE_BUFFERED,
+		NO_SHOW_ALL
 	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public struct ToggleActionEntry {
-		public weak string name;
-		public weak string stock_id;
-		public weak string label;
-		public weak string accelerator;
-		public weak string tooltip;
-		[CCode (type = "GCallback")]
-		public weak Gtk.ActionCallback callback;
-		public bool is_active;
+	[CCode (cprefix = "GTK_WIDGET_HELP_", cheader_filename = "gtk/gtk.h")]
+	public enum WidgetHelpType {
+		TOOLTIP,
+		WHATS_THIS
 	}
-	[CCode (type_id = "GTK_TYPE_BORDER", cheader_filename = "gtk/gtk.h")]
-	public struct Border {
-		public int left;
-		public int right;
-		public int top;
-		public int bottom;
-		public Gtk.Border copy ();
-		public void free ();
-		[CCode (cname = "gtk_border_new", has_construct_function = false)]
-		public Border ();
+	[CCode (cprefix = "GTK_WIN_POS_", cheader_filename = "gtk/gtk.h")]
+	public enum WindowPosition {
+		NONE,
+		CENTER,
+		MOUSE,
+		CENTER_ALWAYS,
+		CENTER_ON_PARENT
 	}
-	[CCode (type_id = "GTK_TYPE_REQUISITION", cheader_filename = "gtk/gtk.h")]
-	public struct Requisition {
-		public int width;
-		public int height;
-		public Gtk.Requisition copy ();
-		public void free ();
+	[CCode (cprefix = "GTK_WINDOW_", cheader_filename = "gtk/gtk.h")]
+	public enum WindowType {
+		TOPLEVEL,
+		POPUP
 	}
-	[CCode (type_id = "GTK_TYPE_TEXT_ITER", cheader_filename = "gtk/gtk.h")]
-	public struct TextIter {
-		public void* dummy1;
-		public void* dummy2;
-		public int dummy3;
-		public int dummy4;
-		public int dummy5;
-		public int dummy6;
-		public int dummy7;
-		public int dummy8;
-		public void* dummy9;
-		public void* dummy10;
-		public int dummy11;
-		public int dummy12;
-		public int dummy13;
-		public void* dummy14;
-		public bool backward_char ();
-		public bool backward_chars (int count);
-		public bool backward_cursor_position ();
-		public bool backward_cursor_positions (int count);
-		public bool backward_find_char (Gtk.TextCharPredicate pred, Gtk.TextIter limit);
-		public bool backward_line ();
-		public bool backward_lines (int count);
-		public bool backward_search (string str, Gtk.TextSearchFlags flags, out Gtk.TextIter match_start, out Gtk.TextIter match_end, Gtk.TextIter? limit);
-		public bool backward_sentence_start ();
-		public bool backward_sentence_starts (int count);
-		public bool backward_to_tag_toggle (Gtk.TextTag? tag);
-		public bool backward_visible_cursor_position ();
-		public bool backward_visible_cursor_positions (int count);
-		public bool backward_visible_line ();
-		public bool backward_visible_lines (int count);
-		public bool backward_visible_word_start ();
-		public bool backward_visible_word_starts (int count);
-		public bool backward_word_start ();
-		public bool backward_word_starts (int count);
-		public bool begins_tag (Gtk.TextTag tag);
-		public bool can_insert (bool default_editability);
-		public int compare (Gtk.TextIter rhs);
-		public Gtk.TextIter copy ();
-		public bool editable (bool default_setting);
-		public bool ends_line ();
-		public bool ends_sentence ();
-		public bool ends_tag (Gtk.TextTag tag);
-		public bool ends_word ();
-		public bool equal (Gtk.TextIter rhs);
-		public bool forward_char ();
-		public bool forward_chars (int count);
-		public bool forward_cursor_position ();
-		public bool forward_cursor_positions (int count);
-		public bool forward_find_char (Gtk.TextCharPredicate pred, Gtk.TextIter limit);
-		public bool forward_line ();
-		public bool forward_lines (int count);
-		public bool forward_search (string str, Gtk.TextSearchFlags flags, out Gtk.TextIter match_start, out Gtk.TextIter match_end, Gtk.TextIter? limit);
-		public bool forward_sentence_end ();
-		public bool forward_sentence_ends (int count);
-		public void forward_to_end ();
-		public bool forward_to_line_end ();
-		public bool forward_to_tag_toggle (Gtk.TextTag? tag);
-		public bool forward_visible_cursor_position ();
-		public bool forward_visible_cursor_positions (int count);
-		public bool forward_visible_line ();
-		public bool forward_visible_lines (int count);
-		public bool forward_visible_word_end ();
-		public bool forward_visible_word_ends (int count);
-		public bool forward_word_end ();
-		public bool forward_word_ends (int count);
-		public void free ();
-		public bool get_attributes (Gtk.TextAttributes values);
-		public weak Gtk.TextBuffer get_buffer ();
-		public int get_bytes_in_line ();
-		public unichar get_char ();
-		public int get_chars_in_line ();
-		public weak Gtk.TextChildAnchor get_child_anchor ();
-		public weak Pango.Language get_language ();
-		public int get_line ();
-		public int get_line_index ();
-		public int get_line_offset ();
-		public weak GLib.SList get_marks ();
-		public int get_offset ();
-		public weak Gdk.Pixbuf get_pixbuf ();
-		public weak string get_slice (Gtk.TextIter end);
-		public weak GLib.SList get_tags ();
-		public weak string get_text (Gtk.TextIter end);
-		public weak GLib.SList get_toggled_tags (bool toggled_on);
-		public int get_visible_line_index ();
-		public int get_visible_line_offset ();
-		public weak string get_visible_slice (Gtk.TextIter end);
-		public weak string get_visible_text (Gtk.TextIter end);
-		public bool has_tag (Gtk.TextTag tag);
-		public bool in_range (Gtk.TextIter start, Gtk.TextIter end);
-		public bool inside_sentence ();
-		public bool inside_word ();
-		public bool is_cursor_position ();
-		public bool is_end ();
-		public bool is_start ();
-		public void order (Gtk.TextIter second);
-		public void set_line (int line_number);
-		public void set_line_index (int byte_on_line);
-		public void set_line_offset (int char_on_line);
-		public void set_offset (int char_offset);
-		public void set_visible_line_index (int byte_on_line);
-		public void set_visible_line_offset (int char_on_line);
-		public bool starts_line ();
-		public bool starts_sentence ();
-		public bool starts_word ();
-		public bool toggles_tag (Gtk.TextTag tag);
+	[CCode (cprefix = "GTK_WRAP_", cheader_filename = "gtk/gtk.h")]
+	public enum WrapMode {
+		NONE,
+		CHAR,
+		WORD,
+		WORD_CHAR
 	}
-	[CCode (type_id = "GTK_TYPE_TREE_ITER", cheader_filename = "gtk/gtk.h")]
-	public struct TreeIter {
-		public int stamp;
-		public void* user_data;
-		public void* user_data2;
-		public void* user_data3;
-		public Gtk.TreeIter copy ();
-		public void free ();
+	[CCode (cprefix = "GTK_BUILDER_ERROR_", cheader_filename = "gtk/gtk.h")]
+	public errordomain BuilderError {
+		INVALID_TYPE_FUNCTION,
+		UNHANDLED_TAG,
+		MISSING_ATTRIBUTE,
+		INVALID_ATTRIBUTE,
+		INVALID_TAG,
+		MISSING_PROPERTY_VALUE,
+		INVALID_VALUE,
+		VERSION_MISMATCH,
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static delegate void CallbackMarshal (Gtk.Object object, void* data, Gtk.Arg[] args);
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public delegate void ActionCallback (Gtk.Action action);
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public delegate void RadioActionCallback (Gtk.Action action, Gtk.Action current);
-	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void AboutDialogActivateLinkFunc (Gtk.AboutDialog about, string link_);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static delegate bool AccelGroupActivate (Gtk.AccelGroup accel_group, GLib.Object acceleratable, uint keyval, Gdk.ModifierType modifier);
@@ -6629,6 +6623,8 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static delegate void AccelMapForeach (void* data, string accel_path, uint accel_key, Gdk.ModifierType accel_mods, bool changed);
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public delegate void ActionCallback (Gtk.Action action);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate int AssistantPageFunc (int current_page);
 	[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);
@@ -6637,6 +6633,8 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void Callback (Gtk.Widget widget);
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static delegate void CallbackMarshal (Gtk.Object object, void* data, Gtk.Arg[] args);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void CellLayoutDataFunc (Gtk.CellLayout cell_layout, Gtk.CellRenderer cell, Gtk.TreeModel tree_model, Gtk.TreeIter iter);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static delegate void ClipboardClearFunc (Gtk.Clipboard clipboard, void* user_data_or_owner);
@@ -6685,6 +6683,8 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void PrintSettingsFunc (string key, string value);
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public delegate void RadioActionCallback (Gtk.Action action, Gtk.Action current);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static delegate bool RcPropertyParser (GLib.ParamSpec pspec, GLib.StringBuilder rc_string, GLib.Value property_value);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate bool RecentFilterFunc (Gtk.RecentFilterInfo filter_info);

Modified: trunk/vapi/gtksourceview-2.0.vapi
==============================================================================
--- trunk/vapi/gtksourceview-2.0.vapi	(original)
+++ trunk/vapi/gtksourceview-2.0.vapi	Fri Oct 24 16:50:22 2008
@@ -2,20 +2,6 @@
 
 [CCode (cprefix = "Gtk", lower_case_cprefix = "gtk_")]
 namespace Gtk {
-	[CCode (cprefix = "GTK_SOURCE_SMART_HOME_END_", has_type_id = "0", cheader_filename = "gtksourceview/gtksourceview.h")]
-	public enum SourceSmartHomeEndType {
-		DISABLED,
-		BEFORE,
-		AFTER,
-		ALWAYS
-	}
-	[CCode (cprefix = "GTK_SOURCE_SEARCH_", has_type_id = "0", cheader_filename = "gtksourceview/gtksourceiter.h")]
-	[Flags]
-	public enum SourceSearchFlags {
-		VISIBLE_ONLY,
-		TEXT_ONLY,
-		CASE_INSENSITIVE
-	}
 	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
 	public class SourceBuffer : Gtk.TextBuffer {
 		public bool backward_iter_to_source_mark (Gtk.TextIter iter, string category);
@@ -31,8 +17,8 @@
 		public weak GLib.SList get_source_marks_at_iter (Gtk.TextIter iter, string category);
 		public weak GLib.SList get_source_marks_at_line (int line, string category);
 		public weak Gtk.SourceStyleScheme get_style_scheme ();
+		[CCode (has_construct_function = false)]
 		public SourceBuffer (Gtk.TextTagTable table);
-		public SourceBuffer.with_language (Gtk.SourceLanguage language);
 		public void redo ();
 		public void remove_source_marks (Gtk.TextIter start, Gtk.TextIter end, string category);
 		public void set_highlight_matching_brackets (bool highlight);
@@ -41,6 +27,8 @@
 		public void set_max_undo_levels (int max_undo_levels);
 		public void set_style_scheme (Gtk.SourceStyleScheme scheme);
 		public void undo ();
+		[CCode (has_construct_function = false)]
+		public SourceBuffer.with_language (Gtk.SourceLanguage language);
 		[NoAccessorMethod]
 		public bool can_redo { get; }
 		[NoAccessorMethod]
@@ -74,6 +62,7 @@
 		public weak Gtk.SourceLanguage get_language (string id);
 		public weak string get_language_ids ();
 		public weak string get_search_path ();
+		[CCode (has_construct_function = false)]
 		public SourceLanguageManager ();
 		public void set_search_path (string dirs);
 		public string[] language_ids { get; }
@@ -82,6 +71,7 @@
 	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
 	public class SourceMark : Gtk.TextMark {
 		public weak string get_category ();
+		[CCode (has_construct_function = false)]
 		public SourceMark (string name, string category);
 		public weak Gtk.SourceMark next (string category);
 		public weak Gtk.SourceMark prev (string category);
@@ -91,6 +81,8 @@
 	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
 	public class SourcePrintCompositor : GLib.Object {
 		public void draw_page (Gtk.PrintContext context, int page_nr);
+		[CCode (has_construct_function = false)]
+		public SourcePrintCompositor.from_view (Gtk.SourceView view);
 		public weak string get_body_font_name ();
 		public double get_bottom_margin (Gtk.Unit unit);
 		public weak Gtk.SourceBuffer get_buffer ();
@@ -108,8 +100,8 @@
 		public uint get_tab_width ();
 		public double get_top_margin (Gtk.Unit unit);
 		public Gtk.WrapMode get_wrap_mode ();
+		[CCode (has_construct_function = false)]
 		public SourcePrintCompositor (Gtk.SourceBuffer buffer);
-		public SourcePrintCompositor.from_view (Gtk.SourceView view);
 		public bool paginate (Gtk.PrintContext context);
 		public void set_body_font_name (string font_name);
 		public void set_bottom_margin (double margin, Gtk.Unit unit);
@@ -195,6 +187,7 @@
 		public weak Gtk.SourceStyleScheme get_scheme (string scheme_id);
 		public weak string get_scheme_ids ();
 		public weak string get_search_path ();
+		[CCode (has_construct_function = false)]
 		public SourceStyleSchemeManager ();
 		public void prepend_search_path (string path);
 		public void set_search_path (string path);
@@ -216,8 +209,8 @@
 		public bool get_show_right_margin ();
 		public Gtk.SourceSmartHomeEndType get_smart_home_end ();
 		public uint get_tab_width ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public SourceView ();
-		public SourceView.with_buffer (Gtk.SourceBuffer buffer);
 		public void set_auto_indent (bool enable);
 		public void set_highlight_current_line (bool show);
 		public void set_indent_on_tab (bool enable);
@@ -231,6 +224,8 @@
 		public void set_show_right_margin (bool show);
 		public void set_smart_home_end (Gtk.SourceSmartHomeEndType smart_he);
 		public void set_tab_width (uint width);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public SourceView.with_buffer (Gtk.SourceBuffer buffer);
 		public bool auto_indent { get; set; }
 		public bool highlight_current_line { get; set; }
 		public bool indent_on_tab { get; set; }
@@ -245,6 +240,20 @@
 		public virtual signal void redo ();
 		public virtual signal void undo ();
 	}
+	[CCode (cprefix = "GTK_SOURCE_SEARCH_", has_type_id = "0", cheader_filename = "gtksourceview/gtksourceiter.h")]
+	[Flags]
+	public enum SourceSearchFlags {
+		VISIBLE_ONLY,
+		TEXT_ONLY,
+		CASE_INSENSITIVE
+	}
+	[CCode (cprefix = "GTK_SOURCE_SMART_HOME_END_", has_type_id = "0", cheader_filename = "gtksourceview/gtksourceview.h")]
+	public enum SourceSmartHomeEndType {
+		DISABLED,
+		BEFORE,
+		AFTER,
+		ALWAYS
+	}
 	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
 	public static bool source_iter_backward_search (Gtk.TextIter iter, string str, Gtk.SourceSearchFlags flags, out Gtk.TextIter match_start, out Gtk.TextIter match_end, Gtk.TextIter? limit);
 	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]

Modified: trunk/vapi/hildon-1.vapi
==============================================================================
--- trunk/vapi/hildon-1.vapi	(original)
+++ trunk/vapi/hildon-1.vapi	Fri Oct 24 16:50:22 2008
@@ -2,79 +2,6 @@
 
 [CCode (cprefix = "Hildon", lower_case_cprefix = "hildon_")]
 namespace Hildon {
-	[CCode (cprefix = "HILDON_CAPTION_POSITION_", has_type_id = "0", cheader_filename = "hildon/hildon.h")]
-	public enum CaptionIconPosition {
-		LEFT,
-		RIGHT
-	}
-	[CCode (cprefix = "HILDON_CAPTION_", has_type_id = "0", cheader_filename = "hildon/hildon.h")]
-	public enum CaptionStatus {
-		OPTIONAL,
-		MANDATORY
-	}
-	[CCode (cprefix = "HILDON_DATE_TIME_ERROR_", has_type_id = "0", cheader_filename = "hildon/hildon.h")]
-	public enum DateTimeError {
-		NO_ERROR,
-		MAX_HOURS,
-		MAX_MINS,
-		MAX_SECS,
-		MAX_DAY,
-		MAX_MONTH,
-		MAX_YEAR,
-		MIN_HOURS,
-		MIN_MINS,
-		MIN_SECS,
-		MIN_DAY,
-		MIN_MONTH,
-		MIN_YEAR,
-		EMPTY_HOURS,
-		EMPTY_MINS,
-		EMPTY_SECS,
-		EMPTY_DAY,
-		EMPTY_MONTH,
-		EMPTY_YEAR,
-		MIN_DURATION,
-		MAX_DURATION,
-		INVALID_CHAR,
-		INVALID_DATE,
-		INVALID_TIME
-	}
-	[CCode (cprefix = "HILDON_NOTE_TYPE_", has_type_id = "0", cheader_filename = "hildon/hildon.h")]
-	public enum NoteType {
-		CONFIRMATION,
-		CONFIRMATION_BUTTON,
-		INFORMATION,
-		INFORMATION_THEME,
-		PROGRESSBAR
-	}
-	[CCode (cprefix = "HILDON_NUMBER_EDITOR_ERROR_", has_type_id = "0", cheader_filename = "hildon/hildon.h")]
-	public enum NumberEditorErrorType {
-		MAXIMUM_VALUE_EXCEED,
-		MINIMUM_VALUE_EXCEED,
-		ERRONEOUS_VALUE
-	}
-	[CCode (cprefix = "HILDON_WINDOW_CO_", has_type_id = "0", cheader_filename = "hildon/hildon.h")]
-	public enum WindowClipboardOperation {
-		COPY,
-		CUT,
-		PASTE
-	}
-	[CCode (cprefix = "HILDON_WIZARD_DIALOG_", has_type_id = "0", cheader_filename = "hildon/hildon.h")]
-	public enum WizardDialogResponse {
-		CANCEL,
-		PREVIOUS,
-		NEXT,
-		FINISH
-	}
-	[CCode (cprefix = "HILDON_CALENDAR_", has_type_id = "0", cheader_filename = "hildon/hildon.h")]
-	[Flags]
-	public enum CalendarDisplayOptions {
-		SHOW_HEADING,
-		SHOW_DAY_NAMES,
-		NO_MONTH_CHANGE,
-		SHOW_WEEK_NUMBERS,
-		WEEK_START_MONDAY
-	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class Banner : Gtk.Window, Atk.Implementor, Gtk.Buildable {
 		public void set_fraction (double fraction);
@@ -98,6 +25,7 @@
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class BreadCrumbTrail : Gtk.Container, Atk.Implementor, Gtk.Buildable {
 		public void clear ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public BreadCrumbTrail ();
 		public void pop ();
 		public void push (Hildon.BreadCrumb item, void* id, GLib.DestroyNotify notify);
@@ -108,30 +36,31 @@
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class Calendar : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
-		public weak Gtk.Style header_style;
-		public weak Gtk.Style label_style;
-		public int selected_day;
 		[NoArrayLength]
 		public weak int[] day_month;
-		public int num_marked_dates;
+		public Hildon.CalendarDisplayOptions display_flags;
+		public int focus_col;
+		public int focus_row;
+		public weak Gdk.GC gc;
+		[NoArrayLength]
+		public weak char[] grow_space;
+		public weak Gtk.Style header_style;
+		public int highlight_col;
+		public int highlight_row;
+		public weak Gtk.Style label_style;
 		[NoArrayLength]
 		public weak int[] marked_date;
-		public Hildon.CalendarDisplayOptions display_flags;
 		[NoArrayLength]
 		public weak Gdk.Color[] marked_date_color;
-		public weak Gdk.GC gc;
+		public int num_marked_dates;
+		public int selected_day;
 		public weak Gdk.GC xor_gc;
-		public int focus_row;
-		public int focus_col;
-		public int highlight_row;
-		public int highlight_col;
-		[NoArrayLength]
-		public weak char[] grow_space;
 		public void clear_marks ();
 		public void freeze ();
 		public void get_date (uint year, uint month, uint day);
 		public Hildon.CalendarDisplayOptions get_display_options ();
 		public bool mark_day (uint day);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Calendar ();
 		public void select_day (uint day);
 		public bool select_month (uint month, uint year);
@@ -171,6 +100,7 @@
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class CalendarPopup : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
 		public void get_date (uint year, uint month, uint day);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public CalendarPopup (Gtk.Window parent, uint year, uint month, uint day);
 		public void set_date (uint year, uint month, uint day);
 		[NoAccessorMethod]
@@ -195,6 +125,7 @@
 		public weak Gtk.SizeGroup get_size_group ();
 		public Hildon.CaptionStatus get_status ();
 		public bool is_mandatory ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Caption (Gtk.SizeGroup group, string value, Gtk.Widget control, Gtk.Widget icon, Hildon.CaptionStatus flag);
 		public void set_child_expand (bool expand);
 		public void set_icon_image (Gtk.Widget icon);
@@ -220,6 +151,7 @@
 	public class CodeDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
 		public void clear_code ();
 		public weak string get_code ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public CodeDialog ();
 		public void set_help_text (string text);
 		public void set_input_sensitive (bool sensitive);
@@ -229,16 +161,19 @@
 	public class ColorButton : Gtk.Button, Atk.Implementor, Gtk.Buildable {
 		public void get_color (out Gdk.Color color);
 		public bool get_popup_shown ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ColorButton ();
-		public ColorButton.with_color (Gdk.Color color);
 		public void popdown ();
 		public void set_color (Gdk.Color color);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public ColorButton.with_color (Gdk.Color color);
 		public Gdk.Color color { get; set; }
 		public bool popup_shown { get; }
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class ColorChooser : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
 		public void get_color (out Gdk.Color color);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ColorChooser ();
 		public virtual void set_color (Gdk.Color color);
 		public Gdk.Color color { get; set; }
@@ -247,6 +182,7 @@
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class ColorChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
 		public void get_color (out Gdk.Color color);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ColorChooserDialog ();
 		public void set_color (Gdk.Color color);
 	}
@@ -255,6 +191,7 @@
 		public int get_max ();
 		public int get_min ();
 		public int get_value ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Controlbar ();
 		public void set_max (int max);
 		public void set_min (int min);
@@ -271,6 +208,7 @@
 		public uint get_day ();
 		public uint get_month ();
 		public uint get_year ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public DateEditor ();
 		public void set_date (uint year, uint month, uint day);
 		public bool set_day (uint day);
@@ -291,10 +229,12 @@
 		public bool get_active_iter (out Gtk.TreeIter iter);
 		public int get_last_index ();
 		public void highlight_entry (bool get_focus);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public FindToolbar (string label);
-		public FindToolbar.with_model (string label, Gtk.ListStore model, int column);
 		public void set_active (int index);
 		public void set_active_iter (Gtk.TreeIter iter);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public FindToolbar.with_model (string label, Gtk.ListStore model, int column);
 		[NoAccessorMethod]
 		public int column { get; set; }
 		[NoAccessorMethod]
@@ -315,6 +255,7 @@
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class FontSelectionDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
 		public weak string get_preview_text ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public FontSelectionDialog (Gtk.Window parent, string title);
 		public void set_preview_text (string text);
 		[NoAccessorMethod]
@@ -356,11 +297,13 @@
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class GetPasswordDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
 		public weak string get_password ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public GetPasswordDialog (Gtk.Window parent, bool get_old);
-		public GetPasswordDialog.with_default (Gtk.Window parent, string password, bool get_old);
 		public void set_caption (string new_caption);
 		public void set_max_characters (int max_characters);
 		public void set_message (string message);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public GetPasswordDialog.with_default (Gtk.Window parent, string password, bool get_old);
 		[NoAccessorMethod]
 		public string caption_label { get; set; }
 		[NoAccessorMethod]
@@ -376,15 +319,18 @@
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class HVolumebar : Hildon.Volumebar, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public HVolumebar ();
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class LoginDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
 		public weak string get_password ();
 		public weak string get_username ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public LoginDialog (Gtk.Window parent);
-		public LoginDialog.with_default (Gtk.Window parent, string name, string password);
 		public void set_message (string msg);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public LoginDialog.with_default (Gtk.Window parent, string name, string password);
 		[NoAccessorMethod]
 		public string message { get; set; }
 		[NoAccessorMethod]
@@ -394,11 +340,17 @@
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class Note : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Note.cancel_with_progress_bar (Gtk.Window parent, string description, Gtk.ProgressBar progressbar);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Note.confirmation (Gtk.Window parent, string description);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Note.confirmation_add_buttons (Gtk.Window parent, string description);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Note.confirmation_with_icon_name (Gtk.Window parent, string description, string icon_name);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Note.information (Gtk.Window parent, string description);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Note.information_with_icon_name (Gtk.Window parent, string description, string icon_name);
 		public void set_button_text (string text);
 		public void set_button_texts (string text_ok, string text_cancel);
@@ -414,6 +366,7 @@
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class NumberEditor : Gtk.Container, Atk.Implementor, Gtk.Buildable {
 		public int get_value ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public NumberEditor (int min, int max);
 		public void set_range (int min, int max);
 		public void set_value (int value);
@@ -443,8 +396,8 @@
 		public int get_min ();
 		public void get_range (int start, int end);
 		public weak string get_separator ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public RangeEditor ();
-		public RangeEditor.with_separator (string separator);
 		public void set_higher (int value);
 		public void set_limits (int start, int end);
 		public void set_lower (int value);
@@ -452,6 +405,8 @@
 		public void set_min (int value);
 		public void set_range (int start, int end);
 		public void set_separator (string separator);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public RangeEditor.with_separator (string separator);
 		public int higher { get; set construct; }
 		public int lower { get; set construct; }
 		public int max { get; set construct; }
@@ -463,6 +418,7 @@
 		public uint get_fraction ();
 		public int get_position ();
 		public int get_total_time ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Seekbar ();
 		public void set_fraction (uint fraction);
 		public void set_position (int time);
@@ -475,9 +431,11 @@
 	public class SetPasswordDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
 		public weak string get_password ();
 		public bool get_protected ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public SetPasswordDialog (Gtk.Window parent, bool modify_protection);
-		public SetPasswordDialog.with_default (Gtk.Window parent, string password, bool modify_protection);
 		public void set_message (string message);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public SetPasswordDialog.with_default (Gtk.Window parent, string password, bool modify_protection);
 		[NoAccessorMethod]
 		public string message { get; set; }
 		[NoAccessorMethod]
@@ -491,6 +449,7 @@
 		public int add_sort_key_reversed (string sort_key);
 		public int get_sort_key ();
 		public Gtk.SortType get_sort_order ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public SortDialog (Gtk.Window parent);
 		public void set_sort_key (int key);
 		public void set_sort_order (Gtk.SortType order);
@@ -508,6 +467,7 @@
 		public uint get_ticks ();
 		public void get_time (uint hours, uint minutes, uint seconds);
 		public static void get_time_separators (Gtk.Label hm_sep_label, Gtk.Label ms_sep_label);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public TimeEditor ();
 		public void set_duration_max (uint duration_max);
 		public void set_duration_min (uint duration_min);
@@ -528,6 +488,7 @@
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class TimePicker : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
 		public void get_time (uint hours, uint minutes);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public TimePicker (Gtk.Window parent);
 		public void set_time (uint hours, uint minutes);
 		[NoAccessorMethod]
@@ -535,6 +496,7 @@
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class VVolumebar : Hildon.Volumebar, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public VVolumebar ();
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
@@ -558,6 +520,7 @@
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class VolumebarRange : Gtk.Scale, Atk.Implementor, Gtk.Buildable {
 		public double get_level ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public VolumebarRange (Gtk.Orientation orientation);
 		public void set_level (double level);
 		public double level { get; set; }
@@ -565,6 +528,7 @@
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class WeekdayPicker : Gtk.Container, Atk.Implementor, Gtk.Buildable {
 		public bool isset_day (GLib.DateWeekday day);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public WeekdayPicker ();
 		public void set_all ();
 		public void set_day (GLib.DateWeekday day);
@@ -579,6 +543,7 @@
 		public void add_with_scrollbar (Gtk.Widget child);
 		public bool get_is_topmost ();
 		public weak Gtk.Menu get_menu ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Window ();
 		public void remove_toolbar (Gtk.Toolbar toolbar);
 		public void set_menu (Gtk.Menu menu);
@@ -587,6 +552,7 @@
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class WizardDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public WizardDialog (Gtk.Window parent, string wizard_name, Gtk.Notebook notebook);
 		[NoAccessorMethod]
 		public bool autotitle { get; set; }
@@ -601,6 +567,79 @@
 		public abstract void get_natural_size (int width, int height);
 		public virtual signal void crumb_activated ();
 	}
+	[CCode (cprefix = "HILDON_CALENDAR_", has_type_id = "0", cheader_filename = "hildon/hildon.h")]
+	[Flags]
+	public enum CalendarDisplayOptions {
+		SHOW_HEADING,
+		SHOW_DAY_NAMES,
+		NO_MONTH_CHANGE,
+		SHOW_WEEK_NUMBERS,
+		WEEK_START_MONDAY
+	}
+	[CCode (cprefix = "HILDON_CAPTION_POSITION_", has_type_id = "0", cheader_filename = "hildon/hildon.h")]
+	public enum CaptionIconPosition {
+		LEFT,
+		RIGHT
+	}
+	[CCode (cprefix = "HILDON_CAPTION_", has_type_id = "0", cheader_filename = "hildon/hildon.h")]
+	public enum CaptionStatus {
+		OPTIONAL,
+		MANDATORY
+	}
+	[CCode (cprefix = "HILDON_DATE_TIME_ERROR_", has_type_id = "0", cheader_filename = "hildon/hildon.h")]
+	public enum DateTimeError {
+		NO_ERROR,
+		MAX_HOURS,
+		MAX_MINS,
+		MAX_SECS,
+		MAX_DAY,
+		MAX_MONTH,
+		MAX_YEAR,
+		MIN_HOURS,
+		MIN_MINS,
+		MIN_SECS,
+		MIN_DAY,
+		MIN_MONTH,
+		MIN_YEAR,
+		EMPTY_HOURS,
+		EMPTY_MINS,
+		EMPTY_SECS,
+		EMPTY_DAY,
+		EMPTY_MONTH,
+		EMPTY_YEAR,
+		MIN_DURATION,
+		MAX_DURATION,
+		INVALID_CHAR,
+		INVALID_DATE,
+		INVALID_TIME
+	}
+	[CCode (cprefix = "HILDON_NOTE_TYPE_", has_type_id = "0", cheader_filename = "hildon/hildon.h")]
+	public enum NoteType {
+		CONFIRMATION,
+		CONFIRMATION_BUTTON,
+		INFORMATION,
+		INFORMATION_THEME,
+		PROGRESSBAR
+	}
+	[CCode (cprefix = "HILDON_NUMBER_EDITOR_ERROR_", has_type_id = "0", cheader_filename = "hildon/hildon.h")]
+	public enum NumberEditorErrorType {
+		MAXIMUM_VALUE_EXCEED,
+		MINIMUM_VALUE_EXCEED,
+		ERRONEOUS_VALUE
+	}
+	[CCode (cprefix = "HILDON_WINDOW_CO_", has_type_id = "0", cheader_filename = "hildon/hildon.h")]
+	public enum WindowClipboardOperation {
+		COPY,
+		CUT,
+		PASTE
+	}
+	[CCode (cprefix = "HILDON_WIZARD_DIALOG_", has_type_id = "0", cheader_filename = "hildon/hildon.h")]
+	public enum WizardDialogResponse {
+		CANCEL,
+		PREVIOUS,
+		NEXT,
+		FINISH
+	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public const int MAJOR_VERSION;
 	[CCode (cheader_filename = "hildon/hildon.h")]

Modified: trunk/vapi/hildon-fm-2.vapi
==============================================================================
--- trunk/vapi/hildon-fm-2.vapi	(original)
+++ trunk/vapi/hildon-fm-2.vapi	Fri Oct 24 16:50:22 2008
@@ -2,89 +2,6 @@
 
 [CCode (cprefix = "Hildon", lower_case_cprefix = "hildon_")]
 namespace Hildon {
-	[CCode (cprefix = "HILDON_FILE_SELECTION_MODE_", has_type_id = "0", cheader_filename = "hildon/hildon-file-selection.h")]
-	public enum FileSelectionMode {
-		LIST,
-		THUMBNAILS
-	}
-	[CCode (cprefix = "HILDON_FILE_SELECTION_PANE_", has_type_id = "0", cheader_filename = "hildon/hildon-file-selection.h")]
-	public enum FileSelectionPane {
-		NAVIGATION,
-		CONTENT
-	}
-	[CCode (cprefix = "HILDON_FILE_SELECTION_SORT_", has_type_id = "0", cheader_filename = "hildon/hildon-file-selection.h")]
-	public enum FileSelectionSortKey {
-		NAME,
-		TYPE,
-		MODIFIED,
-		SIZE
-	}
-	[CCode (cprefix = "HILDON_FILE_SELECTION_SHOW_", has_type_id = "0", cheader_filename = "hildon/hildon-file-selection.h")]
-	public enum FileSelectionVisibleColumns {
-		NAME,
-		MODIFIED,
-		SIZE,
-		ALL
-	}
-	[CCode (cprefix = "HILDON_FILE_SYSTEM_MODEL_", has_type_id = "0", cheader_filename = "hildon/hildon-file-system-model.h")]
-	public enum FileSystemModelColumns {
-		COLUMN_GTK_PATH_INTERNAL,
-		COLUMN_LOCAL_PATH,
-		COLUMN_URI,
-		COLUMN_FILE_NAME,
-		COLUMN_DISPLAY_NAME,
-		COLUMN_SORT_KEY,
-		COLUMN_MIME_TYPE,
-		COLUMN_FILE_SIZE,
-		COLUMN_FILE_TIME,
-		COLUMN_IS_FOLDER,
-		COLUMN_IS_AVAILABLE,
-		COLUMN_HAS_LOCAL_PATH,
-		COLUMN_TYPE,
-		COLUMN_ICON,
-		COLUMN_ICON_EXPANDED,
-		COLUMN_ICON_COLLAPSED,
-		COLUMN_THUMBNAIL,
-		COLUMN_LOAD_READY,
-		COLUMN_FREE_SPACE,
-		COLUMN_TITLE,
-		COLUMN_AUTHOR,
-		COLUMN_IS_HIDDEN,
-		COLUMN_UNAVAILABLE_REASON,
-		COLUMN_FAILED_ACCESS_MESSAGE,
-		COLUMN_SORT_WEIGHT,
-		COLUMN_EXTRA_INFO,
-		COLUMN_IS_DRIVE,
-		NUM_COLUMNS
-	}
-	[CCode (cprefix = "HILDON_FILE_SYSTEM_MODEL_", has_type_id = "0", cheader_filename = "hildon/hildon-file-system-model.h")]
-	public enum FileSystemModelItemType {
-		UNKNOWN,
-		FILE,
-		FOLDER,
-		SAFE_FOLDER_IMAGES,
-		SAFE_FOLDER_VIDEOS,
-		SAFE_FOLDER_SOUNDS,
-		SAFE_FOLDER_DOCUMENTS,
-		SAFE_FOLDER_GAMES,
-		MMC,
-		GATEWAY,
-		LOCAL_DEVICE
-	}
-	[Compact]
-	[CCode (cheader_filename = "hildon/hildon-file-system-info.h")]
-	public class FileSystemInfo {
-		public static void async_cancel (Hildon.FileSystemInfoHandle handle);
-		public static weak Hildon.FileSystemInfoHandle async_new (string uri, Hildon.FileSystemInfoCallback callback);
-		public weak string get_display_name ();
-		public weak Gdk.Pixbuf get_icon (Gtk.Widget ref_widget);
-		public weak Gdk.Pixbuf get_icon_at_size (Gtk.Widget ref_widget, int size);
-		public FileSystemInfo (string uri) throws GLib.Error;
-	}
-	[Compact]
-	[CCode (cheader_filename = "hildon/hildon-file-system-info.h")]
-	public class FileSystemInfoHandle {
-	}
 	[CCode (cheader_filename = "hildon/hildon-file-chooser-dialog.h")]
 	public class FileChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.FileChooser {
 		public weak Gtk.Widget add_extensions_combo (out weak string extensions, out weak string ext_names);
@@ -94,12 +11,14 @@
 		public weak string get_safe_folder ();
 		public weak string get_safe_folder_uri ();
 		public bool get_show_upnp ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public FileChooserDialog (Gtk.Window parent, Gtk.FileChooserAction action);
-		public FileChooserDialog.with_properties (Gtk.Window parent, ...);
 		public void set_extension (string extension);
 		public void set_safe_folder (string local_path);
 		public void set_safe_folder_uri (string uri);
 		public void set_show_upnp (bool value);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public FileChooserDialog.with_properties (Gtk.Window parent, ...);
 		[NoAccessorMethod]
 		public bool autonaming { get; set; }
 		[NoAccessorMethod]
@@ -124,9 +43,11 @@
 	[CCode (cheader_filename = "hildon/hildon-file-details-dialog.h")]
 	public class FileDetailsDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
 		public bool get_file_iter (out Gtk.TreeIter iter);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public FileDetailsDialog (Gtk.Window parent, string filename);
-		public FileDetailsDialog.with_model (Gtk.Window parent, Hildon.FileSystemModel model);
 		public void set_file_iter (Gtk.TreeIter iter);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public FileDetailsDialog.with_model (Gtk.Window parent, Hildon.FileSystemModel model);
 		[NoAccessorMethod]
 		public Gtk.Widget additional_tab { get; set construct; }
 		[NoAccessorMethod]
@@ -159,7 +80,6 @@
 		public void get_sort_key (Hildon.FileSelectionSortKey key, Gtk.SortType order);
 		public void hide_content_pane ();
 		public void move_cursor_to_uri (string uri);
-		public FileSelection.with_model (Hildon.FileSystemModel model);
 		public void select_all ();
 		public bool select_uri (string uri) throws GLib.Error;
 		public void set_column_headers_visible (bool visible);
@@ -172,6 +92,8 @@
 		public void undim_all ();
 		public void unselect_all ();
 		public void unselect_uri (string uri);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public FileSelection.with_model (Hildon.FileSystemModel model);
 		[NoAccessorMethod]
 		public int active_pane { get; set; }
 		[NoAccessorMethod]
@@ -200,13 +122,29 @@
 		public virtual signal void selection_changed ();
 		public virtual signal void uris_dropped (string destination, void* sources);
 	}
+	[Compact]
+	[CCode (cheader_filename = "hildon/hildon-file-system-info.h")]
+	public class FileSystemInfo {
+		public static void async_cancel (Hildon.FileSystemInfoHandle handle);
+		public static weak Hildon.FileSystemInfoHandle async_new (string uri, Hildon.FileSystemInfoCallback callback);
+		public weak string get_display_name ();
+		public weak Gdk.Pixbuf get_icon (Gtk.Widget ref_widget);
+		public weak Gdk.Pixbuf get_icon_at_size (Gtk.Widget ref_widget, int size);
+		[CCode (has_construct_function = false)]
+		public FileSystemInfo (string uri) throws GLib.Error;
+	}
+	[Compact]
+	[CCode (cheader_filename = "hildon/hildon-file-system-info.h")]
+	public class FileSystemInfoHandle {
+	}
 	[CCode (cheader_filename = "hildon/hildon-file-system-model.h")]
 	public class FileSystemModel : GLib.Object, Gtk.TreeModel, Gtk.TreeDragSource {
 		public weak string autoname_uri (string uri) throws GLib.Error;
+		[CCode (type = "gchar*", has_construct_function = false)]
+		public FileSystemModel.item (Hildon.FileSystemModel model, Gtk.TreeIter parent, string stub_name, string extension);
 		public void iter_available (Gtk.TreeIter iter, bool available);
 		public bool load_local_path (string path, Gtk.TreeIter iter);
 		public bool load_uri (string uri, Gtk.TreeIter iter);
-		public FileSystemModel.item (Hildon.FileSystemModel model, Gtk.TreeIter parent, string stub_name, string extension);
 		public void reset_available ();
 		public bool search_local_path (string path, Gtk.TreeIter iter, Gtk.TreeIter start_iter, bool recursive);
 		public bool search_uri (string uri, Gtk.TreeIter iter, Gtk.TreeIter start_iter, bool recursive);
@@ -227,9 +165,79 @@
 	}
 	[CCode (cheader_filename = "hildon/hildon-file-system-storage-dialog.h")]
 	public class FileSystemStorageDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public FileSystemStorageDialog (Gtk.Window parent, string uri_str);
 		public static void set_uri (Gtk.Widget widget, string uri_str);
 	}
+	[CCode (cprefix = "HILDON_FILE_SELECTION_MODE_", has_type_id = "0", cheader_filename = "hildon/hildon-file-selection.h")]
+	public enum FileSelectionMode {
+		LIST,
+		THUMBNAILS
+	}
+	[CCode (cprefix = "HILDON_FILE_SELECTION_PANE_", has_type_id = "0", cheader_filename = "hildon/hildon-file-selection.h")]
+	public enum FileSelectionPane {
+		NAVIGATION,
+		CONTENT
+	}
+	[CCode (cprefix = "HILDON_FILE_SELECTION_SORT_", has_type_id = "0", cheader_filename = "hildon/hildon-file-selection.h")]
+	public enum FileSelectionSortKey {
+		NAME,
+		TYPE,
+		MODIFIED,
+		SIZE
+	}
+	[CCode (cprefix = "HILDON_FILE_SELECTION_SHOW_", has_type_id = "0", cheader_filename = "hildon/hildon-file-selection.h")]
+	public enum FileSelectionVisibleColumns {
+		NAME,
+		MODIFIED,
+		SIZE,
+		ALL
+	}
+	[CCode (cprefix = "HILDON_FILE_SYSTEM_MODEL_", has_type_id = "0", cheader_filename = "hildon/hildon-file-system-model.h")]
+	public enum FileSystemModelColumns {
+		COLUMN_GTK_PATH_INTERNAL,
+		COLUMN_LOCAL_PATH,
+		COLUMN_URI,
+		COLUMN_FILE_NAME,
+		COLUMN_DISPLAY_NAME,
+		COLUMN_SORT_KEY,
+		COLUMN_MIME_TYPE,
+		COLUMN_FILE_SIZE,
+		COLUMN_FILE_TIME,
+		COLUMN_IS_FOLDER,
+		COLUMN_IS_AVAILABLE,
+		COLUMN_HAS_LOCAL_PATH,
+		COLUMN_TYPE,
+		COLUMN_ICON,
+		COLUMN_ICON_EXPANDED,
+		COLUMN_ICON_COLLAPSED,
+		COLUMN_THUMBNAIL,
+		COLUMN_LOAD_READY,
+		COLUMN_FREE_SPACE,
+		COLUMN_TITLE,
+		COLUMN_AUTHOR,
+		COLUMN_IS_HIDDEN,
+		COLUMN_UNAVAILABLE_REASON,
+		COLUMN_FAILED_ACCESS_MESSAGE,
+		COLUMN_SORT_WEIGHT,
+		COLUMN_EXTRA_INFO,
+		COLUMN_IS_DRIVE,
+		NUM_COLUMNS
+	}
+	[CCode (cprefix = "HILDON_FILE_SYSTEM_MODEL_", has_type_id = "0", cheader_filename = "hildon/hildon-file-system-model.h")]
+	public enum FileSystemModelItemType {
+		UNKNOWN,
+		FILE,
+		FOLDER,
+		SAFE_FOLDER_IMAGES,
+		SAFE_FOLDER_VIDEOS,
+		SAFE_FOLDER_SOUNDS,
+		SAFE_FOLDER_DOCUMENTS,
+		SAFE_FOLDER_GAMES,
+		MMC,
+		GATEWAY,
+		LOCAL_DEVICE
+	}
 	[CCode (cheader_filename = "hildon/hildon-file-system-info.h")]
 	public delegate void FileSystemInfoCallback (Hildon.FileSystemInfoHandle handle, Hildon.FileSystemInfo info, GLib.Error error);
 	[CCode (cheader_filename = "hildon/hildon-file-system-model.h")]

Modified: trunk/vapi/json-glib-1.0.vapi
==============================================================================
--- trunk/vapi/json-glib-1.0.vapi	(original)
+++ trunk/vapi/json-glib-1.0.vapi	Fri Oct 24 16:50:22 2008
@@ -2,44 +2,38 @@
 
 [CCode (cprefix = "Json", lower_case_cprefix = "json_")]
 namespace Json {
-	[CCode (cprefix = "JSON_NODE_", has_type_id = "0", cheader_filename = "json-glib/json-glib.h")]
-	public enum NodeType {
-		OBJECT,
-		ARRAY,
-		VALUE,
-		NULL
-	}
-	[CCode (cprefix = "JSON_PARSER_ERROR_", has_type_id = "0", cheader_filename = "json-glib/json-glib.h")]
-	public enum ParserError {
-		PARSE,
-		UNKNOWN
-	}
-	[CCode (cprefix = "JSON_TOKEN_", has_type_id = "0", cheader_filename = "json-glib/json-glib.h")]
-	public enum TokenType {
-		INVALID,
-		TRUE,
-		FALSE,
-		NULL,
-		VAR,
-		LAST
-	}
 	[Compact]
 	[CCode (ref_function = "json_array_ref", unref_function = "json_array_unref", cheader_filename = "json-glib/json-glib.h")]
-	public class Array : GLib.Boxed {
+	public class Array {
 		public void add_element (Json.Node node);
 		public weak Json.Node get_element (uint index_);
 		public weak GLib.List get_elements ();
 		public uint get_length ();
+		[CCode (has_construct_function = false)]
 		public Array ();
 		public void remove_element (uint index_);
 		public static weak Json.Array sized_new (uint n_elements);
 	}
+	[CCode (cheader_filename = "json-glib/json-glib.h")]
+	public class Generator : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public Generator ();
+		public void set_root (Json.Node node);
+		public string to_data (out ulong length);
+		public bool to_file (string filename) throws GLib.Error;
+		[NoAccessorMethod]
+		public uint indent { get; set; }
+		[NoAccessorMethod]
+		public bool pretty { get; set; }
+		[NoAccessorMethod]
+		public Json.Node root { get; set; }
+	}
 	[Compact]
 	[CCode (copy_function = "json_node_copy", cheader_filename = "json-glib/json-glib.h")]
-	public class Node : GLib.Boxed {
-		public Json.NodeType type;
+	public class Node {
 		public void* data;
 		public weak Json.Node parent;
+		public Json.NodeType type;
 		public weak Json.Node copy ();
 		public weak Json.Array dup_array ();
 		public weak Json.Object dup_object ();
@@ -53,6 +47,7 @@
 		public weak string get_string ();
 		public void get_value (GLib.Value value);
 		public GLib.Type get_value_type ();
+		[CCode (has_construct_function = false)]
 		public Node (Json.NodeType type);
 		public void set_array (Json.Array array);
 		public void set_boolean (bool value);
@@ -67,30 +62,18 @@
 	}
 	[Compact]
 	[CCode (ref_function = "json_object_ref", unref_function = "json_object_unref", cheader_filename = "json-glib/json-glib.h")]
-	public class Object : GLib.Boxed {
+	public class Object {
 		public void add_member (string member_name, Json.Node node);
 		public weak Json.Node get_member (string member_name);
 		public weak GLib.List get_members ();
 		public uint get_size ();
 		public weak GLib.List get_values ();
 		public bool has_member (string member_name);
+		[CCode (has_construct_function = false)]
 		public Object ();
 		public void remove_member (string member_name);
 	}
 	[CCode (cheader_filename = "json-glib/json-glib.h")]
-	public class Generator : GLib.Object {
-		public Generator ();
-		public void set_root (Json.Node node);
-		public string to_data (out ulong length);
-		public bool to_file (string filename) throws GLib.Error;
-		[NoAccessorMethod]
-		public uint indent { get; set; }
-		[NoAccessorMethod]
-		public bool pretty { get; set; }
-		[NoAccessorMethod]
-		public Json.Node root { get; set; }
-	}
-	[CCode (cheader_filename = "json-glib/json-glib.h")]
 	public class Parser : GLib.Object {
 		public static GLib.Quark error_quark ();
 		public uint get_current_line ();
@@ -99,6 +82,7 @@
 		public bool has_assignment (out weak string variable_name);
 		public bool load_from_data (string data, ulong length) throws GLib.Error;
 		public bool load_from_file (string filename) throws GLib.Error;
+		[CCode (has_construct_function = false)]
 		public Parser ();
 		public virtual signal void array_element (Json.Array array, int index_);
 		public virtual signal void array_end (Json.Array array);
@@ -115,6 +99,27 @@
 		public abstract bool deserialize_property (string property_name, GLib.Value value, GLib.ParamSpec pspec, Json.Node property_node);
 		public abstract Json.Node serialize_property (string property_name, GLib.Value value, GLib.ParamSpec pspec);
 	}
+	[CCode (cprefix = "JSON_NODE_", has_type_id = "0", cheader_filename = "json-glib/json-glib.h")]
+	public enum NodeType {
+		OBJECT,
+		ARRAY,
+		VALUE,
+		NULL
+	}
+	[CCode (cprefix = "JSON_PARSER_ERROR_", has_type_id = "0", cheader_filename = "json-glib/json-glib.h")]
+	public enum ParserError {
+		PARSE,
+		UNKNOWN
+	}
+	[CCode (cprefix = "JSON_TOKEN_", has_type_id = "0", cheader_filename = "json-glib/json-glib.h")]
+	public enum TokenType {
+		INVALID,
+		TRUE,
+		FALSE,
+		NULL,
+		VAR,
+		LAST
+	}
 	[CCode (cheader_filename = "json-glib/json-glib.h")]
 	public const int MAJOR_VERSION;
 	[CCode (cheader_filename = "json-glib/json-glib.h")]

Modified: trunk/vapi/libglade-2.0.vapi
==============================================================================
--- trunk/vapi/libglade-2.0.vapi	(original)
+++ trunk/vapi/libglade-2.0.vapi	Fri Oct 24 16:50:22 2008
@@ -24,20 +24,20 @@
 	[Compact]
 	[CCode (cheader_filename = "glade/glade.h")]
 	public class ChildInfo {
-		public weak Glade.Property properties;
-		public uint n_properties;
 		public weak Glade.WidgetInfo child;
 		public weak string internal_child;
+		public uint n_properties;
+		public weak Glade.Property properties;
 	}
 	[Compact]
 	[CCode (free_function = "glade_interface_destroy", cheader_filename = "glade/glade.h")]
 	public class Interface {
-		public weak string requires;
 		public uint n_requires;
-		public weak Glade.WidgetInfo toplevels;
 		public uint n_toplevels;
 		public weak GLib.HashTable names;
+		public weak string requires;
 		public weak GLib.HashTable strings;
+		public weak Glade.WidgetInfo toplevels;
 		public void dump (string filename);
 	}
 	[Compact]
@@ -49,31 +49,31 @@
 	[Compact]
 	[CCode (cheader_filename = "glade/glade.h")]
 	public class SignalInfo {
-		public weak string name;
+		public uint after;
 		public weak string handler;
+		public weak string name;
 		public weak string object;
-		public uint after;
 	}
 	[Compact]
 	[CCode (cheader_filename = "glade/glade.h")]
 	public class WidgetInfo {
-		public weak Glade.WidgetInfo parent;
-		public weak string classname;
-		public weak string name;
-		public weak Glade.Property properties;
-		public uint n_properties;
+		public weak Glade.AccelInfo accels;
+		public weak Glade.AtkActionInfo atk_actions;
 		public weak Glade.Property atk_props;
+		public weak Glade.ChildInfo children;
+		public weak string classname;
+		public uint n_accels;
+		public uint n_atk_actions;
 		public uint n_atk_props;
-		public weak Glade.SignalInfo signals;
+		public uint n_children;
+		public uint n_properties;
+		public uint n_relations;
 		public uint n_signals;
-		public weak Glade.AtkActionInfo atk_actions;
-		public uint n_atk_actions;
+		public weak string name;
+		public weak Glade.WidgetInfo parent;
+		public weak Glade.Property properties;
 		public weak Glade.AtkRelationInfo relations;
-		public uint n_relations;
-		public weak Glade.AccelInfo accels;
-		public uint n_accels;
-		public weak Glade.ChildInfo children;
-		public uint n_children;
+		public weak Glade.SignalInfo signals;
 	}
 	[CCode (cheader_filename = "glade/glade.h")]
 	public class XML : GLib.Object {
@@ -82,12 +82,16 @@
 		public bool @construct (string fname, string? root, string? domain);
 		public bool construct_from_buffer (string buffer, int size, string root, string domain);
 		public weak Gtk.AccelGroup ensure_accel ();
+		[CCode (has_construct_function = false)]
+		public XML.from_buffer (string buffer, int size, string? root, string? domain);
 		public weak Gtk.Widget get_widget (string name);
 		public weak GLib.List get_widget_prefix (string name);
 		public void handle_internal_child (Gtk.Widget parent, Glade.ChildInfo child_info);
 		public void handle_widget_prop (Gtk.Widget widget, string prop_name, string value_name);
+		[NoWrapper]
+		public virtual GLib.Type lookup_type (string gtypename);
+		[CCode (has_construct_function = false)]
 		public XML (string fname, string? root, string? domain);
-		public XML.from_buffer (string buffer, int size, string? root, string? domain);
 		public weak string relative_file (string filename);
 		public void set_common_params (Gtk.Widget widget, Glade.WidgetInfo info);
 		public void set_packing_property (Gtk.Widget parent, Gtk.Widget child, string name, string value);
@@ -98,8 +102,6 @@
 		public void signal_connect (string handlername, GLib.Callback func);
 		public void signal_connect_data (string handlername, GLib.Callback func);
 		public void signal_connect_full (string handler_name, Glade.XMLConnectFunc func);
-		[NoWrapper]
-		public virtual GLib.Type lookup_type (string gtypename);
 	}
 	[CCode (cheader_filename = "glade/glade.h")]
 	public static delegate void ApplyCustomPropFunc (Glade.XML xml, Gtk.Widget widget, string propname, string value);

Modified: trunk/vapi/libgnome-2.0.vapi
==============================================================================
--- trunk/vapi/libgnome-2.0.vapi	(original)
+++ trunk/vapi/libgnome-2.0.vapi	Fri Oct 24 16:50:22 2008
@@ -2,71 +2,26 @@
 
 [CCode (cprefix = "Gnome", lower_case_cprefix = "gnome_")]
 namespace Gnome {
-	[CCode (cprefix = "GNOME_FILE_DOMAIN_", has_type_id = "0", cheader_filename = "libgnome/libgnome.h")]
-	public enum FileDomain {
-		UNKNOWN,
-		LIBDIR,
-		DATADIR,
-		SOUND,
-		PIXMAP,
-		CONFIG,
-		HELP,
-		APP_LIBDIR,
-		APP_DATADIR,
-		APP_SOUND,
-		APP_PIXMAP,
-		APP_CONFIG,
-		APP_HELP
-	}
-	[CCode (cprefix = "GNOME_HELP_ERROR_", has_type_id = "0", cheader_filename = "libgnome/libgnome.h")]
-	public enum HelpError {
-		INTERNAL,
-		NOT_FOUND
-	}
-	[CCode (cprefix = "GTRIG_", has_type_id = "0", cheader_filename = "libgnome/libgnome.h")]
-	public enum TriggerType {
-		NONE,
-		FUNCTION,
-		COMMAND,
-		MEDIAPLAY
-	}
-	[CCode (cprefix = "GNOME_URL_ERROR_", has_type_id = "0", cheader_filename = "libgnome/libgnome.h")]
-	public enum URLError {
-		PARSE,
-		LAUNCH,
-		URL,
-		NO_DEFAULT,
-		NOT_SUPPORTED,
-		VFS,
-		CANCELLED
-	}
 	[Compact]
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
-	public class ModuleRequirement {
-		public weak string required_version;
-		public weak Gnome.ModuleInfo module_info;
-	}
-	[Compact]
-	[CCode (cheader_filename = "libgnome/libgnome.h")]
-	public class Trigger {
-		public Gnome.TriggerType type;
-		public void* u;
-		public weak string level;
-	}
-	[Compact]
-	[CCode (cheader_filename = "libgnome/libgnome.h")]
-	public class ModuleInfo : GLib.Boxed {
-		public weak string name;
-		public weak string version;
+	public class ModuleInfo {
+		public weak Gnome.ModuleClassInitHook class_init;
 		public weak string description;
-		public weak Gnome.ModuleRequirement requirements;
-		public weak Gnome.ModuleHook instance_init;
-		public weak Gnome.ModuleHook pre_args_parse;
-		public weak Gnome.ModuleHook post_args_parse;
+		public weak Gnome.ModuleGetGOptionGroupFunc get_goption_group_func;
 		public weak Gnome.ModuleInitHook init_pass;
-		public weak Gnome.ModuleClassInitHook class_init;
+		public weak Gnome.ModuleHook instance_init;
+		public weak string name;
 		public weak string opt_prefix;
-		public weak Gnome.ModuleGetGOptionGroupFunc get_goption_group_func;
+		public weak Gnome.ModuleHook post_args_parse;
+		public weak Gnome.ModuleHook pre_args_parse;
+		public weak Gnome.ModuleRequirement requirements;
+		public weak string version;
+	}
+	[Compact]
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
+	public class ModuleRequirement {
+		public weak Gnome.ModuleInfo module_info;
+		public weak string required_version;
 	}
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public class Program : GLib.Object {
@@ -119,6 +74,51 @@
 		[NoAccessorMethod]
 		public void* popt_table { construct; }
 	}
+	[Compact]
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
+	public class Trigger {
+		public weak string level;
+		public Gnome.TriggerType type;
+		public void* u;
+	}
+	[CCode (cprefix = "GNOME_FILE_DOMAIN_", has_type_id = "0", cheader_filename = "libgnome/libgnome.h")]
+	public enum FileDomain {
+		UNKNOWN,
+		LIBDIR,
+		DATADIR,
+		SOUND,
+		PIXMAP,
+		CONFIG,
+		HELP,
+		APP_LIBDIR,
+		APP_DATADIR,
+		APP_SOUND,
+		APP_PIXMAP,
+		APP_CONFIG,
+		APP_HELP
+	}
+	[CCode (cprefix = "GNOME_HELP_ERROR_", has_type_id = "0", cheader_filename = "libgnome/libgnome.h")]
+	public enum HelpError {
+		INTERNAL,
+		NOT_FOUND
+	}
+	[CCode (cprefix = "GTRIG_", has_type_id = "0", cheader_filename = "libgnome/libgnome.h")]
+	public enum TriggerType {
+		NONE,
+		FUNCTION,
+		COMMAND,
+		MEDIAPLAY
+	}
+	[CCode (cprefix = "GNOME_URL_ERROR_", has_type_id = "0", cheader_filename = "libgnome/libgnome.h")]
+	public enum URLError {
+		PARSE,
+		LAUNCH,
+		URL,
+		NO_DEFAULT,
+		NOT_SUPPORTED,
+		VFS,
+		CANCELLED
+	}
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static delegate void ModuleClassInitHook (void* klass, Gnome.ModuleInfo mod_info);
 	[CCode (cheader_filename = "libgnome/libgnome.h")]

Modified: trunk/vapi/libgnome-menu.vapi
==============================================================================
--- trunk/vapi/libgnome-menu.vapi	(original)
+++ trunk/vapi/libgnome-menu.vapi	Fri Oct 24 16:50:22 2008
@@ -2,31 +2,6 @@
 
 [CCode (cprefix = "GMenu", lower_case_cprefix = "gmenu_")]
 namespace GMenu {
-	[CCode (cprefix = "GMENU_TREE_FLAGS_", has_type_id = "0", cheader_filename = "gnome-menus/gmenu-tree.h")]
-	public enum TreeFlags {
-		NONE,
-		INCLUDE_EXCLUDED,
-		SHOW_EMPTY,
-		INCLUDE_NODISPLAY,
-		MASK
-	}
-	[CCode (cprefix = "GMENU_TREE_ITEM_", has_type_id = "0", cheader_filename = "gnome-menus/gmenu-tree.h")]
-	public enum TreeItemType {
-		INVALID,
-		DIRECTORY,
-		ENTRY,
-		SEPARATOR,
-		HEADER,
-		ALIAS
-	}
-	[CCode (ref_function = "gmenu_tree_item_ref", unref_function = "gmenu_tree_item_unref", cheader_filename = "gnome-menus/gmenu-tree.h")]
-	public class TreeItem {
-		public GMenu.TreeItemType get_type ();
-		public TreeItem ();
-		public weak GMenu.TreeDirectory get_parent ();
-		public void* get_user_data ();
-		public void set_user_data (void* user_data, GLib.DestroyNotify dnotify);
-	}
 	[Compact]
 	[CCode (ref_function = "gmenu_tree_ref", unref_function = "gmenu_tree_unref", cheader_filename = "gnome-menus/gmenu-tree.h")]
 	public class Tree {
@@ -72,9 +47,34 @@
 	public class TreeHeader : GMenu.TreeItem {
 		public weak GMenu.TreeDirectory get_directory ();
 	}
+	[CCode (ref_function = "gmenu_tree_item_ref", unref_function = "gmenu_tree_item_unref", cheader_filename = "gnome-menus/gmenu-tree.h")]
+	public class TreeItem {
+		public weak GMenu.TreeDirectory get_parent ();
+		public GMenu.TreeItemType get_type ();
+		public void* get_user_data ();
+		public TreeItem ();
+		public void set_user_data (void* user_data, GLib.DestroyNotify dnotify);
+	}
 	[CCode (cheader_filename = "gnome-menus/gmenu-tree.h")]
 	public class TreeSeparator : GMenu.TreeItem {
 	}
+	[CCode (cprefix = "GMENU_TREE_FLAGS_", has_type_id = "0", cheader_filename = "gnome-menus/gmenu-tree.h")]
+	public enum TreeFlags {
+		NONE,
+		INCLUDE_EXCLUDED,
+		SHOW_EMPTY,
+		INCLUDE_NODISPLAY,
+		MASK
+	}
+	[CCode (cprefix = "GMENU_TREE_ITEM_", has_type_id = "0", cheader_filename = "gnome-menus/gmenu-tree.h")]
+	public enum TreeItemType {
+		INVALID,
+		DIRECTORY,
+		ENTRY,
+		SEPARATOR,
+		HEADER,
+		ALIAS
+	}
 	[CCode (cheader_filename = "gnome-menus/gmenu-tree.h")]
 	public delegate void TreeChangedFunc (GMenu.Tree tree);
 }

Modified: trunk/vapi/libgnomeui-2.0.vapi
==============================================================================
--- trunk/vapi/libgnomeui-2.0.vapi	(original)
+++ trunk/vapi/libgnomeui-2.0.vapi	Fri Oct 24 16:50:22 2008
@@ -2,215 +2,16 @@
 
 [CCode (cprefix = "Gnome", lower_case_cprefix = "gnome_")]
 namespace Gnome {
-	[CCode (cprefix = "GNOME_CLIENT_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
-	public enum ClientState {
-		IDLE,
-		SAVING_PHASE_1,
-		WAITING_FOR_PHASE_2,
-		SAVING_PHASE_2,
-		FROZEN,
-		DISCONNECTED,
-		REGISTERING
-	}
-	[CCode (cprefix = "GNOME_DIALOG_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
-	public enum DialogType {
-		ERROR,
-		NORMAL
-	}
-	[CCode (cprefix = "GNOME_EDGE_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
-	public enum EdgePosition {
-		START,
-		FINISH,
-		OTHER,
-		LAST
-	}
-	[CCode (cprefix = "GNOME_FONT_PICKER_MODE_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
-	public enum FontPickerMode {
-		PIXMAP,
-		FONT_INFO,
-		USER_WIDGET,
-		UNKNOWN
-	}
-	[CCode (cprefix = "GNOME_ICON_LIST_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
-	public enum IconListMode {
-		ICONS,
-		TEXT_BELOW,
-		TEXT_RIGHT
-	}
-	[CCode (cprefix = "GNOME_INTERACT_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
-	public enum InteractStyle {
-		NONE,
-		ERRORS,
-		ANY
-	}
-	[CCode (cprefix = "GNOME_MDI_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
-	public enum MDIMode {
-		NOTEBOOK,
-		TOPLEVEL,
-		MODAL,
-		DEFAULT_MODE
-	}
-	[CCode (cprefix = "GNOME_PASSWORD_DIALOG_REMEMBER_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
-	public enum PasswordDialogRemember {
-		NOTHING,
-		SESSION,
-		FOREVER
-	}
-	[CCode (cprefix = "GNOME_PREFERENCES_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
-	public enum PreferencesType {
-		NEVER,
-		USER,
-		ALWAYS
-	}
-	[CCode (cprefix = "GNOME_RESTART_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
-	public enum RestartStyle {
-		IF_RUNNING,
-		ANYWAY,
-		IMMEDIATELY,
-		NEVER
-	}
-	[CCode (cprefix = "GNOME_SAVE_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
-	public enum SaveStyle {
-		GLOBAL,
-		LOCAL,
-		BOTH
-	}
-	[CCode (cprefix = "GNOME_THUMBNAIL_SIZE_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
-	public enum ThumbnailSize {
-		NORMAL,
-		LARGE
-	}
-	[CCode (cprefix = "GNOME_APP_CONFIGURABLE_ITEM_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
-	public enum UIInfoConfigurableTypes {
-		NEW,
-		OPEN,
-		SAVE,
-		SAVE_AS,
-		REVERT,
-		PRINT,
-		PRINT_SETUP,
-		CLOSE,
-		QUIT,
-		CUT,
-		COPY,
-		PASTE,
-		CLEAR,
-		UNDO,
-		REDO,
-		FIND,
-		FIND_AGAIN,
-		REPLACE,
-		PROPERTIES,
-		PREFERENCES,
-		ABOUT,
-		SELECT_ALL,
-		NEW_WINDOW,
-		CLOSE_WINDOW,
-		NEW_GAME,
-		PAUSE_GAME,
-		RESTART_GAME,
-		UNDO_MOVE,
-		REDO_MOVE,
-		HINT,
-		SCORES,
-		END_GAME
-	}
-	[CCode (cprefix = "GNOME_APP_UI_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
-	public enum UIInfoType {
-		ENDOFINFO,
-		ITEM,
-		TOGGLEITEM,
-		RADIOITEMS,
-		SUBTREE,
-		SEPARATOR,
-		HELP,
-		BUILDER_DATA,
-		ITEM_CONFIGURABLE,
-		SUBTREE_STOCK,
-		INCLUDE
-	}
-	[CCode (cprefix = "GNOME_APP_PIXMAP_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
-	public enum UIPixmapType {
-		NONE,
-		STOCK,
-		DATA,
-		FILENAME
-	}
-	[CCode (cprefix = "GNOME_CLIENT_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
-	[Flags]
-	public enum ClientFlags {
-		IS_CONNECTED,
-		RESTARTED,
-		RESTORED
-	}
-	[CCode (cprefix = "GNOME_DATE_EDIT_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
-	[Flags]
-	public enum DateEditFlags {
-		SHOW_TIME,
-		24_HR,
-		WEEK_STARTS_ON_MONDAY,
-		DISPLAY_SECONDS
-	}
-	[CCode (cprefix = "GNOME_ICON_LOOKUP_FLAGS_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
-	[Flags]
-	public enum IconLookupFlags {
-		NONE,
-		EMBEDDING_TEXT,
-		SHOW_SMALL_IMAGES_AS_THEMSELVES,
-		ALLOW_SVG_AS_THEMSELVES
-	}
-	[CCode (cprefix = "GNOME_ICON_LOOKUP_RESULT_FLAGS_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
-	[Flags]
-	public enum IconLookupResultFlags {
-		NONE,
-		THUMBNAIL
-	}
-	[Compact]
-	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-	public class AppBarMsg {
-	}
-	[Compact]
-	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-	public class GdkPixbufAsyncHandle {
-	}
-	[Compact]
-	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-	public class PasswordDialogDetails {
-	}
-	[Compact]
-	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-	public class UIBuilderData {
-		public weak Gnome.UISignalConnectFunc connect_func;
-		public void* data;
-		public bool is_interp;
-		public weak Gtk.CallbackMarshal relay_func;
-		public weak Gtk.DestroyNotify destroy_func;
-	}
-	[Compact]
-	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-	public class UIInfo {
-		public Gnome.UIInfoType type;
-		public weak string label;
-		public weak string hint;
-		public void* moreinfo;
-		public void* user_data;
-		public void* unused_data;
-		public Gnome.UIPixmapType pixmap_type;
-		public void* pixmap_info;
-		public uint accelerator_key;
-		public Gdk.ModifierType ac_mods;
-		public weak Gtk.Widget widget;
-	}
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public class App : Gtk.Window, Atk.Implementor, Gtk.Buildable {
+		public weak Gtk.AccelGroup accel_group;
+		public weak Gtk.Widget contents;
+		public weak Gtk.Widget dock;
+		public weak Gtk.Widget menubar;
 		public weak string name;
 		public weak string prefix;
-		public weak Gtk.Widget dock;
 		public weak Gtk.Widget statusbar;
 		public weak Gtk.Widget vbox;
-		public weak Gtk.Widget menubar;
-		public weak Gtk.Widget contents;
-		public weak Gtk.AccelGroup accel_group;
 		public void @construct (string appname, string title);
 		public void create_menus (Gnome.UIInfo uiinfo);
 		public void create_menus_custom (Gnome.UIInfo uiinfo, Gnome.UIBuilderData uibdata);
@@ -236,6 +37,7 @@
 		public static void install_appbar_menu_hints (Gnome.AppBar appbar, Gnome.UIInfo uiinfo);
 		public void install_menu_hints (Gnome.UIInfo uiinfo);
 		public static void install_statusbar_menu_hints (Gtk.Statusbar bar, Gnome.UIInfo uiinfo);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public App (string appname, string title);
 		public void remove_menu_range (string path, int start, int items);
 		public void remove_menus (string path, int items);
@@ -258,7 +60,7 @@
 		public weak string get_response ();
 		[CCode (cname = "gnome_appbar_get_status")]
 		public weak Gtk.Widget get_status ();
-		[CCode (cname = "gnome_appbar_new")]
+		[CCode (cname = "gnome_appbar_new", type = "GtkWidget*", has_construct_function = false)]
 		public AppBar (bool has_progress, bool has_status, Gnome.PreferencesType interactivity);
 		[CCode (cname = "gnome_appbar_pop")]
 		public void pop ();
@@ -284,36 +86,40 @@
 		public virtual signal void clear_prompt ();
 		public virtual signal void user_response ();
 	}
+	[Compact]
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
+	public class AppBarMsg {
+	}
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public class Client : Gtk.Object {
-		public void* smc_conn;
 		public weak string client_id;
-		public weak string previous_id;
-		public weak string config_prefix;
-		public weak string global_config_prefix;
-		public weak GLib.List static_args;
 		public weak string clone_command;
+		public weak string config_prefix;
 		public weak string current_directory;
 		public weak string discard_command;
 		public weak GLib.HashTable environment;
+		public uint fast;
+		public weak string global_config_prefix;
+		public int input_id;
+		public uint interact_style;
+		public weak GLib.SList interaction_keys;
+		public weak string previous_id;
 		public int process_id;
 		public weak string program;
+		public void* reserved;
 		public weak string resign_command;
 		public weak string restart_command;
 		public Gnome.RestartStyle restart_style;
-		public weak string shutdown_command;
-		public weak string user_id;
-		public weak GLib.SList interaction_keys;
-		public int input_id;
-		public uint save_style;
-		public uint interact_style;
-		public uint state;
-		public uint shutdown;
-		public uint fast;
 		public uint save_phase_2_requested;
+		public uint save_style;
 		public uint save_successfull;
 		public uint save_yourself_emitted;
-		public void* reserved;
+		public uint shutdown;
+		public weak string shutdown_command;
+		public void* smc_conn;
+		public uint state;
+		public weak GLib.List static_args;
+		public weak string user_id;
 		public void add_static_arg ();
 		public void flush ();
 		public weak string get_config_prefix ();
@@ -323,8 +129,8 @@
 		public weak string get_id ();
 		public weak string get_previous_id ();
 		public static weak Gnome.ModuleInfo module_info_get ();
+		[CCode (has_construct_function = false)]
 		public Client ();
-		public Client.without_connection ();
 		public void request_interaction (Gnome.DialogType dialog_type, Gnome.InteractFunction function, void* data);
 		public void request_interaction_interp (Gnome.DialogType dialog_type, Gtk.CallbackMarshal function, void* data, Gtk.DestroyNotify destroy);
 		public void request_phase_2 ();
@@ -345,6 +151,8 @@
 		public void set_restart_style (Gnome.RestartStyle style);
 		public void set_shutdown_command (int argc, string[] argv);
 		public void set_user_id (string id);
+		[CCode (has_construct_function = false)]
+		public Client.without_connection ();
 		[HasEmitter]
 		public virtual signal void connect (bool restarted);
 		public virtual signal void die ();
@@ -357,11 +165,13 @@
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public class DateEdit : Gtk.HBox, Atk.Implementor, Gtk.Buildable {
 		public void @construct (ulong the_time, Gnome.DateEditFlags flags);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public DateEdit.flags (ulong the_time, Gnome.DateEditFlags flags);
 		public int get_flags ();
 		public ulong get_initial_time ();
 		public ulong get_time ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public DateEdit (ulong the_time, bool show_time, bool use_24_format);
-		public DateEdit.flags (ulong the_time, Gnome.DateEditFlags flags);
 		public void set_flags (Gnome.DateEditFlags flags);
 		public void set_popup_range (int low_hour, int up_hour);
 		public void set_time (ulong the_time);
@@ -377,16 +187,21 @@
 		public virtual signal void date_changed ();
 		public virtual signal void time_changed ();
 	}
+	[Compact]
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
+	public class GdkPixbufAsyncHandle {
+	}
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public class IconEntry : Gtk.VBox, Atk.Implementor, Gtk.Buildable {
 		public void @construct (string history_id, string browse_dialog_title);
 		public weak string get_filename ();
+		[CCode (cname = "gnome_icon_entry_pick_dialog")]
+		public weak Gtk.Widget get_pick_dialog ();
 		public weak Gtk.Widget gnome_entry ();
 		public weak Gtk.Widget gnome_file_entry ();
 		public weak Gtk.Widget gtk_entry ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public IconEntry (string history_id, string browse_dialog_title);
-		[CCode (cname = "gnome_icon_entry_pick_dialog")]
-		public weak Gtk.Widget get_pick_dialog ();
 		public void set_browse_dialog_title (string browse_dialog_title);
 		public bool set_filename (string filename);
 		public void set_history_id (string history_id);
@@ -413,6 +228,7 @@
 		public weak Gtk.Widget get_box ();
 		public weak Gtk.Widget get_gil ();
 		public weak string get_icon (bool full_path);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public IconSelection ();
 		public void select_icon (string filename);
 		public void show_icons ();
@@ -427,6 +243,7 @@
 		public weak string get_password ();
 		public Gnome.PasswordDialogRemember get_remember ();
 		public weak string get_username ();
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public PasswordDialog (string dialog_title, string message, string username, string password, bool readonly_username);
 		public bool run_and_block ();
 		public void set_domain (string domain);
@@ -475,6 +292,10 @@
 		public bool show_userpass_buttons { get; set; }
 		public string username { get; set; }
 	}
+	[Compact]
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
+	public class PasswordDialogDetails {
+	}
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public class ThumbnailFactory : GLib.Object {
 		public bool can_thumbnail (string uri, string mime_type, ulong mtime);
@@ -482,9 +303,197 @@
 		public weak Gdk.Pixbuf generate_thumbnail (string uri, string mime_type);
 		public bool has_valid_failed_thumbnail (string uri, ulong mtime);
 		public weak string lookup (string uri, ulong mtime);
+		[CCode (has_construct_function = false)]
 		public ThumbnailFactory (Gnome.ThumbnailSize size);
 		public void save_thumbnail (Gdk.Pixbuf thumbnail, string uri, ulong original_mtime);
 	}
+	[Compact]
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
+	public class UIBuilderData {
+		public weak Gnome.UISignalConnectFunc connect_func;
+		public void* data;
+		public weak Gtk.DestroyNotify destroy_func;
+		public bool is_interp;
+		public weak Gtk.CallbackMarshal relay_func;
+	}
+	[Compact]
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
+	public class UIInfo {
+		public Gdk.ModifierType ac_mods;
+		public uint accelerator_key;
+		public weak string hint;
+		public weak string label;
+		public void* moreinfo;
+		public void* pixmap_info;
+		public Gnome.UIPixmapType pixmap_type;
+		public Gnome.UIInfoType type;
+		public void* unused_data;
+		public void* user_data;
+		public weak Gtk.Widget widget;
+	}
+	[CCode (cprefix = "GNOME_CLIENT_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[Flags]
+	public enum ClientFlags {
+		IS_CONNECTED,
+		RESTARTED,
+		RESTORED
+	}
+	[CCode (cprefix = "GNOME_CLIENT_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	public enum ClientState {
+		IDLE,
+		SAVING_PHASE_1,
+		WAITING_FOR_PHASE_2,
+		SAVING_PHASE_2,
+		FROZEN,
+		DISCONNECTED,
+		REGISTERING
+	}
+	[CCode (cprefix = "GNOME_DATE_EDIT_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[Flags]
+	public enum DateEditFlags {
+		SHOW_TIME,
+		24_HR,
+		WEEK_STARTS_ON_MONDAY,
+		DISPLAY_SECONDS
+	}
+	[CCode (cprefix = "GNOME_DIALOG_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	public enum DialogType {
+		ERROR,
+		NORMAL
+	}
+	[CCode (cprefix = "GNOME_EDGE_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	public enum EdgePosition {
+		START,
+		FINISH,
+		OTHER,
+		LAST
+	}
+	[CCode (cprefix = "GNOME_FONT_PICKER_MODE_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	public enum FontPickerMode {
+		PIXMAP,
+		FONT_INFO,
+		USER_WIDGET,
+		UNKNOWN
+	}
+	[CCode (cprefix = "GNOME_ICON_LIST_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	public enum IconListMode {
+		ICONS,
+		TEXT_BELOW,
+		TEXT_RIGHT
+	}
+	[CCode (cprefix = "GNOME_ICON_LOOKUP_FLAGS_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[Flags]
+	public enum IconLookupFlags {
+		NONE,
+		EMBEDDING_TEXT,
+		SHOW_SMALL_IMAGES_AS_THEMSELVES,
+		ALLOW_SVG_AS_THEMSELVES
+	}
+	[CCode (cprefix = "GNOME_ICON_LOOKUP_RESULT_FLAGS_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[Flags]
+	public enum IconLookupResultFlags {
+		NONE,
+		THUMBNAIL
+	}
+	[CCode (cprefix = "GNOME_INTERACT_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	public enum InteractStyle {
+		NONE,
+		ERRORS,
+		ANY
+	}
+	[CCode (cprefix = "GNOME_MDI_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	public enum MDIMode {
+		NOTEBOOK,
+		TOPLEVEL,
+		MODAL,
+		DEFAULT_MODE
+	}
+	[CCode (cprefix = "GNOME_PASSWORD_DIALOG_REMEMBER_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	public enum PasswordDialogRemember {
+		NOTHING,
+		SESSION,
+		FOREVER
+	}
+	[CCode (cprefix = "GNOME_PREFERENCES_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	public enum PreferencesType {
+		NEVER,
+		USER,
+		ALWAYS
+	}
+	[CCode (cprefix = "GNOME_RESTART_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	public enum RestartStyle {
+		IF_RUNNING,
+		ANYWAY,
+		IMMEDIATELY,
+		NEVER
+	}
+	[CCode (cprefix = "GNOME_SAVE_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	public enum SaveStyle {
+		GLOBAL,
+		LOCAL,
+		BOTH
+	}
+	[CCode (cprefix = "GNOME_THUMBNAIL_SIZE_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	public enum ThumbnailSize {
+		NORMAL,
+		LARGE
+	}
+	[CCode (cprefix = "GNOME_APP_CONFIGURABLE_ITEM_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	public enum UIInfoConfigurableTypes {
+		NEW,
+		OPEN,
+		SAVE,
+		SAVE_AS,
+		REVERT,
+		PRINT,
+		PRINT_SETUP,
+		CLOSE,
+		QUIT,
+		CUT,
+		COPY,
+		PASTE,
+		CLEAR,
+		UNDO,
+		REDO,
+		FIND,
+		FIND_AGAIN,
+		REPLACE,
+		PROPERTIES,
+		PREFERENCES,
+		ABOUT,
+		SELECT_ALL,
+		NEW_WINDOW,
+		CLOSE_WINDOW,
+		NEW_GAME,
+		PAUSE_GAME,
+		RESTART_GAME,
+		UNDO_MOVE,
+		REDO_MOVE,
+		HINT,
+		SCORES,
+		END_GAME
+	}
+	[CCode (cprefix = "GNOME_APP_UI_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	public enum UIInfoType {
+		ENDOFINFO,
+		ITEM,
+		TOGGLEITEM,
+		RADIOITEMS,
+		SUBTREE,
+		SEPARATOR,
+		HELP,
+		BUILDER_DATA,
+		ITEM_CONFIGURABLE,
+		SUBTREE_STOCK,
+		INCLUDE
+	}
+	[CCode (cprefix = "GNOME_APP_PIXMAP_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	public enum UIPixmapType {
+		NONE,
+		STOCK,
+		DATA,
+		FILENAME
+	}
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static delegate void GdkPixbufDoneCallback (Gnome.GdkPixbufAsyncHandle handle, void* cb_data);
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
@@ -499,10 +508,8 @@
 	public delegate void StringCallback (string str);
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static delegate void UISignalConnectFunc (Gnome.UIInfo uiinfo, string signal_name, Gnome.UIBuilderData uibdata);
-	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-	public const string GNOMEUIINFO_KEY_UIBDATA;
-	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-	public const string GNOMEUIINFO_KEY_UIDATA;
+	[CCode (cname = "LIBGNOMEUI_MODULE", cheader_filename = "libgnomeui/libgnomeui.h")]
+	public static Gnome.ModuleInfo libgnomeui_module;
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string APP_MENUBAR_NAME;
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
@@ -512,6 +519,10 @@
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string CLIENT_PARAM_SM_CONNECT;
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
+	public const string GNOMEUIINFO_KEY_UIBDATA;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
+	public const string GNOMEUIINFO_KEY_UIDATA;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const int KEY_MOD_CLEAR;
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const int KEY_MOD_CLOSE_WINDOW;
@@ -536,6 +547,12 @@
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const int KEY_NAME_PRINT_SETUP;
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
+	public const string LIBGNOMEUI_PARAM_CRASH_DIALOG;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
+	public const string LIBGNOMEUI_PARAM_DEFAULT_ICON;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
+	public const string LIBGNOMEUI_PARAM_DISPLAY;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string MESSAGE_BOX_ERROR;
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string MESSAGE_BOX_GENERIC;
@@ -624,14 +641,6 @@
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const int YES;
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-	public const string LIBGNOMEUI_PARAM_CRASH_DIALOG;
-	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-	public const string LIBGNOMEUI_PARAM_DEFAULT_ICON;
-	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-	public const string LIBGNOMEUI_PARAM_DISPLAY;
-	[CCode (cname = "LIBGNOMEUI_MODULE", cheader_filename = "libgnomeui/libgnomeui.h")]
-	public Gnome.ModuleInfo libgnomeui_module;
-	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static void accelerators_sync ();
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static bool authentication_manager_dialog_is_visible ();

Modified: trunk/vapi/libgsf-1.vapi
==============================================================================
--- trunk/vapi/libgsf-1.vapi	(original)
+++ trunk/vapi/libgsf-1.vapi	Fri Oct 24 16:50:22 2008
@@ -2,174 +2,10 @@
 
 [CCode (cprefix = "Gsf", lower_case_cprefix = "gsf_")]
 namespace Gsf {
-	[CCode (cprefix = "GSF_CLIP_FORMAT_", has_type_id = "0", cheader_filename = "gsf/gsf-clip-data.h")]
-	public enum ClipFormat {
-		WINDOWS_CLIPBOARD,
-		MACINTOSH_CLIPBOARD,
-		GUID,
-		NO_DATA,
-		CLIPBOARD_FORMAT_NAME,
-		UNKNOWN
-	}
-	[CCode (cprefix = "GSF_CLIP_FORMAT_WINDOWS_", has_type_id = "0", cheader_filename = "gsf/gsf-clip-data.h")]
-	public enum ClipFormatWindows {
-		ERROR,
-		UNKNOWN,
-		METAFILE,
-		DIB,
-		ENHANCED_METAFILE
-	}
-	[CCode (cprefix = "GSF_OUTPUT_CSV_QUOTING_MODE_", cheader_filename = "gsf/gsf-output-csv.h")]
-	public enum OutputCsvQuotingMode {
-		NEVER,
-		AUTO,
-		ALWAYS
-	}
-	[CCode (cprefix = "GSF_XML_", has_type_id = "0", cheader_filename = "gsf/gsf-libxml.h")]
-	public enum XMLContent {
-		NO_CONTENT,
-		CONTENT,
-		SHARED_CONTENT
-	}
-	[CCode (cprefix = "GSF_ZIP_", has_type_id = "0", cheader_filename = "gsf/gsf-outfile-zip.h")]
-	public enum ZipCompressionMethod {
-		STORED,
-		SHRUNK,
-		REDUCEDx1,
-		REDUCEDx2,
-		REDUCEDx3,
-		REDUCEDx4,
-		IMPLODED,
-		TOKENIZED,
-		DEFLATED,
-		DEFLATED_BETTER,
-		IMPLODED_BETTER
-	}
-	[CCode (cprefix = "GSF_ERROR_", cheader_filename = "gsf/gsf-utils.h")]
-	public errordomain Error {
-		OUT_OF_MEMORY,
-		INVALID_DATA,
-	}
-	[CCode (cheader_filename = "gsf/gsf-input-impl.h")]
-	public class Input : GLib.Object {
-		public Gsf.off_t cur_offset;
-		public static Gsf.Input uncompress (Gsf.Input# src);
-		public Input ();
-		public weak Gsf.Infile? container ();
-		public bool copy (Gsf.Output output);
-		public void dump (bool dump_as_hex);
-		public Gsf.Input dup () throws GLib.Error;
-		public bool eof ();
-		public static GLib.Quark error ();
-		public static GLib.Quark error_id ();
-		public static Gsf.Input mmap_new (string filename) throws GLib.Error;
-		public weak string? name ();
-		[NoArrayLength]
-		public weak uchar[] read (ulong num_bytes, uchar[] optional_buffer);
-		public Gsf.off_t remaining ();
-		public bool seek (Gsf.off_t offset, GLib.SeekType whence);
-		public bool seek_emulate (Gsf.off_t pos);
-		public bool set_container (Gsf.Infile? container);
-		public bool set_name (string? name);
-		public bool set_name_from_filename (string filename);
-		public bool set_size (Gsf.off_t size);
-		public weak Gsf.Input? sibling (string name) throws GLib.Error;
-		public Gsf.off_t size ();
-		public Gsf.off_t tell ();
-		[NoWrapper]
-		public virtual Gsf.Input Dup () throws GLib.Error;
-		[NoWrapper]
-		public virtual Gsf.Input OpenSibling (string path) throws GLib.Error;
-		[NoWrapper]
-		[NoArrayLength]
-		public virtual weak uchar[] Read (ulong num_bytes, uchar[] optional_buffer);
-		[NoWrapper]
-		public virtual bool Seek (Gsf.off_t offset, GLib.SeekType whence);
-		[NoAccessorMethod]
-		public int64 position { get; }
-	}
-	[Compact]
-	[CCode (cheader_filename = "gsf/gsf-doc-meta-data.h")]
-	public class DocProp {
-		public void dump ();
-		public weak string? get_link ();
-		public weak string get_name ();
-		public weak GLib.Value? get_val ();
-		public DocProp (string# name);
-		public void set_link (string# link);
-		public void set_val (GLib.Value# val);
-		public GLib.Value swap_val (GLib.Value val);
-	}
-	[Compact]
-	[CCode (cheader_filename = "gsf/gsf-open-pkg-utils.h")]
-	public class OpenPkgRel {
-		public weak string get_target ();
-		public bool is_extern ();
-	}
-	[Compact]
-	[CCode (cheader_filename = "gsf/gsf-open-pkg-utils.h")]
-	public class OpenPkgRels {
-	}
-	[Compact]
-	[CCode (cheader_filename = "gsf/gsf-libxml.h")]
-	public class XMLBlob {
-	}
-	[Compact]
-	[CCode (cheader_filename = "gsf/gsf-libxml.h")]
-	public class XMLIn {
-		public void* user_state;
-		public weak GLib.StringBuilder content;
-		public weak Gsf.XMLInDoc doc;
-		public weak Gsf.XMLInNode node;
-		public weak GLib.SList node_stack;
-		public weak string check_ns (string str, uint ns_id);
-		public weak Gsf.Input get_input ();
-		public bool namecmp (string str, uint ns_id, string name);
-		public void push_state (Gsf.XMLInDoc doc, void* new_state, Gsf.XMLInExtDtor dtor, string[] attrs);
-	}
-	[Compact]
-	[CCode (cheader_filename = "gsf/gsf-libxml.h")]
-	public class XMLInDoc {
-		public XMLInDoc (Gsf.XMLInNode[] nodes, Gsf.XMLInNS ns);
-		public bool parse (Gsf.Input input, void* user_state);
-		public void set_unknown_handler (Gsf.XMLInUnknownFunc handler);
-	}
-	[Compact]
-	[CCode (cheader_filename = "gsf/gsf-libxml.h")]
-	public class XMLInNS {
-		public weak string uri;
-		public uint ns_id;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gsf/gsf-libxml.h")]
-	public class XMLInNode {
-		public weak string id;
-		public int ns_id;
-		public weak string name;
-		public weak string parent_id;
-		public weak GLib.Callback start;
-		public weak GLib.Callback end;
-		public void* user_data;
-		public Gsf.XMLContent has_content;
-		public uint check_children_for_ns;
-		public uint share_children_with_parent;
-	}
-	[Compact]
-	[CCode (copy_function = "gsf_timestamp_copy", cheader_filename = "gsf/gsf-timestamp.h")]
-	public class Timestamp {
-		public GLib.Date date;
-		public long seconds;
-		public weak GLib.StringBuilder time_zone;
-		public uint timet;
-		public string as_string ();
-		public Gsf.Timestamp copy ();
-		public bool equal (Gsf.Timestamp b);
-		public uint hash ();
-		public static int parse (string spec, Gsf.Timestamp stamp);
-	}
 	[CCode (cheader_filename = "gsf/gsf-blob.h")]
 	public class Blob : GLib.Object {
 		public ulong get_size ();
+		[CCode (has_construct_function = false)]
 		public Blob (ulong size, void* data_to_copy) throws GLib.Error;
 		public void* peek_data ();
 	}
@@ -178,6 +14,7 @@
 		public weak Gsf.Blob get_data_blob ();
 		public Gsf.ClipFormat get_format ();
 		public Gsf.ClipFormatWindows get_windows_clipboard_format () throws GLib.Error;
+		[CCode (has_construct_function = false)]
 		public ClipData (Gsf.ClipFormat format, Gsf.Blob data_blob);
 		public void* peek_real_data (ulong ret_size) throws GLib.Error;
 	}
@@ -186,26 +23,40 @@
 		public void @foreach (GLib.HFunc func);
 		public void insert (string name, GLib.Value value);
 		public weak Gsf.DocProp? lookup (string name);
+		[CCode (has_construct_function = false)]
 		public DocMetaData ();
 		public void remove (string name);
 		public ulong size ();
 		public weak Gsf.DocProp? steal (string name);
 		public void store (Gsf.DocProp prop);
 	}
+	[Compact]
+	[CCode (cheader_filename = "gsf/gsf-doc-meta-data.h")]
+	public class DocProp {
+		public void dump ();
+		public weak string? get_link ();
+		public weak string get_name ();
+		public weak GLib.Value? get_val ();
+		[CCode (has_construct_function = false)]
+		public DocProp (string# name);
+		public void set_link (string# link);
+		public void set_val (GLib.Value# val);
+		public GLib.Value swap_val (GLib.Value val);
+	}
 	[CCode (cheader_filename = "gsf/gsf-docprop-vector.h")]
 	public class DocPropVector : GLib.Object {
 		[CCode (cname = "gsf_docprop_vector_append")]
 		public void append (GLib.Value value);
 		[CCode (cname = "gsf_docprop_vector_as_string")]
 		public string as_string ();
-		[CCode (cname = "gsf_docprop_vector_new")]
+		[CCode (cname = "gsf_docprop_vector_new", has_construct_function = false)]
 		public DocPropVector ();
 	}
 	[CCode (cheader_filename = "gsf/gsf-infile-impl.h")]
 	public class Infile : Gsf.Input {
-		public weak Gsf.Input? child_by_vname (string name);
 		public virtual weak Gsf.Input? child_by_index (int i);
 		public virtual weak Gsf.Input? child_by_name (string name);
+		public weak Gsf.Input? child_by_vname (string name);
 		public virtual weak string? name_by_index (int i);
 		public virtual int num_children ();
 	}
@@ -213,19 +64,22 @@
 	public class InfileMSOle : Gsf.Infile {
 		[CCode (cname = "gsf_infile_msole_get_class_id")]
 		public bool get_class_id (uchar res);
-		[CCode (cname = "gsf_infile_msole_new")]
+		[CCode (cname = "gsf_infile_msole_new", type = "GsfInfile*", has_construct_function = false)]
 		public InfileMSOle (Gsf.Input source) throws GLib.Error;
 	}
 	[CCode (cheader_filename = "gsf/gsf-infile-msvba.h")]
 	public class InfileMSVBA : Gsf.Infile {
+		[CCode (type = "GsfInfile*", has_construct_function = false)]
 		public InfileMSVBA (Gsf.Infile source) throws GLib.Error;
 	}
 	[CCode (cheader_filename = "gsf/gsf-infile-stdio.h")]
 	public class InfileStdio : Gsf.Infile {
+		[CCode (type = "GsfInfile*", has_construct_function = false)]
 		public InfileStdio (string root) throws GLib.Error;
 	}
 	[CCode (cheader_filename = "gsf/gsf-infile-zip.h")]
 	public class InfileZip : Gsf.Infile {
+		[CCode (type = "GsfInfile*", has_construct_function = false)]
 		public InfileZip (Gsf.Input source) throws GLib.Error;
 		[NoAccessorMethod]
 		public int compression_level { get; }
@@ -234,8 +88,47 @@
 		[NoAccessorMethod]
 		public Gsf.Input source { get; construct; }
 	}
+	[CCode (cheader_filename = "gsf/gsf-input-impl.h")]
+	public class Input : GLib.Object {
+		public Gsf.off_t cur_offset;
+		[NoWrapper]
+		public virtual Gsf.Input Dup () throws GLib.Error;
+		[NoWrapper]
+		public virtual Gsf.Input OpenSibling (string path) throws GLib.Error;
+		[NoWrapper]
+		[NoArrayLength]
+		public virtual weak uchar[]? Read (ulong num_bytes, uchar[]? optional_buffer);
+		[NoWrapper]
+		public virtual bool Seek (Gsf.off_t offset, GLib.SeekType whence);
+		public weak Gsf.Infile? container ();
+		public bool copy (Gsf.Output output);
+		public void dump (bool dump_as_hex);
+		public Gsf.Input dup () throws GLib.Error;
+		public bool eof ();
+		public static GLib.Quark error ();
+		public static GLib.Quark error_id ();
+		public static Gsf.Input mmap_new (string filename) throws GLib.Error;
+		public weak string? name ();
+		public Input ();
+		[NoArrayLength]
+		public weak uchar[]? read (ulong num_bytes, uchar[]? optional_buffer);
+		public Gsf.off_t remaining ();
+		public bool seek (Gsf.off_t offset, GLib.SeekType whence);
+		public bool seek_emulate (Gsf.off_t pos);
+		public bool set_container (Gsf.Infile? container);
+		public bool set_name (string? name);
+		public bool set_name_from_filename (string filename);
+		public bool set_size (Gsf.off_t size);
+		public weak Gsf.Input? sibling (string name) throws GLib.Error;
+		public Gsf.off_t size ();
+		public Gsf.off_t tell ();
+		public static Gsf.Input uncompress (Gsf.Input# src);
+		[NoAccessorMethod]
+		public int64 position { get; }
+	}
 	[CCode (cheader_filename = "gsf/gsf-input-gzip.h")]
 	public class InputGZip : Gsf.Input {
+		[CCode (type = "GsfInput*", has_construct_function = false)]
 		public InputGZip (Gsf.Input source) throws GLib.Error;
 		[NoAccessorMethod]
 		public bool raw { get; construct; }
@@ -248,6 +141,7 @@
 	public class InputHTTP : Gsf.Input {
 		public weak string get_content_type ();
 		public weak string get_url ();
+		[CCode (type = "GsfInput*", has_construct_function = false)]
 		public InputHTTP (string url) throws GLib.Error;
 		[NoAccessorMethod]
 		public string content_type { get; construct; }
@@ -256,39 +150,59 @@
 	}
 	[CCode (cheader_filename = "gsf/gsf-input-memory.h")]
 	public class InputMemory : Gsf.Input {
-		public InputMemory (uchar buf, Gsf.off_t length, bool needs_free);
+		[CCode (type = "GsfInput*", has_construct_function = false)]
 		public InputMemory.clone (uchar buf, Gsf.off_t length);
+		[CCode (type = "GsfInput*", has_construct_function = false)]
 		public InputMemory.from_bzip (Gsf.Input source) throws GLib.Error;
+		[CCode (type = "GsfInput*", has_construct_function = false)]
 		public InputMemory.from_iochannel (GLib.IOChannel channel) throws GLib.Error;
+		[CCode (type = "GsfInput*", has_construct_function = false)]
+		public InputMemory (uchar buf, Gsf.off_t length, bool needs_free);
 	}
 	[CCode (cheader_filename = "gsf/gsf-input-proxy.h")]
 	public class InputProxy : Gsf.Input {
+		[CCode (type = "GsfInput*", has_construct_function = false)]
 		public InputProxy (Gsf.Input source);
+		[CCode (type = "GsfInput*", has_construct_function = false)]
 		public InputProxy.section (Gsf.Input source, Gsf.off_t offset, Gsf.off_t size);
 	}
 	[CCode (cheader_filename = "gsf/gsf-input-stdio.h")]
 	public class InputStdio : Gsf.Input {
+		[CCode (type = "GsfInput*", has_construct_function = false)]
 		public InputStdio (string filename) throws GLib.Error;
 	}
 	[CCode (cheader_filename = "gsf/gsf-input-textline.h")]
 	public class InputTextline : Gsf.Input {
 		[NoArrayLength]
-		public weak uint[] ascii_gets ();
+		public weak uint[]? ascii_gets ();
+		[CCode (type = "GsfInput*", has_construct_function = false)]
 		public InputTextline (Gsf.Input source);
 		[NoArrayLength]
-		public weak uchar[] utf8_gets ();
+		public weak uchar[]? utf8_gets ();
+	}
+	[Compact]
+	[CCode (cheader_filename = "gsf/gsf-open-pkg-utils.h")]
+	public class OpenPkgRel {
+		public weak string get_target ();
+		public bool is_extern ();
+	}
+	[Compact]
+	[CCode (cheader_filename = "gsf/gsf-open-pkg-utils.h")]
+	public class OpenPkgRels {
 	}
 	[CCode (cheader_filename = "gsf/gsf-outfile-impl.h")]
 	public class Outfile : Gsf.Output {
-		public Outfile.child_full (Gsf.Outfile outfile, string name, bool is_dir, ...);
+		[CCode (type = "GsfOutput*", has_construct_function = false)]
 		public Outfile.child (Gsf.Outfile outfile, string name, bool is_dir);
+		[CCode (type = "GsfOutput*", has_construct_function = false)]
+		public Outfile.child_full (Gsf.Outfile outfile, string name, bool is_dir, ...);
 	}
 	[CCode (cheader_filename = "gsf/gsf-outfile-msole.h")]
 	public class OutfileMSOle : Gsf.Outfile {
-		[CCode (cname = "gsf_outfile_msole_new")]
-		public OutfileMSOle (Gsf.Output sink);
-		[CCode (cname = "gsf_outfile_msole_new_full")]
+		[CCode (cname = "gsf_outfile_msole_new_full", type = "GsfOutfile*", has_construct_function = false)]
 		public OutfileMSOle.full (Gsf.Output sink, uint bb_size, uint sb_size);
+		[CCode (cname = "gsf_outfile_msole_new", type = "GsfOutfile*", has_construct_function = false)]
+		public OutfileMSOle (Gsf.Output sink);
 		[CCode (cname = "gsf_outfile_msole_set_class_id")]
 		public bool set_class_id (uchar clsid);
 	}
@@ -296,6 +210,7 @@
 	public class OutfileOpenPkg : Gsf.Outfile {
 		public weak string add_extern_rel (string target, string content_type);
 		public static Gsf.Output add_rel (Gsf.Outfile dir, string name, string content_type, Gsf.Outfile parent, string type);
+		[CCode (type = "GsfOutfile*", has_construct_function = false)]
 		public OutfileOpenPkg (Gsf.Outfile sink);
 		public weak string relate (Gsf.OutfileOpenPkg parent, string type);
 		public void set_content_type (string content_type);
@@ -309,11 +224,14 @@
 	}
 	[CCode (cheader_filename = "gsf/gsf-outfile-stdio.h")]
 	public class OutfileStdio : Gsf.Outfile {
-		public OutfileStdio (string root) throws GLib.Error;
+		[CCode (type = "GsfOutfile*", has_construct_function = false)]
 		public OutfileStdio.full (string root, ...) throws GLib.Error;
+		[CCode (type = "GsfOutfile*", has_construct_function = false)]
+		public OutfileStdio (string root) throws GLib.Error;
 	}
 	[CCode (cheader_filename = "gsf/gsf-outfile-zip.h")]
 	public class OutfileZip : Gsf.Outfile {
+		[CCode (type = "GsfOutfile*", has_construct_function = false)]
 		public OutfileZip (Gsf.Output sink) throws GLib.Error;
 		public bool set_compression_method (Gsf.ZipCompressionMethod method);
 		[NoAccessorMethod]
@@ -325,12 +243,18 @@
 	}
 	[CCode (cheader_filename = "gsf/gsf-output-impl.h")]
 	public class Output : GLib.Object {
-		public Gsf.off_t cur_size;
 		public Gsf.off_t cur_offset;
-		public weak GLib.Object wrapped_by;
+		public Gsf.off_t cur_size;
 		public weak GLib.Error err;
 		public weak string printf_buf;
 		public int printf_buf_size;
+		public weak GLib.Object wrapped_by;
+		[NoWrapper]
+		public virtual bool Close ();
+		[NoWrapper]
+		public virtual bool Seek (Gsf.off_t offset, GLib.SeekType whence);
+		[NoWrapper]
+		public virtual bool Write (ulong num_bytes, uchar[] data);
 		public bool close ();
 		public weak Gsf.Outfile? container ();
 		public weak GLib.Error error ();
@@ -349,26 +273,21 @@
 		public static bool unwrap (GLib.Object wrapper, Gsf.Output wrapee);
 		public static bool wrap (GLib.Object wrapper, Gsf.Output wrapee);
 		public bool write (ulong num_bytes, uchar[] data);
-		[NoWrapper]
-		public virtual bool Close ();
-		[NoWrapper]
-		public virtual bool Seek (Gsf.off_t offset, GLib.SeekType whence);
-		[NoWrapper]
-		public virtual bool Write (ulong num_bytes, uchar[] data);
 		[NoAccessorMethod]
 		public int64 position { get; }
 	}
 	[CCode (cheader_filename = "gsf/gsf-output-bzip.h")]
 	public class OutputBzip : Gsf.Output {
+		[CCode (type = "GsfOutput*", has_construct_function = false)]
 		public OutputBzip (Gsf.Output sink) throws GLib.Error;
 	}
 	[CCode (cheader_filename = "gsf/gsf-output-csv.h")]
 	public class OutputCsv : Gsf.Output {
-		public ulong quote_len;
+		public weak GLib.StringBuilder buf;
 		public ulong eol_len;
-		public ulong separator_len;
 		public bool fields_on_line;
-		public weak GLib.StringBuilder buf;
+		public ulong quote_len;
+		public ulong separator_len;
 		public bool write_eol ();
 		public bool write_field (string field, ulong len);
 		[NoAccessorMethod]
@@ -388,6 +307,7 @@
 	}
 	[CCode (cheader_filename = "gsf/gsf-output-gzip.h")]
 	public class OutputGZip : Gsf.Output {
+		[CCode (type = "GsfOutput*", has_construct_function = false)]
 		public OutputGZip (Gsf.Output sink) throws GLib.Error;
 		[NoAccessorMethod]
 		public bool raw { get; construct; }
@@ -396,11 +316,12 @@
 	}
 	[CCode (cheader_filename = "gsf/gsf-output-iochannel.h")]
 	public class OutputIOChannel : Gsf.Output {
-		[CCode (cname = "gsf_output_iochannel_new")]
+		[CCode (cname = "gsf_output_iochannel_new", type = "GsfOutput*", has_construct_function = false)]
 		public OutputIOChannel (GLib.IOChannel channel);
 	}
 	[CCode (cheader_filename = "gsf/gsf-output-iconv.h")]
 	public class OutputIconv : Gsf.Output {
+		[CCode (type = "GsfOutput*", has_construct_function = false)]
 		public OutputIconv (Gsf.Output sink, string dst, string src);
 		[NoAccessorMethod]
 		public string fallback { get; set; }
@@ -415,18 +336,79 @@
 	public class OutputMemory : Gsf.Output {
 		[NoArrayLength]
 		public weak uchar[] get_bytes ();
+		[CCode (type = "GsfOutput*", has_construct_function = false)]
 		public OutputMemory ();
 	}
 	[CCode (cheader_filename = "gsf/gsf-output-stdio.h")]
 	public class OutputStdio : Gsf.Output {
-		public OutputStdio (string filename) throws GLib.Error;
+		[CCode (type = "GsfOutput*", has_construct_function = false)]
 		public OutputStdio.full (string filename, ...) throws GLib.Error;
+		[CCode (type = "GsfOutput*", has_construct_function = false)]
+		public OutputStdio (string filename) throws GLib.Error;
 	}
 	[CCode (cheader_filename = "gsf/gsf-structured-blob.h")]
 	public class StructuredBlob : Gsf.Infile {
 		public static Gsf.StructuredBlob read (Gsf.Input input);
 		public bool write (Gsf.Outfile container);
 	}
+	[Compact]
+	[CCode (copy_function = "gsf_timestamp_copy", cheader_filename = "gsf/gsf-timestamp.h")]
+	public class Timestamp {
+		public GLib.Date date;
+		public long seconds;
+		public weak GLib.StringBuilder time_zone;
+		public uint timet;
+		public string as_string ();
+		public Gsf.Timestamp copy ();
+		public bool equal (Gsf.Timestamp b);
+		public uint hash ();
+		public static int parse (string spec, Gsf.Timestamp stamp);
+	}
+	[Compact]
+	[CCode (cheader_filename = "gsf/gsf-libxml.h")]
+	public class XMLBlob {
+	}
+	[Compact]
+	[CCode (cheader_filename = "gsf/gsf-libxml.h")]
+	public class XMLIn {
+		public weak GLib.StringBuilder content;
+		public weak Gsf.XMLInDoc doc;
+		public weak Gsf.XMLInNode node;
+		public weak GLib.SList node_stack;
+		public void* user_state;
+		public weak string check_ns (string str, uint ns_id);
+		public weak Gsf.Input get_input ();
+		public bool namecmp (string str, uint ns_id, string name);
+		public void push_state (Gsf.XMLInDoc doc, void* new_state, Gsf.XMLInExtDtor dtor, string[] attrs);
+	}
+	[Compact]
+	[CCode (cheader_filename = "gsf/gsf-libxml.h")]
+	public class XMLInDoc {
+		[CCode (has_construct_function = false)]
+		public XMLInDoc (Gsf.XMLInNode[] nodes, Gsf.XMLInNS ns);
+		public bool parse (Gsf.Input input, void* user_state);
+		public void set_unknown_handler (Gsf.XMLInUnknownFunc handler);
+	}
+	[Compact]
+	[CCode (cheader_filename = "gsf/gsf-libxml.h")]
+	public class XMLInNS {
+		public uint ns_id;
+		public weak string uri;
+	}
+	[Compact]
+	[CCode (cheader_filename = "gsf/gsf-libxml.h")]
+	public class XMLInNode {
+		public uint check_children_for_ns;
+		public weak GLib.Callback end;
+		public Gsf.XMLContent has_content;
+		public weak string id;
+		public weak string name;
+		public int ns_id;
+		public weak string parent_id;
+		public uint share_children_with_parent;
+		public weak GLib.Callback start;
+		public void* user_data;
+	}
 	[CCode (cheader_filename = "gsf/gsf-libxml.h")]
 	public class XMLOut : GLib.Object {
 		public void add_base64 (string id, uchar data, uint len);
@@ -441,6 +423,7 @@
 		public void add_uint (string id, uint val);
 		public weak string end_element ();
 		public weak Gsf.Output get_output ();
+		[CCode (has_construct_function = false)]
 		public XMLOut (Gsf.Output output);
 		public void set_doc_type (string type);
 		public void simple_element (string id, string content);
@@ -452,8 +435,57 @@
 	}
 	[CCode (cheader_filename = "gsf/gsf.h")]
 	[SimpleType]
+	[IntegerType (rank = 0)]
 	public struct off_t : int64 {
 	}
+	[CCode (cprefix = "GSF_CLIP_FORMAT_", has_type_id = "0", cheader_filename = "gsf/gsf-clip-data.h")]
+	public enum ClipFormat {
+		WINDOWS_CLIPBOARD,
+		MACINTOSH_CLIPBOARD,
+		GUID,
+		NO_DATA,
+		CLIPBOARD_FORMAT_NAME,
+		UNKNOWN
+	}
+	[CCode (cprefix = "GSF_CLIP_FORMAT_WINDOWS_", has_type_id = "0", cheader_filename = "gsf/gsf-clip-data.h")]
+	public enum ClipFormatWindows {
+		ERROR,
+		UNKNOWN,
+		METAFILE,
+		DIB,
+		ENHANCED_METAFILE
+	}
+	[CCode (cprefix = "GSF_OUTPUT_CSV_QUOTING_MODE_", cheader_filename = "gsf/gsf-output-csv.h")]
+	public enum OutputCsvQuotingMode {
+		NEVER,
+		AUTO,
+		ALWAYS
+	}
+	[CCode (cprefix = "GSF_XML_", has_type_id = "0", cheader_filename = "gsf/gsf-libxml.h")]
+	public enum XMLContent {
+		NO_CONTENT,
+		CONTENT,
+		SHARED_CONTENT
+	}
+	[CCode (cprefix = "GSF_ZIP_", has_type_id = "0", cheader_filename = "gsf/gsf-outfile-zip.h")]
+	public enum ZipCompressionMethod {
+		STORED,
+		SHRUNK,
+		REDUCEDx1,
+		REDUCEDx2,
+		REDUCEDx3,
+		REDUCEDx4,
+		IMPLODED,
+		TOKENIZED,
+		DEFLATED,
+		DEFLATED_BETTER,
+		IMPLODED_BETTER
+	}
+	[CCode (cprefix = "GSF_ERROR_", cheader_filename = "gsf/gsf-utils.h")]
+	public errordomain Error {
+		OUT_OF_MEMORY,
+		INVALID_DATA,
+	}
 	[CCode (cheader_filename = "gsf/gsf-libxml.h")]
 	public static delegate void XMLInExtDtor (Gsf.XMLIn xin, void* old_state);
 	[CCode (cheader_filename = "gsf/gsf-libxml.h")]

Modified: trunk/vapi/libnotify.vapi
==============================================================================
--- trunk/vapi/libnotify.vapi	(original)
+++ trunk/vapi/libnotify.vapi	Fri Oct 24 16:50:22 2008
@@ -2,12 +2,6 @@
 
 [CCode (cprefix = "Notify", lower_case_cprefix = "notify_")]
 namespace Notify {
-	[CCode (cprefix = "NOTIFY_URGENCY_", has_type_id = "0", cheader_filename = "libnotify/notify.h")]
-	public enum Urgency {
-		LOW,
-		NORMAL,
-		CRITICAL
-	}
 	[CCode (cheader_filename = "libnotify/notify.h")]
 	public class Notification : GLib.Object {
 		public void add_action (string action, string label, Notify.ActionCallback callback, GLib.FreeFunc free_func);
@@ -16,8 +10,8 @@
 		public void clear_actions ();
 		public void clear_hints ();
 		public bool close () throws GLib.Error;
+		[CCode (has_construct_function = false)]
 		public Notification (string summary, string body, string icon, Gtk.Widget attach);
-		public Notification.with_status_icon (string summary, string body, string icon, Gtk.StatusIcon status_icon);
 		public void set_category (string category);
 		public void set_geometry_hints (Gdk.Screen screen, int x, int y);
 		public void set_hint_byte (string key, uchar value);
@@ -30,6 +24,8 @@
 		public void set_urgency (Notify.Urgency urgency);
 		public bool show () throws GLib.Error;
 		public bool update (string summary, string body, string icon);
+		[CCode (has_construct_function = false)]
+		public Notification.with_status_icon (string summary, string body, string icon, Gtk.StatusIcon status_icon);
 		[NoAccessorMethod]
 		public Gtk.Widget attach_widget { get; set construct; }
 		[NoAccessorMethod]
@@ -42,6 +38,12 @@
 		public string summary { get; set construct; }
 		public virtual signal void closed ();
 	}
+	[CCode (cprefix = "NOTIFY_URGENCY_", has_type_id = "0", cheader_filename = "libnotify/notify.h")]
+	public enum Urgency {
+		LOW,
+		NORMAL,
+		CRITICAL
+	}
 	[CCode (cheader_filename = "libnotify/notify.h")]
 	public static delegate void ActionCallback (Notify.Notification p1, string p2, void* p3);
 	[CCode (cheader_filename = "libnotify/notify.h")]

Modified: trunk/vapi/liboobs-1.vapi
==============================================================================
--- trunk/vapi/liboobs-1.vapi	(original)
+++ trunk/vapi/liboobs-1.vapi	Fri Oct 24 16:50:22 2008
@@ -2,83 +2,6 @@
 
 [CCode (cprefix = "Oobs", lower_case_cprefix = "oobs_")]
 namespace Oobs {
-	[CCode (cprefix = "OOBS_DIAL_TYPE_", has_type_id = "0", cheader_filename = "oobs/oobs.h")]
-	public enum DialType {
-		TONES,
-		PULSES
-	}
-	[CCode (cprefix = "OOBS_IFACE_TYPE_", has_type_id = "0", cheader_filename = "oobs/oobs.h")]
-	public enum IfaceType {
-		ETHERNET,
-		WIRELESS,
-		IRLAN,
-		PLIP,
-		PPP
-	}
-	[CCode (cprefix = "OOBS_MODEM_VOLUME_", has_type_id = "0", cheader_filename = "oobs/oobs.h")]
-	public enum ModemVolume {
-		SILENT,
-		LOW,
-		MEDIUM,
-		LOUD
-	}
-	[CCode (cprefix = "OOBS_RESULT_", has_type_id = "0", cheader_filename = "oobs/oobs.h")]
-	public enum Result {
-		OK,
-		ACCESS_DENIED,
-		NO_PLATFORM,
-		MALFORMED_DATA,
-		ERROR
-	}
-	[CCode (cprefix = "OOBS_RUNLEVEL_", has_type_id = "0", cheader_filename = "oobs/oobs.h")]
-	public enum RunlevelRole {
-		HALT,
-		REBOOT,
-		MONOUSER,
-		MULTIUSER
-	}
-	[CCode (cprefix = "OOBS_SERVICE_", has_type_id = "0", cheader_filename = "oobs/oobs.h")]
-	public enum ServiceStatus {
-		START,
-		STOP,
-		IGNORE
-	}
-	[CCode (cprefix = "OOBS_SHARE_SMB_", has_type_id = "0", cheader_filename = "oobs/oobs.h")]
-	[Flags]
-	public enum ShareSMBFlags {
-		ENABLED,
-		BROWSABLE,
-		PUBLIC,
-		WRITABLE
-	}
-	[Compact]
-	[CCode (cheader_filename = "oobs/oobs.h")]
-	public class Platform {
-		public weak string id;
-		public weak string name;
-		public weak string version;
-		public weak string codename;
-	}
-	[Compact]
-	[CCode (cheader_filename = "oobs/oobs.h")]
-	public class ServicesRunlevel {
-		public weak string name;
-		public uint role;
-	}
-	[Compact]
-	[CCode (cheader_filename = "oobs/oobs.h")]
-	public class ShareAclElement {
-		public weak string element;
-		public bool read_only;
-	}
-	[Compact]
-	[CCode (copy_function = "oobs_list_iter_copy", cheader_filename = "oobs/oobs.h")]
-	public class ListIter : GLib.Boxed {
-		public uint stamp;
-		public void* data;
-		public weak Oobs.ListIter copy ();
-		public static bool next (Oobs.List list, Oobs.ListIter iter);
-	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class Group : GLib.Object {
 		public void add_user (Oobs.User user);
@@ -86,6 +9,7 @@
 		public long get_gid ();
 		public weak string get_name ();
 		public weak GLib.List get_users ();
+		[CCode (has_construct_function = false)]
 		public Group (string name);
 		public void remove_user (Oobs.User user);
 		public void set_crypted_password (string crypted_password);
@@ -126,12 +50,12 @@
 		public bool get_auto ();
 		public bool get_configured ();
 		public weak string get_device_name ();
-		public void set_active (bool is_active);
-		public void set_auto (bool is_auto);
-		public void set_configured (bool is_configured);
 		public virtual bool has_gateway ();
 		[NoWrapper]
 		public virtual bool is_configured ();
+		public void set_active (bool is_active);
+		public void set_auto (bool is_auto);
+		public void set_configured (bool is_configured);
 		public bool active { get; set; }
 		public bool auto { get; set; }
 		public bool configured { get; set; }
@@ -256,6 +180,14 @@
 		[NoAccessorMethod]
 		public void* contained_type { construct; }
 	}
+	[Compact]
+	[CCode (copy_function = "oobs_list_iter_copy", cheader_filename = "oobs/oobs.h")]
+	public class ListIter {
+		public void* data;
+		public uint stamp;
+		public weak Oobs.ListIter copy ();
+		public static bool next (Oobs.List list, Oobs.ListIter iter);
+	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class NFSConfig : Oobs.Object {
 		public static weak Oobs.Object get ();
@@ -269,26 +201,35 @@
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class NTPServer : GLib.Object {
 		public weak string get_hostname ();
+		[CCode (has_construct_function = false)]
 		public NTPServer (string hostname);
 		public void set_hostname (string hostname);
 		public string hostname { get; set; }
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class Object : GLib.Object {
+		public virtual void commit ();
 		public Oobs.Result commit_async (Oobs.ObjectAsyncFunc func, void* data);
 		public void ensure_update ();
+		public virtual weak string get_authentication_action ();
 		public bool has_updated ();
 		public void process_requests ();
-		public Oobs.Result update_async (Oobs.ObjectAsyncFunc func, void* data);
-		public virtual void commit ();
-		public virtual weak string get_authentication_action ();
 		public virtual void update ();
+		public Oobs.Result update_async (Oobs.ObjectAsyncFunc func, void* data);
 		[NoAccessorMethod]
 		public string remote_object { construct; }
 		public virtual signal void changed ();
 		public virtual signal void committed ();
 		public virtual signal void updated ();
 	}
+	[Compact]
+	[CCode (cheader_filename = "oobs/oobs.h")]
+	public class Platform {
+		public weak string codename;
+		public weak string id;
+		public weak string name;
+		public weak string version;
+	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class SMBConfig : Oobs.Object {
 		public void delete_user_password (Oobs.User user);
@@ -329,6 +270,12 @@
 		public weak GLib.List get_runlevels ();
 		public weak Oobs.List get_services ();
 	}
+	[Compact]
+	[CCode (cheader_filename = "oobs/oobs.h")]
+	public class ServicesRunlevel {
+		public weak string name;
+		public uint role;
+	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class Session : GLib.Object {
 		public Oobs.Result commit ();
@@ -347,10 +294,17 @@
 		public void set_path (string path);
 		public string path { get; set; }
 	}
+	[Compact]
+	[CCode (cheader_filename = "oobs/oobs.h")]
+	public class ShareAclElement {
+		public weak string element;
+		public bool read_only;
+	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class ShareNFS : Oobs.Share {
 		public void add_acl_element (string element, bool read_only);
 		public weak GLib.SList get_acl ();
+		[CCode (type = "OobsShare*", has_construct_function = false)]
 		public ShareNFS (string path);
 		public void set_acl (GLib.SList acl);
 	}
@@ -359,6 +313,7 @@
 		public weak string get_comment ();
 		public Oobs.ShareSMBFlags get_flags ();
 		public weak string get_name ();
+		[CCode (type = "OobsShare*", has_construct_function = false)]
 		public ShareSMB (string path, string name, string comment, Oobs.ShareSMBFlags flags);
 		public void set_comment (string comment);
 		public void set_flags (Oobs.ShareSMBFlags flags);
@@ -371,6 +326,7 @@
 	public class StaticHost : GLib.Object {
 		public weak GLib.List get_aliases ();
 		public weak string get_ip_address ();
+		[CCode (has_construct_function = false)]
 		public StaticHost (string ip_address, GLib.List aliases);
 		public void set_aliases (GLib.List aliases);
 		public void set_ip_address (string ip_address);
@@ -403,6 +359,7 @@
 		public weak string get_shell ();
 		public long get_uid ();
 		public weak string get_work_phone_number ();
+		[CCode (has_construct_function = false)]
 		public User (string name);
 		public void set_crypted_password (string crypted_password);
 		public void set_full_name (string full_name);
@@ -457,6 +414,55 @@
 		[NoAccessorMethod]
 		public bool use_md5 { get; }
 	}
+	[CCode (cprefix = "OOBS_DIAL_TYPE_", has_type_id = "0", cheader_filename = "oobs/oobs.h")]
+	public enum DialType {
+		TONES,
+		PULSES
+	}
+	[CCode (cprefix = "OOBS_IFACE_TYPE_", has_type_id = "0", cheader_filename = "oobs/oobs.h")]
+	public enum IfaceType {
+		ETHERNET,
+		WIRELESS,
+		IRLAN,
+		PLIP,
+		PPP
+	}
+	[CCode (cprefix = "OOBS_MODEM_VOLUME_", has_type_id = "0", cheader_filename = "oobs/oobs.h")]
+	public enum ModemVolume {
+		SILENT,
+		LOW,
+		MEDIUM,
+		LOUD
+	}
+	[CCode (cprefix = "OOBS_RESULT_", has_type_id = "0", cheader_filename = "oobs/oobs.h")]
+	public enum Result {
+		OK,
+		ACCESS_DENIED,
+		NO_PLATFORM,
+		MALFORMED_DATA,
+		ERROR
+	}
+	[CCode (cprefix = "OOBS_RUNLEVEL_", has_type_id = "0", cheader_filename = "oobs/oobs.h")]
+	public enum RunlevelRole {
+		HALT,
+		REBOOT,
+		MONOUSER,
+		MULTIUSER
+	}
+	[CCode (cprefix = "OOBS_SERVICE_", has_type_id = "0", cheader_filename = "oobs/oobs.h")]
+	public enum ServiceStatus {
+		START,
+		STOP,
+		IGNORE
+	}
+	[CCode (cprefix = "OOBS_SHARE_SMB_", has_type_id = "0", cheader_filename = "oobs/oobs.h")]
+	[Flags]
+	public enum ShareSMBFlags {
+		ENABLED,
+		BROWSABLE,
+		PUBLIC,
+		WRITABLE
+	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public delegate void ObjectAsyncFunc (Oobs.Object object, Oobs.Result result);
 }

Modified: trunk/vapi/libsexy.vapi
==============================================================================
--- trunk/vapi/libsexy.vapi	(original)
+++ trunk/vapi/libsexy.vapi	Fri Oct 24 16:50:22 2008
@@ -2,20 +2,12 @@
 
 [CCode (cprefix = "Sexy", lower_case_cprefix = "sexy_")]
 namespace Sexy {
-	[CCode (cprefix = "SEXY_ICON_ENTRY_", cheader_filename = "libsexy/sexy.h")]
-	public enum IconEntryPosition {
-		PRIMARY,
-		SECONDARY
-	}
-	[CCode (cprefix = "SEXY_SPELL_ERROR_", cheader_filename = "libsexy/sexy.h")]
-	public enum SpellError {
-		BACKEND
-	}
 	[CCode (cheader_filename = "libsexy/sexy.h")]
 	public class IconEntry : Gtk.Entry, Atk.Implementor, Gtk.Buildable, Gtk.Editable, Gtk.CellEditable {
 		public void add_clear_button ();
 		public weak Gtk.Image get_icon (Sexy.IconEntryPosition position);
 		public bool get_icon_highlight (Sexy.IconEntryPosition position);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public IconEntry ();
 		public void set_icon (Sexy.IconEntryPosition position, Gtk.Image? icon);
 		public void set_icon_highlight (Sexy.IconEntryPosition position, bool highlight);
@@ -32,6 +24,7 @@
 		public weak GLib.SList get_languages ();
 		public bool is_checked ();
 		public bool language_is_active (string lang);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public SpellEntry ();
 		public bool set_active_languages (GLib.SList langs) throws GLib.Error;
 		public void set_checked (bool checked);
@@ -39,23 +32,36 @@
 	}
 	[CCode (cheader_filename = "libsexy/sexy.h")]
 	public class Tooltip : Gtk.Window, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Tooltip ();
-		public Tooltip.with_label (string text);
 		public void position_to_rect (Gdk.Rectangle rect, Gdk.Screen screen);
 		public void position_to_widget (Gtk.Widget widget);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Tooltip.with_label (string text);
 	}
 	[CCode (cheader_filename = "libsexy/sexy.h")]
 	public class TreeView : Gtk.TreeView, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public TreeView ();
 		public void set_tooltip_label_column (uint column);
 		public virtual signal weak Gtk.Widget get_tooltip (Gtk.TreePath path, Gtk.TreeViewColumn column);
 	}
 	[CCode (cheader_filename = "libsexy/sexy.h")]
 	public class UrlLabel : Gtk.Label, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public UrlLabel ();
 		public void set_markup (string markup);
 		public virtual signal void url_activated (string url);
 	}
+	[CCode (cprefix = "SEXY_ICON_ENTRY_", cheader_filename = "libsexy/sexy.h")]
+	public enum IconEntryPosition {
+		PRIMARY,
+		SECONDARY
+	}
+	[CCode (cprefix = "SEXY_SPELL_ERROR_", cheader_filename = "libsexy/sexy.h")]
+	public enum SpellError {
+		BACKEND
+	}
 	[CCode (cheader_filename = "libsexy/sexy.h")]
 	public static GLib.Quark spell_error_quark ();
 }

Modified: trunk/vapi/libsoup-2.2.vapi
==============================================================================
--- trunk/vapi/libsoup-2.2.vapi	(original)
+++ trunk/vapi/libsoup-2.2.vapi	Fri Oct 24 16:50:22 2008
@@ -2,311 +2,16 @@
 
 [CCode (cprefix = "Soup", lower_case_cprefix = "soup_")]
 namespace Soup {
-	[CCode (cprefix = "SOUP_ADDRESS_FAMILY_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
-	public enum AddressFamily {
-		IPV4,
-		IPV6
-	}
-	[CCode (cprefix = "SOUP_AUTH_TYPE_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
-	public enum AuthType {
-		BASIC,
-		DIGEST
-	}
-	[CCode (cprefix = "SOUP_ALGORITHM_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
-	public enum DigestAlgorithm {
-		MD5,
-		MD5_SESS
-	}
-	[CCode (cprefix = "SOUP_HANDLER_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
-	public enum HandlerPhase {
-		POST_REQUEST,
-		PRE_BODY,
-		BODY_CHUNK,
-		POST_BODY
-	}
-	[CCode (cprefix = "SOUP_HTTP_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
-	public enum HttpVersion {
-		1_0,
-		1_1
-	}
-	[CCode (cprefix = "SOUP_STATUS_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
-	public enum KnownStatusCode {
-		NONE,
-		CANCELLED,
-		CANT_RESOLVE,
-		CANT_RESOLVE_PROXY,
-		CANT_CONNECT,
-		CANT_CONNECT_PROXY,
-		SSL_FAILED,
-		IO_ERROR,
-		MALFORMED,
-		TRY_AGAIN,
-		CONTINUE,
-		SWITCHING_PROTOCOLS,
-		PROCESSING,
-		OK,
-		CREATED,
-		ACCEPTED,
-		NON_AUTHORITATIVE,
-		NO_CONTENT,
-		RESET_CONTENT,
-		PARTIAL_CONTENT,
-		MULTI_STATUS,
-		MULTIPLE_CHOICES,
-		MOVED_PERMANENTLY,
-		FOUND,
-		MOVED_TEMPORARILY,
-		SEE_OTHER,
-		NOT_MODIFIED,
-		USE_PROXY,
-		NOT_APPEARING_IN_THIS_PROTOCOL,
-		TEMPORARY_REDIRECT,
-		BAD_REQUEST,
-		UNAUTHORIZED,
-		PAYMENT_REQUIRED,
-		FORBIDDEN,
-		NOT_FOUND,
-		METHOD_NOT_ALLOWED,
-		NOT_ACCEPTABLE,
-		PROXY_AUTHENTICATION_REQUIRED,
-		PROXY_UNAUTHORIZED,
-		REQUEST_TIMEOUT,
-		CONFLICT,
-		GONE,
-		LENGTH_REQUIRED,
-		PRECONDITION_FAILED,
-		REQUEST_ENTITY_TOO_LARGE,
-		REQUEST_URI_TOO_LONG,
-		UNSUPPORTED_MEDIA_TYPE,
-		REQUESTED_RANGE_NOT_SATISFIABLE,
-		INVALID_RANGE,
-		EXPECTATION_FAILED,
-		UNPROCESSABLE_ENTITY,
-		LOCKED,
-		FAILED_DEPENDENCY,
-		INTERNAL_SERVER_ERROR,
-		NOT_IMPLEMENTED,
-		BAD_GATEWAY,
-		SERVICE_UNAVAILABLE,
-		GATEWAY_TIMEOUT,
-		HTTP_VERSION_NOT_SUPPORTED,
-		INSUFFICIENT_STORAGE,
-		NOT_EXTENDED
-	}
-	[CCode (cprefix = "SOUP_MESSAGE_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
-	public enum MessageFlags {
-		NO_REDIRECT,
-		OVERWRITE_CHUNKS,
-		EXPECT_CONTINUE
-	}
-	[CCode (cprefix = "SOUP_MESSAGE_STATUS_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
-	public enum MessageStatus {
-		IDLE,
-		QUEUED,
-		CONNECTING,
-		RUNNING,
-		FINISHED
-	}
-	[CCode (cprefix = "SOUP_METHOD_ID_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
-	public enum MethodId {
-		UNKNOWN,
-		POST,
-		GET,
-		HEAD,
-		OPTIONS,
-		PUT,
-		MOVE,
-		COPY,
-		DELETE,
-		TRACE,
-		CONNECT,
-		MKCOL,
-		PROPPATCH,
-		PROPFIND,
-		PATCH,
-		LOCK,
-		UNLOCK
-	}
-	[CCode (cprefix = "SOUP_BUFFER_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
-	public enum Ownership {
-		SYSTEM_OWNED,
-		USER_OWNED,
-		STATIC
-	}
-	[CCode (cprefix = "SOUP_SOCKET_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
-	public enum SocketIOStatus {
-		OK,
-		WOULD_BLOCK,
-		EOF,
-		ERROR
-	}
-	[CCode (cprefix = "SOUP_STATUS_CLASS_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
-	public enum StatusClass {
-		TRANSPORT_ERROR,
-		INFORMATIONAL,
-		SUCCESS,
-		REDIRECT,
-		CLIENT_ERROR,
-		SERVER_ERROR
-	}
-	[CCode (cprefix = "SOUP_TRANSFER_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
-	public enum TransferEncoding {
-		UNKNOWN,
-		CHUNKED,
-		CONTENT_LENGTH,
-		BYTERANGES,
-		NONE,
-		EOF
-	}
-	[CCode (cprefix = "SOUP_XMLRPC_VALUE_TYPE_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
-	public enum XmlrpcValueType {
-		BAD,
-		INT,
-		BOOLEAN,
-		STRING,
-		DOUBLE,
-		DATETIME,
-		BASE64,
-		STRUCT,
-		ARRAY
-	}
-	[Compact]
-	[CCode (free_function = "soup_message_queue_destroy", cheader_filename = "libsoup/soup.h")]
-	public class MessageQueue {
-		public void append (Soup.Message msg);
-		public weak Soup.Message first (Soup.MessageQueueIter iter);
-		public void free_iter (Soup.MessageQueueIter iter);
-		public MessageQueue ();
-		public weak Soup.Message next (Soup.MessageQueueIter iter);
-		public weak Soup.Message remove (Soup.MessageQueueIter iter);
-		public void remove_message (Soup.Message msg);
-	}
-	[Compact]
-	[CCode (cheader_filename = "libsoup/soup.h")]
-	public class MessageQueueIter {
-		public weak GLib.List cur;
-		public weak GLib.List next;
-	}
-	[Compact]
-	[CCode (cheader_filename = "libsoup/soup.h")]
-	public class Protocol {
-	}
-	[Compact]
-	[CCode (cheader_filename = "libsoup/soup.h")]
-	public class ServerAuthBasic {
-		public Soup.AuthType type;
-		public weak string user;
-		public weak string passwd;
-	}
-	[Compact]
-	[CCode (cheader_filename = "libsoup/soup.h")]
-	public class ServerAuthContext {
-		public uint types;
-		public weak Soup.ServerAuthCallbackFn callback;
-		public void* user_data;
-		public void* basic_info;
-		public void* digest_info;
-		public void challenge (Soup.Message msg, string header_name);
-	}
-	[Compact]
-	[CCode (cheader_filename = "libsoup/soup.h")]
-	public class ServerAuthDigest {
-		public Soup.AuthType type;
-		public Soup.DigestAlgorithm algorithm;
-		public bool integrity;
-		public weak string realm;
-		public weak string user;
-		public weak string nonce;
-		public int nonce_count;
-		public weak string cnonce;
-		public weak string digest_uri;
-		public weak string digest_response;
-		public weak string request_method;
-	}
-	[Compact]
-	[CCode (cheader_filename = "libsoup/soup.h")]
-	public class ServerContext {
-		public weak Soup.Message msg;
-		public weak string path;
-		public Soup.MethodId method_id;
-		public weak Soup.ServerAuth auth;
-		public weak Soup.Server server;
-		public weak Soup.ServerHandler handler;
-		public weak Soup.Socket sock;
-		public weak Soup.Address get_client_address ();
-		public weak string get_client_host ();
-	}
-	[Compact]
-	[CCode (cheader_filename = "libsoup/soup.h")]
-	public class ServerHandler {
-		public weak string path;
-		public weak Soup.ServerAuthContext auth_ctx;
-		public weak Soup.ServerCallbackFn callback;
-		public weak Soup.ServerUnregisterFn unregister;
-		public void* user_data;
-	}
-	[Compact]
-	[CCode (cheader_filename = "libsoup/soup.h")]
-	public class SoapParameter {
-		public weak Soup.SoapParameter get_first_child ();
-		public weak Soup.SoapParameter get_first_child_by_name (string name);
-		public int get_int_value ();
-		public weak string get_name ();
-		public weak Soup.SoapParameter get_next_child ();
-		public weak Soup.SoapParameter get_next_child_by_name (string name);
-		public weak string get_property (string prop_name);
-		public weak string get_string_value ();
-	}
-	[Compact]
-	[CCode (copy_function = "soup_uri_copy", cheader_filename = "libsoup/soup.h")]
-	public class Uri {
-		public weak Soup.Protocol protocol;
-		public weak string user;
-		public weak string passwd;
-		public weak string host;
-		public uint port;
-		public weak string path;
-		public weak string query;
-		public weak string fragment;
-		public bool broken_encoding;
-		public weak Soup.Uri copy ();
-		public weak Soup.Uri copy_root ();
-		public static void decode (string part);
-		public static string encode (string part, string escape_extra);
-		public bool equal (Soup.Uri uri2);
-		public Uri (string uri_string);
-		public Uri.with_base (Soup.Uri @base, string uri_string);
-		public weak string to_string (bool just_path);
-		public bool uses_default_port ();
-	}
-	[Compact]
-	[CCode (cheader_filename = "libsoup/soup.h")]
-	public class XmlrpcValue {
-		public bool array_get_iterator (out weak Soup.XmlrpcValueArrayIterator iter);
-		public void dump ();
-		public bool get_base64 (out weak GLib.ByteArray data);
-		public bool get_boolean (bool b);
-		public bool get_datetime (ulong timeval);
-		public bool get_double (double b);
-		public bool get_int (long i);
-		public bool get_string (out weak string str);
-		public bool get_struct (GLib.HashTable table);
-	}
-	[Compact]
-	[CCode (cheader_filename = "libsoup/soup.h")]
-	public class XmlrpcValueArrayIterator {
-		public bool get_value (out weak Soup.XmlrpcValue value);
-		public weak Soup.XmlrpcValueArrayIterator next ();
-		public weak Soup.XmlrpcValueArrayIterator prev ();
-	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class Address : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public Address.any (Soup.AddressFamily family, uint port);
 		public weak string get_name ();
 		public weak string get_physical ();
 		public uint get_port ();
 		public void* get_sockaddr (int len);
+		[CCode (has_construct_function = false)]
 		public Address (string name, uint port);
-		public Address.any (Soup.AddressFamily family, uint port);
 		public void resolve_async (Soup.AddressCallback callback);
 		public void resolve_async_full (GLib.MainContext async_context, Soup.AddressCallback callback);
 		public uint resolve_sync ();
@@ -319,6 +24,7 @@
 		public void disconnect ();
 		public bool is_in_use ();
 		public ulong last_used ();
+		[CCode (has_construct_function = false)]
 		public Connection (string propname1);
 		public void release ();
 		public void reserve ();
@@ -345,13 +51,13 @@
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class Message : GLib.Object {
 		public weak string method;
-		public uint status_code;
 		public weak string reason_phrase;
 		public Soup.DataBuffer request;
 		public weak GLib.HashTable request_headers;
 		public Soup.DataBuffer response;
 		public weak GLib.HashTable response_headers;
 		public Soup.MessageStatus status;
+		public uint status_code;
 		public void add_chunk (Soup.Ownership owner, string# body, uint length);
 		public void add_final_chunk ();
 		public void add_handler (Soup.HandlerPhase phase, Soup.MessageCallbackFn handler_cb);
@@ -360,6 +66,8 @@
 		public void add_status_class_handler (Soup.StatusClass status_class, Soup.HandlerPhase phase, Soup.MessageCallbackFn handler_cb);
 		public void add_status_code_handler (uint status_code, Soup.HandlerPhase phase, Soup.MessageCallbackFn handler_cb);
 		public static void clear_headers (GLib.HashTable hash);
+		[CCode (has_construct_function = false)]
+		public Message.from_uri (string method, Soup.Uri uri);
 		public uint get_flags ();
 		public static weak string get_header (GLib.HashTable hash, string name);
 		public static weak GLib.SList get_header_list (GLib.HashTable hash, string name);
@@ -372,8 +80,8 @@
 		public void io_stop ();
 		public void io_unpause ();
 		public bool is_keepalive ();
+		[CCode (has_construct_function = false)]
 		public Message (string method, string uri_string);
-		public Message.from_uri (string method, Soup.Uri uri);
 		public void read_request (Soup.Socket sock);
 		public void remove_handler (Soup.HandlerPhase phase, Soup.MessageCallbackFn handler_cb);
 		public static void remove_header (GLib.HashTable hash, string name);
@@ -406,6 +114,28 @@
 		[HasEmitter]
 		public virtual signal void wrote_informational ();
 	}
+	[Compact]
+	[CCode (free_function = "soup_message_queue_destroy", cheader_filename = "libsoup/soup.h")]
+	public class MessageQueue {
+		public void append (Soup.Message msg);
+		public weak Soup.Message first (Soup.MessageQueueIter iter);
+		public void free_iter (Soup.MessageQueueIter iter);
+		[CCode (has_construct_function = false)]
+		public MessageQueue ();
+		public weak Soup.Message next (Soup.MessageQueueIter iter);
+		public weak Soup.Message remove (Soup.MessageQueueIter iter);
+		public void remove_message (Soup.Message msg);
+	}
+	[Compact]
+	[CCode (cheader_filename = "libsoup/soup.h")]
+	public class MessageQueueIter {
+		public weak GLib.List cur;
+		public weak GLib.List next;
+	}
+	[Compact]
+	[CCode (cheader_filename = "libsoup/soup.h")]
+	public class Protocol {
+	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class Server : GLib.Object {
 		public void add_handler (string path, Soup.ServerAuthContext auth_ctx, Soup.ServerCallbackFn callback, Soup.ServerUnregisterFn unreg, void* data);
@@ -415,6 +145,7 @@
 		public uint get_port ();
 		public weak Soup.Protocol get_protocol ();
 		public weak GLib.SList list_handlers ();
+		[CCode (has_construct_function = false)]
 		public Server (string optname1, ...);
 		public void quit ();
 		public void remove_handler (string path);
@@ -431,6 +162,71 @@
 		[NoAccessorMethod]
 		public string ssl_key_file { get; construct; }
 	}
+	[Compact]
+	[CCode (cheader_filename = "libsoup/soup.h")]
+	public class ServerAuth {
+		public weak Soup.ServerAuthBasic basic;
+		public weak Soup.ServerAuthDigest digest;
+		public Soup.AuthType type;
+		public bool check_passwd (string passwd);
+		public weak string get_user ();
+		[CCode (has_construct_function = false)]
+		public ServerAuth (Soup.ServerAuthContext auth_ctx, GLib.SList auth_hdrs, Soup.Message msg);
+	}
+	[Compact]
+	[CCode (cheader_filename = "libsoup/soup.h")]
+	public class ServerAuthBasic {
+		public weak string passwd;
+		public Soup.AuthType type;
+		public weak string user;
+	}
+	[Compact]
+	[CCode (cheader_filename = "libsoup/soup.h")]
+	public class ServerAuthContext {
+		public void* basic_info;
+		public weak Soup.ServerAuthCallbackFn callback;
+		public void* digest_info;
+		public uint types;
+		public void* user_data;
+		public void challenge (Soup.Message msg, string header_name);
+	}
+	[Compact]
+	[CCode (cheader_filename = "libsoup/soup.h")]
+	public class ServerAuthDigest {
+		public Soup.DigestAlgorithm algorithm;
+		public weak string cnonce;
+		public weak string digest_response;
+		public weak string digest_uri;
+		public bool integrity;
+		public weak string nonce;
+		public int nonce_count;
+		public weak string realm;
+		public weak string request_method;
+		public Soup.AuthType type;
+		public weak string user;
+	}
+	[Compact]
+	[CCode (cheader_filename = "libsoup/soup.h")]
+	public class ServerContext {
+		public weak Soup.ServerAuth auth;
+		public weak Soup.ServerHandler handler;
+		public Soup.MethodId method_id;
+		public weak Soup.Message msg;
+		public weak string path;
+		public weak Soup.Server server;
+		public weak Soup.Socket sock;
+		public weak Soup.Address get_client_address ();
+		public weak string get_client_host ();
+	}
+	[Compact]
+	[CCode (cheader_filename = "libsoup/soup.h")]
+	public class ServerHandler {
+		public weak Soup.ServerAuthContext auth_ctx;
+		public weak Soup.ServerCallbackFn callback;
+		public weak string path;
+		public weak Soup.ServerUnregisterFn unregister;
+		public void* user_data;
+	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class ServerMessage : Soup.Message {
 		public void finish ();
@@ -438,6 +234,7 @@
 		public weak Soup.Server get_server ();
 		public bool is_finished ();
 		public bool is_started ();
+		[CCode (has_construct_function = false)]
 		public ServerMessage (Soup.Server server);
 		public void set_encoding (Soup.TransferEncoding encoding);
 		public void start ();
@@ -447,14 +244,14 @@
 		public weak Soup.MessageQueue queue;
 		public void abort ();
 		public void add_filter (Soup.MessageFilter filter);
+		public virtual void cancel_message (Soup.Message msg);
 		public weak GLib.MainContext get_async_context ();
 		public weak Soup.Connection get_connection (Soup.Message msg, bool try_pruning, bool is_new);
-		public void remove_filter (Soup.MessageFilter filter);
-		public bool try_prune_connection ();
-		public virtual void cancel_message (Soup.Message msg);
 		public virtual void queue_message (Soup.Message# msg, Soup.MessageCallbackFn callback);
+		public void remove_filter (Soup.MessageFilter filter);
 		public virtual void requeue_message (Soup.Message msg);
 		public virtual uint send_message (Soup.Message msg);
+		public bool try_prune_connection ();
 		[NoAccessorMethod]
 		public void* async_context { get; construct; }
 		[NoAccessorMethod]
@@ -474,18 +271,30 @@
 	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class SessionAsync : Soup.Session, Soup.MessageFilter {
-		[CCode (type = "SoupSession*")]
+		[CCode (type = "SoupSession*", has_construct_function = false)]
 		public SessionAsync ();
-		[CCode (type = "SoupSession*")]
+		[CCode (type = "SoupSession*", has_construct_function = false)]
 		public SessionAsync.with_options (string optname1);
 	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class SessionSync : Soup.Session, Soup.MessageFilter {
-		[CCode (type = "SoupSession*")]
+		[CCode (type = "SoupSession*", has_construct_function = false)]
 		public SessionSync ();
-		[CCode (type = "SoupSession*")]
+		[CCode (type = "SoupSession*", has_construct_function = false)]
 		public SessionSync.with_options (string optname1);
 	}
+	[Compact]
+	[CCode (cheader_filename = "libsoup/soup.h")]
+	public class SoapParameter {
+		public weak Soup.SoapParameter get_first_child ();
+		public weak Soup.SoapParameter get_first_child_by_name (string name);
+		public int get_int_value ();
+		public weak string get_name ();
+		public weak Soup.SoapParameter get_next_child ();
+		public weak Soup.SoapParameter get_next_child_by_name (string name);
+		public weak string get_property (string prop_name);
+		public weak string get_string_value ();
+	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class Socket : GLib.Object {
 		public static weak Soup.Socket client_new_async (string hostname, uint port, void* ssl_creds, Soup.SocketCallback callback);
@@ -496,6 +305,7 @@
 		public weak Soup.Address get_remote_address ();
 		public bool is_connected ();
 		public bool listen (Soup.Address local_addr);
+		[CCode (has_construct_function = false)]
 		public Socket (string optname1);
 		public Soup.SocketIOStatus read (void* buffer, ulong len, ulong nread);
 		public Soup.SocketIOStatus read_until (void* buffer, ulong len, void* boundary, ulong boundary_len, ulong nread, bool got_boundary);
@@ -526,14 +336,48 @@
 		public virtual signal void writable ();
 	}
 	[Compact]
+	[CCode (copy_function = "soup_uri_copy", cheader_filename = "libsoup/soup.h")]
+	public class Uri {
+		public bool broken_encoding;
+		public weak string fragment;
+		public weak string host;
+		public weak string passwd;
+		public weak string path;
+		public uint port;
+		public weak Soup.Protocol protocol;
+		public weak string query;
+		public weak string user;
+		public weak Soup.Uri copy ();
+		public weak Soup.Uri copy_root ();
+		public static void decode (string part);
+		public static string encode (string part, string escape_extra);
+		public bool equal (Soup.Uri uri2);
+		[CCode (has_construct_function = false)]
+		public Uri (string uri_string);
+		public weak string to_string (bool just_path);
+		public bool uses_default_port ();
+		[CCode (has_construct_function = false)]
+		public Uri.with_base (Soup.Uri @base, string uri_string);
+	}
+	[Compact]
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public class ServerAuth {
-		public Soup.AuthType type;
-		public weak Soup.ServerAuthBasic basic;
-		public weak Soup.ServerAuthDigest digest;
-		public bool check_passwd (string passwd);
-		public weak string get_user ();
-		public ServerAuth (Soup.ServerAuthContext auth_ctx, GLib.SList auth_hdrs, Soup.Message msg);
+	public class XmlrpcValue {
+		public bool array_get_iterator (out weak Soup.XmlrpcValueArrayIterator iter);
+		public void dump ();
+		public bool get_base64 (out weak GLib.ByteArray data);
+		public bool get_boolean (bool b);
+		public bool get_datetime (ulong timeval);
+		public bool get_double (double b);
+		public bool get_int (long i);
+		public bool get_string (out weak string str);
+		public bool get_struct (GLib.HashTable table);
+	}
+	[Compact]
+	[CCode (cheader_filename = "libsoup/soup.h")]
+	public class XmlrpcValueArrayIterator {
+		public bool get_value (out weak Soup.XmlrpcValue value);
+		public weak Soup.XmlrpcValueArrayIterator next ();
+		public weak Soup.XmlrpcValueArrayIterator prev ();
 	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public interface MessageFilter {
@@ -541,9 +385,177 @@
 	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public struct DataBuffer {
-		public Soup.Ownership owner;
 		public string body;
 		public uint length;
+		public Soup.Ownership owner;
+	}
+	[CCode (cprefix = "SOUP_ADDRESS_FAMILY_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	public enum AddressFamily {
+		IPV4,
+		IPV6
+	}
+	[CCode (cprefix = "SOUP_AUTH_TYPE_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	public enum AuthType {
+		BASIC,
+		DIGEST
+	}
+	[CCode (cprefix = "SOUP_ALGORITHM_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	public enum DigestAlgorithm {
+		MD5,
+		MD5_SESS
+	}
+	[CCode (cprefix = "SOUP_HANDLER_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	public enum HandlerPhase {
+		POST_REQUEST,
+		PRE_BODY,
+		BODY_CHUNK,
+		POST_BODY
+	}
+	[CCode (cprefix = "SOUP_HTTP_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	public enum HttpVersion {
+		1_0,
+		1_1
+	}
+	[CCode (cprefix = "SOUP_STATUS_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	public enum KnownStatusCode {
+		NONE,
+		CANCELLED,
+		CANT_RESOLVE,
+		CANT_RESOLVE_PROXY,
+		CANT_CONNECT,
+		CANT_CONNECT_PROXY,
+		SSL_FAILED,
+		IO_ERROR,
+		MALFORMED,
+		TRY_AGAIN,
+		CONTINUE,
+		SWITCHING_PROTOCOLS,
+		PROCESSING,
+		OK,
+		CREATED,
+		ACCEPTED,
+		NON_AUTHORITATIVE,
+		NO_CONTENT,
+		RESET_CONTENT,
+		PARTIAL_CONTENT,
+		MULTI_STATUS,
+		MULTIPLE_CHOICES,
+		MOVED_PERMANENTLY,
+		FOUND,
+		MOVED_TEMPORARILY,
+		SEE_OTHER,
+		NOT_MODIFIED,
+		USE_PROXY,
+		NOT_APPEARING_IN_THIS_PROTOCOL,
+		TEMPORARY_REDIRECT,
+		BAD_REQUEST,
+		UNAUTHORIZED,
+		PAYMENT_REQUIRED,
+		FORBIDDEN,
+		NOT_FOUND,
+		METHOD_NOT_ALLOWED,
+		NOT_ACCEPTABLE,
+		PROXY_AUTHENTICATION_REQUIRED,
+		PROXY_UNAUTHORIZED,
+		REQUEST_TIMEOUT,
+		CONFLICT,
+		GONE,
+		LENGTH_REQUIRED,
+		PRECONDITION_FAILED,
+		REQUEST_ENTITY_TOO_LARGE,
+		REQUEST_URI_TOO_LONG,
+		UNSUPPORTED_MEDIA_TYPE,
+		REQUESTED_RANGE_NOT_SATISFIABLE,
+		INVALID_RANGE,
+		EXPECTATION_FAILED,
+		UNPROCESSABLE_ENTITY,
+		LOCKED,
+		FAILED_DEPENDENCY,
+		INTERNAL_SERVER_ERROR,
+		NOT_IMPLEMENTED,
+		BAD_GATEWAY,
+		SERVICE_UNAVAILABLE,
+		GATEWAY_TIMEOUT,
+		HTTP_VERSION_NOT_SUPPORTED,
+		INSUFFICIENT_STORAGE,
+		NOT_EXTENDED
+	}
+	[CCode (cprefix = "SOUP_MESSAGE_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	public enum MessageFlags {
+		NO_REDIRECT,
+		OVERWRITE_CHUNKS,
+		EXPECT_CONTINUE
+	}
+	[CCode (cprefix = "SOUP_MESSAGE_STATUS_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	public enum MessageStatus {
+		IDLE,
+		QUEUED,
+		CONNECTING,
+		RUNNING,
+		FINISHED
+	}
+	[CCode (cprefix = "SOUP_METHOD_ID_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	public enum MethodId {
+		UNKNOWN,
+		POST,
+		GET,
+		HEAD,
+		OPTIONS,
+		PUT,
+		MOVE,
+		COPY,
+		DELETE,
+		TRACE,
+		CONNECT,
+		MKCOL,
+		PROPPATCH,
+		PROPFIND,
+		PATCH,
+		LOCK,
+		UNLOCK
+	}
+	[CCode (cprefix = "SOUP_BUFFER_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	public enum Ownership {
+		SYSTEM_OWNED,
+		USER_OWNED,
+		STATIC
+	}
+	[CCode (cprefix = "SOUP_SOCKET_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	public enum SocketIOStatus {
+		OK,
+		WOULD_BLOCK,
+		EOF,
+		ERROR
+	}
+	[CCode (cprefix = "SOUP_STATUS_CLASS_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	public enum StatusClass {
+		TRANSPORT_ERROR,
+		INFORMATIONAL,
+		SUCCESS,
+		REDIRECT,
+		CLIENT_ERROR,
+		SERVER_ERROR
+	}
+	[CCode (cprefix = "SOUP_TRANSFER_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	public enum TransferEncoding {
+		UNKNOWN,
+		CHUNKED,
+		CONTENT_LENGTH,
+		BYTERANGES,
+		NONE,
+		EOF
+	}
+	[CCode (cprefix = "SOUP_XMLRPC_VALUE_TYPE_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	public enum XmlrpcValueType {
+		BAD,
+		INT,
+		BOOLEAN,
+		STRING,
+		DOUBLE,
+		DATETIME,
+		BASE64,
+		STRUCT,
+		ARRAY
 	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public delegate void AddressCallback (Soup.Address addr, uint status);

Modified: trunk/vapi/libsoup-2.4.vapi
==============================================================================
--- trunk/vapi/libsoup-2.4.vapi	(original)
+++ trunk/vapi/libsoup-2.4.vapi	Fri Oct 24 16:50:22 2008
@@ -2,282 +2,18 @@
 
 [CCode (cprefix = "Soup", lower_case_cprefix = "soup_")]
 namespace Soup {
-	[CCode (cprefix = "SOUP_ADDRESS_FAMILY_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
-	public enum AddressFamily {
-		INVALID,
-		IPV4,
-		IPV6
-	}
-	[CCode (cprefix = "SOUP_DATE_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
-	public enum DateFormat {
-		HTTP,
-		COOKIE,
-		RFC2822,
-		ISO8601_COMPACT,
-		ISO8601_FULL,
-		ISO8601,
-		ISO8601_XMLRPC
-	}
-	[CCode (cprefix = "SOUP_ENCODING_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
-	public enum Encoding {
-		UNRECOGNIZED,
-		NONE,
-		CONTENT_LENGTH,
-		EOF,
-		CHUNKED,
-		BYTERANGES
-	}
-	[CCode (cprefix = "SOUP_HTTP_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
-	public enum HTTPVersion {
-		1_0,
-		1_1
-	}
-	[CCode (cprefix = "SOUP_STATUS_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
-	public enum KnownStatusCode {
-		NONE,
-		CANCELLED,
-		CANT_RESOLVE,
-		CANT_RESOLVE_PROXY,
-		CANT_CONNECT,
-		CANT_CONNECT_PROXY,
-		SSL_FAILED,
-		IO_ERROR,
-		MALFORMED,
-		TRY_AGAIN,
-		CONTINUE,
-		SWITCHING_PROTOCOLS,
-		PROCESSING,
-		OK,
-		CREATED,
-		ACCEPTED,
-		NON_AUTHORITATIVE,
-		NO_CONTENT,
-		RESET_CONTENT,
-		PARTIAL_CONTENT,
-		MULTI_STATUS,
-		MULTIPLE_CHOICES,
-		MOVED_PERMANENTLY,
-		FOUND,
-		MOVED_TEMPORARILY,
-		SEE_OTHER,
-		NOT_MODIFIED,
-		USE_PROXY,
-		NOT_APPEARING_IN_THIS_PROTOCOL,
-		TEMPORARY_REDIRECT,
-		BAD_REQUEST,
-		UNAUTHORIZED,
-		PAYMENT_REQUIRED,
-		FORBIDDEN,
-		NOT_FOUND,
-		METHOD_NOT_ALLOWED,
-		NOT_ACCEPTABLE,
-		PROXY_AUTHENTICATION_REQUIRED,
-		PROXY_UNAUTHORIZED,
-		REQUEST_TIMEOUT,
-		CONFLICT,
-		GONE,
-		LENGTH_REQUIRED,
-		PRECONDITION_FAILED,
-		REQUEST_ENTITY_TOO_LARGE,
-		REQUEST_URI_TOO_LONG,
-		UNSUPPORTED_MEDIA_TYPE,
-		REQUESTED_RANGE_NOT_SATISFIABLE,
-		INVALID_RANGE,
-		EXPECTATION_FAILED,
-		UNPROCESSABLE_ENTITY,
-		LOCKED,
-		FAILED_DEPENDENCY,
-		INTERNAL_SERVER_ERROR,
-		NOT_IMPLEMENTED,
-		BAD_GATEWAY,
-		SERVICE_UNAVAILABLE,
-		GATEWAY_TIMEOUT,
-		HTTP_VERSION_NOT_SUPPORTED,
-		INSUFFICIENT_STORAGE,
-		NOT_EXTENDED
-	}
-	[CCode (cprefix = "SOUP_LOGGER_LOG_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
-	public enum LoggerLogLevel {
-		NONE,
-		MINIMAL,
-		HEADERS,
-		BODY
-	}
-	[CCode (cprefix = "SOUP_MEMORY_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
-	public enum MemoryUse {
-		STATIC,
-		TAKE,
-		COPY,
-		TEMPORARY
-	}
-	[CCode (cprefix = "SOUP_MESSAGE_HEADERS_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
-	public enum MessageHeadersType {
-		REQUEST,
-		RESPONSE
-	}
-	[CCode (cprefix = "SOUP_SSL_ERROR_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
-	public enum SSLError {
-		HANDSHAKE_NEEDS_READ,
-		HANDSHAKE_NEEDS_WRITE,
-		CERTIFICATE
-	}
-	[CCode (cprefix = "SOUP_SOCKET_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
-	public enum SocketIOStatus {
-		OK,
-		WOULD_BLOCK,
-		EOF,
-		ERROR
-	}
-	[CCode (cprefix = "SOUP_XMLRPC_ERROR_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
-	public enum XMLRPCError {
-		ARGUMENTS,
-		RETVAL
-	}
-	[CCode (cprefix = "SOUP_XMLRPC_FAULT_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
-	public enum XMLRPCFault {
-		PARSE_ERROR_NOT_WELL_FORMED,
-		PARSE_ERROR_UNSUPPORTED_ENCODING,
-		PARSE_ERROR_INVALID_CHARACTER_FOR_ENCODING,
-		SERVER_ERROR_INVALID_XML_RPC,
-		SERVER_ERROR_REQUESTED_METHOD_NOT_FOUND,
-		SERVER_ERROR_INVALID_METHOD_PARAMETERS,
-		SERVER_ERROR_INTERNAL_XML_RPC_ERROR,
-		APPLICATION_ERROR,
-		SYSTEM_ERROR,
-		TRANSPORT_ERROR
-	}
-	[CCode (cprefix = "SOUP_EXPECTATION_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
-	[Flags]
-	public enum Expectation {
-		UNRECOGNIZED,
-		CONTINUE
-	}
-	[CCode (cprefix = "SOUP_MESSAGE_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
-	[Flags]
-	public enum MessageFlags {
-		NO_REDIRECT,
-		OVERWRITE_CHUNKS
-	}
-	[Compact]
-	[CCode (cheader_filename = "libsoup/soup.h")]
-	public class MessageHeadersIter {
-		public void* dummy;
-		public void init (Soup.MessageHeaders hdrs);
-		public bool next (out weak string name, out weak string value);
-	}
-	[Compact]
-	[CCode (copy_function = "soup_buffer_copy", cheader_filename = "libsoup/soup.h")]
-	public class Buffer {
-		public weak string data;
-		public ulong length;
-		public weak Soup.Buffer copy ();
-		public void* get_owner ();
-		public Buffer (Soup.MemoryUse use, void* data, ulong length);
-		public Buffer.subbuffer (Soup.Buffer parent, ulong offset, ulong length);
-		public Buffer.with_owner (void* data, ulong length, void* owner, GLib.DestroyNotify owner_dnotify);
-	}
-	[Compact]
-	[CCode (cheader_filename = "libsoup/soup.h")]
-	public class ByteArray {
-	}
-	[Compact]
-	[CCode (cheader_filename = "libsoup/soup.h")]
-	public class ClientContext {
-		public weak Soup.Address get_address ();
-		public weak Soup.AuthDomain get_auth_domain ();
-		public weak string get_auth_user ();
-		public weak string get_host ();
-		public weak Soup.Socket get_socket ();
-	}
-	[Compact]
-	[CCode (copy_function = "soup_date_copy", cheader_filename = "libsoup/soup.h")]
-	public class Date {
-		public int year;
-		public int month;
-		public int day;
-		public int hour;
-		public int minute;
-		public int second;
-		public bool utc;
-		public int offset;
-		public weak Soup.Date copy ();
-		public Date (int year, int month, int day, int hour, int minute, int second);
-		public Date.from_now (int offset_seconds);
-		public Date.from_string (string date_string);
-		public Date.from_time_t (ulong when);
-		public weak string to_string (Soup.DateFormat format);
-		public ulong to_time_t ();
-	}
-	[Compact]
-	[CCode (cheader_filename = "libsoup/soup.h")]
-	public class MessageBody {
-		public weak string data;
-		public int64 length;
-		public void append (Soup.MemoryUse use, void* data, ulong length);
-		public void append_buffer (Soup.Buffer buffer);
-		public void complete ();
-		public weak Soup.Buffer flatten ();
-		public weak Soup.Buffer get_chunk (int64 offset);
-		public MessageBody ();
-		public void truncate ();
-	}
-	[Compact]
-	[CCode (cheader_filename = "libsoup/soup.h")]
-	public class MessageHeaders {
-		public void append (string name, string value);
-		public void clear ();
-		public void @foreach (Soup.MessageHeadersForeachFunc func);
-		public weak string get (string name);
-		public int64 get_content_length ();
-		public Soup.Encoding get_encoding ();
-		public Soup.Expectation get_expectations ();
-		public MessageHeaders (Soup.MessageHeadersType type);
-		public void remove (string name);
-		public void replace (string name, string value);
-		public void set_content_length (int64 content_length);
-		public void set_encoding (Soup.Encoding encoding);
-		public void set_expectations (Soup.Expectation expectations);
-	}
-	[Compact]
-	[CCode (copy_function = "soup_uri_copy", cheader_filename = "libsoup/soup.h")]
-	public class URI {
-		public weak string scheme;
-		public weak string user;
-		public weak string password;
-		public weak string host;
-		public uint port;
-		public weak string path;
-		public weak string query;
-		public weak string fragment;
-		public Soup.URI copy ();
-		public static string decode (string part);
-		public static string encode (string part, string escape_extra);
-		public bool equal (Soup.URI uri2);
-		public URI (string uri_string);
-		public URI.with_base (Soup.URI @base, string uri_string);
-		public static string normalize (string part, string unescape_extra);
-		public void set_fragment (string fragment);
-		public void set_host (string host);
-		public void set_password (string password);
-		public void set_path (string path);
-		public void set_port (uint port);
-		public void set_query (string query);
-		public void set_query_from_fields (...);
-		public void set_query_from_form (GLib.HashTable form);
-		public void set_scheme (string scheme);
-		public void set_user (string user);
-		public string to_string (bool just_path_and_query);
-		public bool uses_default_port ();
-	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class Address : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public Address.any (Soup.AddressFamily family, uint port);
+		[CCode (has_construct_function = false)]
+		public Address.from_sockaddr (void* sa, int len);
 		public weak string get_name ();
 		public weak string get_physical ();
 		public uint get_port ();
 		public void* get_sockaddr (int len);
+		[CCode (has_construct_function = false)]
 		public Address (string name, uint port);
-		public Address.any (Soup.AddressFamily family, uint port);
-		public Address.from_sockaddr (void* sa, int len);
 		public void resolve_async (GLib.MainContext async_context, GLib.Cancellable cancellable, Soup.AddressCallback callback);
 		public uint resolve_sync (GLib.Cancellable cancellable);
 		[NoAccessorMethod]
@@ -292,15 +28,16 @@
 	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class Auth : GLib.Object {
+		public virtual void authenticate (string username, string password);
 		public void free_protection_space (GLib.SList space);
+		public virtual weak string get_authorization (Soup.Message msg);
 		public weak string get_host ();
 		public weak string get_info ();
+		public virtual weak GLib.SList get_protection_space (Soup.URI source_uri);
 		public weak string get_realm ();
 		public weak string get_scheme_name ();
+		[CCode (has_construct_function = false)]
 		public Auth (GLib.Type type, Soup.Message msg, string auth_header);
-		public virtual void authenticate (string username, string password);
-		public virtual weak string get_authorization (Soup.Message msg);
-		public virtual weak GLib.SList get_protection_space (Soup.URI source_uri);
 		public virtual bool update (Soup.Message msg, string auth_header);
 		[NoAccessorMethod]
 		public string host { get; construct; }
@@ -314,16 +51,16 @@
 	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class AuthDomain : GLib.Object {
+		public virtual weak string accepts (Soup.Message msg);
 		public void add_path (string path);
+		public virtual weak string challenge (Soup.Message msg);
+		public virtual bool check_password (Soup.Message msg, string username, string password);
 		public bool covers (Soup.Message msg);
 		public weak string get_realm ();
 		public void remove_path (string path);
 		public void set_filter (Soup.AuthDomainFilter filter, void* filter_data, GLib.DestroyNotify dnotify);
 		public void set_generic_auth_callback (Soup.AuthDomainGenericAuthCallback auth_callback, void* auth_data, GLib.DestroyNotify dnotify);
 		public bool try_generic_auth_callback (Soup.Message msg, string username);
-		public virtual weak string accepts (Soup.Message msg);
-		public virtual weak string challenge (Soup.Message msg);
-		public virtual bool check_password (Soup.Message msg, string username, string password);
 		[NoAccessorMethod]
 		public void* filter { get; set; }
 		[NoAccessorMethod]
@@ -339,7 +76,7 @@
 	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class AuthDomainBasic : Soup.AuthDomain {
-		[CCode (type = "SoupAuthDomain*")]
+		[CCode (type = "SoupAuthDomain*", has_construct_function = false)]
 		public AuthDomainBasic (string optname1);
 		public static void set_auth_callback (Soup.AuthDomain domain, Soup.AuthDomainBasicAuthCallback callback, GLib.DestroyNotify dnotify);
 		[NoAccessorMethod]
@@ -350,7 +87,7 @@
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class AuthDomainDigest : Soup.AuthDomain {
 		public static weak string encode_password (string username, string realm, string password);
-		[CCode (type = "SoupAuthDomain*")]
+		[CCode (type = "SoupAuthDomain*", has_construct_function = false)]
 		public AuthDomainDigest (string optname1);
 		public static void set_auth_callback (Soup.AuthDomain domain, Soup.AuthDomainDigestAuthCallback callback, GLib.DestroyNotify dnotify);
 		[NoAccessorMethod]
@@ -358,10 +95,61 @@
 		[NoAccessorMethod]
 		public void* auth_data { get; set; }
 	}
+	[Compact]
+	[CCode (copy_function = "soup_buffer_copy", cheader_filename = "libsoup/soup.h")]
+	public class Buffer {
+		public weak string data;
+		public ulong length;
+		public weak Soup.Buffer copy ();
+		public void* get_owner ();
+		[CCode (has_construct_function = false)]
+		public Buffer (Soup.MemoryUse use, void* data, ulong length);
+		[CCode (has_construct_function = false)]
+		public Buffer.subbuffer (Soup.Buffer parent, ulong offset, ulong length);
+		[CCode (has_construct_function = false)]
+		public Buffer.with_owner (void* data, ulong length, void* owner, GLib.DestroyNotify owner_dnotify);
+	}
+	[Compact]
+	[CCode (cheader_filename = "libsoup/soup.h")]
+	public class ByteArray {
+	}
+	[Compact]
+	[CCode (cheader_filename = "libsoup/soup.h")]
+	public class ClientContext {
+		public weak Soup.Address get_address ();
+		public weak Soup.AuthDomain get_auth_domain ();
+		public weak string get_auth_user ();
+		public weak string get_host ();
+		public weak Soup.Socket get_socket ();
+	}
+	[Compact]
+	[CCode (copy_function = "soup_date_copy", cheader_filename = "libsoup/soup.h")]
+	public class Date {
+		public int day;
+		public int hour;
+		public int minute;
+		public int month;
+		public int offset;
+		public int second;
+		public bool utc;
+		public int year;
+		public weak Soup.Date copy ();
+		[CCode (has_construct_function = false)]
+		public Date.from_now (int offset_seconds);
+		[CCode (has_construct_function = false)]
+		public Date.from_string (string date_string);
+		[CCode (has_construct_function = false)]
+		public Date.from_time_t (ulong when);
+		[CCode (has_construct_function = false)]
+		public Date (int year, int month, int day, int hour, int minute, int second);
+		public weak string to_string (Soup.DateFormat format);
+		public ulong to_time_t ();
+	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class Logger : GLib.Object {
 		public void attach (Soup.Session session);
 		public void detach (Soup.Session session);
+		[CCode (has_construct_function = false)]
 		public Logger (Soup.LoggerLogLevel level, int max_body_size);
 		public void set_printer (Soup.LoggerPrinter printer, void* printer_data, GLib.DestroyNotify destroy);
 		public void set_request_filter (Soup.LoggerFilter request_filter, void* filter_data, GLib.DestroyNotify destroy);
@@ -375,12 +163,14 @@
 		public weak Soup.MessageHeaders response_headers;
 		public uint add_header_handler (string @signal, string header, GLib.Callback callback);
 		public uint add_status_code_handler (string @signal, uint status_code, GLib.Callback callback);
+		[CCode (has_construct_function = false)]
+		public Message.from_uri (string method, Soup.URI uri);
 		public Soup.MessageFlags get_flags ();
 		public Soup.HTTPVersion get_http_version ();
 		public weak Soup.URI get_uri ();
 		public bool is_keepalive ();
+		[CCode (has_construct_function = false)]
 		public Message (string method, string uri_string);
-		public Message.from_uri (string method, Soup.URI uri);
 		public void set_chunk_allocator (Soup.ChunkAllocator allocator, GLib.DestroyNotify destroy_notify);
 		public void set_flags (Soup.MessageFlags flags);
 		public void set_http_version (Soup.HTTPVersion version);
@@ -419,6 +209,45 @@
 		[HasEmitter]
 		public virtual signal void wrote_informational ();
 	}
+	[Compact]
+	[CCode (cheader_filename = "libsoup/soup.h")]
+	public class MessageBody {
+		public weak string data;
+		public int64 length;
+		public void append (Soup.MemoryUse use, void* data, ulong length);
+		public void append_buffer (Soup.Buffer buffer);
+		public void complete ();
+		public weak Soup.Buffer flatten ();
+		public weak Soup.Buffer get_chunk (int64 offset);
+		[CCode (has_construct_function = false)]
+		public MessageBody ();
+		public void truncate ();
+	}
+	[Compact]
+	[CCode (cheader_filename = "libsoup/soup.h")]
+	public class MessageHeaders {
+		public void append (string name, string value);
+		public void clear ();
+		public void @foreach (Soup.MessageHeadersForeachFunc func);
+		public weak string get (string name);
+		public int64 get_content_length ();
+		public Soup.Encoding get_encoding ();
+		public Soup.Expectation get_expectations ();
+		[CCode (has_construct_function = false)]
+		public MessageHeaders (Soup.MessageHeadersType type);
+		public void remove (string name);
+		public void replace (string name, string value);
+		public void set_content_length (int64 content_length);
+		public void set_encoding (Soup.Encoding encoding);
+		public void set_expectations (Soup.Expectation expectations);
+	}
+	[Compact]
+	[CCode (cheader_filename = "libsoup/soup.h")]
+	public class MessageHeadersIter {
+		public void* dummy;
+		public void init (Soup.MessageHeaders hdrs);
+		public bool next (out weak string name, out weak string value);
+	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class Server : GLib.Object {
 		public void add_auth_domain (Soup.AuthDomain auth_domain);
@@ -427,6 +256,7 @@
 		public weak Soup.Socket get_listener ();
 		public uint get_port ();
 		public bool is_https ();
+		[CCode (has_construct_function = false)]
 		public Server (string optname1, ...);
 		public void pause_message (Soup.Message msg);
 		public void quit ();
@@ -457,13 +287,13 @@
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class Session : GLib.Object {
 		public void abort ();
+		public virtual void cancel_message (Soup.Message msg, uint status_code);
 		public weak GLib.MainContext get_async_context ();
 		public void pause_message (Soup.Message msg);
-		public void unpause_message (Soup.Message msg);
-		public virtual void cancel_message (Soup.Message msg, uint status_code);
 		public virtual void queue_message (Soup.Message# msg, Soup.SessionCallback callback);
 		public virtual void requeue_message (Soup.Message msg);
 		public virtual uint send_message (Soup.Message msg);
+		public void unpause_message (Soup.Message msg);
 		[NoAccessorMethod]
 		public void* async_context { get; construct; }
 		[NoAccessorMethod]
@@ -485,16 +315,16 @@
 	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class SessionAsync : Soup.Session {
-		[CCode (type = "SoupSession*")]
+		[CCode (type = "SoupSession*", has_construct_function = false)]
 		public SessionAsync ();
-		[CCode (type = "SoupSession*")]
+		[CCode (type = "SoupSession*", has_construct_function = false)]
 		public SessionAsync.with_options (string optname1);
 	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class SessionSync : Soup.Session {
-		[CCode (type = "SoupSession*")]
+		[CCode (type = "SoupSession*", has_construct_function = false)]
 		public SessionSync ();
-		[CCode (type = "SoupSession*")]
+		[CCode (type = "SoupSession*", has_construct_function = false)]
 		public SessionSync.with_options (string optname1);
 	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
@@ -507,6 +337,7 @@
 		public bool is_connected ();
 		public bool is_ssl ();
 		public bool listen ();
+		[CCode (has_construct_function = false)]
 		public Socket (string optname1);
 		public Soup.SocketIOStatus read (void* buffer, ulong len, ulong nread, GLib.Cancellable cancellable) throws GLib.Error;
 		public Soup.SocketIOStatus read_until (void* buffer, ulong len, void* boundary, ulong boundary_len, ulong nread, bool got_boundary, GLib.Cancellable cancellable) throws GLib.Error;
@@ -532,6 +363,195 @@
 		public virtual signal void readable ();
 		public virtual signal void writable ();
 	}
+	[Compact]
+	[CCode (copy_function = "soup_uri_copy", cheader_filename = "libsoup/soup.h")]
+	public class URI {
+		public weak string fragment;
+		public weak string host;
+		public weak string password;
+		public weak string path;
+		public uint port;
+		public weak string query;
+		public weak string scheme;
+		public weak string user;
+		public Soup.URI copy ();
+		public static string decode (string part);
+		public static string encode (string part, string escape_extra);
+		public bool equal (Soup.URI uri2);
+		[CCode (has_construct_function = false)]
+		public URI (string uri_string);
+		public static string normalize (string part, string unescape_extra);
+		public void set_fragment (string fragment);
+		public void set_host (string host);
+		public void set_password (string password);
+		public void set_path (string path);
+		public void set_port (uint port);
+		public void set_query (string query);
+		public void set_query_from_fields (...);
+		public void set_query_from_form (GLib.HashTable form);
+		public void set_scheme (string scheme);
+		public void set_user (string user);
+		public string to_string (bool just_path_and_query);
+		public bool uses_default_port ();
+		[CCode (has_construct_function = false)]
+		public URI.with_base (Soup.URI @base, string uri_string);
+	}
+	[CCode (cprefix = "SOUP_ADDRESS_FAMILY_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	public enum AddressFamily {
+		INVALID,
+		IPV4,
+		IPV6
+	}
+	[CCode (cprefix = "SOUP_DATE_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	public enum DateFormat {
+		HTTP,
+		COOKIE,
+		RFC2822,
+		ISO8601_COMPACT,
+		ISO8601_FULL,
+		ISO8601,
+		ISO8601_XMLRPC
+	}
+	[CCode (cprefix = "SOUP_ENCODING_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	public enum Encoding {
+		UNRECOGNIZED,
+		NONE,
+		CONTENT_LENGTH,
+		EOF,
+		CHUNKED,
+		BYTERANGES
+	}
+	[CCode (cprefix = "SOUP_EXPECTATION_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	[Flags]
+	public enum Expectation {
+		UNRECOGNIZED,
+		CONTINUE
+	}
+	[CCode (cprefix = "SOUP_HTTP_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	public enum HTTPVersion {
+		1_0,
+		1_1
+	}
+	[CCode (cprefix = "SOUP_STATUS_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	public enum KnownStatusCode {
+		NONE,
+		CANCELLED,
+		CANT_RESOLVE,
+		CANT_RESOLVE_PROXY,
+		CANT_CONNECT,
+		CANT_CONNECT_PROXY,
+		SSL_FAILED,
+		IO_ERROR,
+		MALFORMED,
+		TRY_AGAIN,
+		CONTINUE,
+		SWITCHING_PROTOCOLS,
+		PROCESSING,
+		OK,
+		CREATED,
+		ACCEPTED,
+		NON_AUTHORITATIVE,
+		NO_CONTENT,
+		RESET_CONTENT,
+		PARTIAL_CONTENT,
+		MULTI_STATUS,
+		MULTIPLE_CHOICES,
+		MOVED_PERMANENTLY,
+		FOUND,
+		MOVED_TEMPORARILY,
+		SEE_OTHER,
+		NOT_MODIFIED,
+		USE_PROXY,
+		NOT_APPEARING_IN_THIS_PROTOCOL,
+		TEMPORARY_REDIRECT,
+		BAD_REQUEST,
+		UNAUTHORIZED,
+		PAYMENT_REQUIRED,
+		FORBIDDEN,
+		NOT_FOUND,
+		METHOD_NOT_ALLOWED,
+		NOT_ACCEPTABLE,
+		PROXY_AUTHENTICATION_REQUIRED,
+		PROXY_UNAUTHORIZED,
+		REQUEST_TIMEOUT,
+		CONFLICT,
+		GONE,
+		LENGTH_REQUIRED,
+		PRECONDITION_FAILED,
+		REQUEST_ENTITY_TOO_LARGE,
+		REQUEST_URI_TOO_LONG,
+		UNSUPPORTED_MEDIA_TYPE,
+		REQUESTED_RANGE_NOT_SATISFIABLE,
+		INVALID_RANGE,
+		EXPECTATION_FAILED,
+		UNPROCESSABLE_ENTITY,
+		LOCKED,
+		FAILED_DEPENDENCY,
+		INTERNAL_SERVER_ERROR,
+		NOT_IMPLEMENTED,
+		BAD_GATEWAY,
+		SERVICE_UNAVAILABLE,
+		GATEWAY_TIMEOUT,
+		HTTP_VERSION_NOT_SUPPORTED,
+		INSUFFICIENT_STORAGE,
+		NOT_EXTENDED
+	}
+	[CCode (cprefix = "SOUP_LOGGER_LOG_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	public enum LoggerLogLevel {
+		NONE,
+		MINIMAL,
+		HEADERS,
+		BODY
+	}
+	[CCode (cprefix = "SOUP_MEMORY_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	public enum MemoryUse {
+		STATIC,
+		TAKE,
+		COPY,
+		TEMPORARY
+	}
+	[CCode (cprefix = "SOUP_MESSAGE_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	[Flags]
+	public enum MessageFlags {
+		NO_REDIRECT,
+		OVERWRITE_CHUNKS
+	}
+	[CCode (cprefix = "SOUP_MESSAGE_HEADERS_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	public enum MessageHeadersType {
+		REQUEST,
+		RESPONSE
+	}
+	[CCode (cprefix = "SOUP_SSL_ERROR_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	public enum SSLError {
+		HANDSHAKE_NEEDS_READ,
+		HANDSHAKE_NEEDS_WRITE,
+		CERTIFICATE
+	}
+	[CCode (cprefix = "SOUP_SOCKET_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	public enum SocketIOStatus {
+		OK,
+		WOULD_BLOCK,
+		EOF,
+		ERROR
+	}
+	[CCode (cprefix = "SOUP_XMLRPC_ERROR_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	public enum XMLRPCError {
+		ARGUMENTS,
+		RETVAL
+	}
+	[CCode (cprefix = "SOUP_XMLRPC_FAULT_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	public enum XMLRPCFault {
+		PARSE_ERROR_NOT_WELL_FORMED,
+		PARSE_ERROR_UNSUPPORTED_ENCODING,
+		PARSE_ERROR_INVALID_CHARACTER_FOR_ENCODING,
+		SERVER_ERROR_INVALID_XML_RPC,
+		SERVER_ERROR_REQUESTED_METHOD_NOT_FOUND,
+		SERVER_ERROR_INVALID_METHOD_PARAMETERS,
+		SERVER_ERROR_INTERNAL_XML_RPC_ERROR,
+		APPLICATION_ERROR,
+		SYSTEM_ERROR,
+		TRANSPORT_ERROR
+	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public delegate void AddressCallback (Soup.Address addr, uint status);
 	[CCode (cheader_filename = "libsoup/soup.h")]
@@ -557,8 +577,6 @@
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public delegate void SocketCallback (Soup.Socket sock, uint status);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public const int AF_INET6;
-	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int ADDRESS_ANY_PORT;
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string ADDRESS_FAMILY;
@@ -571,6 +589,8 @@
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string ADDRESS_SOCKADDR;
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	public const int AF_INET6;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string AUTH_DOMAIN_ADD_PATH;
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string AUTH_DOMAIN_BASIC_AUTH_CALLBACK;

Modified: trunk/vapi/libwnck-1.0.vapi
==============================================================================
--- trunk/vapi/libwnck-1.0.vapi	(original)
+++ trunk/vapi/libwnck-1.0.vapi	Fri Oct 24 16:50:22 2008
@@ -2,139 +2,9 @@
 
 [CCode (cprefix = "Wnck", lower_case_cprefix = "wnck_")]
 namespace Wnck {
-	[CCode (cprefix = "WNCK_CLIENT_TYPE_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
-	public enum ClientType {
-		APPLICATION,
-		PAGER
-	}
-	[CCode (cprefix = "WNCK_MOTION_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
-	public enum MotionDirection {
-		UP,
-		DOWN,
-		LEFT,
-		RIGHT
-	}
-	[CCode (cprefix = "WNCK_PAGER_DISPLAY_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
-	public enum PagerDisplayMode {
-		NAME,
-		CONTENT
-	}
-	[CCode (cprefix = "WNCK_TASKLIST_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
-	public enum TasklistGroupingType {
-		NEVER_GROUP,
-		AUTO_GROUP,
-		ALWAYS_GROUP
-	}
-	[CCode (cprefix = "WNCK_WINDOW_GRAVITY_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
-	public enum WindowGravity {
-		CURRENT,
-		NORTHWEST,
-		NORTH,
-		NORTHEAST,
-		WEST,
-		CENTER,
-		EAST,
-		SOUTHWEST,
-		SOUTH,
-		SOUTHEAST,
-		STATIC
-	}
-	[CCode (cprefix = "WNCK_WINDOW_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
-	public enum WindowType {
-		NORMAL,
-		DESKTOP,
-		DOCK,
-		DIALOG,
-		TOOLBAR,
-		MENU,
-		UTILITY,
-		SPLASHSCREEN
-	}
-	[CCode (cprefix = "WNCK_WINDOW_ACTION_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
-	[Flags]
-	public enum WindowActions {
-		MOVE,
-		RESIZE,
-		SHADE,
-		STICK,
-		MAXIMIZE_HORIZONTALLY,
-		MAXIMIZE_VERTICALLY,
-		CHANGE_WORKSPACE,
-		CLOSE,
-		UNMAXIMIZE_HORIZONTALLY,
-		UNMAXIMIZE_VERTICALLY,
-		UNSHADE,
-		UNSTICK,
-		MINIMIZE,
-		UNMINIMIZE,
-		MAXIMIZE,
-		UNMAXIMIZE,
-		FULLSCREEN,
-		ABOVE,
-		BELOW
-	}
-	[CCode (cprefix = "WNCK_WINDOW_CHANGE_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
-	[Flags]
-	public enum WindowMoveResizeMask {
-		X,
-		Y,
-		WIDTH,
-		HEIGHT
-	}
-	[CCode (cprefix = "WNCK_WINDOW_STATE_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
-	[Flags]
-	public enum WindowState {
-		MINIMIZED,
-		MAXIMIZED_HORIZONTALLY,
-		MAXIMIZED_VERTICALLY,
-		SHADED,
-		SKIP_PAGER,
-		SKIP_TASKLIST,
-		STICKY,
-		HIDDEN,
-		FULLSCREEN,
-		DEMANDS_ATTENTION,
-		URGENT,
-		ABOVE,
-		BELOW
-	}
-	[Compact]
-	[CCode (cheader_filename = "libwnck/libwnck.h")]
-	public class ResourceUsage {
-		public ulong total_bytes_estimate;
-		public ulong pixmap_bytes;
-		public uint n_pixmaps;
-		public uint n_windows;
-		public uint n_gcs;
-		public uint n_pictures;
-		public uint n_glyphsets;
-		public uint n_fonts;
-		public uint n_colormap_entries;
-		public uint n_passive_grabs;
-		public uint n_cursors;
-		public uint n_other;
-		public uint pad1;
-		public uint pad2;
-		public uint pad3;
-		public uint pad4;
-		public uint pad5;
-		public uint pad6;
-		public uint pad7;
-		public uint pad8;
-		public uint pad9;
-	}
-	[Compact]
-	[CCode (cheader_filename = "libwnck/libwnck.h")]
-	public class WorkspaceLayout {
-		public int rows;
-		public int cols;
-		public int grid;
-		public int grid_area;
-		public int current_row;
-		public int current_col;
-	}
 	[CCode (cheader_filename = "libwnck/libwnck.h")]
 	public class ActionMenu : Gtk.Menu, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ActionMenu (Wnck.Window window);
 		[NoWrapper]
 		public virtual void pad1 ();
@@ -192,13 +62,8 @@
 	}
 	[CCode (cheader_filename = "libwnck/libwnck.h")]
 	public class Pager : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Pager (Wnck.Screen screen);
-		public void set_display_mode (Wnck.PagerDisplayMode mode);
-		public bool set_n_rows (int n_rows);
-		public bool set_orientation (Gtk.Orientation orientation);
-		public void set_screen (Wnck.Screen screen);
-		public void set_shadow_type (Gtk.ShadowType shadow_type);
-		public void set_show_all (bool show_all_workspaces);
 		[NoWrapper]
 		public virtual void pad1 ();
 		[NoWrapper]
@@ -207,6 +72,37 @@
 		public virtual void pad3 ();
 		[NoWrapper]
 		public virtual void pad4 ();
+		public void set_display_mode (Wnck.PagerDisplayMode mode);
+		public bool set_n_rows (int n_rows);
+		public bool set_orientation (Gtk.Orientation orientation);
+		public void set_screen (Wnck.Screen screen);
+		public void set_shadow_type (Gtk.ShadowType shadow_type);
+		public void set_show_all (bool show_all_workspaces);
+	}
+	[Compact]
+	[CCode (cheader_filename = "libwnck/libwnck.h")]
+	public class ResourceUsage {
+		public uint n_colormap_entries;
+		public uint n_cursors;
+		public uint n_fonts;
+		public uint n_gcs;
+		public uint n_glyphsets;
+		public uint n_other;
+		public uint n_passive_grabs;
+		public uint n_pictures;
+		public uint n_pixmaps;
+		public uint n_windows;
+		public uint pad1;
+		public uint pad2;
+		public uint pad3;
+		public uint pad4;
+		public uint pad5;
+		public uint pad6;
+		public uint pad7;
+		public uint pad8;
+		public uint pad9;
+		public ulong pixmap_bytes;
+		public ulong total_bytes_estimate;
 	}
 	[CCode (cheader_filename = "libwnck/libwnck.h")]
 	public class Screen : GLib.Object {
@@ -235,9 +131,6 @@
 		public weak GLib.List get_workspaces ();
 		public void move_viewport (int x, int y);
 		public bool net_wm_supports (string atom);
-		public void release_workspace_layout (int current_token);
-		public void toggle_showing_desktop (bool show);
-		public int try_set_workspace_layout (int current_token, int rows, int columns);
 		[NoWrapper]
 		public virtual void pad2 ();
 		[NoWrapper]
@@ -248,6 +141,9 @@
 		public virtual void pad5 ();
 		[NoWrapper]
 		public virtual void pad6 ();
+		public void release_workspace_layout (int current_token);
+		public void toggle_showing_desktop (bool show);
+		public int try_set_workspace_layout (int current_token, int rows, int columns);
 		public virtual signal void active_window_changed (Wnck.Window previous_window);
 		public virtual signal void active_workspace_changed (Wnck.Workspace previous_workspace);
 		public virtual signal void application_closed (Wnck.Application app);
@@ -266,6 +162,7 @@
 	}
 	[CCode (cheader_filename = "libwnck/libwnck.h")]
 	public class Selector : Gtk.MenuBar, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Selector ();
 		[NoWrapper]
 		public virtual void pad1 ();
@@ -281,7 +178,16 @@
 		public int get_minimum_height ();
 		public int get_minimum_width ();
 		public int get_size_hint_list (int n_elements);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Tasklist (Wnck.Screen screen);
+		[NoWrapper]
+		public virtual void pad1 ();
+		[NoWrapper]
+		public virtual void pad2 ();
+		[NoWrapper]
+		public virtual void pad3 ();
+		[NoWrapper]
+		public virtual void pad4 ();
 		public void set_button_relief (Gtk.ReliefStyle relief);
 		public void set_grouping (Wnck.TasklistGroupingType grouping);
 		public void set_grouping_limit (int limit);
@@ -291,14 +197,6 @@
 		public void set_minimum_width (int size);
 		public void set_screen (Wnck.Screen screen);
 		public void set_switch_workspace_on_unminimize (bool switch_workspace_on_unminimize);
-		[NoWrapper]
-		public virtual void pad1 ();
-		[NoWrapper]
-		public virtual void pad2 ();
-		[NoWrapper]
-		public virtual void pad3 ();
-		[NoWrapper]
-		public virtual void pad4 ();
 	}
 	[CCode (cheader_filename = "libwnck/libwnck.h")]
 	public class Window : GLib.Object {
@@ -357,6 +255,14 @@
 		public void move_to_workspace (Wnck.Workspace space);
 		public bool needs_attention ();
 		public bool or_transient_needs_attention ();
+		[NoWrapper]
+		public virtual void pad1 ();
+		[NoWrapper]
+		public virtual void pad2 ();
+		[NoWrapper]
+		public virtual void pad3 ();
+		[NoWrapper]
+		public virtual void pad4 ();
 		public void pin ();
 		public void set_fullscreen (bool fullscreen);
 		public void set_geometry (Wnck.WindowGravity gravity, Wnck.WindowMoveResizeMask geometry_mask, int x, int y, int width, int height);
@@ -377,14 +283,6 @@
 		public void unpin ();
 		public void unshade ();
 		public void unstick ();
-		[NoWrapper]
-		public virtual void pad1 ();
-		[NoWrapper]
-		public virtual void pad2 ();
-		[NoWrapper]
-		public virtual void pad3 ();
-		[NoWrapper]
-		public virtual void pad4 ();
 		public virtual signal void actions_changed (Wnck.WindowActions changed_mask, Wnck.WindowActions new_actions);
 		public virtual signal void geometry_changed ();
 		public virtual signal void icon_changed ();
@@ -417,6 +315,112 @@
 		public virtual void pad4 ();
 		public virtual signal void name_changed ();
 	}
+	[Compact]
+	[CCode (cheader_filename = "libwnck/libwnck.h")]
+	public class WorkspaceLayout {
+		public int cols;
+		public int current_col;
+		public int current_row;
+		public int grid;
+		public int grid_area;
+		public int rows;
+	}
+	[CCode (cprefix = "WNCK_CLIENT_TYPE_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
+	public enum ClientType {
+		APPLICATION,
+		PAGER
+	}
+	[CCode (cprefix = "WNCK_MOTION_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
+	public enum MotionDirection {
+		UP,
+		DOWN,
+		LEFT,
+		RIGHT
+	}
+	[CCode (cprefix = "WNCK_PAGER_DISPLAY_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
+	public enum PagerDisplayMode {
+		NAME,
+		CONTENT
+	}
+	[CCode (cprefix = "WNCK_TASKLIST_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
+	public enum TasklistGroupingType {
+		NEVER_GROUP,
+		AUTO_GROUP,
+		ALWAYS_GROUP
+	}
+	[CCode (cprefix = "WNCK_WINDOW_ACTION_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
+	[Flags]
+	public enum WindowActions {
+		MOVE,
+		RESIZE,
+		SHADE,
+		STICK,
+		MAXIMIZE_HORIZONTALLY,
+		MAXIMIZE_VERTICALLY,
+		CHANGE_WORKSPACE,
+		CLOSE,
+		UNMAXIMIZE_HORIZONTALLY,
+		UNMAXIMIZE_VERTICALLY,
+		UNSHADE,
+		UNSTICK,
+		MINIMIZE,
+		UNMINIMIZE,
+		MAXIMIZE,
+		UNMAXIMIZE,
+		FULLSCREEN,
+		ABOVE,
+		BELOW
+	}
+	[CCode (cprefix = "WNCK_WINDOW_GRAVITY_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
+	public enum WindowGravity {
+		CURRENT,
+		NORTHWEST,
+		NORTH,
+		NORTHEAST,
+		WEST,
+		CENTER,
+		EAST,
+		SOUTHWEST,
+		SOUTH,
+		SOUTHEAST,
+		STATIC
+	}
+	[CCode (cprefix = "WNCK_WINDOW_CHANGE_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
+	[Flags]
+	public enum WindowMoveResizeMask {
+		X,
+		Y,
+		WIDTH,
+		HEIGHT
+	}
+	[CCode (cprefix = "WNCK_WINDOW_STATE_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
+	[Flags]
+	public enum WindowState {
+		MINIMIZED,
+		MAXIMIZED_HORIZONTALLY,
+		MAXIMIZED_VERTICALLY,
+		SHADED,
+		SKIP_PAGER,
+		SKIP_TASKLIST,
+		STICKY,
+		HIDDEN,
+		FULLSCREEN,
+		DEMANDS_ATTENTION,
+		URGENT,
+		ABOVE,
+		BELOW
+	}
+	[CCode (cprefix = "WNCK_WINDOW_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
+	public enum WindowType {
+		NORMAL,
+		DESKTOP,
+		DOCK,
+		DIALOG,
+		TOOLBAR,
+		MENU,
+		UTILITY,
+		SPLASHSCREEN
+	}
 	[CCode (cheader_filename = "libwnck/libwnck.h")]
 	public delegate weak Gdk.Pixbuf LoadIconFunction (string icon_name, int size, uint flags);
 	[CCode (cheader_filename = "libwnck/libwnck.h")]

Modified: trunk/vapi/packages/gdk-x11-2.0/gdk-x11-2.0.deps
==============================================================================
--- trunk/vapi/packages/gdk-x11-2.0/gdk-x11-2.0.deps	(original)
+++ trunk/vapi/packages/gdk-x11-2.0/gdk-x11-2.0.deps	Fri Oct 24 16:50:22 2008
@@ -1,3 +1,4 @@
+gio-2.0
 gdk-2.0
 gdk-pixbuf-2.0
 cairo

Modified: trunk/vapi/packages/gnome-desktop-2.0/gnome-desktop-2.0.deps
==============================================================================
--- trunk/vapi/packages/gnome-desktop-2.0/gnome-desktop-2.0.deps	(original)
+++ trunk/vapi/packages/gnome-desktop-2.0/gnome-desktop-2.0.deps	Fri Oct 24 16:50:22 2008
@@ -1,5 +1,6 @@
 atk
 cairo
+gio-2.0
 gdk-pixbuf-2.0
 gdk-2.0
 pango

Modified: trunk/vapi/packages/gtksourceview-2.0/gtksourceview-2.0.deps
==============================================================================
--- trunk/vapi/packages/gtksourceview-2.0/gtksourceview-2.0.deps	(original)
+++ trunk/vapi/packages/gtksourceview-2.0/gtksourceview-2.0.deps	Fri Oct 24 16:50:22 2008
@@ -1,5 +1,6 @@
 atk
 cairo
+gio-2.0
 gdk-pixbuf-2.0
 gdk-2.0
 pango

Modified: trunk/vapi/packages/hildon-1/hildon-1.deps
==============================================================================
--- trunk/vapi/packages/hildon-1/hildon-1.deps	(original)
+++ trunk/vapi/packages/hildon-1/hildon-1.deps	Fri Oct 24 16:50:22 2008
@@ -1,4 +1,5 @@
 gtk+-2.0
+gio-2.0
 gdk-pixbuf-2.0
 gdk-2.0
 pango

Modified: trunk/vapi/packages/hildon-fm-2/hildon-fm-2.deps
==============================================================================
--- trunk/vapi/packages/hildon-fm-2/hildon-fm-2.deps	(original)
+++ trunk/vapi/packages/hildon-fm-2/hildon-fm-2.deps	Fri Oct 24 16:50:22 2008
@@ -1,4 +1,5 @@
 atk
+gio-2.0
 gdk-2.0
 gdk-pixbuf-2.0
 gtk+-2.0

Modified: trunk/vapi/packages/libglade-2.0/libglade-2.0.deps
==============================================================================
--- trunk/vapi/packages/libglade-2.0/libglade-2.0.deps	(original)
+++ trunk/vapi/packages/libglade-2.0/libglade-2.0.deps	Fri Oct 24 16:50:22 2008
@@ -1,5 +1,6 @@
 atk
 cairo
+gio-2.0
 gdk-pixbuf-2.0
 gdk-2.0
 pango

Modified: trunk/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.deps
==============================================================================
--- trunk/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.deps	(original)
+++ trunk/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.deps	Fri Oct 24 16:50:22 2008
@@ -1,5 +1,6 @@
 atk
 cairo
+gio-2.0
 gdk-pixbuf-2.0
 gdk-2.0
 pango

Modified: trunk/vapi/packages/libnotify/libnotify.deps
==============================================================================
--- trunk/vapi/packages/libnotify/libnotify.deps	(original)
+++ trunk/vapi/packages/libnotify/libnotify.deps	Fri Oct 24 16:50:22 2008
@@ -1,5 +1,6 @@
 atk
 cairo
+gio-2.0
 gdk-pixbuf-2.0
 gdk-2.0
 pango

Modified: trunk/vapi/packages/libsexy/libsexy.deps
==============================================================================
--- trunk/vapi/packages/libsexy/libsexy.deps	(original)
+++ trunk/vapi/packages/libsexy/libsexy.deps	Fri Oct 24 16:50:22 2008
@@ -1,3 +1,4 @@
+gio-2.0
 gtk+-2.0
 atk
 cairo

Modified: trunk/vapi/packages/libwnck-1.0/libwnck-1.0.deps
==============================================================================
--- trunk/vapi/packages/libwnck-1.0/libwnck-1.0.deps	(original)
+++ trunk/vapi/packages/libwnck-1.0/libwnck-1.0.deps	Fri Oct 24 16:50:22 2008
@@ -1,5 +1,6 @@
 atk
 cairo
+gio-2.0
 gdk-pixbuf-2.0
 gdk-2.0
 pango

Modified: trunk/vapi/packages/webkit-1.0/webkit-1.0.deps
==============================================================================
--- trunk/vapi/packages/webkit-1.0/webkit-1.0.deps	(original)
+++ trunk/vapi/packages/webkit-1.0/webkit-1.0.deps	Fri Oct 24 16:50:22 2008
@@ -1,4 +1,5 @@
 atk
+gio-2.0
 cairo
 pango
 gdk-pixbuf-2.0

Modified: trunk/vapi/pango.vapi
==============================================================================
--- trunk/vapi/pango.vapi	(original)
+++ trunk/vapi/pango.vapi	Fri Oct 24 16:50:22 2008
@@ -2,429 +2,70 @@
 
 [CCode (cprefix = "Pango", lower_case_cprefix = "pango_")]
 namespace Pango {
-	[CCode (cprefix = "PANGO_ALIGN_", cheader_filename = "pango/pango.h")]
-	public enum Alignment {
-		LEFT,
-		CENTER,
-		RIGHT
-	}
-	[CCode (cprefix = "PANGO_ATTR_", cheader_filename = "pango/pango.h")]
-	public enum AttrType {
-		INVALID,
-		LANGUAGE,
-		FAMILY,
-		STYLE,
-		WEIGHT,
-		VARIANT,
-		STRETCH,
-		SIZE,
-		FONT_DESC,
-		FOREGROUND,
-		BACKGROUND,
-		UNDERLINE,
-		STRIKETHROUGH,
-		RISE,
-		SHAPE,
-		SCALE,
-		FALLBACK,
-		LETTER_SPACING,
-		UNDERLINE_COLOR,
-		STRIKETHROUGH_COLOR,
-		ABSOLUTE_SIZE,
-		GRAVITY,
-		GRAVITY_HINT
-	}
-	[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_", cheader_filename = "pango/pango.h")]
-	public enum Direction {
-		LTR,
-		RTL,
-		TTB_LTR,
-		TTB_RTL,
-		WEAK_LTR,
-		WEAK_RTL,
-		NEUTRAL
-	}
-	[CCode (cprefix = "PANGO_ELLIPSIZE_", cheader_filename = "pango/pango.h")]
-	public enum EllipsizeMode {
-		NONE,
-		START,
-		MIDDLE,
-		END
-	}
-	[CCode (cprefix = "PANGO_GRAVITY_", cheader_filename = "pango/pango.h")]
-	public enum Gravity {
-		SOUTH,
-		EAST,
-		NORTH,
-		WEST,
-		AUTO
-	}
-	[CCode (cprefix = "PANGO_GRAVITY_HINT_", cheader_filename = "pango/pango.h")]
-	public enum GravityHint {
-		NATURAL,
-		STRONG,
-		LINE
-	}
-	[CCode (cprefix = "PANGO_RENDER_PART_", cheader_filename = "pango/pango.h")]
-	public enum RenderPart {
-		FOREGROUND,
-		BACKGROUND,
-		UNDERLINE,
-		STRIKETHROUGH
-	}
-	[CCode (cprefix = "PANGO_SCRIPT_", cheader_filename = "pango/pango.h")]
-	public enum Script {
-		INVALID_CODE,
-		COMMON,
-		INHERITED,
-		ARABIC,
-		ARMENIAN,
-		BENGALI,
-		BOPOMOFO,
-		CHEROKEE,
-		COPTIC,
-		CYRILLIC,
-		DESERET,
-		DEVANAGARI,
-		ETHIOPIC,
-		GEORGIAN,
-		GOTHIC,
-		GREEK,
-		GUJARATI,
-		GURMUKHI,
-		HAN,
-		HANGUL,
-		HEBREW,
-		HIRAGANA,
-		KANNADA,
-		KATAKANA,
-		KHMER,
-		LAO,
-		LATIN,
-		MALAYALAM,
-		MONGOLIAN,
-		MYANMAR,
-		OGHAM,
-		OLD_ITALIC,
-		ORIYA,
-		RUNIC,
-		SINHALA,
-		SYRIAC,
-		TAMIL,
-		TELUGU,
-		THAANA,
-		THAI,
-		TIBETAN,
-		CANADIAN_ABORIGINAL,
-		YI,
-		TAGALOG,
-		HANUNOO,
-		BUHID,
-		TAGBANWA,
-		BRAILLE,
-		CYPRIOT,
-		LIMBU,
-		OSMANYA,
-		SHAVIAN,
-		LINEAR_B,
-		TAI_LE,
-		UGARITIC,
-		NEW_TAI_LUE,
-		BUGINESE,
-		GLAGOLITIC,
-		TIFINAGH,
-		SYLOTI_NAGRI,
-		OLD_PERSIAN,
-		KHAROSHTHI,
-		UNKNOWN,
-		BALINESE,
-		CUNEIFORM,
-		PHOENICIAN,
-		PHAGS_PA,
-		NKO,
-		KAYAH_LI,
-		LEPCHA,
-		REJANG,
-		SUNDANESE,
-		SAURASHTRA,
-		CHAM,
-		OL_CHIKI,
-		VAI,
-		CARIAN,
-		LYCIAN,
-		LYDIAN
-	}
-	[CCode (cprefix = "PANGO_STRETCH_", cheader_filename = "pango/pango.h")]
-	public enum Stretch {
-		ULTRA_CONDENSED,
-		EXTRA_CONDENSED,
-		CONDENSED,
-		SEMI_CONDENSED,
-		NORMAL,
-		SEMI_EXPANDED,
-		EXPANDED,
-		EXTRA_EXPANDED,
-		ULTRA_EXPANDED
-	}
-	[CCode (cprefix = "PANGO_STYLE_", cheader_filename = "pango/pango.h")]
-	public enum Style {
-		NORMAL,
-		OBLIQUE,
-		ITALIC
-	}
-	[CCode (cprefix = "PANGO_TAB_", cheader_filename = "pango/pango.h")]
-	public enum TabAlign {
-		LEFT
-	}
-	[CCode (cprefix = "PANGO_UNDERLINE_", cheader_filename = "pango/pango.h")]
-	public enum Underline {
-		NONE,
-		SINGLE,
-		DOUBLE,
-		LOW,
-		ERROR
-	}
-	[CCode (cprefix = "PANGO_VARIANT_", cheader_filename = "pango/pango.h")]
-	public enum Variant {
-		NORMAL,
-		SMALL_CAPS
-	}
-	[CCode (cprefix = "PANGO_WEIGHT_", cheader_filename = "pango/pango.h")]
-	public enum Weight {
-		ULTRALIGHT,
-		LIGHT,
-		NORMAL,
-		SEMIBOLD,
-		BOLD,
-		ULTRABOLD,
-		HEAVY
-	}
-	[CCode (cprefix = "PANGO_WRAP_", cheader_filename = "pango/pango.h")]
-	public enum WrapMode {
-		WORD,
-		CHAR,
-		WORD_CHAR
-	}
-	[CCode (cprefix = "PANGO_FONT_MASK_", cheader_filename = "pango/pango.h")]
-	[Flags]
-	public enum FontMask {
-		FAMILY,
-		STYLE,
-		VARIANT,
-		WEIGHT,
-		STRETCH,
-		SIZE,
-		GRAVITY
-	}
-	[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);
-		public static weak Pango.Language get_default ();
-		public weak string get_sample_string ();
-		public bool includes_script (Pango.Script script);
-		public bool matches (string range_list);
-	}
-	[Compact]
-	[CCode (cheader_filename = "pango/pango.h")]
-	public class Analysis {
-		public weak Pango.EngineShape shape_engine;
-		public weak Pango.EngineLang lang_engine;
-		public weak Pango.Font font;
-		public uchar level;
-		public uchar gravity;
-		public uchar flags;
-		public uchar script;
-		public weak Pango.Language language;
-		public weak GLib.SList extra_attrs;
-	}
-	[Compact]
-	[CCode (cheader_filename = "pango/pango.h")]
-	public class AttrClass {
-		public Pango.AttrType type;
-		public weak GLib.Callback copy;
-		public weak GLib.Callback destroy;
-		public weak GLib.Callback equal;
-	}
-	[Compact]
-	[CCode (cheader_filename = "pango/pango.h")]
-	public class AttrColor {
-		public weak Pango.Attribute attr;
-		public Pango.Color color;
-	}
-	[Compact]
-	[CCode (cheader_filename = "pango/pango.h")]
-	public class AttrFloat {
-		public weak Pango.Attribute attr;
-		public double value;
-	}
-	[Compact]
-	[CCode (cheader_filename = "pango/pango.h")]
-	public class AttrFontDesc {
-		public weak Pango.Attribute attr;
-		public weak Pango.FontDescription desc;
-		[CCode (type = "PangoAttribute*", has_construct_function = false)]
-		public AttrFontDesc (Pango.FontDescription desc);
-	}
-	[Compact]
-	[CCode (cheader_filename = "pango/pango.h")]
-	public class AttrInt {
-		public weak Pango.Attribute attr;
-		public int value;
-	}
-	[Compact]
-	[CCode (copy_function = "pango_attr_iterator_copy", free_function = "pango_attr_iterator_destroy", cheader_filename = "pango/pango.h")]
-	public class AttrIterator {
-		public weak Pango.AttrIterator copy ();
-		public weak Pango.Attribute get (Pango.AttrType type);
-		public weak GLib.SList get_attrs ();
-		public void get_font (Pango.FontDescription desc, out weak Pango.Language language, GLib.SList extra_attrs);
-		public bool next ();
-		public void range (int start, int end);
-	}
-	[Compact]
-	[CCode (cheader_filename = "pango/pango.h")]
-	public class AttrLanguage {
-		public weak Pango.Attribute attr;
-		public weak Pango.Language value;
-		[CCode (type = "PangoAttribute*", has_construct_function = false)]
-		public AttrLanguage (Pango.Language language);
-	}
-	[Compact]
-	[CCode (cheader_filename = "pango/pango.h")]
-	public class AttrShape {
-		public weak Pango.Attribute attr;
-		public Pango.Rectangle ink_rect;
-		public Pango.Rectangle logical_rect;
-		public void* data;
-		public weak Pango.AttrDataCopyFunc copy_func;
-		public weak GLib.DestroyNotify destroy_func;
-		[CCode (type = "PangoAttribute*", has_construct_function = false)]
-		public AttrShape (Pango.Rectangle ink_rect, Pango.Rectangle logical_rect);
-		[CCode (type = "PangoAttribute*", has_construct_function = false)]
-		public AttrShape.with_data (Pango.Rectangle ink_rect, Pango.Rectangle logical_rect, void* data, Pango.AttrDataCopyFunc copy_func, GLib.DestroyNotify destroy_func);
-	}
-	[Compact]
-	[CCode (cheader_filename = "pango/pango.h")]
-	public class AttrSize {
-		public weak Pango.Attribute attr;
-		public int size;
-		public uint absolute;
-		[CCode (type = "PangoAttribute*", has_construct_function = false)]
-		public AttrSize (int size);
-	}
-	[Compact]
-	[CCode (cheader_filename = "pango/pango.h")]
-	public class AttrString {
-		public weak Pango.Attribute attr;
-		public weak string value;
-	}
-	[Compact]
-	[CCode (copy_function = "pango_attribute_copy", free_function = "pango_attribute_destroy", cheader_filename = "pango/pango.h")]
-	public class Attribute {
-		public weak Pango.AttrClass klass;
-		public uint start_index;
-		public uint end_index;
-		public weak Pango.Attribute copy ();
-		public bool equal (Pango.Attribute attr2);
-		public void init (Pango.AttrClass klass);
-	}
-	[Compact]
-	[CCode (cheader_filename = "pango/pango.h")]
-	public class ContextClass {
-	}
-	[Compact]
-	[CCode (ref_function = "pango_coverage_ref", unref_function = "pango_coverage_unref", cheader_filename = "pango/pango.h")]
-	public class Coverage {
-		public weak Pango.Coverage copy ();
-		public static weak Pango.Coverage from_bytes (uchar[][] bytes);
-		public Pango.CoverageLevel get (int index_);
-		public void max (Pango.Coverage other);
-		[CCode (has_construct_function = false)]
-		public Coverage ();
-		public void set (int index_, Pango.CoverageLevel level);
-		public void to_bytes (uchar[][] bytes);
-	}
-	[Compact]
-	[CCode (cheader_filename = "pango/pango.h")]
-	public class EngineLang {
-	}
-	[Compact]
-	[CCode (cheader_filename = "pango/pango.h")]
-	public class EngineShape {
-	}
 	[Compact]
 	[CCode (cheader_filename = "pango/pango.h")]
-	public class Glyph {
+	public class Analysis {
+		public weak GLib.SList extra_attrs;
+		public uchar flags;
+		public weak Pango.Font font;
+		public uchar gravity;
+		public weak Pango.EngineLang lang_engine;
+		public weak Pango.Language language;
+		public uchar level;
+		public uchar script;
+		public weak Pango.EngineShape shape_engine;
 	}
 	[Compact]
 	[CCode (cheader_filename = "pango/pango.h")]
-	public class GlyphGeometry {
-		public weak Pango.GlyphUnit width;
-		public weak Pango.GlyphUnit x_offset;
-		public weak Pango.GlyphUnit y_offset;
+	public class AttrClass {
+		public weak GLib.Callback copy;
+		public weak GLib.Callback destroy;
+		public weak GLib.Callback equal;
+		public Pango.AttrType type;
 	}
 	[Compact]
 	[CCode (cheader_filename = "pango/pango.h")]
-	public class GlyphInfo {
-		public weak Pango.Glyph glyph;
-		public weak Pango.GlyphGeometry geometry;
-		public weak Pango.GlyphVisAttr attr;
+	public class AttrColor {
+		public weak Pango.Attribute attr;
+		public Pango.Color color;
 	}
 	[Compact]
 	[CCode (cheader_filename = "pango/pango.h")]
-	public class GlyphUnit {
+	public class AttrFloat {
+		public weak Pango.Attribute attr;
+		public double value;
 	}
 	[Compact]
 	[CCode (cheader_filename = "pango/pango.h")]
-	public class GlyphVisAttr {
-		public uint is_cluster_start;
+	public class AttrFontDesc {
+		public weak Pango.Attribute attr;
+		public weak Pango.FontDescription desc;
+		[CCode (type = "PangoAttribute*", has_construct_function = false)]
+		public AttrFontDesc (Pango.FontDescription desc);
 	}
 	[Compact]
 	[CCode (cheader_filename = "pango/pango.h")]
-	public class LayoutClass {
+	public class AttrInt {
+		public weak Pango.Attribute attr;
+		public int value;
 	}
 	[Compact]
-	[CCode (cheader_filename = "pango/pango.h")]
-	public class LayoutRun {
+	[CCode (copy_function = "pango_attr_iterator_copy", free_function = "pango_attr_iterator_destroy", cheader_filename = "pango/pango.h")]
+	public class AttrIterator {
+		public weak Pango.AttrIterator copy ();
+		public weak Pango.Attribute get (Pango.AttrType type);
+		public weak GLib.SList get_attrs ();
+		public void get_font (Pango.FontDescription desc, out weak Pango.Language language, GLib.SList extra_attrs);
+		public bool next ();
+		public void range (int start, int end);
 	}
 	[Compact]
 	[CCode (cheader_filename = "pango/pango.h")]
-	public class ScriptIter {
-		public void get_range (out weak string start, out weak string end, Pango.Script script);
-		[CCode (has_construct_function = false)]
-		public ScriptIter (string text, int length);
-		public bool next ();
+	public class AttrLanguage {
+		public weak Pango.Attribute attr;
+		public weak Pango.Language value;
+		[CCode (type = "PangoAttribute*", has_construct_function = false)]
+		public AttrLanguage (Pango.Language language);
 	}
 	[Compact]
 	[CCode (ref_function = "pango_attr_list_ref", unref_function = "pango_attr_list_unref", cheader_filename = "pango/pango.h")]
@@ -440,144 +81,43 @@
 		public void splice (Pango.AttrList other, int pos, int len);
 	}
 	[Compact]
-	[CCode (copy_function = "pango_font_description_copy", cheader_filename = "pango/pango.h")]
-	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 ();
-		public bool equal (Pango.FontDescription desc2);
-		public static weak Pango.FontDescription from_string (string str);
-		public weak string get_family ();
-		public Pango.Gravity get_gravity ();
-		public Pango.FontMask get_set_fields ();
-		public int get_size ();
-		public bool get_size_is_absolute ();
-		public Pango.Stretch get_stretch ();
-		public Pango.Style get_style ();
-		public Pango.Variant get_variant ();
-		public Pango.Weight get_weight ();
-		public uint hash ();
-		public void merge (Pango.FontDescription desc_to_merge, bool replace_existing);
-		public void merge_static (Pango.FontDescription desc_to_merge, bool replace_existing);
-		[CCode (has_construct_function = false)]
-		public FontDescription ();
-		public void set_absolute_size (double size);
-		public void set_family (string family);
-		public void set_family_static (string family);
-		public void set_gravity (Pango.Gravity gravity);
-		public void set_size (int size);
-		public void set_stretch (Pango.Stretch stretch);
-		public void set_style (Pango.Style style);
-		public void set_variant (Pango.Variant variant);
-		public void set_weight (Pango.Weight weight);
-		public weak string to_filename ();
-		public weak string to_string ();
-		public void unset_fields (Pango.FontMask to_unset);
-	}
-	[Compact]
-	[CCode (ref_function = "pango_font_metrics_ref", unref_function = "pango_font_metrics_unref", cheader_filename = "pango/pango.h")]
-	public class FontMetrics {
-		public int get_approximate_char_width ();
-		public int get_approximate_digit_width ();
-		public int get_ascent ();
-		public int get_descent ();
-		public int get_strikethrough_position ();
-		public int get_strikethrough_thickness ();
-		public int get_underline_position ();
-		public int get_underline_thickness ();
-	}
-	[Compact]
-	[CCode (copy_function = "pango_glyph_item_copy", cheader_filename = "pango/pango.h")]
-	public class GlyphItem {
-		public weak Pango.Item item;
-		public weak Pango.GlyphString glyphs;
-		public weak GLib.SList apply_attrs (string text, Pango.AttrList list);
-		public weak Pango.GlyphItem copy ();
-		public void letter_space (string text, Pango.LogAttr[] log_attrs, int letter_spacing);
-		public weak Pango.GlyphItem split (string text, int split_index);
-	}
-	[Compact]
-	[CCode (copy_function = "pango_glyph_string_copy", cheader_filename = "pango/pango.h")]
-	public class GlyphString {
-		public int num_glyphs;
-		public weak Pango.GlyphInfo glyphs;
-		public int log_clusters;
-		public int space;
-		public weak Pango.GlyphString copy ();
-		public void extents (Pango.Font font, out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
-		public void extents_range (int start, int end, Pango.Font font, out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
-		public void get_logical_widths (string text, int length, int embedding_level, int logical_widths);
-		public int get_width ();
-		public void index_to_x (string text, int length, Pango.Analysis analysis, int index_, bool trailing, int x_pos);
-		[CCode (has_construct_function = false)]
-		public GlyphString ();
-		public void set_size (int new_len);
-		public void x_to_index (string text, int length, Pango.Analysis analysis, int x_pos, int index_, int trailing);
-	}
-	[Compact]
-	[CCode (copy_function = "pango_item_copy", cheader_filename = "pango/pango.h")]
-	public class Item {
-		public int offset;
-		public int length;
-		public int num_chars;
-		public weak Pango.Analysis analysis;
-		public weak Pango.Item copy ();
-		[CCode (has_construct_function = false)]
-		public Item ();
-		public weak Pango.Item split (int split_index, int split_offset);
+	[CCode (cheader_filename = "pango/pango.h")]
+	public class AttrShape {
+		public weak Pango.Attribute attr;
+		public weak Pango.AttrDataCopyFunc copy_func;
+		public void* data;
+		public weak GLib.DestroyNotify destroy_func;
+		public Pango.Rectangle ink_rect;
+		public Pango.Rectangle logical_rect;
+		[CCode (type = "PangoAttribute*", has_construct_function = false)]
+		public AttrShape (Pango.Rectangle ink_rect, Pango.Rectangle logical_rect);
+		[CCode (type = "PangoAttribute*", has_construct_function = false)]
+		public AttrShape.with_data (Pango.Rectangle ink_rect, Pango.Rectangle logical_rect, void* data, Pango.AttrDataCopyFunc copy_func, GLib.DestroyNotify destroy_func);
 	}
 	[Compact]
-	[CCode (copy_function = "pango_layout_iter_copy", cheader_filename = "pango/pango.h")]
-	public class LayoutIter {
-		public bool at_last_line ();
-		public weak Pango.LayoutIter copy ();
-		public int get_baseline ();
-		public void get_char_extents (out Pango.Rectangle logical_rect);
-		public void get_cluster_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
-		public int get_index ();
-		public weak Pango.Layout get_layout ();
-		public void get_layout_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
-		public weak Pango.LayoutLine get_line ();
-		public void get_line_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
-		public weak Pango.LayoutLine get_line_readonly ();
-		public void get_line_yrange (out int y0_, out int y1_);
-		public weak Pango.LayoutRun get_run ();
-		public void get_run_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
-		public weak Pango.LayoutRun get_run_readonly ();
-		public bool next_char ();
-		public bool next_cluster ();
-		public bool next_line ();
-		public bool next_run ();
+	[CCode (cheader_filename = "pango/pango.h")]
+	public class AttrSize {
+		public uint absolute;
+		public weak Pango.Attribute attr;
+		public int size;
+		[CCode (type = "PangoAttribute*", has_construct_function = false)]
+		public AttrSize (int size);
 	}
 	[Compact]
-	[CCode (ref_function = "pango_layout_line_ref", unref_function = "pango_layout_line_unref", cheader_filename = "pango/pango.h")]
-	public class LayoutLine {
-		public weak Pango.Layout layout;
-		public int start_index;
-		public int length;
-		public weak GLib.SList runs;
-		public uint is_paragraph_start;
-		public uint resolved_dir;
-		public void get_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
-		public void get_pixel_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
-		public void get_x_ranges (int start_index, int end_index, int[] ranges);
-		public void index_to_x (int index_, bool trailing, int x_pos);
-		public bool x_to_index (int x_pos, int index_, int trailing);
+	[CCode (cheader_filename = "pango/pango.h")]
+	public class AttrString {
+		public weak Pango.Attribute attr;
+		public weak string value;
 	}
 	[Compact]
-	[CCode (copy_function = "pango_tab_array_copy", cheader_filename = "pango/pango.h")]
-	public class TabArray {
-		public weak Pango.TabArray copy ();
-		public bool get_positions_in_pixels ();
-		public int get_size ();
-		public void get_tab (int tab_index, Pango.TabAlign alignment, int location);
-		public void get_tabs (out Pango.TabAlign alignments, int locations);
-		[CCode (has_construct_function = false)]
-		public TabArray (int initial_size, bool positions_in_pixels);
-		[CCode (has_construct_function = false)]
-		public TabArray.with_positions (int size, bool positions_in_pixels, Pango.TabAlign first_alignment, ...);
-		public void resize (int new_size);
-		public void set_tab (int tab_index, Pango.TabAlign alignment, int location);
+	[CCode (copy_function = "pango_attribute_copy", free_function = "pango_attribute_destroy", cheader_filename = "pango/pango.h")]
+	public class Attribute {
+		public uint end_index;
+		public weak Pango.AttrClass klass;
+		public uint start_index;
+		public weak Pango.Attribute copy ();
+		public bool equal (Pango.Attribute attr2);
+		public void init (Pango.AttrClass klass);
 	}
 	[CCode (cheader_filename = "pango/pango.h")]
 	public class Context : GLib.Object {
@@ -600,6 +140,30 @@
 		public void set_language (Pango.Language language);
 		public void set_matrix (Pango.Matrix matrix);
 	}
+	[Compact]
+	[CCode (cheader_filename = "pango/pango.h")]
+	public class ContextClass {
+	}
+	[Compact]
+	[CCode (ref_function = "pango_coverage_ref", unref_function = "pango_coverage_unref", cheader_filename = "pango/pango.h")]
+	public class Coverage {
+		public weak Pango.Coverage copy ();
+		public static weak Pango.Coverage from_bytes (uchar[][] bytes);
+		public Pango.CoverageLevel get (int index_);
+		public void max (Pango.Coverage other);
+		[CCode (has_construct_function = false)]
+		public Coverage ();
+		public void set (int index_, Pango.CoverageLevel level);
+		public void to_bytes (uchar[][] bytes);
+	}
+	[Compact]
+	[CCode (cheader_filename = "pango/pango.h")]
+	public class EngineLang {
+	}
+	[Compact]
+	[CCode (cheader_filename = "pango/pango.h")]
+	public class EngineShape {
+	}
 	[CCode (cheader_filename = "pango/pango.h")]
 	public class Font : GLib.Object {
 		public weak Pango.FontDescription describe ();
@@ -611,6 +175,41 @@
 		public void get_glyph_extents (Pango.Glyph glyph, out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
 		public weak Pango.FontMetrics get_metrics (Pango.Language language);
 	}
+	[Compact]
+	[CCode (copy_function = "pango_font_description_copy", cheader_filename = "pango/pango.h")]
+	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 ();
+		public bool equal (Pango.FontDescription desc2);
+		public static weak Pango.FontDescription from_string (string str);
+		public weak string get_family ();
+		public Pango.Gravity get_gravity ();
+		public Pango.FontMask get_set_fields ();
+		public int get_size ();
+		public bool get_size_is_absolute ();
+		public Pango.Stretch get_stretch ();
+		public Pango.Style get_style ();
+		public Pango.Variant get_variant ();
+		public Pango.Weight get_weight ();
+		public uint hash ();
+		public void merge (Pango.FontDescription desc_to_merge, bool replace_existing);
+		public void merge_static (Pango.FontDescription desc_to_merge, bool replace_existing);
+		[CCode (has_construct_function = false)]
+		public FontDescription ();
+		public void set_absolute_size (double size);
+		public void set_family (string family);
+		public void set_family_static (string family);
+		public void set_gravity (Pango.Gravity gravity);
+		public void set_size (int size);
+		public void set_stretch (Pango.Stretch stretch);
+		public void set_style (Pango.Style style);
+		public void set_variant (Pango.Variant variant);
+		public void set_weight (Pango.Weight weight);
+		public weak string to_filename ();
+		public weak string to_string ();
+		public void unset_fields (Pango.FontMask to_unset);
+	}
 	[CCode (cheader_filename = "pango/pango.h")]
 	public class FontFace : GLib.Object {
 		public weak Pango.FontDescription describe ();
@@ -630,12 +229,101 @@
 		public weak Pango.Font load_font (Pango.Context context, Pango.FontDescription desc);
 		public weak Pango.Fontset load_fontset (Pango.Context context, Pango.FontDescription desc, Pango.Language language);
 	}
+	[Compact]
+	[CCode (ref_function = "pango_font_metrics_ref", unref_function = "pango_font_metrics_unref", cheader_filename = "pango/pango.h")]
+	public class FontMetrics {
+		public int get_approximate_char_width ();
+		public int get_approximate_digit_width ();
+		public int get_ascent ();
+		public int get_descent ();
+		public int get_strikethrough_position ();
+		public int get_strikethrough_thickness ();
+		public int get_underline_position ();
+		public int get_underline_thickness ();
+	}
 	[CCode (cheader_filename = "pango/pango.h")]
 	public class Fontset : GLib.Object {
 		public void @foreach (Pango.FontsetForeachFunc func, void* data);
 		public weak Pango.Font get_font (uint wc);
 		public weak Pango.FontMetrics get_metrics ();
 	}
+	[Compact]
+	[CCode (cheader_filename = "pango/pango.h")]
+	public class Glyph {
+	}
+	[Compact]
+	[CCode (cheader_filename = "pango/pango.h")]
+	public class GlyphGeometry {
+		public weak Pango.GlyphUnit width;
+		public weak Pango.GlyphUnit x_offset;
+		public weak Pango.GlyphUnit y_offset;
+	}
+	[Compact]
+	[CCode (cheader_filename = "pango/pango.h")]
+	public class GlyphInfo {
+		public weak Pango.GlyphVisAttr attr;
+		public weak Pango.GlyphGeometry geometry;
+		public weak Pango.Glyph glyph;
+	}
+	[Compact]
+	[CCode (copy_function = "pango_glyph_item_copy", cheader_filename = "pango/pango.h")]
+	public class GlyphItem {
+		public weak Pango.GlyphString glyphs;
+		public weak Pango.Item item;
+		public weak GLib.SList apply_attrs (string text, Pango.AttrList list);
+		public weak Pango.GlyphItem copy ();
+		public void letter_space (string text, Pango.LogAttr[] log_attrs, int letter_spacing);
+		public weak Pango.GlyphItem split (string text, int split_index);
+	}
+	[Compact]
+	[CCode (copy_function = "pango_glyph_string_copy", cheader_filename = "pango/pango.h")]
+	public class GlyphString {
+		public weak Pango.GlyphInfo glyphs;
+		public int log_clusters;
+		public int num_glyphs;
+		public int space;
+		public weak Pango.GlyphString copy ();
+		public void extents (Pango.Font font, out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
+		public void extents_range (int start, int end, Pango.Font font, out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
+		public void get_logical_widths (string text, int length, int embedding_level, int logical_widths);
+		public int get_width ();
+		public void index_to_x (string text, int length, Pango.Analysis analysis, int index_, bool trailing, int x_pos);
+		[CCode (has_construct_function = false)]
+		public GlyphString ();
+		public void set_size (int new_len);
+		public void x_to_index (string text, int length, Pango.Analysis analysis, int x_pos, int index_, int trailing);
+	}
+	[Compact]
+	[CCode (cheader_filename = "pango/pango.h")]
+	public class GlyphUnit {
+	}
+	[Compact]
+	[CCode (cheader_filename = "pango/pango.h")]
+	public class GlyphVisAttr {
+		public uint is_cluster_start;
+	}
+	[Compact]
+	[CCode (copy_function = "pango_item_copy", cheader_filename = "pango/pango.h")]
+	public class Item {
+		public weak Pango.Analysis analysis;
+		public int length;
+		public int num_chars;
+		public int offset;
+		public weak Pango.Item copy ();
+		[CCode (has_construct_function = false)]
+		public Item ();
+		public weak Pango.Item split (int split_index, int split_offset);
+	}
+	[CCode (ref_function = "pango_language_ref", unref_function = "pango_language_unref", cheader_filename = "pango/pango.h")]
+	public class Language {
+		public static weak Pango.Language from_string (string language);
+		public static weak Pango.Language get_default ();
+		public weak string get_sample_string ();
+		public bool includes_script (Pango.Script script);
+		public bool matches (string range_list);
+		public Language ();
+		public weak string to_string ();
+	}
 	[CCode (cheader_filename = "pango/pango.h")]
 	public class Layout : GLib.Object {
 		public void context_changed ();
@@ -694,78 +382,140 @@
 		public void set_wrap (Pango.WrapMode wrap);
 		public bool xy_to_index (int x, int y, int index_, int trailing);
 	}
+	[Compact]
+	[CCode (cheader_filename = "pango/pango.h")]
+	public class LayoutClass {
+	}
+	[Compact]
+	[CCode (copy_function = "pango_layout_iter_copy", cheader_filename = "pango/pango.h")]
+	public class LayoutIter {
+		public bool at_last_line ();
+		public weak Pango.LayoutIter copy ();
+		public int get_baseline ();
+		public void get_char_extents (out Pango.Rectangle logical_rect);
+		public void get_cluster_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
+		public int get_index ();
+		public weak Pango.Layout get_layout ();
+		public void get_layout_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
+		public weak Pango.LayoutLine get_line ();
+		public void get_line_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
+		public weak Pango.LayoutLine get_line_readonly ();
+		public void get_line_yrange (out int y0_, out int y1_);
+		public weak Pango.LayoutRun get_run ();
+		public void get_run_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
+		public weak Pango.LayoutRun get_run_readonly ();
+		public bool next_char ();
+		public bool next_cluster ();
+		public bool next_line ();
+		public bool next_run ();
+	}
+	[Compact]
+	[CCode (ref_function = "pango_layout_line_ref", unref_function = "pango_layout_line_unref", cheader_filename = "pango/pango.h")]
+	public class LayoutLine {
+		public uint is_paragraph_start;
+		public weak Pango.Layout layout;
+		public int length;
+		public uint resolved_dir;
+		public weak GLib.SList runs;
+		public int start_index;
+		public void get_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
+		public void get_pixel_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
+		public void get_x_ranges (int start_index, int end_index, int[] ranges);
+		public void index_to_x (int index_, bool trailing, int x_pos);
+		public bool x_to_index (int x_pos, int index_, int trailing);
+	}
+	[Compact]
+	[CCode (cheader_filename = "pango/pango.h")]
+	public class LayoutRun {
+	}
 	[CCode (cheader_filename = "pango/pango.h")]
 	public class Renderer : GLib.Object {
-		public Pango.Underline underline;
-		public bool strikethrough;
 		public int active_count;
 		public Pango.Matrix matrix;
+		public bool strikethrough;
+		public Pango.Underline underline;
 		public void activate ();
-		public void deactivate ();
-		public void draw_layout (Pango.Layout layout, int x, int y);
-		public void draw_layout_line (Pango.LayoutLine line, int x, int y);
-		public Pango.Color get_color (Pango.RenderPart part);
-		public weak Pango.Layout get_layout ();
-		public weak Pango.LayoutLine get_layout_line ();
-		public Pango.Matrix get_matrix ();
-		public void set_color (Pango.RenderPart part, Pango.Color color);
-		public void set_matrix (Pango.Matrix matrix);
 		[NoWrapper]
 		public virtual void begin ();
+		public void deactivate ();
 		public virtual void draw_error_underline (int x, int y, int width, int height);
 		public virtual void draw_glyph (Pango.Font font, Pango.Glyph glyph, double x, double y);
 		public virtual void draw_glyphs (Pango.Font font, Pango.GlyphString glyphs, int x, int y);
+		public void draw_layout (Pango.Layout layout, int x, int y);
+		public void draw_layout_line (Pango.LayoutLine line, int x, int y);
 		public virtual void draw_rectangle (Pango.RenderPart part, int x, int y, int width, int height);
 		[NoWrapper]
 		public virtual void draw_shape (Pango.AttrShape attr, int x, int y);
 		public virtual void draw_trapezoid (Pango.RenderPart part, double y1_, double x11, double x21, double y2, double x12, double x22);
 		[NoWrapper]
 		public virtual void end ();
+		public Pango.Color get_color (Pango.RenderPart part);
+		public weak Pango.Layout get_layout ();
+		public weak Pango.LayoutLine get_layout_line ();
+		public Pango.Matrix get_matrix ();
 		public virtual void part_changed (Pango.RenderPart part);
 		[NoWrapper]
 		public virtual void prepare_run (Pango.LayoutRun run);
+		public void set_color (Pango.RenderPart part, Pango.Color color);
+		public void set_matrix (Pango.Matrix matrix);
 	}
+	[Compact]
 	[CCode (cheader_filename = "pango/pango.h")]
-	public struct LogAttr {
-		public uint is_line_break;
-		public uint is_mandatory_break;
-		public uint is_char_break;
-		public uint is_white;
-		public uint is_cursor_position;
-		public uint is_word_start;
-		public uint is_word_end;
-		public uint is_sentence_boundary;
-		public uint is_sentence_start;
-		public uint is_sentence_end;
-		public uint backspace_deletes_character;
-		public uint is_expandable_space;
-		public uint is_word_boundary;
+	public class ScriptIter {
+		public void get_range (out weak string start, out weak string end, Pango.Script script);
+		[CCode (has_construct_function = false)]
+		public ScriptIter (string text, int length);
+		public bool next ();
 	}
-	[CCode (cheader_filename = "pango/pango.h")]
-	public struct Rectangle {
-		public int x;
-		public int y;
-		public int width;
-		public int height;
+	[Compact]
+	[CCode (copy_function = "pango_tab_array_copy", cheader_filename = "pango/pango.h")]
+	public class TabArray {
+		public weak Pango.TabArray copy ();
+		public bool get_positions_in_pixels ();
+		public int get_size ();
+		public void get_tab (int tab_index, Pango.TabAlign alignment, int location);
+		public void get_tabs (out Pango.TabAlign alignments, int locations);
+		[CCode (has_construct_function = false)]
+		public TabArray (int initial_size, bool positions_in_pixels);
+		public void resize (int new_size);
+		public void set_tab (int tab_index, Pango.TabAlign alignment, int location);
+		[CCode (has_construct_function = false)]
+		public TabArray.with_positions (int size, bool positions_in_pixels, Pango.TabAlign first_alignment, ...);
 	}
 	[CCode (type_id = "PANGO_TYPE_COLOR", cheader_filename = "pango/pango.h")]
 	public struct Color {
-		public ushort red;
-		public ushort green;
 		public ushort blue;
+		public ushort green;
+		public ushort red;
 		public Pango.Color copy ();
 		public void free ();
 		public bool parse (string spec);
 		public weak string to_string ();
 	}
+	[CCode (cheader_filename = "pango/pango.h")]
+	public struct LogAttr {
+		public uint backspace_deletes_character;
+		public uint is_char_break;
+		public uint is_cursor_position;
+		public uint is_expandable_space;
+		public uint is_line_break;
+		public uint is_mandatory_break;
+		public uint is_sentence_boundary;
+		public uint is_sentence_end;
+		public uint is_sentence_start;
+		public uint is_white;
+		public uint is_word_boundary;
+		public uint is_word_end;
+		public uint is_word_start;
+	}
 	[CCode (type_id = "PANGO_TYPE_MATRIX", cheader_filename = "pango/pango.h")]
 	public struct Matrix {
+		public double x0;
 		public double xx;
 		public double xy;
+		public double y0;
 		public double yx;
 		public double yy;
-		public double x0;
-		public double y0;
 		public void concat (Pango.Matrix new_matrix);
 		public Pango.Matrix copy ();
 		public void free ();
@@ -779,6 +529,256 @@
 		public void translate (double tx, double ty);
 	}
 	[CCode (cheader_filename = "pango/pango.h")]
+	public struct Rectangle {
+		public int height;
+		public int width;
+		public int x;
+		public int y;
+	}
+	[CCode (cprefix = "PANGO_ALIGN_", cheader_filename = "pango/pango.h")]
+	public enum Alignment {
+		LEFT,
+		CENTER,
+		RIGHT
+	}
+	[CCode (cprefix = "PANGO_ATTR_", cheader_filename = "pango/pango.h")]
+	public enum AttrType {
+		INVALID,
+		LANGUAGE,
+		FAMILY,
+		STYLE,
+		WEIGHT,
+		VARIANT,
+		STRETCH,
+		SIZE,
+		FONT_DESC,
+		FOREGROUND,
+		BACKGROUND,
+		UNDERLINE,
+		STRIKETHROUGH,
+		RISE,
+		SHAPE,
+		SCALE,
+		FALLBACK,
+		LETTER_SPACING,
+		UNDERLINE_COLOR,
+		STRIKETHROUGH_COLOR,
+		ABSOLUTE_SIZE,
+		GRAVITY,
+		GRAVITY_HINT
+	}
+	[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_", cheader_filename = "pango/pango.h")]
+	public enum Direction {
+		LTR,
+		RTL,
+		TTB_LTR,
+		TTB_RTL,
+		WEAK_LTR,
+		WEAK_RTL,
+		NEUTRAL
+	}
+	[CCode (cprefix = "PANGO_ELLIPSIZE_", cheader_filename = "pango/pango.h")]
+	public enum EllipsizeMode {
+		NONE,
+		START,
+		MIDDLE,
+		END
+	}
+	[CCode (cprefix = "PANGO_FONT_MASK_", cheader_filename = "pango/pango.h")]
+	[Flags]
+	public enum FontMask {
+		FAMILY,
+		STYLE,
+		VARIANT,
+		WEIGHT,
+		STRETCH,
+		SIZE,
+		GRAVITY
+	}
+	[CCode (cprefix = "PANGO_GRAVITY_", cheader_filename = "pango/pango.h")]
+	public enum Gravity {
+		SOUTH,
+		EAST,
+		NORTH,
+		WEST,
+		AUTO
+	}
+	[CCode (cprefix = "PANGO_GRAVITY_HINT_", cheader_filename = "pango/pango.h")]
+	public enum GravityHint {
+		NATURAL,
+		STRONG,
+		LINE
+	}
+	[CCode (cprefix = "PANGO_RENDER_PART_", cheader_filename = "pango/pango.h")]
+	public enum RenderPart {
+		FOREGROUND,
+		BACKGROUND,
+		UNDERLINE,
+		STRIKETHROUGH
+	}
+	[CCode (cprefix = "PANGO_SCRIPT_", cheader_filename = "pango/pango.h")]
+	public enum Script {
+		INVALID_CODE,
+		COMMON,
+		INHERITED,
+		ARABIC,
+		ARMENIAN,
+		BENGALI,
+		BOPOMOFO,
+		CHEROKEE,
+		COPTIC,
+		CYRILLIC,
+		DESERET,
+		DEVANAGARI,
+		ETHIOPIC,
+		GEORGIAN,
+		GOTHIC,
+		GREEK,
+		GUJARATI,
+		GURMUKHI,
+		HAN,
+		HANGUL,
+		HEBREW,
+		HIRAGANA,
+		KANNADA,
+		KATAKANA,
+		KHMER,
+		LAO,
+		LATIN,
+		MALAYALAM,
+		MONGOLIAN,
+		MYANMAR,
+		OGHAM,
+		OLD_ITALIC,
+		ORIYA,
+		RUNIC,
+		SINHALA,
+		SYRIAC,
+		TAMIL,
+		TELUGU,
+		THAANA,
+		THAI,
+		TIBETAN,
+		CANADIAN_ABORIGINAL,
+		YI,
+		TAGALOG,
+		HANUNOO,
+		BUHID,
+		TAGBANWA,
+		BRAILLE,
+		CYPRIOT,
+		LIMBU,
+		OSMANYA,
+		SHAVIAN,
+		LINEAR_B,
+		TAI_LE,
+		UGARITIC,
+		NEW_TAI_LUE,
+		BUGINESE,
+		GLAGOLITIC,
+		TIFINAGH,
+		SYLOTI_NAGRI,
+		OLD_PERSIAN,
+		KHAROSHTHI,
+		UNKNOWN,
+		BALINESE,
+		CUNEIFORM,
+		PHOENICIAN,
+		PHAGS_PA,
+		NKO,
+		KAYAH_LI,
+		LEPCHA,
+		REJANG,
+		SUNDANESE,
+		SAURASHTRA,
+		CHAM,
+		OL_CHIKI,
+		VAI,
+		CARIAN,
+		LYCIAN,
+		LYDIAN
+	}
+	[CCode (cprefix = "PANGO_STRETCH_", cheader_filename = "pango/pango.h")]
+	public enum Stretch {
+		ULTRA_CONDENSED,
+		EXTRA_CONDENSED,
+		CONDENSED,
+		SEMI_CONDENSED,
+		NORMAL,
+		SEMI_EXPANDED,
+		EXPANDED,
+		EXTRA_EXPANDED,
+		ULTRA_EXPANDED
+	}
+	[CCode (cprefix = "PANGO_STYLE_", cheader_filename = "pango/pango.h")]
+	public enum Style {
+		NORMAL,
+		OBLIQUE,
+		ITALIC
+	}
+	[CCode (cprefix = "PANGO_TAB_", cheader_filename = "pango/pango.h")]
+	public enum TabAlign {
+		LEFT
+	}
+	[CCode (cprefix = "PANGO_UNDERLINE_", cheader_filename = "pango/pango.h")]
+	public enum Underline {
+		NONE,
+		SINGLE,
+		DOUBLE,
+		LOW,
+		ERROR
+	}
+	[CCode (cprefix = "PANGO_VARIANT_", cheader_filename = "pango/pango.h")]
+	public enum Variant {
+		NORMAL,
+		SMALL_CAPS
+	}
+	[CCode (cprefix = "PANGO_WEIGHT_", cheader_filename = "pango/pango.h")]
+	public enum Weight {
+		ULTRALIGHT,
+		LIGHT,
+		NORMAL,
+		SEMIBOLD,
+		BOLD,
+		ULTRABOLD,
+		HEAVY
+	}
+	[CCode (cprefix = "PANGO_WRAP_", cheader_filename = "pango/pango.h")]
+	public enum WrapMode {
+		WORD,
+		CHAR,
+		WORD_CHAR
+	}
+	[CCode (cheader_filename = "pango/pango.h")]
 	public delegate void* AttrDataCopyFunc ();
 	[CCode (cheader_filename = "pango/pango.h")]
 	public delegate bool AttrFilterFunc (Pango.Attribute attribute);

Modified: trunk/vapi/poppler-glib.vapi
==============================================================================
--- trunk/vapi/poppler-glib.vapi	(original)
+++ trunk/vapi/poppler-glib.vapi	Fri Oct 24 16:50:22 2008
@@ -2,328 +2,108 @@
 
 [CCode (cprefix = "Poppler", lower_case_cprefix = "poppler_")]
 namespace Poppler {
-	[CCode (cprefix = "POPPLER_ACTION_", has_type_id = "0", cheader_filename = "poppler.h")]
-	public enum ActionType {
-		UNKNOWN,
-		GOTO_DEST,
-		GOTO_REMOTE,
-		LAUNCH,
-		URI,
-		NAMED,
-		MOVIE
-	}
-	[CCode (cprefix = "POPPLER_BACKEND_", has_type_id = "0", cheader_filename = "poppler.h")]
-	public enum Backend {
-		UNKNOWN,
-		SPLASH,
-		CAIRO
-	}
-	[CCode (cprefix = "POPPLER_DEST_", has_type_id = "0", cheader_filename = "poppler.h")]
-	public enum DestType {
-		UNKNOWN,
-		XYZ,
-		FIT,
-		FITH,
-		FITV,
-		FITR,
-		FITB,
-		FITBH,
-		FITBV,
-		NAMED
-	}
-	[CCode (cprefix = "POPPLER_ERROR_", has_type_id = "0", cheader_filename = "poppler.h")]
-	public enum Error {
-		INVALID,
-		ENCRYPTED
-	}
-	[CCode (cprefix = "POPPLER_FONT_TYPE_", has_type_id = "0", cheader_filename = "poppler.h")]
-	public enum FontType {
-		UNKNOWN,
-		TYPE1,
-		TYPE1C,
-		TYPE1COT,
-		TYPE3,
-		TRUETYPE,
-		TRUETYPEOT,
-		CID_TYPE0,
-		CID_TYPE0C,
-		CID_TYPE0COT,
-		CID_TYPE2,
-		CID_TYPE2OT
-	}
-	[CCode (cprefix = "POPPLER_FORM_BUTTON_", has_type_id = "0", cheader_filename = "poppler.h")]
-	public enum FormButtonType {
-		PUSH,
-		CHECK,
-		RADIO
-	}
-	[CCode (cprefix = "POPPLER_FORM_CHOICE_", has_type_id = "0", cheader_filename = "poppler.h")]
-	public enum FormChoiceType {
-		COMBO,
-		LIST
-	}
-	[CCode (cprefix = "POPPLER_FORM_FIELD_", has_type_id = "0", cheader_filename = "poppler.h")]
-	public enum FormFieldType {
-		UNKNOWN,
-		BUTTON,
-		TEXT,
-		CHOICE,
-		SIGNATURE
-	}
-	[CCode (cprefix = "POPPLER_FORM_TEXT_", has_type_id = "0", cheader_filename = "poppler.h")]
-	public enum FormTextType {
-		NORMAL,
-		MULTILINE,
-		FILE_SELECT
-	}
-	[CCode (cprefix = "POPPLER_ORIENTATION_", has_type_id = "0", cheader_filename = "poppler.h")]
-	public enum Orientation {
-		PORTRAIT,
-		LANDSCAPE,
-		UPSIDEDOWN,
-		SEASCAPE
-	}
-	[CCode (cprefix = "POPPLER_PAGE_LAYOUT_", has_type_id = "0", cheader_filename = "poppler.h")]
-	public enum PageLayout {
-		UNSET,
-		SINGLE_PAGE,
-		ONE_COLUMN,
-		TWO_COLUMN_LEFT,
-		TWO_COLUMN_RIGHT,
-		TWO_PAGE_LEFT,
-		TWO_PAGE_RIGHT
-	}
-	[CCode (cprefix = "POPPLER_PAGE_MODE_", has_type_id = "0", cheader_filename = "poppler.h")]
-	public enum PageMode {
-		UNSET,
-		NONE,
-		USE_OUTLINES,
-		USE_THUMBS,
-		FULL_SCREEN,
-		USE_OC,
-		USE_ATTACHMENTS
-	}
-	[CCode (cprefix = "POPPLER_PAGE_TRANSITION_", has_type_id = "0", cheader_filename = "poppler.h")]
-	public enum PageTransitionAlignment {
-		HORIZONTAL,
-		VERTICAL
-	}
-	[CCode (cprefix = "POPPLER_PAGE_TRANSITION_", has_type_id = "0", cheader_filename = "poppler.h")]
-	public enum PageTransitionDirection {
-		INWARD,
-		OUTWARD
-	}
-	[CCode (cprefix = "POPPLER_PAGE_TRANSITION_", has_type_id = "0", cheader_filename = "poppler.h")]
-	public enum PageTransitionType {
-		REPLACE,
-		SPLIT,
-		BLINDS,
-		BOX,
-		WIPE,
-		DISSOLVE,
-		GLITTER,
-		FLY,
-		PUSH,
-		COVER,
-		UNCOVER,
-		FADE
-	}
-	[CCode (cprefix = "POPPLER_SELECTION_", has_type_id = "0", cheader_filename = "poppler.h")]
-	public enum SelectionStyle {
-		GLYPH,
-		WORD,
-		LINE
-	}
-	[CCode (cprefix = "POPPLER_PERMISSIONS_", has_type_id = "0", cheader_filename = "poppler.h")]
-	[Flags]
-	public enum Permissions {
-		OK_TO_PRINT,
-		OK_TO_MODIFY,
-		OK_TO_COPY,
-		OK_TO_ADD_NOTES,
-		FULL
-	}
-	[CCode (cprefix = "POPPLER_VIEWER_PREFERENCES_", has_type_id = "0", cheader_filename = "poppler.h")]
-	[Flags]
-	public enum ViewerPreferences {
-		UNSET,
-		HIDE_TOOLBAR,
-		HIDE_MENUBAR,
-		HIDE_WINDOWUI,
-		FIT_WINDOW,
-		CENTER_WINDOW,
-		DISPLAY_DOC_TITLE,
-		DIRECTION_RTL
+	[Compact]
+	[CCode (copy_function = "poppler_action_copy", cheader_filename = "poppler.h")]
+	public class Action {
+		public weak Poppler.ActionAny any;
+		public weak Poppler.ActionGotoDest goto_dest;
+		public weak Poppler.ActionGotoRemote goto_remote;
+		public weak Poppler.ActionLaunch launch;
+		public weak Poppler.ActionMovie movie;
+		public weak Poppler.ActionNamed named;
+		public Poppler.ActionType type;
+		public weak Poppler.ActionUri uri;
+		public weak Poppler.Action copy ();
 	}
 	[Compact]
 	[CCode (cheader_filename = "poppler.h")]
 	public class ActionAny {
-		public Poppler.ActionType type;
 		public weak string title;
+		public Poppler.ActionType type;
 	}
 	[Compact]
 	[CCode (cheader_filename = "poppler.h")]
 	public class ActionGotoDest {
-		public Poppler.ActionType type;
-		public weak string title;
 		public weak Poppler.Dest dest;
+		public weak string title;
+		public Poppler.ActionType type;
 	}
 	[Compact]
 	[CCode (cheader_filename = "poppler.h")]
 	public class ActionGotoRemote {
-		public Poppler.ActionType type;
-		public weak string title;
-		public weak string file_name;
 		public weak Poppler.Dest dest;
+		public weak string file_name;
+		public weak string title;
+		public Poppler.ActionType type;
 	}
 	[Compact]
 	[CCode (cheader_filename = "poppler.h")]
 	public class ActionLaunch {
-		public Poppler.ActionType type;
-		public weak string title;
 		public weak string file_name;
 		public weak string params;
+		public weak string title;
+		public Poppler.ActionType type;
 	}
 	[Compact]
 	[CCode (cheader_filename = "poppler.h")]
 	public class ActionMovie {
-		public Poppler.ActionType type;
 		public weak string title;
+		public Poppler.ActionType type;
 	}
 	[Compact]
 	[CCode (cheader_filename = "poppler.h")]
 	public class ActionNamed {
-		public Poppler.ActionType type;
-		public weak string title;
 		public weak string named_dest;
-	}
-	[Compact]
-	[CCode (cheader_filename = "poppler.h")]
-	public class ActionUri {
-		public Poppler.ActionType type;
 		public weak string title;
-		public weak string uri;
-	}
-	[Compact]
-	[CCode (copy_function = "poppler_action_copy", cheader_filename = "poppler.h")]
-	public class Action {
 		public Poppler.ActionType type;
-		public weak Poppler.ActionAny any;
-		public weak Poppler.ActionGotoDest goto_dest;
-		public weak Poppler.ActionGotoRemote goto_remote;
-		public weak Poppler.ActionLaunch launch;
-		public weak Poppler.ActionUri uri;
-		public weak Poppler.ActionNamed named;
-		public weak Poppler.ActionMovie movie;
-		public weak Poppler.Action copy ();
 	}
-	[Compact]
-	[CCode (copy_function = "poppler_dest_copy", cheader_filename = "poppler.h")]
-	public class Dest {
-		public Poppler.DestType type;
-		public int page_num;
-		public double left;
-		public double bottom;
-		public double right;
-		public double top;
-		public double zoom;
-		public weak string named_dest;
-		public uint change_left;
-		public uint change_top;
-		public uint change_zoom;
-		public weak Poppler.Dest copy ();
-	}
-	[Compact]
-	[CCode (copy_function = "poppler_fonts_iter_copy", cheader_filename = "poppler.h")]
-	public class FontsIter {
-		public weak Poppler.FontsIter copy ();
-		public weak string get_file_name ();
-		public Poppler.FontType get_font_type ();
-		public weak string get_full_name ();
-		public weak string get_name ();
-		public bool is_embedded ();
-		public bool is_subset ();
-		public bool next ();
-	}
-	[Compact]
-	[CCode (copy_function = "poppler_form_field_mapping_copy", cheader_filename = "poppler.h")]
-	public class FormFieldMapping {
-		public weak Poppler.Rectangle area;
-		public weak Poppler.FormField field;
-		public weak Poppler.FormFieldMapping copy ();
-		public FormFieldMapping ();
-	}
-	[Compact]
-	[CCode (copy_function = "poppler_image_mapping_copy", cheader_filename = "poppler.h")]
-	public class ImageMapping {
-		public weak Poppler.Rectangle area;
-		public weak Gdk.Pixbuf image;
-		public weak Poppler.ImageMapping copy ();
-		public ImageMapping ();
-	}
-	[Compact]
-	[CCode (copy_function = "poppler_index_iter_copy", cheader_filename = "poppler.h")]
-	public class IndexIter {
-		public weak Poppler.IndexIter copy ();
-		public weak Poppler.Action get_action ();
-		public weak Poppler.IndexIter get_child ();
-		public bool is_open ();
-		public IndexIter (Poppler.Document document);
-		public bool next ();
-	}
-	[Compact]
-	[CCode (copy_function = "poppler_link_mapping_copy", cheader_filename = "poppler.h")]
-	public class LinkMapping {
-		public weak Poppler.Rectangle area;
-		public weak Poppler.Action action;
-		public weak Poppler.LinkMapping copy ();
-		public LinkMapping ();
-	}
-	[Compact]
-	[CCode (copy_function = "poppler_page_transition_copy", cheader_filename = "poppler.h")]
-	public class PageTransition {
-		public Poppler.PageTransitionType type;
-		public Poppler.PageTransitionAlignment alignment;
-		public Poppler.PageTransitionDirection direction;
-		public int duration;
-		public int angle;
-		public double scale;
-		public bool rectangular;
-		public weak Poppler.PageTransition copy ();
-		public PageTransition ();
-	}
-	[Compact]
-	[CCode (copy_function = "poppler_rectangle_copy", cheader_filename = "poppler.h")]
-	public class Rectangle {
-		public double x1;
-		public double y1;
-		public double x2;
-		public double y2;
-		public weak Poppler.Rectangle copy ();
-		public Rectangle ();
+	[Compact]
+	[CCode (cheader_filename = "poppler.h")]
+	public class ActionUri {
+		public weak string title;
+		public Poppler.ActionType type;
+		public weak string uri;
 	}
 	[CCode (cheader_filename = "poppler.h")]
 	public class Attachment : GLib.Object {
-		public weak string name;
+		public weak GLib.StringBuilder checksum;
+		public GLib.Time ctime;
 		public weak string description;
-		public ulong size;
 		public GLib.Time mtime;
-		public GLib.Time ctime;
-		public weak GLib.StringBuilder checksum;
+		public weak string name;
+		public ulong size;
 		public bool save (string filename) throws GLib.Error;
 		public bool save_to_callback (Poppler.AttachmentSaveFunc save_func) throws GLib.Error;
 	}
+	[Compact]
+	[CCode (copy_function = "poppler_dest_copy", cheader_filename = "poppler.h")]
+	public class Dest {
+		public double bottom;
+		public uint change_left;
+		public uint change_top;
+		public uint change_zoom;
+		public double left;
+		public weak string named_dest;
+		public int page_num;
+		public double right;
+		public double top;
+		public Poppler.DestType type;
+		public double zoom;
+		public weak Poppler.Dest copy ();
+	}
 	[CCode (cheader_filename = "poppler.h")]
 	public class Document : GLib.Object {
 		public weak Poppler.Dest find_dest (string link_name);
+		[CCode (has_construct_function = false)]
+		public Document.from_data (string data, int length, string password) throws GLib.Error;
+		[CCode (has_construct_function = false)]
+		public Document.from_file (string uri, string? password) throws GLib.Error;
 		public weak GLib.List get_attachments ();
 		public weak Poppler.FormField get_form_field (int id);
 		public int get_n_pages ();
 		public weak Poppler.Page get_page (int index);
 		public weak Poppler.Page get_page_by_label (string label);
 		public bool has_attachments ();
-		public Document.from_data (string data, int length, string password) throws GLib.Error;
-		public Document.from_file (string uri, string? password) throws GLib.Error;
 		public bool save (string uri) throws GLib.Error;
 		[NoAccessorMethod]
 		public string author { get; }
@@ -359,9 +139,22 @@
 	[CCode (cheader_filename = "poppler.h")]
 	public class FontInfo : GLib.Object {
 		public void free ();
+		[CCode (has_construct_function = false)]
 		public FontInfo (Poppler.Document document);
 		public bool scan (int n_pages, out weak Poppler.FontsIter iter);
 	}
+	[Compact]
+	[CCode (copy_function = "poppler_fonts_iter_copy", cheader_filename = "poppler.h")]
+	public class FontsIter {
+		public weak Poppler.FontsIter copy ();
+		public weak string get_file_name ();
+		public Poppler.FontType get_font_type ();
+		public weak string get_full_name ();
+		public weak string get_name ();
+		public bool is_embedded ();
+		public bool is_subset ();
+		public bool next ();
+	}
 	[CCode (cheader_filename = "poppler.h")]
 	public class FormField : GLib.Object {
 		public Poppler.FormButtonType button_get_button_type ();
@@ -393,9 +186,48 @@
 		public bool text_is_rich_text ();
 		public void text_set_text (string text);
 	}
+	[Compact]
+	[CCode (copy_function = "poppler_form_field_mapping_copy", cheader_filename = "poppler.h")]
+	public class FormFieldMapping {
+		public weak Poppler.Rectangle area;
+		public weak Poppler.FormField field;
+		public weak Poppler.FormFieldMapping copy ();
+		[CCode (has_construct_function = false)]
+		public FormFieldMapping ();
+	}
+	[Compact]
+	[CCode (copy_function = "poppler_image_mapping_copy", cheader_filename = "poppler.h")]
+	public class ImageMapping {
+		public weak Poppler.Rectangle area;
+		public weak Gdk.Pixbuf image;
+		public weak Poppler.ImageMapping copy ();
+		[CCode (has_construct_function = false)]
+		public ImageMapping ();
+	}
+	[Compact]
+	[CCode (copy_function = "poppler_index_iter_copy", cheader_filename = "poppler.h")]
+	public class IndexIter {
+		public weak Poppler.IndexIter copy ();
+		public weak Poppler.Action get_action ();
+		public weak Poppler.IndexIter get_child ();
+		public bool is_open ();
+		[CCode (has_construct_function = false)]
+		public IndexIter (Poppler.Document document);
+		public bool next ();
+	}
+	[Compact]
+	[CCode (copy_function = "poppler_link_mapping_copy", cheader_filename = "poppler.h")]
+	public class LinkMapping {
+		public weak Poppler.Action action;
+		public weak Poppler.Rectangle area;
+		public weak Poppler.LinkMapping copy ();
+		[CCode (has_construct_function = false)]
+		public LinkMapping ();
+	}
 	[CCode (cheader_filename = "poppler.h")]
 	public class PSFile : GLib.Object {
 		public void free ();
+		[CCode (has_construct_function = false)]
 		public PSFile (Poppler.Document document, string filename, int first_page, int n_pages);
 		public void set_duplex (bool duplex);
 		public void set_paper_size (double width, double height);
@@ -426,6 +258,184 @@
 		[NoAccessorMethod]
 		public string label { get; }
 	}
+	[Compact]
+	[CCode (copy_function = "poppler_page_transition_copy", cheader_filename = "poppler.h")]
+	public class PageTransition {
+		public Poppler.PageTransitionAlignment alignment;
+		public int angle;
+		public Poppler.PageTransitionDirection direction;
+		public int duration;
+		public bool rectangular;
+		public double scale;
+		public Poppler.PageTransitionType type;
+		public weak Poppler.PageTransition copy ();
+		[CCode (has_construct_function = false)]
+		public PageTransition ();
+	}
+	[Compact]
+	[CCode (copy_function = "poppler_rectangle_copy", cheader_filename = "poppler.h")]
+	public class Rectangle {
+		public double x1;
+		public double x2;
+		public double y1;
+		public double y2;
+		public weak Poppler.Rectangle copy ();
+		[CCode (has_construct_function = false)]
+		public Rectangle ();
+	}
+	[CCode (cprefix = "POPPLER_ACTION_", has_type_id = "0", cheader_filename = "poppler.h")]
+	public enum ActionType {
+		UNKNOWN,
+		GOTO_DEST,
+		GOTO_REMOTE,
+		LAUNCH,
+		URI,
+		NAMED,
+		MOVIE
+	}
+	[CCode (cprefix = "POPPLER_BACKEND_", has_type_id = "0", cheader_filename = "poppler.h")]
+	public enum Backend {
+		UNKNOWN,
+		SPLASH,
+		CAIRO
+	}
+	[CCode (cprefix = "POPPLER_DEST_", has_type_id = "0", cheader_filename = "poppler.h")]
+	public enum DestType {
+		UNKNOWN,
+		XYZ,
+		FIT,
+		FITH,
+		FITV,
+		FITR,
+		FITB,
+		FITBH,
+		FITBV,
+		NAMED
+	}
+	[CCode (cprefix = "POPPLER_ERROR_", has_type_id = "0", cheader_filename = "poppler.h")]
+	public enum Error {
+		INVALID,
+		ENCRYPTED
+	}
+	[CCode (cprefix = "POPPLER_FONT_TYPE_", has_type_id = "0", cheader_filename = "poppler.h")]
+	public enum FontType {
+		UNKNOWN,
+		TYPE1,
+		TYPE1C,
+		TYPE1COT,
+		TYPE3,
+		TRUETYPE,
+		TRUETYPEOT,
+		CID_TYPE0,
+		CID_TYPE0C,
+		CID_TYPE0COT,
+		CID_TYPE2,
+		CID_TYPE2OT
+	}
+	[CCode (cprefix = "POPPLER_FORM_BUTTON_", has_type_id = "0", cheader_filename = "poppler.h")]
+	public enum FormButtonType {
+		PUSH,
+		CHECK,
+		RADIO
+	}
+	[CCode (cprefix = "POPPLER_FORM_CHOICE_", has_type_id = "0", cheader_filename = "poppler.h")]
+	public enum FormChoiceType {
+		COMBO,
+		LIST
+	}
+	[CCode (cprefix = "POPPLER_FORM_FIELD_", has_type_id = "0", cheader_filename = "poppler.h")]
+	public enum FormFieldType {
+		UNKNOWN,
+		BUTTON,
+		TEXT,
+		CHOICE,
+		SIGNATURE
+	}
+	[CCode (cprefix = "POPPLER_FORM_TEXT_", has_type_id = "0", cheader_filename = "poppler.h")]
+	public enum FormTextType {
+		NORMAL,
+		MULTILINE,
+		FILE_SELECT
+	}
+	[CCode (cprefix = "POPPLER_ORIENTATION_", has_type_id = "0", cheader_filename = "poppler.h")]
+	public enum Orientation {
+		PORTRAIT,
+		LANDSCAPE,
+		UPSIDEDOWN,
+		SEASCAPE
+	}
+	[CCode (cprefix = "POPPLER_PAGE_LAYOUT_", has_type_id = "0", cheader_filename = "poppler.h")]
+	public enum PageLayout {
+		UNSET,
+		SINGLE_PAGE,
+		ONE_COLUMN,
+		TWO_COLUMN_LEFT,
+		TWO_COLUMN_RIGHT,
+		TWO_PAGE_LEFT,
+		TWO_PAGE_RIGHT
+	}
+	[CCode (cprefix = "POPPLER_PAGE_MODE_", has_type_id = "0", cheader_filename = "poppler.h")]
+	public enum PageMode {
+		UNSET,
+		NONE,
+		USE_OUTLINES,
+		USE_THUMBS,
+		FULL_SCREEN,
+		USE_OC,
+		USE_ATTACHMENTS
+	}
+	[CCode (cprefix = "POPPLER_PAGE_TRANSITION_", has_type_id = "0", cheader_filename = "poppler.h")]
+	public enum PageTransitionAlignment {
+		HORIZONTAL,
+		VERTICAL
+	}
+	[CCode (cprefix = "POPPLER_PAGE_TRANSITION_", has_type_id = "0", cheader_filename = "poppler.h")]
+	public enum PageTransitionDirection {
+		INWARD,
+		OUTWARD
+	}
+	[CCode (cprefix = "POPPLER_PAGE_TRANSITION_", has_type_id = "0", cheader_filename = "poppler.h")]
+	public enum PageTransitionType {
+		REPLACE,
+		SPLIT,
+		BLINDS,
+		BOX,
+		WIPE,
+		DISSOLVE,
+		GLITTER,
+		FLY,
+		PUSH,
+		COVER,
+		UNCOVER,
+		FADE
+	}
+	[CCode (cprefix = "POPPLER_PERMISSIONS_", has_type_id = "0", cheader_filename = "poppler.h")]
+	[Flags]
+	public enum Permissions {
+		OK_TO_PRINT,
+		OK_TO_MODIFY,
+		OK_TO_COPY,
+		OK_TO_ADD_NOTES,
+		FULL
+	}
+	[CCode (cprefix = "POPPLER_SELECTION_", has_type_id = "0", cheader_filename = "poppler.h")]
+	public enum SelectionStyle {
+		GLYPH,
+		WORD,
+		LINE
+	}
+	[CCode (cprefix = "POPPLER_VIEWER_PREFERENCES_", has_type_id = "0", cheader_filename = "poppler.h")]
+	[Flags]
+	public enum ViewerPreferences {
+		UNSET,
+		HIDE_TOOLBAR,
+		HIDE_MENUBAR,
+		HIDE_WINDOWUI,
+		FIT_WINDOW,
+		CENTER_WINDOW,
+		DISPLAY_DOC_TITLE,
+		DIRECTION_RTL
+	}
 	[CCode (cheader_filename = "poppler.h")]
 	public static delegate bool AttachmentSaveFunc (string buf, ulong count, void* data, GLib.Error error);
 	[CCode (cheader_filename = "poppler.h")]

Modified: trunk/vapi/vte.vapi
==============================================================================
--- trunk/vapi/vte.vapi	(original)
+++ trunk/vapi/vte.vapi	Fri Oct 24 16:50:22 2008
@@ -1,29 +1,16 @@
-/* vte.vapi generated by vapigen, do not modify. */
+/* vte.vapi generated by lt-vapigen, do not modify. */
 
 [CCode (cprefix = "Vte", lower_case_cprefix = "vte_")]
 namespace Vte {
-	[CCode (cprefix = "VTE_ANTI_ALIAS_", has_type_id = "0", cheader_filename = "vte/vte.h")]
-	public enum TerminalAntiAlias {
-		USE_DEFAULT,
-		FORCE_ENABLE,
-		FORCE_DISABLE
-	}
-	[CCode (cprefix = "VTE_ERASE_", has_type_id = "0", cheader_filename = "vte/vte.h")]
-	public enum TerminalEraseBinding {
-		AUTO,
-		ASCII_BACKSPACE,
-		ASCII_DELETE,
-		DELETE_SEQUENCE
-	}
 	[Compact]
 	[CCode (cheader_filename = "vte/vte.h")]
 	public class CharAttributes {
-		public long row;
+		public Gdk.Color back;
 		public long column;
 		public Gdk.Color fore;
-		public Gdk.Color back;
-		public uint underline;
+		public long row;
 		public uint strikethrough;
+		public uint underline;
 	}
 	[CCode (cheader_filename = "vte/reaper.h")]
 	public class Reaper : GLib.Object {
@@ -37,14 +24,14 @@
 	[CCode (cheader_filename = "vte/vte.h")]
 	public class Terminal : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
 		public weak Gtk.Adjustment adjustment;
-		public long char_width;
-		public long char_height;
 		public long char_ascent;
 		public long char_descent;
-		public long row_count;
+		public long char_height;
+		public long char_width;
 		public long column_count;
-		public weak string window_title;
 		public weak string icon_title;
+		public long row_count;
+		public weak string window_title;
 		public void copy_primary ();
 		public void feed (string data, long length);
 		public void feed_child (string text, long length);
@@ -175,4 +162,17 @@
 		[CCode (type = "AtkObjectFactory*", has_construct_function = false)]
 		public TerminalAccessibleFactory ();
 	}
+	[CCode (cprefix = "VTE_ANTI_ALIAS_", has_type_id = "0", cheader_filename = "vte/vte.h")]
+	public enum TerminalAntiAlias {
+		USE_DEFAULT,
+		FORCE_ENABLE,
+		FORCE_DISABLE
+	}
+	[CCode (cprefix = "VTE_ERASE_", has_type_id = "0", cheader_filename = "vte/vte.h")]
+	public enum TerminalEraseBinding {
+		AUTO,
+		ASCII_BACKSPACE,
+		ASCII_DELETE,
+		DELETE_SEQUENCE
+	}
 }

Modified: trunk/vapi/webkit-1.0.vapi
==============================================================================
--- trunk/vapi/webkit-1.0.vapi	(original)
+++ trunk/vapi/webkit-1.0.vapi	Fri Oct 24 16:50:22 2008
@@ -2,20 +2,10 @@
 
 [CCode (cprefix = "WebKit", lower_case_cprefix = "webkit_")]
 namespace WebKit {
-	[CCode (cprefix = "WEBKIT_NAVIGATION_RESPONSE_", has_type_id = "0", cheader_filename = "webkit/webkit.h")]
-	public enum NavigationResponse {
-		ACCEPT,
-		IGNORE,
-		DOWNLOAD
-	}
-	[CCode (cprefix = "WEBKIT_WEB_VIEW_TARGET_INFO_", has_type_id = "0", cheader_filename = "webkit/webkit.h")]
-	public enum WebViewTargetInfo {
-		HTML,
-		TEXT
-	}
 	[CCode (cheader_filename = "webkit/webkit.h")]
 	public class NetworkRequest : GLib.Object {
 		public weak string get_uri ();
+		[CCode (has_construct_function = false)]
 		public NetworkRequest (string uri);
 		public void set_uri (string uri);
 	}
@@ -34,8 +24,9 @@
 		public void go_back ();
 		public void go_forward ();
 		public void go_to_item (WebKit.WebHistoryItem history_item);
-		public WebBackForwardList.with_web_view (WebKit.WebView web_view);
 		public void set_limit (int limit);
+		[CCode (has_construct_function = false)]
+		public WebBackForwardList.with_web_view (WebKit.WebView web_view);
 	}
 	[CCode (cheader_filename = "webkit/webkit.h")]
 	public class WebFrame : GLib.Object {
@@ -46,6 +37,7 @@
 		public weak string get_uri ();
 		public weak WebKit.WebView get_web_view ();
 		public void load_request (WebKit.NetworkRequest request);
+		[CCode (has_construct_function = false)]
 		public WebFrame (WebKit.WebView web_view);
 		public void reload ();
 		public void stop_loading ();
@@ -65,13 +57,16 @@
 		public weak string get_original_uri ();
 		public weak string get_title ();
 		public weak string get_uri ();
+		[CCode (has_construct_function = false)]
 		public WebHistoryItem ();
-		public WebHistoryItem.with_data (string uri, string title);
 		public void set_alternate_title (string title);
+		[CCode (has_construct_function = false)]
+		public WebHistoryItem.with_data (string uri, string title);
 	}
 	[CCode (cheader_filename = "webkit/webkit.h")]
 	public class WebSettings : GLib.Object {
 		public weak WebKit.WebSettings copy ();
+		[CCode (has_construct_function = false)]
 		public WebSettings ();
 		[NoAccessorMethod]
 		public bool auto_load_images { get; set construct; }
@@ -119,6 +114,10 @@
 		public bool can_go_backward ();
 		public bool can_go_forward ();
 		public bool can_paste_clipboard ();
+		[NoWrapper]
+		public virtual weak string choose_file (WebKit.WebFrame frame, string old_file);
+		[NoWrapper]
+		public virtual weak WebKit.WebView create_web_view ();
 		public void delete_selection ();
 		public void execute_script (string script);
 		public weak WebKit.WebBackForwardList get_back_forward_list ();
@@ -138,6 +137,7 @@
 		public void load_html_string (string content, string base_uri);
 		public void load_string (string content, string content_mime_type, string content_encoding, string base_uri);
 		public uint mark_text_matches (string str, bool case_sensitive, uint limit);
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public WebView ();
 		public void open (string uri);
 		public void reload ();
@@ -149,10 +149,6 @@
 		public void set_transparent (bool flag);
 		public void stop_loading ();
 		public void unmark_text_matches ();
-		[NoWrapper]
-		public virtual weak string choose_file (WebKit.WebFrame frame, string old_file);
-		[NoWrapper]
-		public virtual weak WebKit.WebView create_web_view ();
 		public Gtk.TargetList copy_target_list { get; }
 		public bool editable { get; set; }
 		public Gtk.TargetList paste_target_list { get; }
@@ -184,4 +180,15 @@
 		public virtual signal void title_changed (WebKit.WebFrame p0, string p1);
 		public virtual signal void window_object_cleared (WebKit.WebFrame frame, void* context, void* window_object);
 	}
+	[CCode (cprefix = "WEBKIT_NAVIGATION_RESPONSE_", has_type_id = "0", cheader_filename = "webkit/webkit.h")]
+	public enum NavigationResponse {
+		ACCEPT,
+		IGNORE,
+		DOWNLOAD
+	}
+	[CCode (cprefix = "WEBKIT_WEB_VIEW_TARGET_INFO_", has_type_id = "0", cheader_filename = "webkit/webkit.h")]
+	public enum WebViewTargetInfo {
+		HTML,
+		TEXT
+	}
 }



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