[vala] Update several bindings to newer versions



commit 1364c251d74e171872939109f30b87276a1fb5c9
Author: Evan Nemerson <evan coeus-group com>
Date:   Mon Jul 19 02:24:26 2010 -0700

    Update several bindings to newer versions
    
    atk to 1.30.0, gconf-2.0 to 2.28.1, gdk-2.0 to 2.21.2, gdk-x11-2.0 to
    2.21.2, gio-2.0 to 2.25.11, gnome-vfs-2.0 to 2.24.3, json-glib-1.0 to
    0.11.1, libgnome-menu to 2.30.0, libnotify to 0.5.0, libsoup-2.4 to
    2.30.2, libwnck-1.0 to 2.30.0

 vapi/atk.vapi                                |   23 +-
 vapi/gconf-2.0.vapi                          |   14 +-
 vapi/gdk-2.0.vapi                            |   40 +++
 vapi/gdk-x11-2.0.vapi                        |    6 +
 vapi/gio-2.0.vapi                            |   26 +-
 vapi/gnome-vfs-2.0.vapi                      |   62 ++--
 vapi/json-glib-1.0.vapi                      |    4 +
 vapi/libgnome-menu.vapi                      |   10 +
 vapi/libnotify.vapi                          |   10 +-
 vapi/libsoup-2.4.vapi                        |   16 +-
 vapi/libwnck-1.0.vapi                        |   19 +-
 vapi/packages/atk/atk.gi                     |   58 +++-
 vapi/packages/gconf-2.0/gconf-2.0.gi         |   24 +-
 vapi/packages/gdk-2.0/gdk-2.0.gi             |  264 ++++++++++++++
 vapi/packages/gdk-x11-2.0/gdk-x11-2.0.gi     |   19 +
 vapi/packages/gio-2.0/gio-2.0.gi             |  134 ++++++--
 vapi/packages/gnome-vfs-2.0/gnome-vfs-2.0.gi |   66 ++--
 vapi/packages/json-glib-1.0/json-glib-1.0.gi |   12 +-
 vapi/packages/libgnome-menu/libgnome-menu.gi |   32 ++-
 vapi/packages/libnotify/libnotify.gi         |   61 +++-
 vapi/packages/libsoup-2.4/libsoup-2.4.gi     |   15 +
 vapi/packages/libwnck-1.0/libwnck-1.0.gi     |   25 +-
 vapi/packages/pango/pango.gi                 |   23 +-
 vapi/packages/poppler-glib/poppler-glib.gi   |  480 ++++++++++++++++++++++++--
 vapi/packages/webkit-1.0/webkit-1.0.gi       |   48 +++-
 vapi/pango.vapi                              |    3 +
 vapi/poppler-glib.vapi                       |  230 +++++++++++--
 vapi/webkit-1.0.vapi                         |   15 +
 28 files changed, 1512 insertions(+), 227 deletions(-)
---
diff --git a/vapi/atk.vapi b/vapi/atk.vapi
index 6114340..c81ca5e 100644
--- a/vapi/atk.vapi
+++ b/vapi/atk.vapi
@@ -56,7 +56,7 @@ namespace Atk {
 		public virtual void threads_leave ();
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
-	public class NoOpObject : Atk.Object, Atk.Value, Atk.Document, Atk.Component, Atk.Text, Atk.Action, Atk.Hypertext, Atk.Selection, Atk.Table, Atk.Image, Atk.EditableText {
+	public class NoOpObject : Atk.Object, Atk.Component, Atk.Action, Atk.EditableText, Atk.Image, Atk.Selection, Atk.Table, Atk.Text, Atk.Hypertext, Atk.Value, Atk.Document {
 		[CCode (type = "AtkObject*", has_construct_function = false)]
 		public NoOpObject (GLib.Object obj);
 	}
@@ -141,6 +141,14 @@ namespace Atk {
 		public virtual GLib.Type get_accessible_type ();
 		public virtual void invalidate ();
 	}
+	[CCode (cheader_filename = "atk/atk.h")]
+	public class Plug : Atk.Object {
+		[CCode (type = "AtkObject*", has_construct_function = false)]
+		public Plug ();
+		public unowned string get_id ();
+		[NoWrapper]
+		public virtual unowned string get_object_id ();
+	}
 	[Compact]
 	[CCode (cheader_filename = "atk/atk.h")]
 	public class PropertyValues {
@@ -163,7 +171,7 @@ namespace Atk {
 		public Relation (Atk.Object[] targets, Atk.RelationType relationship);
 		public void add_target (Atk.Object target);
 		public Atk.RelationType get_relation_type ();
-		public unowned GLib.PtrArray get_target ();
+		public unowned GLib.GenericArray get_target ();
 		public bool remove_target (Atk.Object target);
 		public static Atk.RelationType type_for_name (string name);
 		public static unowned string type_get_name (Atk.RelationType type);
@@ -175,7 +183,7 @@ namespace Atk {
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public class RelationSet : GLib.Object {
-		public weak GLib.PtrArray relations;
+		public weak GLib.GenericArray relations;
 		[CCode (has_construct_function = false)]
 		public RelationSet ();
 		public void add (Atk.Relation relation);
@@ -187,6 +195,14 @@ namespace Atk {
 		public void remove (Atk.Relation relation);
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
+	public class Socket : Atk.Object {
+		public weak string embedded_plug_id;
+		[CCode (type = "AtkObject*", has_construct_function = false)]
+		public Socket ();
+		public virtual void embed (string plug_id);
+		public bool is_occupied ();
+	}
+	[CCode (cheader_filename = "atk/atk.h")]
 	public class StateSet : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public StateSet ();
@@ -471,6 +487,7 @@ namespace Atk {
 		PARENT_WINDOW_OF,
 		DESCRIBED_BY,
 		DESCRIPTION_FOR,
+		NODE_PARENT_OF,
 		LAST_DEFINED
 	}
 	[CCode (cprefix = "ATK_ROLE_", cheader_filename = "atk/atk.h")]
diff --git a/vapi/gconf-2.0.vapi b/vapi/gconf-2.0.vapi
index 77f919b..5294bcf 100644
--- a/vapi/gconf-2.0.vapi
+++ b/vapi/gconf-2.0.vapi
@@ -27,6 +27,7 @@ namespace GConf {
 	}
 	[CCode (cheader_filename = "gconf/gconf-client.h")]
 	public class Client : GLib.Object {
+		public weak GLib.HashTable cache_dirs;
 		public weak GLib.HashTable cache_hash;
 		public weak GLib.HashTable dir_hash;
 		public weak GConf.Engine engine;
@@ -34,7 +35,6 @@ namespace GConf {
 		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;
@@ -219,6 +219,8 @@ namespace GConf {
 		public Value (GConf.ValueType type);
 		public int compare (GConf.Value value_b);
 		public GConf.Value copy ();
+		public static unowned GConf.Value decode (string encoded);
+		public unowned string encode ();
 		[CCode (has_construct_function = false)]
 		public Value.from_string (GConf.ValueType type, string str) throws GLib.Error;
 		public bool get_bool ();
@@ -245,19 +247,19 @@ namespace GConf {
 		public void set_string (string the_str);
 		public unowned string to_string ();
 	}
-	[CCode (cprefix = "GCONF_CLIENT_HANDLE_", has_type_id = false, cheader_filename = "gconf/gconf.h")]
+	[CCode (cprefix = "GCONF_CLIENT_HANDLE_", cheader_filename = "gconf/gconf.h")]
 	public enum ClientErrorHandlingMode {
 		NONE,
 		UNRETURNED,
 		ALL
 	}
-	[CCode (cprefix = "GCONF_CLIENT_PRELOAD_", has_type_id = false, cheader_filename = "gconf/gconf.h")]
+	[CCode (cprefix = "GCONF_CLIENT_PRELOAD_", cheader_filename = "gconf/gconf.h")]
 	public enum ClientPreloadType {
 		NONE,
 		ONELEVEL,
 		RECURSIVE
 	}
-	[CCode (cprefix = "GCONF_ERROR_", has_type_id = false, cheader_filename = "gconf/gconf.h")]
+	[CCode (cprefix = "GCONF_ERROR_", cheader_filename = "gconf/gconf.h")]
 	public enum Error {
 		SUCCESS,
 		FAILED,
@@ -277,12 +279,12 @@ namespace GConf {
 		NO_WRITABLE_DATABASE,
 		IN_SHUTDOWN
 	}
-	[CCode (cprefix = "GCONF_UNSET_INCLUDING_SCHEMA_", has_type_id = false, cheader_filename = "gconf/gconf.h")]
+	[CCode (cprefix = "GCONF_UNSET_INCLUDING_SCHEMA_", cheader_filename = "gconf/gconf.h")]
 	[Flags]
 	public enum UnsetFlags {
 		NAMES
 	}
-	[CCode (cprefix = "GCONF_VALUE_", has_type_id = false, cheader_filename = "gconf/gconf.h")]
+	[CCode (cprefix = "GCONF_VALUE_", cheader_filename = "gconf/gconf.h")]
 	public enum ValueType {
 		INVALID,
 		STRING,
diff --git a/vapi/gdk-2.0.vapi b/vapi/gdk-2.0.vapi
index 562acf5..b8a2b78 100644
--- a/vapi/gdk-2.0.vapi
+++ b/vapi/gdk-2.0.vapi
@@ -67,8 +67,14 @@ namespace Gdk {
 		public Gdk.InputSource source;
 		public static void free_history (Gdk.TimeCoord[] events);
 		public bool get_axis ([CCode (array_length = false)] double[] axes, Gdk.AxisUse use, out double value);
+		public Gdk.AxisUse get_axis_use (uint index);
 		public static unowned Gdk.Device get_core_pointer ();
+		public bool get_has_cursor ();
 		public bool get_history (Gdk.Window window, uint32 start, uint32 stop, Gdk.TimeCoord[] events);
+		public void get_key (uint index, uint keyval, Gdk.ModifierType modifiers);
+		public Gdk.InputMode get_mode ();
+		public unowned string get_name ();
+		public Gdk.InputSource get_source ();
 		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);
@@ -170,6 +176,11 @@ namespace Gdk {
 		public void* windowing_data;
 		[CCode (has_construct_function = false)]
 		public DragContext ();
+		public Gdk.DragAction get_actions ();
+		public Gdk.DragAction get_selected_action ();
+		public unowned Gdk.Window get_source_window ();
+		public Gdk.DragAction get_suggested_action ();
+		public unowned GLib.List list_targets ();
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class Drawable : GLib.Object {
@@ -331,8 +342,17 @@ namespace Gdk {
 		public void* windowing_data;
 		[CCode (has_construct_function = false)]
 		public Image (Gdk.ImageType type, Gdk.Visual visual, int width, int height);
+		public uint16 get_bits_per_pixel ();
+		public Gdk.ByteOrder get_byte_order ();
+		public uint16 get_bytes_per_line ();
+		public uint16 get_bytes_per_pixel ();
 		public unowned Gdk.Colormap get_colormap ();
+		public uint16 get_depth ();
+		public int get_height ();
+		public Gdk.ImageType get_image_type ();
 		public uint32 get_pixel (int x, int y);
+		public unowned Gdk.Visual get_visual ();
+		public int get_width ();
 		public void put_pixel (int x, int y, uint32 pixel);
 		public void set_colormap (Gdk.Colormap colormap);
 	}
@@ -509,8 +529,16 @@ namespace Gdk {
 		public static unowned Gdk.Visual get_best_with_both (int depth, Gdk.VisualType visual_type);
 		public static unowned Gdk.Visual get_best_with_depth (int depth);
 		public static unowned Gdk.Visual get_best_with_type (Gdk.VisualType visual_type);
+		public int get_bits_per_rgb ();
+		public void get_blue_pixel_details (uint32 mask, int shift, int precision);
+		public Gdk.ByteOrder get_byte_order ();
+		public int get_colormap_size ();
+		public int get_depth ();
+		public void get_green_pixel_details (uint32 mask, int shift, int precision);
+		public void get_red_pixel_details (uint32 mask, int shift, int precision);
 		public unowned Gdk.Screen get_screen ();
 		public static unowned Gdk.Visual get_system ();
+		public Gdk.VisualType get_visual_type ();
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class Window : Gdk.Drawable {
@@ -528,6 +556,8 @@ namespace Gdk {
 		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 coords_from_parent (double parent_x, double parent_y, double x, double y);
+		public void coords_to_parent (double x, double y, double parent_x, double parent_y);
 		public void deiconify ();
 		public void destroy ();
 		public void enable_synchronized_configure ();
@@ -541,15 +571,23 @@ namespace Gdk {
 		public void freeze_updates ();
 		public void fullscreen ();
 		public void geometry_changed ();
+		public bool get_accept_focus ();
+		public void get_back_pixmap (out unowned Gdk.Pixmap pixmap, bool parent_relative);
+		public void get_background (Gdk.Color color);
 		public GLib.List<weak Gdk.Window> get_children ();
+		public bool get_composited ();
 		public unowned Gdk.Cursor? get_cursor ();
 		public bool get_decorations (out Gdk.WMDecoration decorations);
 		public bool get_deskrelative_origin (out int x, out int y);
+		public unowned Gdk.Window get_effective_parent ();
+		public unowned Gdk.Window get_effective_toplevel ();
 		public Gdk.EventMask get_events ();
+		public bool get_focus_on_map ();
 		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 unowned Gdk.Window get_group ();
 		public void get_internal_paint_info (out unowned Gdk.Drawable real_drawable, out int x_offset, out int y_offset);
+		public bool get_modal_hint ();
 		public int get_origin (out int x, out int y);
 		public unowned Gdk.Window get_parent ();
 		public unowned Gdk.Window get_pointer (out int x, out int y, out Gdk.ModifierType mask);
@@ -570,6 +608,8 @@ namespace Gdk {
 		public void invalidate_rect (Gdk.Rectangle? rect, bool invalidate_children);
 		public void invalidate_region (Gdk.Region region, bool invalidate_children);
 		public bool is_destroyed ();
+		public bool is_input_only ();
+		public bool is_shaped ();
 		public bool is_viewable ();
 		public bool is_visible ();
 		public static unowned Gdk.Window lookup (Gdk.NativeWindow anid);
diff --git a/vapi/gdk-x11-2.0.vapi b/vapi/gdk-x11-2.0.vapi
index 4827ea5..2f5dac4 100644
--- a/vapi/gdk-x11-2.0.vapi
+++ b/vapi/gdk-x11-2.0.vapi
@@ -65,8 +65,12 @@ namespace Gdk {
 	[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 unowned Gdk.Drawable x11_pixmap_get_drawable_impl (Gdk.Pixmap pixmap);
+	[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")]
+	public static X.ID x11_screen_get_monitor_output (Gdk.Screen screen, int monitor_num);
+	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static int x11_screen_get_screen_number (Gdk.Screen screen);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static unowned string x11_screen_get_window_manager_name (Gdk.Screen screen);
@@ -83,6 +87,8 @@ namespace Gdk {
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static unowned Gdk.Visual x11_visual_get_xvisual (Gdk.Visual visual);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
+	public static unowned Gdk.Drawable x11_window_get_drawable_impl (Gdk.Window window);
+	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static void x11_window_move_to_current_desktop (Gdk.Window window);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static void x11_window_set_user_time (Gdk.Window window, uint32 timestamp);
diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 82c5c30..114a84c 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -172,7 +172,7 @@ namespace GLib {
 		[CCode (has_construct_function = false)]
 		public DBusAuthObserver ();
 		[HasEmitter]
-		public virtual signal bool authorize_authenticated_peer (GLib.IOStream stream, GLib.Credentials credentials);
+		public virtual signal bool authorize_authenticated_peer (GLib.IOStream p0, GLib.Credentials p1);
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class DBusConnection : GLib.Object, GLib.Initable, GLib.AsyncInitable {
@@ -183,6 +183,9 @@ namespace GLib {
 		public GLib.Variant call_sync (string bus_name, string object_path, string interface_name, string method_name, GLib.Variant parameters, GLib.VariantType reply_type, GLib.DBusCallFlags flags, int timeout_msec, GLib.Cancellable? cancellable = null) throws GLib.Error;
 		public void close ();
 		public bool emit_signal (string? destination_bus_name, string object_path, string interface_name, string signal_name, GLib.Variant parameters) throws GLib.Error;
+		public void flush (GLib.Cancellable? cancellable = null, GLib.AsyncReadyCallback callback);
+		public bool flush_finish (GLib.AsyncResult res) throws GLib.Error;
+		public bool flush_sync (GLib.Cancellable? cancellable = null) throws GLib.Error;
 		[CCode (type = "void", has_construct_function = false)]
 		public async DBusConnection.for_address (string address, GLib.DBusConnectionFlags flags, GLib.DBusAuthObserver observer, GLib.Cancellable? cancellable = null) throws GLib.Error;
 		[CCode (has_construct_function = false)]
@@ -203,6 +206,7 @@ namespace GLib {
 		public void set_exit_on_close (bool exit_on_close);
 		public uint signal_subscribe (string sender, string interface_name, string member, string object_path, string arg0, GLib.DBusSignalCallback callback, GLib.DestroyNotify user_data_free_func);
 		public void signal_unsubscribe (uint subscription_id);
+		public void start_message_processing ();
 		[CCode (has_construct_function = false)]
 		public DBusConnection.sync (GLib.IOStream stream, string guid, GLib.DBusConnectionFlags flags, GLib.DBusAuthObserver observer, GLib.Cancellable? cancellable = null) throws GLib.Error;
 		public bool unregister_object (uint registration_id);
@@ -215,7 +219,7 @@ namespace GLib {
 		public string guid { get; construct; }
 		public GLib.IOStream stream { get; construct; }
 		public string unique_name { get; }
-		public virtual signal void closed (bool remote_peer_vanished, GLib.Error error);
+		public virtual signal void closed (bool p0, GLib.Error p1);
 	}
 	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
@@ -242,6 +246,7 @@ namespace GLib {
 	public class DBusInterfaceVTable {
 		public weak GLib.DBusInterfaceGetPropertyFunc get_property;
 		public weak GLib.DBusInterfaceMethodCallFunc method_call;
+		public void* padding;
 		public weak GLib.DBusInterfaceSetPropertyFunc set_property;
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
@@ -414,7 +419,7 @@ namespace GLib {
 		public string client_address { get; }
 		public GLib.DBusServerFlags flags { get; construct; }
 		public string guid { get; construct; }
-		public virtual signal void new_connection (GLib.DBusConnection connection);
+		public virtual signal void new_connection (GLib.DBusConnection p0);
 	}
 	[Compact]
 	[CCode (ref_function = "g_dbus_signal_info_ref", unref_function = "g_dbus_signal_info_unref", type_id = "G_TYPE_DBUS_SIGNAL_INFO", cheader_filename = "gio/gio.h")]
@@ -970,18 +975,23 @@ namespace GLib {
 		public unowned GLib.Settings get_child (string name);
 		public double get_double (string key);
 		public int get_enum (string key);
+		public uint get_flags (string key);
 		public bool get_has_unapplied ();
 		public int get_int (string key);
+		public void* get_mapped (string key, GLib.SettingsGetMapping mapping);
 		public unowned string get_string (string key);
 		public unowned string get_strv (string key);
 		public GLib.Variant get_value (string key);
 		public bool is_writable (string name);
+		public unowned string list_items ();
+		public static unowned string list_schemas ();
 		public void revert ();
 		[CCode (sentinel = "")]
 		public bool @set (string key, string format, ...);
 		public bool set_boolean (string key, bool value);
 		public bool set_double (string key, double value);
 		public bool set_enum (string key, int value);
+		public bool set_flags (string key, uint value);
 		public bool set_int (string key, int value);
 		public bool set_string (string key, string value);
 		public bool set_strv (string key, string value);
@@ -1562,7 +1572,8 @@ namespace GLib {
 	public enum AppInfoCreateFlags {
 		NONE,
 		NEEDS_TERMINAL,
-		SUPPORTS_URIS
+		SUPPORTS_URIS,
+		SUPPORTS_STARTUP_NOTIFICATION
 	}
 	[CCode (cprefix = "G_ASK_PASSWORD_", cheader_filename = "gio/gio.h")]
 	[Flags]
@@ -1626,7 +1637,8 @@ namespace GLib {
 		AUTHENTICATION_CLIENT,
 		AUTHENTICATION_SERVER,
 		AUTHENTICATION_ALLOW_ANONYMOUS,
-		MESSAGE_BUS_CONNECTION
+		MESSAGE_BUS_CONNECTION,
+		DELAY_MESSAGE_PROCESSING
 	}
 	[CCode (cprefix = "G_DBUS_ERROR_", cheader_filename = "gio/gio.h")]
 	public enum DBusError {
@@ -1990,7 +2002,7 @@ namespace GLib {
 	[CCode (cheader_filename = "gio/gio.h")]
 	public delegate bool DBusInterfaceSetPropertyFunc (GLib.DBusConnection connection, string sender, string object_path, string interface_name, string property_name, GLib.Variant value, GLib.Error error);
 	[CCode (cheader_filename = "gio/gio.h")]
-	public delegate bool DBusMessageFilterFunction (GLib.DBusConnection connection, GLib.DBusMessage message);
+	public delegate bool DBusMessageFilterFunction (GLib.DBusConnection connection, GLib.DBusMessage message, bool incoming);
 	[CCode (cheader_filename = "gio/gio.h")]
 	public delegate void DBusSignalCallback (GLib.DBusConnection connection, string sender_name, string object_path, string interface_name, string signal_name, GLib.Variant parameters);
 	[CCode (cheader_filename = "gio/gio.h")]
@@ -2011,6 +2023,8 @@ namespace GLib {
 	public delegate bool SettingsBindGetMapping (GLib.Value value, GLib.Variant variant);
 	[CCode (cheader_filename = "gio/gio.h")]
 	public delegate unowned GLib.Variant SettingsBindSetMapping (GLib.Value value, GLib.VariantType expected_type);
+	[CCode (cheader_filename = "gio/gio.h")]
+	public delegate bool SettingsGetMapping (GLib.Variant value, void* result);
 	[CCode (cheader_filename = "gio/gio.h", has_target = false)]
 	public delegate void SimpleAsyncThreadFunc (GLib.SimpleAsyncResult res, GLib.Object object, GLib.Cancellable cancellable);
 	[CCode (cheader_filename = "gio/gio.h")]
diff --git a/vapi/gnome-vfs-2.0.vapi b/vapi/gnome-vfs-2.0.vapi
index 25d8f07..eaaccd3 100644
--- a/vapi/gnome-vfs-2.0.vapi
+++ b/vapi/gnome-vfs-2.0.vapi
@@ -565,12 +565,12 @@ namespace GnomeVFS {
 	[IntegerType (rank = 0)]
 	public struct FileSize : uint64 {
 	}
-	[CCode (cprefix = "GNOME_VFS_DNS_SD_SERVICE_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_DNS_SD_SERVICE_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum DNSSDServiceStatus {
 		ADDED,
 		REMOVED
 	}
-	[CCode (cprefix = "GNOME_VFS_DEVICE_TYPE_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_DEVICE_TYPE_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum DeviceType {
 		UNKNOWN,
 		AUDIO_CD,
@@ -591,7 +591,7 @@ namespace GnomeVFS {
 		LOOPBACK,
 		NETWORK
 	}
-	[CCode (cprefix = "GNOME_VFS_DIRECTORY_VISIT_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_DIRECTORY_VISIT_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	[Flags]
 	public enum DirectoryVisitOptions {
 		DEFAULT,
@@ -599,14 +599,14 @@ namespace GnomeVFS {
 		LOOPCHECK,
 		IGNORE_RECURSE_ERROR
 	}
-	[CCode (cprefix = "GNOME_VFS_FILE_FLAGS_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_FILE_FLAGS_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	[Flags]
 	public enum FileFlags {
 		NONE,
 		SYMLINK,
 		LOCAL
 	}
-	[CCode (cprefix = "GNOME_VFS_FILE_INFO_FIELDS_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_FILE_INFO_FIELDS_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	[Flags]
 	public enum FileInfoFields {
 		NONE,
@@ -629,7 +629,7 @@ namespace GnomeVFS {
 		ACL,
 		SELINUX_CONTEXT
 	}
-	[CCode (cprefix = "GNOME_VFS_FILE_INFO_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_FILE_INFO_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	[Flags]
 	public enum FileInfoOptions {
 		DEFAULT,
@@ -642,7 +642,7 @@ namespace GnomeVFS {
 		GET_ACL,
 		GET_SELINUX_CONTEXT
 	}
-	[CCode (cprefix = "GNOME_VFS_PERM_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_PERM_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	[Flags]
 	public enum FilePermissions {
 		SUID,
@@ -664,7 +664,7 @@ namespace GnomeVFS {
 		ACCESS_WRITABLE,
 		ACCESS_EXECUTABLE
 	}
-	[CCode (cprefix = "GNOME_VFS_FILE_TYPE_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_FILE_TYPE_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum FileType {
 		UNKNOWN,
 		REGULAR,
@@ -675,42 +675,42 @@ namespace GnomeVFS {
 		BLOCK_DEVICE,
 		SYMBOLIC_LINK
 	}
-	[CCode (cprefix = "GNOME_VFS_DIRECTORY_KIND_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_DIRECTORY_KIND_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum FindDirectoryKind {
 		DESKTOP,
 		TRASH
 	}
-	[CCode (cprefix = "GNOME_VFS_MAKE_URI_DIR_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_MAKE_URI_DIR_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	[Flags]
 	public enum MakeURIDirs {
 		NONE,
 		HOMEDIR,
 		CURRENT
 	}
-	[CCode (cprefix = "GNOME_VFS_MIME_ACTION_TYPE_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_MIME_ACTION_TYPE_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum MimeActionType {
 		NONE,
 		APPLICATION,
 		COMPONENT
 	}
-	[CCode (cprefix = "GNOME_VFS_MIME_APPLICATION_ARGUMENT_TYPE_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_MIME_APPLICATION_ARGUMENT_TYPE_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum MimeApplicationArgumentType {
 		URIS,
 		PATHS,
 		URIS_FOR_NON_FILES
 	}
-	[CCode (cprefix = "GNOME_VFS_MIME_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_MIME_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum MimeEquivalence {
 		UNRELATED,
 		IDENTICAL,
 		PARENT
 	}
-	[CCode (cprefix = "", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum ModuleCallbackAuthenticationAuthType {
 		AuthTypeBasic,
 		AuthTypeDigest
 	}
-	[CCode (cprefix = "GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	[Flags]
 	public enum ModuleCallbackFullAuthenticationFlags {
 		PREVIOUS_ATTEMPT_FAILED,
@@ -720,12 +720,12 @@ namespace GnomeVFS {
 		SAVING_SUPPORTED,
 		ANON_SUPPORTED
 	}
-	[CCode (cprefix = "GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_OUT_ANON_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_OUT_ANON_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	[Flags]
 	public enum ModuleCallbackFullAuthenticationOutFlags {
 		SELECTED
 	}
-	[CCode (cprefix = "GNOME_VFS_MONITOR_EVENT_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_MONITOR_EVENT_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum MonitorEventType {
 		CHANGED,
 		DELETED,
@@ -734,12 +734,12 @@ namespace GnomeVFS {
 		CREATED,
 		METADATA_CHANGED
 	}
-	[CCode (cprefix = "GNOME_VFS_MONITOR_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_MONITOR_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum MonitorType {
 		FILE,
 		DIRECTORY
 	}
-	[CCode (cprefix = "GNOME_VFS_OPEN_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_OPEN_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	[Flags]
 	public enum OpenMode {
 		NONE,
@@ -748,7 +748,7 @@ namespace GnomeVFS {
 		RANDOM,
 		TRUNCATE
 	}
-	[CCode (cprefix = "GNOME_VFS_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum Result {
 		OK,
 		ERROR_NOT_FOUND,
@@ -804,13 +804,13 @@ namespace GnomeVFS {
 		ERROR_NOT_A_SYMBOLIC_LINK,
 		NUM_ERRORS
 	}
-	[CCode (cprefix = "GNOME_VFS_SEEK_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_SEEK_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum SeekPosition {
 		START,
 		CURRENT,
 		END
 	}
-	[CCode (cprefix = "GNOME_VFS_SET_FILE_INFO_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_SET_FILE_INFO_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	[Flags]
 	public enum SetFileInfoMask {
 		NONE,
@@ -822,7 +822,7 @@ namespace GnomeVFS {
 		SELINUX_CONTEXT,
 		SYMLINK_NAME
 	}
-	[CCode (cprefix = "GNOME_VFS_URI_HIDE_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_URI_HIDE_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	[Flags]
 	public enum URIHideOptions {
 		NONE,
@@ -833,24 +833,24 @@ namespace GnomeVFS {
 		TOPLEVEL_METHOD,
 		FRAGMENT_IDENTIFIER
 	}
-	[CCode (cprefix = "GNOME_VFS_VOLUME_TYPE_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_VOLUME_TYPE_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum VolumeType {
 		MOUNTPOINT,
 		VFS_MOUNT,
 		CONNECTED_SERVER
 	}
-	[CCode (cprefix = "GNOME_VFS_XFER_ERROR_ACTION_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_XFER_ERROR_ACTION_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum XferErrorAction {
 		ABORT,
 		RETRY,
 		SKIP
 	}
-	[CCode (cprefix = "GNOME_VFS_XFER_ERROR_MODE_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_XFER_ERROR_MODE_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum XferErrorMode {
 		ABORT,
 		QUERY
 	}
-	[CCode (cprefix = "GNOME_VFS_XFER_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_XFER_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	[Flags]
 	public enum XferOptions {
 		DEFAULT,
@@ -868,7 +868,7 @@ namespace GnomeVFS {
 		FOLLOW_LINKS_RECURSIVE,
 		TARGET_DEFAULT_PERMS
 	}
-	[CCode (cprefix = "GNOME_VFS_XFER_OVERWRITE_ACTION_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_XFER_OVERWRITE_ACTION_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum XferOverwriteAction {
 		ABORT,
 		REPLACE,
@@ -876,14 +876,14 @@ namespace GnomeVFS {
 		SKIP,
 		SKIP_ALL
 	}
-	[CCode (cprefix = "GNOME_VFS_XFER_OVERWRITE_MODE_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_XFER_OVERWRITE_MODE_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum XferOverwriteMode {
 		ABORT,
 		QUERY,
 		REPLACE,
 		SKIP
 	}
-	[CCode (cprefix = "GNOME_VFS_XFER_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_XFER_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum XferPhase {
 		PHASE_INITIAL,
 		CHECKING_DESTINATION,
@@ -904,7 +904,7 @@ namespace GnomeVFS {
 		PHASE_COMPLETED,
 		NUM_PHASES
 	}
-	[CCode (cprefix = "GNOME_VFS_XFER_PROGRESS_STATUS_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_XFER_PROGRESS_STATUS_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum XferProgressStatus {
 		OK,
 		VFSERROR,
diff --git a/vapi/json-glib-1.0.vapi b/vapi/json-glib-1.0.vapi
index f496c2c..219e1fb 100644
--- a/vapi/json-glib-1.0.vapi
+++ b/vapi/json-glib-1.0.vapi
@@ -146,6 +146,10 @@ namespace Json {
 	[CCode (cprefix = "JSON_PARSER_ERROR_", cheader_filename = "json-glib/json-glib.h")]
 	public enum ParserError {
 		PARSE,
+		TRAILING_COMMA,
+		MISSING_COMMA,
+		MISSING_COLON,
+		INVALID_BAREWORD,
 		UNKNOWN
 	}
 	[CCode (cheader_filename = "json-glib/json-glib.h")]
diff --git a/vapi/libgnome-menu.vapi b/vapi/libgnome-menu.vapi
index a762535..844fa5a 100644
--- a/vapi/libgnome-menu.vapi
+++ b/vapi/libgnome-menu.vapi
@@ -9,9 +9,11 @@ namespace GMenu {
 		public unowned GMenu.TreeDirectory get_directory_from_path (string path);
 		public unowned string get_menu_file ();
 		public unowned GMenu.TreeDirectory get_root_directory ();
+		public GMenu.TreeSortKey get_sort_key ();
 		public void* get_user_data ();
 		public static unowned GMenu.Tree lookup (string menu_file, GMenu.TreeFlags flags);
 		public void remove_monitor (GMenu.TreeChangedFunc callback);
+		public void set_sort_key (GMenu.TreeSortKey sort_key);
 		public void set_user_data (void* user_data, GLib.DestroyNotify dnotify);
 	}
 	[Compact]
@@ -39,7 +41,9 @@ namespace GMenu {
 		public unowned string get_comment ();
 		public unowned string get_desktop_file_id ();
 		public unowned string get_desktop_file_path ();
+		public unowned string get_display_name ();
 		public unowned string get_exec ();
+		public unowned string get_generic_name ();
 		public unowned string get_icon ();
 		public bool get_is_excluded ();
 		public bool get_is_nodisplay ();
@@ -69,6 +73,7 @@ namespace GMenu {
 		INCLUDE_EXCLUDED,
 		SHOW_EMPTY,
 		INCLUDE_NODISPLAY,
+		SHOW_ALL_SEPARATORS,
 		MASK
 	}
 	[CCode (cprefix = "GMENU_TREE_ITEM_", has_type_id = false, cheader_filename = "gnome-menus/gmenu-tree.h")]
@@ -80,6 +85,11 @@ namespace GMenu {
 		HEADER,
 		ALIAS
 	}
+	[CCode (cprefix = "GMENU_TREE_SORT_", has_type_id = false, cheader_filename = "gnome-menus/gmenu-tree.h")]
+	public enum TreeSortKey {
+		NAME,
+		DISPLAY_NAME
+	}
 	[CCode (cheader_filename = "gnome-menus/gmenu-tree.h")]
 	public delegate void TreeChangedFunc (GMenu.Tree tree);
 }
diff --git a/vapi/libnotify.vapi b/vapi/libnotify.vapi
index 9d5aade..f901977 100644
--- a/vapi/libnotify.vapi
+++ b/vapi/libnotify.vapi
@@ -12,6 +12,7 @@ namespace Notify {
 		public void clear_actions ();
 		public void clear_hints ();
 		public bool close () throws GLib.Error;
+		public int get_closed_reason ();
 		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);
@@ -19,7 +20,9 @@ namespace Notify {
 		public void set_hint_double (string key, double value);
 		public void set_hint_int32 (string key, int value);
 		public void set_hint_string (string key, string value);
+		public void set_hint_uint32 (string key, uint value);
 		public void set_icon_from_pixbuf (Gdk.Pixbuf icon);
+		public void set_image_from_pixbuf (Gdk.Pixbuf image);
 		public void set_timeout (int timeout);
 		public void set_urgency (Notify.Urgency urgency);
 		public bool show () throws GLib.Error;
@@ -30,22 +33,25 @@ namespace Notify {
 		public Gtk.Widget attach_widget { owned get; set construct; }
 		[NoAccessorMethod]
 		public string body { owned get; set construct; }
+		public int closed_reason { get; }
 		[NoAccessorMethod]
 		public string icon_name { owned get; set construct; }
 		[NoAccessorMethod]
+		public int id { get; set construct; }
+		[NoAccessorMethod]
 		public Gtk.StatusIcon status_icon { owned get; set construct; }
 		[NoAccessorMethod]
 		public string summary { owned get; set construct; }
 		public virtual signal void closed ();
 	}
-	[CCode (cprefix = "NOTIFY_URGENCY_", has_type_id = false, cheader_filename = "libnotify/notify.h")]
+	[CCode (cprefix = "NOTIFY_URGENCY_", cheader_filename = "libnotify/notify.h")]
 	public enum Urgency {
 		LOW,
 		NORMAL,
 		CRITICAL
 	}
 	[CCode (cheader_filename = "libnotify/notify.h")]
-	public delegate void ActionCallback (Notify.Notification p1, string p2);
+	public delegate void ActionCallback (Notify.Notification notification, string action);
 	[CCode (cheader_filename = "libnotify/notify.h")]
 	public const int EXPIRES_DEFAULT;
 	[CCode (cheader_filename = "libnotify/notify.h")]
diff --git a/vapi/libsoup-2.4.vapi b/vapi/libsoup-2.4.vapi
index b59bb53..230dc8a 100644
--- a/vapi/libsoup-2.4.vapi
+++ b/vapi/libsoup-2.4.vapi
@@ -619,6 +619,7 @@ namespace Soup {
 		IO_ERROR,
 		MALFORMED,
 		TRY_AGAIN,
+		TOO_MANY_REDIRECTS,
 		CONTINUE,
 		SWITCHING_PROTOCOLS,
 		PROCESSING,
@@ -703,7 +704,8 @@ namespace Soup {
 	public enum SSLError {
 		HANDSHAKE_NEEDS_READ,
 		HANDSHAKE_NEEDS_WRITE,
-		CERTIFICATE
+		CERTIFICATE,
+		HANDSHAKE_FAILED
 	}
 	[CCode (cprefix = "SOUP_SOCKET_", cheader_filename = "libsoup/soup.h")]
 	public enum SocketIOStatus {
@@ -813,6 +815,16 @@ namespace Soup {
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string AUTH_SCHEME_NAME;
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	public const int CHAR_HTTP_CTL;
+	[CCode (cheader_filename = "libsoup/soup.h")]
+	public const int CHAR_HTTP_SEPARATOR;
+	[CCode (cheader_filename = "libsoup/soup.h")]
+	public const int CHAR_URI_GEN_DELIMS;
+	[CCode (cheader_filename = "libsoup/soup.h")]
+	public const int CHAR_URI_PERCENT_ENCODED;
+	[CCode (cheader_filename = "libsoup/soup.h")]
+	public const int CHAR_URI_SUB_DELIMS;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int CONTENT_DECODER_H;
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int CONTENT_SNIFFER_H;
@@ -1009,6 +1021,8 @@ namespace Soup {
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static void header_g_string_append_param (GLib.StringBuilder str, string name, string value);
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	public static void header_g_string_append_param_quoted (GLib.StringBuilder str, string name, string value);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static GLib.SList<string> header_parse_list (string header);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static GLib.HashTable<string,string> header_parse_param_list (string header);
diff --git a/vapi/libwnck-1.0.vapi b/vapi/libwnck-1.0.vapi
index 42fc377..fa2e43e 100644
--- a/vapi/libwnck-1.0.vapi
+++ b/vapi/libwnck-1.0.vapi
@@ -195,6 +195,7 @@ namespace Wnck {
 		public void set_include_all_workspaces (bool include_all_workspaces);
 		public void set_minimum_height (int size);
 		public void set_minimum_width (int size);
+		public void set_orientation (Gtk.Orientation orient);
 		public void set_screen (Wnck.Screen screen);
 		public void set_switch_workspace_on_unminimize (bool switch_workspace_on_unminimize);
 	}
@@ -325,30 +326,30 @@ namespace Wnck {
 		public int grid_area;
 		public int rows;
 	}
-	[CCode (cprefix = "WNCK_CLIENT_TYPE_", has_type_id = false, cheader_filename = "libwnck/libwnck.h")]
+	[CCode (cprefix = "WNCK_CLIENT_TYPE_", cheader_filename = "libwnck/libwnck.h")]
 	public enum ClientType {
 		APPLICATION,
 		PAGER
 	}
-	[CCode (cprefix = "WNCK_MOTION_", has_type_id = false, cheader_filename = "libwnck/libwnck.h")]
+	[CCode (cprefix = "WNCK_MOTION_", cheader_filename = "libwnck/libwnck.h")]
 	public enum MotionDirection {
 		UP,
 		DOWN,
 		LEFT,
 		RIGHT
 	}
-	[CCode (cprefix = "WNCK_PAGER_DISPLAY_", has_type_id = false, cheader_filename = "libwnck/libwnck.h")]
+	[CCode (cprefix = "WNCK_PAGER_DISPLAY_", cheader_filename = "libwnck/libwnck.h")]
 	public enum PagerDisplayMode {
 		NAME,
 		CONTENT
 	}
-	[CCode (cprefix = "WNCK_TASKLIST_", has_type_id = false, cheader_filename = "libwnck/libwnck.h")]
+	[CCode (cprefix = "WNCK_TASKLIST_", cheader_filename = "libwnck/libwnck.h")]
 	public enum TasklistGroupingType {
 		NEVER_GROUP,
 		AUTO_GROUP,
 		ALWAYS_GROUP
 	}
-	[CCode (cprefix = "WNCK_WINDOW_ACTION_", has_type_id = false, cheader_filename = "libwnck/libwnck.h")]
+	[CCode (cprefix = "WNCK_WINDOW_ACTION_", cheader_filename = "libwnck/libwnck.h")]
 	[Flags]
 	public enum WindowActions {
 		MOVE,
@@ -371,7 +372,7 @@ namespace Wnck {
 		ABOVE,
 		BELOW
 	}
-	[CCode (cprefix = "WNCK_WINDOW_GRAVITY_", has_type_id = false, cheader_filename = "libwnck/libwnck.h")]
+	[CCode (cprefix = "WNCK_WINDOW_GRAVITY_", cheader_filename = "libwnck/libwnck.h")]
 	public enum WindowGravity {
 		CURRENT,
 		NORTHWEST,
@@ -385,7 +386,7 @@ namespace Wnck {
 		SOUTHEAST,
 		STATIC
 	}
-	[CCode (cprefix = "WNCK_WINDOW_CHANGE_", has_type_id = false, cheader_filename = "libwnck/libwnck.h")]
+	[CCode (cprefix = "WNCK_WINDOW_CHANGE_", cheader_filename = "libwnck/libwnck.h")]
 	[Flags]
 	public enum WindowMoveResizeMask {
 		X,
@@ -393,7 +394,7 @@ namespace Wnck {
 		WIDTH,
 		HEIGHT
 	}
-	[CCode (cprefix = "WNCK_WINDOW_STATE_", has_type_id = false, cheader_filename = "libwnck/libwnck.h")]
+	[CCode (cprefix = "WNCK_WINDOW_STATE_", cheader_filename = "libwnck/libwnck.h")]
 	[Flags]
 	public enum WindowState {
 		MINIMIZED,
@@ -410,7 +411,7 @@ namespace Wnck {
 		ABOVE,
 		BELOW
 	}
-	[CCode (cprefix = "WNCK_WINDOW_", has_type_id = false, cheader_filename = "libwnck/libwnck.h")]
+	[CCode (cprefix = "WNCK_WINDOW_", cheader_filename = "libwnck/libwnck.h")]
 	public enum WindowType {
 		NORMAL,
 		DESKTOP,
diff --git a/vapi/packages/atk/atk.gi b/vapi/packages/atk/atk.gi
index 1d7fd5a..6af80b5 100644
--- a/vapi/packages/atk/atk.gi
+++ b/vapi/packages/atk/atk.gi
@@ -229,7 +229,8 @@
 			<member name="ATK_RELATION_PARENT_WINDOW_OF" value="13"/>
 			<member name="ATK_RELATION_DESCRIBED_BY" value="14"/>
 			<member name="ATK_RELATION_DESCRIPTION_FOR" value="15"/>
-			<member name="ATK_RELATION_LAST_DEFINED" value="16"/>
+			<member name="ATK_RELATION_NODE_PARENT_OF" value="16"/>
+			<member name="ATK_RELATION_LAST_DEFINED" value="17"/>
 		</enum>
 		<enum name="AtkRole" type-name="AtkRole" get-type="atk_role_get_type">
 			<member name="ATK_ROLE_INVALID" value="0"/>
@@ -573,16 +574,16 @@
 		</object>
 		<object name="AtkNoOpObject" parent="AtkObject" type-name="AtkNoOpObject" get-type="atk_no_op_object_get_type">
 			<implements>
-				<interface name="AtkValue"/>
-				<interface name="AtkDocument"/>
 				<interface name="AtkComponent"/>
-				<interface name="AtkText"/>
 				<interface name="AtkAction"/>
-				<interface name="AtkHypertext"/>
+				<interface name="AtkEditableText"/>
+				<interface name="AtkImage"/>
 				<interface name="AtkSelection"/>
 				<interface name="AtkTable"/>
-				<interface name="AtkImage"/>
-				<interface name="AtkEditableText"/>
+				<interface name="AtkText"/>
+				<interface name="AtkHypertext"/>
+				<interface name="AtkValue"/>
+				<interface name="AtkDocument"/>
 			</implements>
 			<constructor name="new" symbol="atk_no_op_object_new">
 				<return-type type="AtkObject*"/>
@@ -966,6 +967,23 @@
 				</parameters>
 			</vfunc>
 		</object>
+		<object name="AtkPlug" parent="AtkObject" type-name="AtkPlug" get-type="atk_plug_get_type">
+			<method name="get_id" symbol="atk_plug_get_id">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="plug" type="AtkPlug*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="atk_plug_new">
+				<return-type type="AtkObject*"/>
+			</constructor>
+			<vfunc name="get_object_id">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="obj" type="AtkPlug*"/>
+				</parameters>
+			</vfunc>
+		</object>
 		<object name="AtkRegistry" parent="GObject" type-name="AtkRegistry" get-type="atk_registry_get_type">
 			<method name="get_factory" symbol="atk_registry_get_factory">
 				<return-type type="AtkObjectFactory*"/>
@@ -1105,6 +1123,32 @@
 			</method>
 			<field name="relations" type="GPtrArray*"/>
 		</object>
+		<object name="AtkSocket" parent="AtkObject" type-name="AtkSocket" get-type="atk_socket_get_type">
+			<method name="embed" symbol="atk_socket_embed">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="obj" type="AtkSocket*"/>
+					<parameter name="plug_id" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="is_occupied" symbol="atk_socket_is_occupied">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="obj" type="AtkSocket*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="atk_socket_new">
+				<return-type type="AtkObject*"/>
+			</constructor>
+			<vfunc name="embed">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="obj" type="AtkSocket*"/>
+					<parameter name="plug_id" type="gchar*"/>
+				</parameters>
+			</vfunc>
+			<field name="embedded_plug_id" type="gchar*"/>
+		</object>
 		<object name="AtkStateSet" parent="GObject" type-name="AtkStateSet" get-type="atk_state_set_get_type">
 			<method name="add_state" symbol="atk_state_set_add_state">
 				<return-type type="gboolean"/>
diff --git a/vapi/packages/gconf-2.0/gconf-2.0.gi b/vapi/packages/gconf-2.0/gconf-2.0.gi
index b380582..e5ed3fe 100644
--- a/vapi/packages/gconf-2.0/gconf-2.0.gi
+++ b/vapi/packages/gconf-2.0/gconf-2.0.gi
@@ -865,6 +865,18 @@
 					<parameter name="src" type="GConfValue*"/>
 				</parameters>
 			</method>
+			<method name="decode" symbol="gconf_value_decode">
+				<return-type type="GConfValue*"/>
+				<parameters>
+					<parameter name="encoded" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="encode" symbol="gconf_value_encode">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="val" type="GConfValue*"/>
+				</parameters>
+			</method>
 			<method name="free" symbol="gconf_value_free">
 				<return-type type="void"/>
 				<parameters>
@@ -1187,17 +1199,17 @@
 				</parameters>
 			</method>
 		</boxed>
-		<enum name="GConfClientErrorHandlingMode">
+		<enum name="GConfClientErrorHandlingMode" type-name="GConfClientErrorHandlingMode" get-type="gconf_client_error_handling_mode_get_type">
 			<member name="GCONF_CLIENT_HANDLE_NONE" value="0"/>
 			<member name="GCONF_CLIENT_HANDLE_UNRETURNED" value="1"/>
 			<member name="GCONF_CLIENT_HANDLE_ALL" value="2"/>
 		</enum>
-		<enum name="GConfClientPreloadType">
+		<enum name="GConfClientPreloadType" type-name="GConfClientPreloadType" get-type="gconf_client_preload_type_get_type">
 			<member name="GCONF_CLIENT_PRELOAD_NONE" value="0"/>
 			<member name="GCONF_CLIENT_PRELOAD_ONELEVEL" value="1"/>
 			<member name="GCONF_CLIENT_PRELOAD_RECURSIVE" value="2"/>
 		</enum>
-		<enum name="GConfError">
+		<enum name="GConfError" type-name="GConfError" get-type="gconf_error_get_type">
 			<member name="GCONF_ERROR_SUCCESS" value="0"/>
 			<member name="GCONF_ERROR_FAILED" value="1"/>
 			<member name="GCONF_ERROR_NO_SERVER" value="2"/>
@@ -1216,7 +1228,7 @@
 			<member name="GCONF_ERROR_NO_WRITABLE_DATABASE" value="15"/>
 			<member name="GCONF_ERROR_IN_SHUTDOWN" value="16"/>
 		</enum>
-		<enum name="GConfValueType">
+		<enum name="GConfValueType" type-name="GConfValueType" get-type="gconf_value_type_get_type">
 			<member name="GCONF_VALUE_INVALID" value="0"/>
 			<member name="GCONF_VALUE_STRING" value="1"/>
 			<member name="GCONF_VALUE_INT" value="2"/>
@@ -1226,7 +1238,7 @@
 			<member name="GCONF_VALUE_LIST" value="6"/>
 			<member name="GCONF_VALUE_PAIR" value="7"/>
 		</enum>
-		<flags name="GConfUnsetFlags">
+		<flags name="GConfUnsetFlags" type-name="GConfUnsetFlags" get-type="gconf_unset_flags_get_type">
 			<member name="GCONF_UNSET_INCLUDING_SCHEMA_NAMES" value="1"/>
 		</flags>
 		<object name="GConfClient" parent="GObject" type-name="GConfClient" get-type="gconf_client_get_type">
@@ -1621,7 +1633,7 @@
 			<field name="notify_list" type="GSList*"/>
 			<field name="notify_handler" type="guint"/>
 			<field name="pending_notify_count" type="int"/>
-			<field name="pad1" type="gpointer"/>
+			<field name="cache_dirs" type="GHashTable*"/>
 			<field name="pad2" type="int"/>
 		</object>
 	</namespace>
diff --git a/vapi/packages/gdk-2.0/gdk-2.0.gi b/vapi/packages/gdk-2.0/gdk-2.0.gi
index 1456c06..34fd946 100644
--- a/vapi/packages/gdk-2.0/gdk-2.0.gi
+++ b/vapi/packages/gdk-2.0/gdk-2.0.gi
@@ -2766,9 +2766,22 @@
 					<parameter name="value" type="gdouble*"/>
 				</parameters>
 			</method>
+			<method name="get_axis_use" symbol="gdk_device_get_axis_use">
+				<return-type type="GdkAxisUse"/>
+				<parameters>
+					<parameter name="device" type="GdkDevice*"/>
+					<parameter name="index" type="guint"/>
+				</parameters>
+			</method>
 			<method name="get_core_pointer" symbol="gdk_device_get_core_pointer">
 				<return-type type="GdkDevice*"/>
 			</method>
+			<method name="get_has_cursor" symbol="gdk_device_get_has_cursor">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="device" type="GdkDevice*"/>
+				</parameters>
+			</method>
 			<method name="get_history" symbol="gdk_device_get_history">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -2780,6 +2793,33 @@
 					<parameter name="n_events" type="gint*"/>
 				</parameters>
 			</method>
+			<method name="get_key" symbol="gdk_device_get_key">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="device" type="GdkDevice*"/>
+					<parameter name="index" type="guint"/>
+					<parameter name="keyval" type="guint*"/>
+					<parameter name="modifiers" type="GdkModifierType*"/>
+				</parameters>
+			</method>
+			<method name="get_mode" symbol="gdk_device_get_mode">
+				<return-type type="GdkInputMode"/>
+				<parameters>
+					<parameter name="device" type="GdkDevice*"/>
+				</parameters>
+			</method>
+			<method name="get_name" symbol="gdk_device_get_name">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="device" type="GdkDevice*"/>
+				</parameters>
+			</method>
+			<method name="get_source" symbol="gdk_device_get_source">
+				<return-type type="GdkInputSource"/>
+				<parameters>
+					<parameter name="device" type="GdkDevice*"/>
+				</parameters>
+			</method>
 			<method name="get_state" symbol="gdk_device_get_state">
 				<return-type type="void"/>
 				<parameters>
@@ -3161,6 +3201,36 @@
 			</signal>
 		</object>
 		<object name="GdkDragContext" parent="GObject" type-name="GdkDragContext" get-type="gdk_drag_context_get_type">
+			<method name="get_actions" symbol="gdk_drag_context_get_actions">
+				<return-type type="GdkDragAction"/>
+				<parameters>
+					<parameter name="context" type="GdkDragContext*"/>
+				</parameters>
+			</method>
+			<method name="get_selected_action" symbol="gdk_drag_context_get_selected_action">
+				<return-type type="GdkDragAction"/>
+				<parameters>
+					<parameter name="context" type="GdkDragContext*"/>
+				</parameters>
+			</method>
+			<method name="get_source_window" symbol="gdk_drag_context_get_source_window">
+				<return-type type="GdkWindow*"/>
+				<parameters>
+					<parameter name="context" type="GdkDragContext*"/>
+				</parameters>
+			</method>
+			<method name="get_suggested_action" symbol="gdk_drag_context_get_suggested_action">
+				<return-type type="GdkDragAction"/>
+				<parameters>
+					<parameter name="context" type="GdkDragContext*"/>
+				</parameters>
+			</method>
+			<method name="list_targets" symbol="gdk_drag_context_list_targets">
+				<return-type type="GList*"/>
+				<parameters>
+					<parameter name="context" type="GdkDragContext*"/>
+				</parameters>
+			</method>
 			<constructor name="new" symbol="gdk_drag_context_new">
 				<return-type type="GdkDragContext*"/>
 			</constructor>
@@ -3765,12 +3835,54 @@
 			<field name="colormap" type="GdkColormap*"/>
 		</object>
 		<object name="GdkImage" parent="GObject" type-name="GdkImage" get-type="gdk_image_get_type">
+			<method name="get_bits_per_pixel" symbol="gdk_image_get_bits_per_pixel">
+				<return-type type="guint16"/>
+				<parameters>
+					<parameter name="image" type="GdkImage*"/>
+				</parameters>
+			</method>
+			<method name="get_byte_order" symbol="gdk_image_get_byte_order">
+				<return-type type="GdkByteOrder"/>
+				<parameters>
+					<parameter name="image" type="GdkImage*"/>
+				</parameters>
+			</method>
+			<method name="get_bytes_per_line" symbol="gdk_image_get_bytes_per_line">
+				<return-type type="guint16"/>
+				<parameters>
+					<parameter name="image" type="GdkImage*"/>
+				</parameters>
+			</method>
+			<method name="get_bytes_per_pixel" symbol="gdk_image_get_bytes_per_pixel">
+				<return-type type="guint16"/>
+				<parameters>
+					<parameter name="image" type="GdkImage*"/>
+				</parameters>
+			</method>
 			<method name="get_colormap" symbol="gdk_image_get_colormap">
 				<return-type type="GdkColormap*"/>
 				<parameters>
 					<parameter name="image" type="GdkImage*"/>
 				</parameters>
 			</method>
+			<method name="get_depth" symbol="gdk_image_get_depth">
+				<return-type type="guint16"/>
+				<parameters>
+					<parameter name="image" type="GdkImage*"/>
+				</parameters>
+			</method>
+			<method name="get_height" symbol="gdk_image_get_height">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="image" type="GdkImage*"/>
+				</parameters>
+			</method>
+			<method name="get_image_type" symbol="gdk_image_get_image_type">
+				<return-type type="GdkImageType"/>
+				<parameters>
+					<parameter name="image" type="GdkImage*"/>
+				</parameters>
+			</method>
 			<method name="get_pixel" symbol="gdk_image_get_pixel">
 				<return-type type="guint32"/>
 				<parameters>
@@ -3779,6 +3891,18 @@
 					<parameter name="y" type="gint"/>
 				</parameters>
 			</method>
+			<method name="get_visual" symbol="gdk_image_get_visual">
+				<return-type type="GdkVisual*"/>
+				<parameters>
+					<parameter name="image" type="GdkImage*"/>
+				</parameters>
+			</method>
+			<method name="get_width" symbol="gdk_image_get_width">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="image" type="GdkImage*"/>
+				</parameters>
+			</method>
 			<constructor name="new" symbol="gdk_image_new">
 				<return-type type="GdkImage*"/>
 				<parameters>
@@ -4356,6 +4480,57 @@
 					<parameter name="visual_type" type="GdkVisualType"/>
 				</parameters>
 			</method>
+			<method name="get_bits_per_rgb" symbol="gdk_visual_get_bits_per_rgb">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="visual" type="GdkVisual*"/>
+				</parameters>
+			</method>
+			<method name="get_blue_pixel_details" symbol="gdk_visual_get_blue_pixel_details">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="visual" type="GdkVisual*"/>
+					<parameter name="mask" type="guint32*"/>
+					<parameter name="shift" type="gint*"/>
+					<parameter name="precision" type="gint*"/>
+				</parameters>
+			</method>
+			<method name="get_byte_order" symbol="gdk_visual_get_byte_order">
+				<return-type type="GdkByteOrder"/>
+				<parameters>
+					<parameter name="visual" type="GdkVisual*"/>
+				</parameters>
+			</method>
+			<method name="get_colormap_size" symbol="gdk_visual_get_colormap_size">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="visual" type="GdkVisual*"/>
+				</parameters>
+			</method>
+			<method name="get_depth" symbol="gdk_visual_get_depth">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="visual" type="GdkVisual*"/>
+				</parameters>
+			</method>
+			<method name="get_green_pixel_details" symbol="gdk_visual_get_green_pixel_details">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="visual" type="GdkVisual*"/>
+					<parameter name="mask" type="guint32*"/>
+					<parameter name="shift" type="gint*"/>
+					<parameter name="precision" type="gint*"/>
+				</parameters>
+			</method>
+			<method name="get_red_pixel_details" symbol="gdk_visual_get_red_pixel_details">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="visual" type="GdkVisual*"/>
+					<parameter name="mask" type="guint32*"/>
+					<parameter name="shift" type="gint*"/>
+					<parameter name="precision" type="gint*"/>
+				</parameters>
+			</method>
 			<method name="get_screen" symbol="gdk_visual_get_screen">
 				<return-type type="GdkScreen*"/>
 				<parameters>
@@ -4365,6 +4540,12 @@
 			<method name="get_system" symbol="gdk_visual_get_system">
 				<return-type type="GdkVisual*"/>
 			</method>
+			<method name="get_visual_type" symbol="gdk_visual_get_visual_type">
+				<return-type type="GdkVisualType"/>
+				<parameters>
+					<parameter name="visual" type="GdkVisual*"/>
+				</parameters>
+			</method>
 			<field name="type" type="GdkVisualType"/>
 			<field name="depth" type="gint"/>
 			<field name="byte_order" type="GdkByteOrder"/>
@@ -4480,6 +4661,26 @@
 					<parameter name="new_height" type="gint*"/>
 				</parameters>
 			</method>
+			<method name="coords_from_parent" symbol="gdk_window_coords_from_parent">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="parent_x" type="gdouble"/>
+					<parameter name="parent_y" type="gdouble"/>
+					<parameter name="x" type="gdouble*"/>
+					<parameter name="y" type="gdouble*"/>
+				</parameters>
+			</method>
+			<method name="coords_to_parent" symbol="gdk_window_coords_to_parent">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="x" type="gdouble"/>
+					<parameter name="y" type="gdouble"/>
+					<parameter name="parent_x" type="gdouble*"/>
+					<parameter name="parent_y" type="gdouble*"/>
+				</parameters>
+			</method>
 			<method name="deiconify" symbol="gdk_window_deiconify">
 				<return-type type="void"/>
 				<parameters>
@@ -4560,12 +4761,39 @@
 					<parameter name="window" type="GdkWindow*"/>
 				</parameters>
 			</method>
+			<method name="get_accept_focus" symbol="gdk_window_get_accept_focus">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+				</parameters>
+			</method>
+			<method name="get_back_pixmap" symbol="gdk_window_get_back_pixmap">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="pixmap" type="GdkPixmap**"/>
+					<parameter name="parent_relative" type="gboolean*"/>
+				</parameters>
+			</method>
+			<method name="get_background" symbol="gdk_window_get_background">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="color" type="GdkColor*"/>
+				</parameters>
+			</method>
 			<method name="get_children" symbol="gdk_window_get_children">
 				<return-type type="GList*"/>
 				<parameters>
 					<parameter name="window" type="GdkWindow*"/>
 				</parameters>
 			</method>
+			<method name="get_composited" symbol="gdk_window_get_composited">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+				</parameters>
+			</method>
 			<method name="get_cursor" symbol="gdk_window_get_cursor">
 				<return-type type="GdkCursor*"/>
 				<parameters>
@@ -4587,12 +4815,30 @@
 					<parameter name="y" type="gint*"/>
 				</parameters>
 			</method>
+			<method name="get_effective_parent" symbol="gdk_window_get_effective_parent">
+				<return-type type="GdkWindow*"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+				</parameters>
+			</method>
+			<method name="get_effective_toplevel" symbol="gdk_window_get_effective_toplevel">
+				<return-type type="GdkWindow*"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+				</parameters>
+			</method>
 			<method name="get_events" symbol="gdk_window_get_events">
 				<return-type type="GdkEventMask"/>
 				<parameters>
 					<parameter name="window" type="GdkWindow*"/>
 				</parameters>
 			</method>
+			<method name="get_focus_on_map" symbol="gdk_window_get_focus_on_map">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+				</parameters>
+			</method>
 			<method name="get_frame_extents" symbol="gdk_window_get_frame_extents">
 				<return-type type="void"/>
 				<parameters>
@@ -4626,6 +4872,12 @@
 					<parameter name="y_offset" type="gint*"/>
 				</parameters>
 			</method>
+			<method name="get_modal_hint" symbol="gdk_window_get_modal_hint">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+				</parameters>
+			</method>
 			<method name="get_origin" symbol="gdk_window_get_origin">
 				<return-type type="gint"/>
 				<parameters>
@@ -4773,6 +5025,18 @@
 					<parameter name="window" type="GdkWindow*"/>
 				</parameters>
 			</method>
+			<method name="is_input_only" symbol="gdk_window_is_input_only">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+				</parameters>
+			</method>
+			<method name="is_shaped" symbol="gdk_window_is_shaped">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+				</parameters>
+			</method>
 			<method name="is_viewable" symbol="gdk_window_is_viewable">
 				<return-type type="gboolean"/>
 				<parameters>
diff --git a/vapi/packages/gdk-x11-2.0/gdk-x11-2.0.gi b/vapi/packages/gdk-x11-2.0/gdk-x11-2.0.gi
index baef917..0dec2ec 100644
--- a/vapi/packages/gdk-x11-2.0/gdk-x11-2.0.gi
+++ b/vapi/packages/gdk-x11-2.0/gdk-x11-2.0.gi
@@ -188,6 +188,12 @@
 				<parameter name="xdisplay" type="Display*"/>
 			</parameters>
 		</function>
+		<function name="x11_pixmap_get_drawable_impl" symbol="gdk_x11_pixmap_get_drawable_impl">
+			<return-type type="GdkDrawable*"/>
+			<parameters>
+				<parameter name="pixmap" type="GdkPixmap*"/>
+			</parameters>
+		</function>
 		<function name="x11_register_standard_event_type" symbol="gdk_x11_register_standard_event_type">
 			<return-type type="void"/>
 			<parameters>
@@ -196,6 +202,13 @@
 				<parameter name="n_events" type="gint"/>
 			</parameters>
 		</function>
+		<function name="x11_screen_get_monitor_output" symbol="gdk_x11_screen_get_monitor_output">
+			<return-type type="XID"/>
+			<parameters>
+				<parameter name="screen" type="GdkScreen*"/>
+				<parameter name="monitor_num" type="gint"/>
+			</parameters>
+		</function>
 		<function name="x11_screen_get_screen_number" symbol="gdk_x11_screen_get_screen_number">
 			<return-type type="int"/>
 			<parameters>
@@ -237,6 +250,12 @@
 				<parameter name="visual" type="GdkVisual*"/>
 			</parameters>
 		</function>
+		<function name="x11_window_get_drawable_impl" symbol="gdk_x11_window_get_drawable_impl">
+			<return-type type="GdkDrawable*"/>
+			<parameters>
+				<parameter name="window" type="GdkWindow*"/>
+			</parameters>
+		</function>
 		<function name="x11_window_move_to_current_desktop" symbol="gdk_x11_window_move_to_current_desktop">
 			<return-type type="void"/>
 			<parameters>
diff --git a/vapi/packages/gio-2.0/gio-2.0.gi b/vapi/packages/gio-2.0/gio-2.0.gi
index c76e87c..33adcfa 100644
--- a/vapi/packages/gio-2.0/gio-2.0.gi
+++ b/vapi/packages/gio-2.0/gio-2.0.gi
@@ -130,51 +130,51 @@
 		<function name="g_content_type_can_be_executable" symbol="g_content_type_can_be_executable">
 			<return-type type="gboolean"/>
 			<parameters>
-				<parameter name="type" type="char*"/>
+				<parameter name="type" type="gchar*"/>
 			</parameters>
 		</function>
 		<function name="g_content_type_equals" symbol="g_content_type_equals">
 			<return-type type="gboolean"/>
 			<parameters>
-				<parameter name="type1" type="char*"/>
-				<parameter name="type2" type="char*"/>
+				<parameter name="type1" type="gchar*"/>
+				<parameter name="type2" type="gchar*"/>
 			</parameters>
 		</function>
 		<function name="g_content_type_from_mime_type" symbol="g_content_type_from_mime_type">
-			<return-type type="char*"/>
+			<return-type type="gchar*"/>
 			<parameters>
-				<parameter name="mime_type" type="char*"/>
+				<parameter name="mime_type" type="gchar*"/>
 			</parameters>
 		</function>
 		<function name="g_content_type_get_description" symbol="g_content_type_get_description">
-			<return-type type="char*"/>
+			<return-type type="gchar*"/>
 			<parameters>
-				<parameter name="type" type="char*"/>
+				<parameter name="type" type="gchar*"/>
 			</parameters>
 		</function>
 		<function name="g_content_type_get_icon" symbol="g_content_type_get_icon">
 			<return-type type="GIcon*"/>
 			<parameters>
-				<parameter name="type" type="char*"/>
+				<parameter name="type" type="gchar*"/>
 			</parameters>
 		</function>
 		<function name="g_content_type_get_mime_type" symbol="g_content_type_get_mime_type">
-			<return-type type="char*"/>
+			<return-type type="gchar*"/>
 			<parameters>
-				<parameter name="type" type="char*"/>
+				<parameter name="type" type="gchar*"/>
 			</parameters>
 		</function>
 		<function name="g_content_type_guess" symbol="g_content_type_guess">
-			<return-type type="char*"/>
+			<return-type type="gchar*"/>
 			<parameters>
-				<parameter name="filename" type="char*"/>
+				<parameter name="filename" type="gchar*"/>
 				<parameter name="data" type="guchar*"/>
 				<parameter name="data_size" type="gsize"/>
 				<parameter name="result_uncertain" type="gboolean*"/>
 			</parameters>
 		</function>
 		<function name="g_content_type_guess_for_tree" symbol="g_content_type_guess_for_tree">
-			<return-type type="char**"/>
+			<return-type type="gchar**"/>
 			<parameters>
 				<parameter name="root" type="GFile*"/>
 			</parameters>
@@ -182,14 +182,14 @@
 		<function name="g_content_type_is_a" symbol="g_content_type_is_a">
 			<return-type type="gboolean"/>
 			<parameters>
-				<parameter name="type" type="char*"/>
-				<parameter name="supertype" type="char*"/>
+				<parameter name="type" type="gchar*"/>
+				<parameter name="supertype" type="gchar*"/>
 			</parameters>
 		</function>
 		<function name="g_content_type_is_unknown" symbol="g_content_type_is_unknown">
 			<return-type type="gboolean"/>
 			<parameters>
-				<parameter name="type" type="char*"/>
+				<parameter name="type" type="gchar*"/>
 			</parameters>
 		</function>
 		<function name="g_content_types_get_registered" symbol="g_content_types_get_registered">
@@ -499,6 +499,7 @@
 			<parameters>
 				<parameter name="connection" type="GDBusConnection*"/>
 				<parameter name="message" type="GDBusMessage*"/>
+				<parameter name="incoming" type="gboolean"/>
 				<parameter name="user_data" type="gpointer"/>
 			</parameters>
 		</callback>
@@ -592,6 +593,14 @@
 				<parameter name="user_data" type="gpointer"/>
 			</parameters>
 		</callback>
+		<callback name="GSettingsGetMapping">
+			<return-type type="gboolean"/>
+			<parameters>
+				<parameter name="value" type="GVariant*"/>
+				<parameter name="result" type="gpointer*"/>
+				<parameter name="user_data" type="gpointer"/>
+			</parameters>
+		</callback>
 		<callback name="GSimpleAsyncThreadFunc">
 			<return-type type="void"/>
 			<parameters>
@@ -616,14 +625,7 @@
 			<field name="method_call" type="GDBusInterfaceMethodCallFunc"/>
 			<field name="get_property" type="GDBusInterfaceGetPropertyFunc"/>
 			<field name="set_property" type="GDBusInterfaceSetPropertyFunc"/>
-			<field name="_g_reserved1" type="GCallback"/>
-			<field name="_g_reserved2" type="GCallback"/>
-			<field name="_g_reserved3" type="GCallback"/>
-			<field name="_g_reserved4" type="GCallback"/>
-			<field name="_g_reserved5" type="GCallback"/>
-			<field name="_g_reserved6" type="GCallback"/>
-			<field name="_g_reserved7" type="GCallback"/>
-			<field name="_g_reserved8" type="GCallback"/>
+			<field name="padding" type="gpointer[]"/>
 		</struct>
 		<struct name="GDBusSubtreeVTable">
 			<field name="enumerate" type="GDBusSubtreeEnumerateFunc"/>
@@ -1332,6 +1334,7 @@
 			<member name="G_APP_INFO_CREATE_NONE" value="0"/>
 			<member name="G_APP_INFO_CREATE_NEEDS_TERMINAL" value="1"/>
 			<member name="G_APP_INFO_CREATE_SUPPORTS_URIS" value="2"/>
+			<member name="G_APP_INFO_CREATE_SUPPORTS_STARTUP_NOTIFICATION" value="4"/>
 		</flags>
 		<flags name="GAskPasswordFlags" type-name="GAskPasswordFlags" get-type="g_ask_password_flags_get_type">
 			<member name="G_ASK_PASSWORD_NEED_PASSWORD" value="1"/>
@@ -1368,6 +1371,7 @@
 			<member name="G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_SERVER" value="2"/>
 			<member name="G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS" value="4"/>
 			<member name="G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION" value="8"/>
+			<member name="G_DBUS_CONNECTION_FLAGS_DELAY_MESSAGE_PROCESSING" value="16"/>
 		</flags>
 		<flags name="GDBusMessageFlags" type-name="GDBusMessageFlags" get-type="g_dbus_message_flags_get_type">
 			<member name="G_DBUS_MESSAGE_FLAGS_NONE" value="0"/>
@@ -2014,9 +2018,9 @@
 			<signal name="authorize-authenticated-peer" when="LAST">
 				<return-type type="gboolean"/>
 				<parameters>
-					<parameter name="observer" type="GDBusAuthObserver*"/>
-					<parameter name="stream" type="GIOStream*"/>
-					<parameter name="credentials" type="GCredentials*"/>
+					<parameter name="object" type="GDBusAuthObserver*"/>
+					<parameter name="p0" type="GIOStream*"/>
+					<parameter name="p1" type="GCredentials*"/>
 				</parameters>
 			</signal>
 		</object>
@@ -2093,6 +2097,31 @@
 					<parameter name="error" type="GError**"/>
 				</parameters>
 			</method>
+			<method name="flush" symbol="g_dbus_connection_flush">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="connection" type="GDBusConnection*"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="callback" type="GAsyncReadyCallback"/>
+					<parameter name="user_data" type="gpointer"/>
+				</parameters>
+			</method>
+			<method name="flush_finish" symbol="g_dbus_connection_flush_finish">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="connection" type="GDBusConnection*"/>
+					<parameter name="res" type="GAsyncResult*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
+			<method name="flush_sync" symbol="g_dbus_connection_flush_sync">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="connection" type="GDBusConnection*"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
 			<method name="get_capabilities" symbol="g_dbus_connection_get_capabilities">
 				<return-type type="GDBusCapabilityFlags"/>
 				<parameters>
@@ -2198,7 +2227,7 @@
 				<parameters>
 					<parameter name="connection" type="GDBusConnection*"/>
 					<parameter name="object_path" type="gchar*"/>
-					<parameter name="introspection_data" type="GDBusInterfaceInfo*"/>
+					<parameter name="interface_info" type="GDBusInterfaceInfo*"/>
 					<parameter name="vtable" type="GDBusInterfaceVTable*"/>
 					<parameter name="user_data" type="gpointer"/>
 					<parameter name="user_data_free_func" type="GDestroyNotify"/>
@@ -2292,6 +2321,12 @@
 					<parameter name="subscription_id" type="guint"/>
 				</parameters>
 			</method>
+			<method name="start_message_processing" symbol="g_dbus_connection_start_message_processing">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="connection" type="GDBusConnection*"/>
+				</parameters>
+			</method>
 			<method name="unregister_object" symbol="g_dbus_connection_unregister_object">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -2318,9 +2353,9 @@
 			<signal name="closed" when="LAST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="connection" type="GDBusConnection*"/>
-					<parameter name="remote_peer_vanished" type="gboolean"/>
-					<parameter name="error" type="GError*"/>
+					<parameter name="object" type="GDBusConnection*"/>
+					<parameter name="p0" type="gboolean"/>
+					<parameter name="p1" type="GError*"/>
 				</parameters>
 			</signal>
 		</object>
@@ -3022,8 +3057,8 @@
 			<signal name="new-connection" when="LAST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="server" type="GDBusServer*"/>
-					<parameter name="connection" type="GDBusConnection*"/>
+					<parameter name="object" type="GDBusServer*"/>
+					<parameter name="p0" type="GDBusConnection*"/>
 				</parameters>
 			</signal>
 		</object>
@@ -5807,6 +5842,13 @@
 					<parameter name="key" type="gchar*"/>
 				</parameters>
 			</method>
+			<method name="get_flags" symbol="g_settings_get_flags">
+				<return-type type="guint"/>
+				<parameters>
+					<parameter name="settings" type="GSettings*"/>
+					<parameter name="key" type="gchar*"/>
+				</parameters>
+			</method>
 			<method name="get_has_unapplied" symbol="g_settings_get_has_unapplied">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -5820,6 +5862,15 @@
 					<parameter name="key" type="gchar*"/>
 				</parameters>
 			</method>
+			<method name="get_mapped" symbol="g_settings_get_mapped">
+				<return-type type="gpointer"/>
+				<parameters>
+					<parameter name="settings" type="GSettings*"/>
+					<parameter name="key" type="gchar*"/>
+					<parameter name="mapping" type="GSettingsGetMapping"/>
+					<parameter name="user_data" type="gpointer"/>
+				</parameters>
+			</method>
 			<method name="get_string" symbol="g_settings_get_string">
 				<return-type type="gchar*"/>
 				<parameters>
@@ -5848,6 +5899,15 @@
 					<parameter name="name" type="gchar*"/>
 				</parameters>
 			</method>
+			<method name="list_items" symbol="g_settings_list_items">
+				<return-type type="gchar**"/>
+				<parameters>
+					<parameter name="settings" type="GSettings*"/>
+				</parameters>
+			</method>
+			<method name="list_schemas" symbol="g_settings_list_schemas">
+				<return-type type="gchar**"/>
+			</method>
 			<constructor name="new" symbol="g_settings_new">
 				<return-type type="GSettings*"/>
 				<parameters>
@@ -5914,6 +5974,14 @@
 					<parameter name="value" type="gint"/>
 				</parameters>
 			</method>
+			<method name="set_flags" symbol="g_settings_set_flags">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="settings" type="GSettings*"/>
+					<parameter name="key" type="gchar*"/>
+					<parameter name="value" type="guint"/>
+				</parameters>
+			</method>
 			<method name="set_int" symbol="g_settings_set_int">
 				<return-type type="gboolean"/>
 				<parameters>
diff --git a/vapi/packages/gnome-vfs-2.0/gnome-vfs-2.0.gi b/vapi/packages/gnome-vfs-2.0/gnome-vfs-2.0.gi
index f4ee24c..7fd5e0a 100644
--- a/vapi/packages/gnome-vfs-2.0/gnome-vfs-2.0.gi
+++ b/vapi/packages/gnome-vfs-2.0/gnome-vfs-2.0.gi
@@ -2635,11 +2635,11 @@
 		</boxed>
 		<boxed name="GnomeVfsGetFileInfoResult" type-name="GnomeVfsGetFileInfoResult" get-type="gnome_vfs_get_file_info_result_get_type">
 		</boxed>
-		<enum name="GnomeVFSDNSSDServiceStatus">
+		<enum name="GnomeVFSDNSSDServiceStatus" type-name="GnomeVFSDNSSDServiceStatus" get-type="gnome_vfs_dns_sd_service_status_get_type">
 			<member name="GNOME_VFS_DNS_SD_SERVICE_ADDED" value="0"/>
 			<member name="GNOME_VFS_DNS_SD_SERVICE_REMOVED" value="1"/>
 		</enum>
-		<enum name="GnomeVFSDeviceType">
+		<enum name="GnomeVFSDeviceType" type-name="GnomeVFSDeviceType" get-type="gnome_vfs_device_type_get_type">
 			<member name="GNOME_VFS_DEVICE_TYPE_UNKNOWN" value="0"/>
 			<member name="GNOME_VFS_DEVICE_TYPE_AUDIO_CD" value="1"/>
 			<member name="GNOME_VFS_DEVICE_TYPE_VIDEO_DVD" value="2"/>
@@ -2659,7 +2659,7 @@
 			<member name="GNOME_VFS_DEVICE_TYPE_LOOPBACK" value="16"/>
 			<member name="GNOME_VFS_DEVICE_TYPE_NETWORK" value="17"/>
 		</enum>
-		<enum name="GnomeVFSFileType">
+		<enum name="GnomeVFSFileType" type-name="GnomeVFSFileType" get-type="gnome_vfs_file_type_get_type">
 			<member name="GNOME_VFS_FILE_TYPE_UNKNOWN" value="0"/>
 			<member name="GNOME_VFS_FILE_TYPE_REGULAR" value="1"/>
 			<member name="GNOME_VFS_FILE_TYPE_DIRECTORY" value="2"/>
@@ -2669,30 +2669,30 @@
 			<member name="GNOME_VFS_FILE_TYPE_BLOCK_DEVICE" value="6"/>
 			<member name="GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK" value="7"/>
 		</enum>
-		<enum name="GnomeVFSFindDirectoryKind">
+		<enum name="GnomeVFSFindDirectoryKind" type-name="GnomeVFSFindDirectoryKind" get-type="gnome_vfs_find_directory_kind_get_type">
 			<member name="GNOME_VFS_DIRECTORY_KIND_DESKTOP" value="1000"/>
 			<member name="GNOME_VFS_DIRECTORY_KIND_TRASH" value="1001"/>
 		</enum>
-		<enum name="GnomeVFSMimeActionType">
+		<enum name="GnomeVFSMimeActionType" type-name="GnomeVFSMimeActionType" get-type="gnome_vfs_mime_action_type_get_type">
 			<member name="GNOME_VFS_MIME_ACTION_TYPE_NONE" value="0"/>
 			<member name="GNOME_VFS_MIME_ACTION_TYPE_APPLICATION" value="1"/>
 			<member name="GNOME_VFS_MIME_ACTION_TYPE_COMPONENT" value="2"/>
 		</enum>
-		<enum name="GnomeVFSMimeApplicationArgumentType">
+		<enum name="GnomeVFSMimeApplicationArgumentType" type-name="GnomeVFSMimeApplicationArgumentType" get-type="gnome_vfs_mime_application_argument_type_get_type">
 			<member name="GNOME_VFS_MIME_APPLICATION_ARGUMENT_TYPE_URIS" value="0"/>
 			<member name="GNOME_VFS_MIME_APPLICATION_ARGUMENT_TYPE_PATHS" value="1"/>
 			<member name="GNOME_VFS_MIME_APPLICATION_ARGUMENT_TYPE_URIS_FOR_NON_FILES" value="2"/>
 		</enum>
-		<enum name="GnomeVFSMimeEquivalence">
+		<enum name="GnomeVFSMimeEquivalence" type-name="GnomeVFSMimeEquivalence" get-type="gnome_vfs_mime_equivalence_get_type">
 			<member name="GNOME_VFS_MIME_UNRELATED" value="0"/>
 			<member name="GNOME_VFS_MIME_IDENTICAL" value="1"/>
 			<member name="GNOME_VFS_MIME_PARENT" value="2"/>
 		</enum>
-		<enum name="GnomeVFSModuleCallbackAuthenticationAuthType">
+		<enum name="GnomeVFSModuleCallbackAuthenticationAuthType" type-name="GnomeVFSModuleCallbackAuthenticationAuthType" get-type="gnome_vfs_module_callback_authentication_auth_type_get_type">
 			<member name="AuthTypeBasic" value="0"/>
 			<member name="AuthTypeDigest" value="1"/>
 		</enum>
-		<enum name="GnomeVFSMonitorEventType">
+		<enum name="GnomeVFSMonitorEventType" type-name="GnomeVFSMonitorEventType" get-type="gnome_vfs_monitor_event_type_get_type">
 			<member name="GNOME_VFS_MONITOR_EVENT_CHANGED" value="0"/>
 			<member name="GNOME_VFS_MONITOR_EVENT_DELETED" value="1"/>
 			<member name="GNOME_VFS_MONITOR_EVENT_STARTEXECUTING" value="2"/>
@@ -2700,11 +2700,11 @@
 			<member name="GNOME_VFS_MONITOR_EVENT_CREATED" value="4"/>
 			<member name="GNOME_VFS_MONITOR_EVENT_METADATA_CHANGED" value="5"/>
 		</enum>
-		<enum name="GnomeVFSMonitorType">
+		<enum name="GnomeVFSMonitorType" type-name="GnomeVFSMonitorType" get-type="gnome_vfs_monitor_type_get_type">
 			<member name="GNOME_VFS_MONITOR_FILE" value="0"/>
 			<member name="GNOME_VFS_MONITOR_DIRECTORY" value="1"/>
 		</enum>
-		<enum name="GnomeVFSResult">
+		<enum name="GnomeVFSResult" type-name="GnomeVFSResult" get-type="gnome_vfs_result_get_type">
 			<member name="GNOME_VFS_OK" value="0"/>
 			<member name="GNOME_VFS_ERROR_NOT_FOUND" value="1"/>
 			<member name="GNOME_VFS_ERROR_GENERIC" value="2"/>
@@ -2759,39 +2759,39 @@
 			<member name="GNOME_VFS_ERROR_NOT_A_SYMBOLIC_LINK" value="51"/>
 			<member name="GNOME_VFS_NUM_ERRORS" value="52"/>
 		</enum>
-		<enum name="GnomeVFSSeekPosition">
+		<enum name="GnomeVFSSeekPosition" type-name="GnomeVFSSeekPosition" get-type="gnome_vfs_seek_position_get_type">
 			<member name="GNOME_VFS_SEEK_START" value="0"/>
 			<member name="GNOME_VFS_SEEK_CURRENT" value="1"/>
 			<member name="GNOME_VFS_SEEK_END" value="2"/>
 		</enum>
-		<enum name="GnomeVFSVolumeType">
+		<enum name="GnomeVFSVolumeType" type-name="GnomeVFSVolumeType" get-type="gnome_vfs_volume_type_get_type">
 			<member name="GNOME_VFS_VOLUME_TYPE_MOUNTPOINT" value="0"/>
 			<member name="GNOME_VFS_VOLUME_TYPE_VFS_MOUNT" value="1"/>
 			<member name="GNOME_VFS_VOLUME_TYPE_CONNECTED_SERVER" value="2"/>
 		</enum>
-		<enum name="GnomeVFSXferErrorAction">
+		<enum name="GnomeVFSXferErrorAction" type-name="GnomeVFSXferErrorAction" get-type="gnome_vfs_xfer_error_action_get_type">
 			<member name="GNOME_VFS_XFER_ERROR_ACTION_ABORT" value="0"/>
 			<member name="GNOME_VFS_XFER_ERROR_ACTION_RETRY" value="1"/>
 			<member name="GNOME_VFS_XFER_ERROR_ACTION_SKIP" value="2"/>
 		</enum>
-		<enum name="GnomeVFSXferErrorMode">
+		<enum name="GnomeVFSXferErrorMode" type-name="GnomeVFSXferErrorMode" get-type="gnome_vfs_xfer_error_mode_get_type">
 			<member name="GNOME_VFS_XFER_ERROR_MODE_ABORT" value="0"/>
 			<member name="GNOME_VFS_XFER_ERROR_MODE_QUERY" value="1"/>
 		</enum>
-		<enum name="GnomeVFSXferOverwriteAction">
+		<enum name="GnomeVFSXferOverwriteAction" type-name="GnomeVFSXferOverwriteAction" get-type="gnome_vfs_xfer_overwrite_action_get_type">
 			<member name="GNOME_VFS_XFER_OVERWRITE_ACTION_ABORT" value="0"/>
 			<member name="GNOME_VFS_XFER_OVERWRITE_ACTION_REPLACE" value="1"/>
 			<member name="GNOME_VFS_XFER_OVERWRITE_ACTION_REPLACE_ALL" value="2"/>
 			<member name="GNOME_VFS_XFER_OVERWRITE_ACTION_SKIP" value="3"/>
 			<member name="GNOME_VFS_XFER_OVERWRITE_ACTION_SKIP_ALL" value="4"/>
 		</enum>
-		<enum name="GnomeVFSXferOverwriteMode">
+		<enum name="GnomeVFSXferOverwriteMode" type-name="GnomeVFSXferOverwriteMode" get-type="gnome_vfs_xfer_overwrite_mode_get_type">
 			<member name="GNOME_VFS_XFER_OVERWRITE_MODE_ABORT" value="0"/>
 			<member name="GNOME_VFS_XFER_OVERWRITE_MODE_QUERY" value="1"/>
 			<member name="GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE" value="2"/>
 			<member name="GNOME_VFS_XFER_OVERWRITE_MODE_SKIP" value="3"/>
 		</enum>
-		<enum name="GnomeVFSXferPhase">
+		<enum name="GnomeVFSXferPhase" type-name="GnomeVFSXferPhase" get-type="gnome_vfs_xfer_phase_get_type">
 			<member name="GNOME_VFS_XFER_PHASE_INITIAL" value="0"/>
 			<member name="GNOME_VFS_XFER_CHECKING_DESTINATION" value="1"/>
 			<member name="GNOME_VFS_XFER_PHASE_COLLECTING" value="2"/>
@@ -2811,24 +2811,24 @@
 			<member name="GNOME_VFS_XFER_PHASE_COMPLETED" value="16"/>
 			<member name="GNOME_VFS_XFER_NUM_PHASES" value="17"/>
 		</enum>
-		<enum name="GnomeVFSXferProgressStatus">
+		<enum name="GnomeVFSXferProgressStatus" type-name="GnomeVFSXferProgressStatus" get-type="gnome_vfs_xfer_progress_status_get_type">
 			<member name="GNOME_VFS_XFER_PROGRESS_STATUS_OK" value="0"/>
 			<member name="GNOME_VFS_XFER_PROGRESS_STATUS_VFSERROR" value="1"/>
 			<member name="GNOME_VFS_XFER_PROGRESS_STATUS_OVERWRITE" value="2"/>
 			<member name="GNOME_VFS_XFER_PROGRESS_STATUS_DUPLICATE" value="3"/>
 		</enum>
-		<flags name="GnomeVFSDirectoryVisitOptions">
+		<flags name="GnomeVFSDirectoryVisitOptions" type-name="GnomeVFSDirectoryVisitOptions" get-type="gnome_vfs_directory_visit_options_get_type">
 			<member name="GNOME_VFS_DIRECTORY_VISIT_DEFAULT" value="0"/>
 			<member name="GNOME_VFS_DIRECTORY_VISIT_SAMEFS" value="1"/>
 			<member name="GNOME_VFS_DIRECTORY_VISIT_LOOPCHECK" value="2"/>
 			<member name="GNOME_VFS_DIRECTORY_VISIT_IGNORE_RECURSE_ERROR" value="4"/>
 		</flags>
-		<flags name="GnomeVFSFileFlags">
+		<flags name="GnomeVFSFileFlags" type-name="GnomeVFSFileFlags" get-type="gnome_vfs_file_flags_get_type">
 			<member name="GNOME_VFS_FILE_FLAGS_NONE" value="0"/>
 			<member name="GNOME_VFS_FILE_FLAGS_SYMLINK" value="1"/>
 			<member name="GNOME_VFS_FILE_FLAGS_LOCAL" value="2"/>
 		</flags>
-		<flags name="GnomeVFSFileInfoFields">
+		<flags name="GnomeVFSFileInfoFields" type-name="GnomeVFSFileInfoFields" get-type="gnome_vfs_file_info_fields_get_type">
 			<member name="GNOME_VFS_FILE_INFO_FIELDS_NONE" value="0"/>
 			<member name="GNOME_VFS_FILE_INFO_FIELDS_TYPE" value="1"/>
 			<member name="GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS" value="2"/>
@@ -2849,7 +2849,7 @@
 			<member name="GNOME_VFS_FILE_INFO_FIELDS_ACL" value="65536"/>
 			<member name="GNOME_VFS_FILE_INFO_FIELDS_SELINUX_CONTEXT" value="131072"/>
 		</flags>
-		<flags name="GnomeVFSFileInfoOptions">
+		<flags name="GnomeVFSFileInfoOptions" type-name="GnomeVFSFileInfoOptions" get-type="gnome_vfs_file_info_options_get_type">
 			<member name="GNOME_VFS_FILE_INFO_DEFAULT" value="0"/>
 			<member name="GNOME_VFS_FILE_INFO_GET_MIME_TYPE" value="1"/>
 			<member name="GNOME_VFS_FILE_INFO_FORCE_FAST_MIME_TYPE" value="2"/>
@@ -2860,7 +2860,7 @@
 			<member name="GNOME_VFS_FILE_INFO_GET_ACL" value="64"/>
 			<member name="GNOME_VFS_FILE_INFO_GET_SELINUX_CONTEXT" value="128"/>
 		</flags>
-		<flags name="GnomeVFSFilePermissions">
+		<flags name="GnomeVFSFilePermissions" type-name="GnomeVFSFilePermissions" get-type="gnome_vfs_file_permissions_get_type">
 			<member name="GNOME_VFS_PERM_SUID" value="2048"/>
 			<member name="GNOME_VFS_PERM_SGID" value="1024"/>
 			<member name="GNOME_VFS_PERM_STICKY" value="512"/>
@@ -2880,12 +2880,12 @@
 			<member name="GNOME_VFS_PERM_ACCESS_WRITABLE" value="131072"/>
 			<member name="GNOME_VFS_PERM_ACCESS_EXECUTABLE" value="262144"/>
 		</flags>
-		<flags name="GnomeVFSMakeURIDirs">
+		<flags name="GnomeVFSMakeURIDirs" type-name="GnomeVFSMakeURIDirs" get-type="gnome_vfs_make_uri_dirs_get_type">
 			<member name="GNOME_VFS_MAKE_URI_DIR_NONE" value="0"/>
 			<member name="GNOME_VFS_MAKE_URI_DIR_HOMEDIR" value="1"/>
 			<member name="GNOME_VFS_MAKE_URI_DIR_CURRENT" value="2"/>
 		</flags>
-		<flags name="GnomeVFSModuleCallbackFullAuthenticationFlags">
+		<flags name="GnomeVFSModuleCallbackFullAuthenticationFlags" type-name="GnomeVFSModuleCallbackFullAuthenticationFlags" get-type="gnome_vfs_module_callback_full_authentication_flags_get_type">
 			<member name="GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_PREVIOUS_ATTEMPT_FAILED" value="1"/>
 			<member name="GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_NEED_PASSWORD" value="2"/>
 			<member name="GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_NEED_USERNAME" value="4"/>
@@ -2893,17 +2893,17 @@
 			<member name="GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_SAVING_SUPPORTED" value="16"/>
 			<member name="GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_ANON_SUPPORTED" value="32"/>
 		</flags>
-		<flags name="GnomeVFSModuleCallbackFullAuthenticationOutFlags">
+		<flags name="GnomeVFSModuleCallbackFullAuthenticationOutFlags" type-name="GnomeVFSModuleCallbackFullAuthenticationOutFlags" get-type="gnome_vfs_module_callback_full_authentication_out_flags_get_type">
 			<member name="GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_OUT_ANON_SELECTED" value="1"/>
 		</flags>
-		<flags name="GnomeVFSOpenMode">
+		<flags name="GnomeVFSOpenMode" type-name="GnomeVFSOpenMode" get-type="gnome_vfs_open_mode_get_type">
 			<member name="GNOME_VFS_OPEN_NONE" value="0"/>
 			<member name="GNOME_VFS_OPEN_READ" value="1"/>
 			<member name="GNOME_VFS_OPEN_WRITE" value="2"/>
 			<member name="GNOME_VFS_OPEN_RANDOM" value="4"/>
 			<member name="GNOME_VFS_OPEN_TRUNCATE" value="8"/>
 		</flags>
-		<flags name="GnomeVFSSetFileInfoMask">
+		<flags name="GnomeVFSSetFileInfoMask" type-name="GnomeVFSSetFileInfoMask" get-type="gnome_vfs_set_file_info_mask_get_type">
 			<member name="GNOME_VFS_SET_FILE_INFO_NONE" value="0"/>
 			<member name="GNOME_VFS_SET_FILE_INFO_NAME" value="1"/>
 			<member name="GNOME_VFS_SET_FILE_INFO_PERMISSIONS" value="2"/>
@@ -2913,7 +2913,7 @@
 			<member name="GNOME_VFS_SET_FILE_INFO_SELINUX_CONTEXT" value="32"/>
 			<member name="GNOME_VFS_SET_FILE_INFO_SYMLINK_NAME" value="64"/>
 		</flags>
-		<flags name="GnomeVFSURIHideOptions">
+		<flags name="GnomeVFSURIHideOptions" type-name="GnomeVFSURIHideOptions" get-type="gnome_vfs_uri_hide_options_get_type">
 			<member name="GNOME_VFS_URI_HIDE_NONE" value="0"/>
 			<member name="GNOME_VFS_URI_HIDE_USER_NAME" value="1"/>
 			<member name="GNOME_VFS_URI_HIDE_PASSWORD" value="2"/>
@@ -2922,7 +2922,7 @@
 			<member name="GNOME_VFS_URI_HIDE_TOPLEVEL_METHOD" value="16"/>
 			<member name="GNOME_VFS_URI_HIDE_FRAGMENT_IDENTIFIER" value="256"/>
 		</flags>
-		<flags name="GnomeVFSXferOptions">
+		<flags name="GnomeVFSXferOptions" type-name="GnomeVFSXferOptions" get-type="gnome_vfs_xfer_options_get_type">
 			<member name="GNOME_VFS_XFER_DEFAULT" value="0"/>
 			<member name="GNOME_VFS_XFER_UNUSED_1" value="1"/>
 			<member name="GNOME_VFS_XFER_FOLLOW_LINKS" value="2"/>
@@ -3474,9 +3474,9 @@
 		<constant name="GNOME_VFS_APPLICATION_REGISTRY_STARTUP_NOTIFY" type="char*" value="startup_notify"/>
 		<constant name="GNOME_VFS_APPLICATION_REGISTRY_USES_GNOMEVFS" type="char*" value="uses_gnomevfs"/>
 		<constant name="GNOME_VFS_MAJOR_VERSION" type="int" value="2"/>
-		<constant name="GNOME_VFS_MICRO_VERSION" type="int" value="1"/>
+		<constant name="GNOME_VFS_MICRO_VERSION" type="int" value="3"/>
 		<constant name="GNOME_VFS_MIME_TYPE_UNKNOWN" type="char*" value="application/octet-stream"/>
-		<constant name="GNOME_VFS_MINOR_VERSION" type="int" value="20"/>
+		<constant name="GNOME_VFS_MINOR_VERSION" type="int" value="24"/>
 		<constant name="GNOME_VFS_MODULE_CALLBACK_AUTHENTICATION" type="char*" value="simple-authentication"/>
 		<constant name="GNOME_VFS_MODULE_CALLBACK_FILL_AUTHENTICATION" type="char*" value="fill-authentication"/>
 		<constant name="GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION" type="char*" value="full-authentication"/>
diff --git a/vapi/packages/json-glib-1.0/json-glib-1.0.gi b/vapi/packages/json-glib-1.0/json-glib-1.0.gi
index 76e1bfe..35aa0a0 100644
--- a/vapi/packages/json-glib-1.0/json-glib-1.0.gi
+++ b/vapi/packages/json-glib-1.0/json-glib-1.0.gi
@@ -668,7 +668,11 @@
 		</enum>
 		<enum name="JsonParserError" type-name="JsonParserError" get-type="json_parser_error_get_type">
 			<member name="JSON_PARSER_ERROR_PARSE" value="0"/>
-			<member name="JSON_PARSER_ERROR_UNKNOWN" value="1"/>
+			<member name="JSON_PARSER_ERROR_TRAILING_COMMA" value="1"/>
+			<member name="JSON_PARSER_ERROR_MISSING_COMMA" value="2"/>
+			<member name="JSON_PARSER_ERROR_MISSING_COLON" value="3"/>
+			<member name="JSON_PARSER_ERROR_INVALID_BAREWORD" value="4"/>
+			<member name="JSON_PARSER_ERROR_UNKNOWN" value="5"/>
 		</enum>
 		<object name="JsonGenerator" parent="GObject" type-name="JsonGenerator" get-type="json_generator_get_type">
 			<constructor name="new" symbol="json_generator_new">
@@ -872,9 +876,9 @@
 			</vfunc>
 		</interface>
 		<constant name="JSON_MAJOR_VERSION" type="int" value="0"/>
-		<constant name="JSON_MICRO_VERSION" type="int" value="0"/>
-		<constant name="JSON_MINOR_VERSION" type="int" value="10"/>
+		<constant name="JSON_MICRO_VERSION" type="int" value="1"/>
+		<constant name="JSON_MINOR_VERSION" type="int" value="11"/>
 		<constant name="JSON_VERSION_HEX" type="int" value="0"/>
-		<constant name="JSON_VERSION_S" type="char*" value="0.10.0"/>
+		<constant name="JSON_VERSION_S" type="char*" value="0.11.1"/>
 	</namespace>
 </api>
diff --git a/vapi/packages/libgnome-menu/libgnome-menu.gi b/vapi/packages/libgnome-menu/libgnome-menu.gi
index ea29b04..9d726e9 100644
--- a/vapi/packages/libgnome-menu/libgnome-menu.gi
+++ b/vapi/packages/libgnome-menu/libgnome-menu.gi
@@ -36,6 +36,12 @@
 					<parameter name="tree" type="GMenuTree*"/>
 				</parameters>
 			</method>
+			<method name="get_sort_key" symbol="gmenu_tree_get_sort_key">
+				<return-type type="GMenuTreeSortKey"/>
+				<parameters>
+					<parameter name="tree" type="GMenuTree*"/>
+				</parameters>
+			</method>
 			<method name="get_user_data" symbol="gmenu_tree_get_user_data">
 				<return-type type="gpointer"/>
 				<parameters>
@@ -63,6 +69,13 @@
 					<parameter name="user_data" type="gpointer"/>
 				</parameters>
 			</method>
+			<method name="set_sort_key" symbol="gmenu_tree_set_sort_key">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="tree" type="GMenuTree*"/>
+					<parameter name="sort_key" type="GMenuTreeSortKey"/>
+				</parameters>
+			</method>
 			<method name="set_user_data" symbol="gmenu_tree_set_user_data">
 				<return-type type="void"/>
 				<parameters>
@@ -168,12 +181,24 @@
 					<parameter name="entry" type="GMenuTreeEntry*"/>
 				</parameters>
 			</method>
+			<method name="get_display_name" symbol="gmenu_tree_entry_get_display_name">
+				<return-type type="char*"/>
+				<parameters>
+					<parameter name="entry" type="GMenuTreeEntry*"/>
+				</parameters>
+			</method>
 			<method name="get_exec" symbol="gmenu_tree_entry_get_exec">
 				<return-type type="char*"/>
 				<parameters>
 					<parameter name="entry" type="GMenuTreeEntry*"/>
 				</parameters>
 			</method>
+			<method name="get_generic_name" symbol="gmenu_tree_entry_get_generic_name">
+				<return-type type="char*"/>
+				<parameters>
+					<parameter name="entry" type="GMenuTreeEntry*"/>
+				</parameters>
+			</method>
 			<method name="get_icon" symbol="gmenu_tree_entry_get_icon">
 				<return-type type="char*"/>
 				<parameters>
@@ -254,7 +279,8 @@
 			<member name="GMENU_TREE_FLAGS_INCLUDE_EXCLUDED" value="1"/>
 			<member name="GMENU_TREE_FLAGS_SHOW_EMPTY" value="2"/>
 			<member name="GMENU_TREE_FLAGS_INCLUDE_NODISPLAY" value="4"/>
-			<member name="GMENU_TREE_FLAGS_MASK" value="7"/>
+			<member name="GMENU_TREE_FLAGS_SHOW_ALL_SEPARATORS" value="8"/>
+			<member name="GMENU_TREE_FLAGS_MASK" value="15"/>
 		</enum>
 		<enum name="GMenuTreeItemType">
 			<member name="GMENU_TREE_ITEM_INVALID" value="0"/>
@@ -264,5 +290,9 @@
 			<member name="GMENU_TREE_ITEM_HEADER" value="4"/>
 			<member name="GMENU_TREE_ITEM_ALIAS" value="5"/>
 		</enum>
+		<enum name="GMenuTreeSortKey">
+			<member name="GMENU_TREE_SORT_NAME" value="0"/>
+			<member name="GMENU_TREE_SORT_DISPLAY_NAME" value="1"/>
+		</enum>
 	</namespace>
 </api>
diff --git a/vapi/packages/libnotify/libnotify.gi b/vapi/packages/libnotify/libnotify.gi
index d514412..81cdc2c 100644
--- a/vapi/packages/libnotify/libnotify.gi
+++ b/vapi/packages/libnotify/libnotify.gi
@@ -31,12 +31,12 @@
 		<callback name="NotifyActionCallback">
 			<return-type type="void"/>
 			<parameters>
-				<parameter name="p1" type="NotifyNotification*"/>
-				<parameter name="p2" type="gchar*"/>
-				<parameter name="p3" type="gpointer"/>
+				<parameter name="notification" type="NotifyNotification*"/>
+				<parameter name="action" type="char*"/>
+				<parameter name="user_data" type="gpointer"/>
 			</parameters>
 		</callback>
-		<enum name="NotifyUrgency">
+		<enum name="NotifyUrgency" type-name="NotifyUrgency" get-type="notify_urgency_get_type">
 			<member name="NOTIFY_URGENCY_LOW" value="0"/>
 			<member name="NOTIFY_URGENCY_NORMAL" value="1"/>
 			<member name="NOTIFY_URGENCY_CRITICAL" value="2"/>
@@ -86,21 +86,27 @@
 					<parameter name="error" type="GError**"/>
 				</parameters>
 			</method>
+			<method name="get_closed_reason" symbol="notify_notification_get_closed_reason">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="notification" type="NotifyNotification*"/>
+				</parameters>
+			</method>
 			<constructor name="new" symbol="notify_notification_new">
 				<return-type type="NotifyNotification*"/>
 				<parameters>
-					<parameter name="summary" type="gchar*"/>
-					<parameter name="body" type="gchar*"/>
-					<parameter name="icon" type="gchar*"/>
+					<parameter name="summary" type="char*"/>
+					<parameter name="body" type="char*"/>
+					<parameter name="icon" type="char*"/>
 					<parameter name="attach" type="GtkWidget*"/>
 				</parameters>
 			</constructor>
 			<constructor name="new_with_status_icon" symbol="notify_notification_new_with_status_icon">
 				<return-type type="NotifyNotification*"/>
 				<parameters>
-					<parameter name="summary" type="gchar*"/>
-					<parameter name="body" type="gchar*"/>
-					<parameter name="icon" type="gchar*"/>
+					<parameter name="summary" type="char*"/>
+					<parameter name="body" type="char*"/>
+					<parameter name="icon" type="char*"/>
 					<parameter name="status_icon" type="GtkStatusIcon*"/>
 				</parameters>
 			</constructor>
@@ -124,7 +130,7 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="notification" type="NotifyNotification*"/>
-					<parameter name="key" type="gchar*"/>
+					<parameter name="key" type="char*"/>
 					<parameter name="value" type="guchar"/>
 				</parameters>
 			</method>
@@ -132,7 +138,7 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="notification" type="NotifyNotification*"/>
-					<parameter name="key" type="gchar*"/>
+					<parameter name="key" type="char*"/>
 					<parameter name="value" type="guchar*"/>
 					<parameter name="len" type="gsize"/>
 				</parameters>
@@ -141,7 +147,7 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="notification" type="NotifyNotification*"/>
-					<parameter name="key" type="gchar*"/>
+					<parameter name="key" type="char*"/>
 					<parameter name="value" type="gdouble"/>
 				</parameters>
 			</method>
@@ -149,7 +155,7 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="notification" type="NotifyNotification*"/>
-					<parameter name="key" type="gchar*"/>
+					<parameter name="key" type="char*"/>
 					<parameter name="value" type="gint"/>
 				</parameters>
 			</method>
@@ -157,8 +163,16 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="notification" type="NotifyNotification*"/>
-					<parameter name="key" type="gchar*"/>
-					<parameter name="value" type="gchar*"/>
+					<parameter name="key" type="char*"/>
+					<parameter name="value" type="char*"/>
+				</parameters>
+			</method>
+			<method name="set_hint_uint32" symbol="notify_notification_set_hint_uint32">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="notification" type="NotifyNotification*"/>
+					<parameter name="key" type="char*"/>
+					<parameter name="value" type="guint"/>
 				</parameters>
 			</method>
 			<method name="set_icon_from_pixbuf" symbol="notify_notification_set_icon_from_pixbuf">
@@ -168,6 +182,13 @@
 					<parameter name="icon" type="GdkPixbuf*"/>
 				</parameters>
 			</method>
+			<method name="set_image_from_pixbuf" symbol="notify_notification_set_image_from_pixbuf">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="notification" type="NotifyNotification*"/>
+					<parameter name="image" type="GdkPixbuf*"/>
+				</parameters>
+			</method>
 			<method name="set_timeout" symbol="notify_notification_set_timeout">
 				<return-type type="void"/>
 				<parameters>
@@ -193,14 +214,16 @@
 				<return-type type="gboolean"/>
 				<parameters>
 					<parameter name="notification" type="NotifyNotification*"/>
-					<parameter name="summary" type="gchar*"/>
-					<parameter name="body" type="gchar*"/>
-					<parameter name="icon" type="gchar*"/>
+					<parameter name="summary" type="char*"/>
+					<parameter name="body" type="char*"/>
+					<parameter name="icon" type="char*"/>
 				</parameters>
 			</method>
 			<property name="attach-widget" type="GtkWidget*" readable="1" writable="1" construct="1" construct-only="0"/>
 			<property name="body" type="char*" readable="1" writable="1" construct="1" construct-only="0"/>
+			<property name="closed-reason" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
 			<property name="icon-name" type="char*" readable="1" writable="1" construct="1" construct-only="0"/>
+			<property name="id" type="gint" readable="1" writable="1" construct="1" construct-only="0"/>
 			<property name="status-icon" type="GtkStatusIcon*" readable="1" writable="1" construct="1" construct-only="0"/>
 			<property name="summary" type="char*" readable="1" writable="1" construct="1" construct-only="0"/>
 			<signal name="closed" when="FIRST">
diff --git a/vapi/packages/libsoup-2.4/libsoup-2.4.gi b/vapi/packages/libsoup-2.4/libsoup-2.4.gi
index d8f67fb..13bf3ea 100644
--- a/vapi/packages/libsoup-2.4/libsoup-2.4.gi
+++ b/vapi/packages/libsoup-2.4/libsoup-2.4.gi
@@ -173,6 +173,14 @@
 				<parameter name="value" type="char*"/>
 			</parameters>
 		</function>
+		<function name="header_g_string_append_param_quoted" symbol="soup_header_g_string_append_param_quoted">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="string" type="GString*"/>
+				<parameter name="name" type="char*"/>
+				<parameter name="value" type="char*"/>
+			</parameters>
+		</function>
 		<function name="header_parse_list" symbol="soup_header_parse_list">
 			<return-type type="GSList*"/>
 			<parameters>
@@ -1439,6 +1447,7 @@
 			<member name="SOUP_STATUS_IO_ERROR" value="7"/>
 			<member name="SOUP_STATUS_MALFORMED" value="8"/>
 			<member name="SOUP_STATUS_TRY_AGAIN" value="9"/>
+			<member name="SOUP_STATUS_TOO_MANY_REDIRECTS" value="10"/>
 			<member name="SOUP_STATUS_CONTINUE" value="100"/>
 			<member name="SOUP_STATUS_SWITCHING_PROTOCOLS" value="101"/>
 			<member name="SOUP_STATUS_PROCESSING" value="102"/>
@@ -1512,6 +1521,7 @@
 			<member name="SOUP_SSL_ERROR_HANDSHAKE_NEEDS_READ" value="0"/>
 			<member name="SOUP_SSL_ERROR_HANDSHAKE_NEEDS_WRITE" value="1"/>
 			<member name="SOUP_SSL_ERROR_CERTIFICATE" value="2"/>
+			<member name="SOUP_SSL_ERROR_HANDSHAKE_FAILED" value="3"/>
 		</enum>
 		<enum name="SoupSocketIOStatus" type-name="SoupSocketIOStatus" get-type="soup_socket_io_status_get_type">
 			<member name="SOUP_SOCKET_OK" value="0"/>
@@ -3144,6 +3154,11 @@
 		<constant name="SOUP_AUTH_IS_FOR_PROXY" type="char*" value="is-for-proxy"/>
 		<constant name="SOUP_AUTH_REALM" type="char*" value="realm"/>
 		<constant name="SOUP_AUTH_SCHEME_NAME" type="char*" value="scheme-name"/>
+		<constant name="SOUP_CHAR_HTTP_CTL" type="int" value="16"/>
+		<constant name="SOUP_CHAR_HTTP_SEPARATOR" type="int" value="8"/>
+		<constant name="SOUP_CHAR_URI_GEN_DELIMS" type="int" value="2"/>
+		<constant name="SOUP_CHAR_URI_PERCENT_ENCODED" type="int" value="1"/>
+		<constant name="SOUP_CHAR_URI_SUB_DELIMS" type="int" value="4"/>
 		<constant name="SOUP_CONTENT_DECODER_H" type="int" value="1"/>
 		<constant name="SOUP_CONTENT_SNIFFER_H" type="int" value="1"/>
 		<constant name="SOUP_COOKIE_H" type="int" value="1"/>
diff --git a/vapi/packages/libwnck-1.0/libwnck-1.0.gi b/vapi/packages/libwnck-1.0/libwnck-1.0.gi
index ebb5233..fdcd15e 100644
--- a/vapi/packages/libwnck-1.0/libwnck-1.0.gi
+++ b/vapi/packages/libwnck-1.0/libwnck-1.0.gi
@@ -75,26 +75,26 @@
 			<field name="current_row" type="int"/>
 			<field name="current_col" type="int"/>
 		</struct>
-		<enum name="WnckClientType">
+		<enum name="WnckClientType" type-name="WnckClientType" get-type="wnck_client_type_get_type">
 			<member name="WNCK_CLIENT_TYPE_APPLICATION" value="1"/>
 			<member name="WNCK_CLIENT_TYPE_PAGER" value="2"/>
 		</enum>
-		<enum name="WnckMotionDirection">
+		<enum name="WnckMotionDirection" type-name="WnckMotionDirection" get-type="wnck_motion_direction_get_type">
 			<member name="WNCK_MOTION_UP" value="-1"/>
 			<member name="WNCK_MOTION_DOWN" value="-2"/>
 			<member name="WNCK_MOTION_LEFT" value="-3"/>
 			<member name="WNCK_MOTION_RIGHT" value="-4"/>
 		</enum>
-		<enum name="WnckPagerDisplayMode">
+		<enum name="WnckPagerDisplayMode" type-name="WnckPagerDisplayMode" get-type="wnck_pager_display_mode_get_type">
 			<member name="WNCK_PAGER_DISPLAY_NAME" value="0"/>
 			<member name="WNCK_PAGER_DISPLAY_CONTENT" value="1"/>
 		</enum>
-		<enum name="WnckTasklistGroupingType">
+		<enum name="WnckTasklistGroupingType" type-name="WnckTasklistGroupingType" get-type="wnck_tasklist_grouping_type_get_type">
 			<member name="WNCK_TASKLIST_NEVER_GROUP" value="0"/>
 			<member name="WNCK_TASKLIST_AUTO_GROUP" value="1"/>
 			<member name="WNCK_TASKLIST_ALWAYS_GROUP" value="2"/>
 		</enum>
-		<enum name="WnckWindowGravity">
+		<enum name="WnckWindowGravity" type-name="WnckWindowGravity" get-type="wnck_window_gravity_get_type">
 			<member name="WNCK_WINDOW_GRAVITY_CURRENT" value="0"/>
 			<member name="WNCK_WINDOW_GRAVITY_NORTHWEST" value="1"/>
 			<member name="WNCK_WINDOW_GRAVITY_NORTH" value="2"/>
@@ -107,7 +107,7 @@
 			<member name="WNCK_WINDOW_GRAVITY_SOUTHEAST" value="9"/>
 			<member name="WNCK_WINDOW_GRAVITY_STATIC" value="10"/>
 		</enum>
-		<enum name="WnckWindowType">
+		<enum name="WnckWindowType" type-name="WnckWindowType" get-type="wnck_window_type_get_type">
 			<member name="WNCK_WINDOW_NORMAL" value="0"/>
 			<member name="WNCK_WINDOW_DESKTOP" value="1"/>
 			<member name="WNCK_WINDOW_DOCK" value="2"/>
@@ -117,7 +117,7 @@
 			<member name="WNCK_WINDOW_UTILITY" value="6"/>
 			<member name="WNCK_WINDOW_SPLASHSCREEN" value="7"/>
 		</enum>
-		<flags name="WnckWindowActions">
+		<flags name="WnckWindowActions" type-name="WnckWindowActions" get-type="wnck_window_actions_get_type">
 			<member name="WNCK_WINDOW_ACTION_MOVE" value="1"/>
 			<member name="WNCK_WINDOW_ACTION_RESIZE" value="2"/>
 			<member name="WNCK_WINDOW_ACTION_SHADE" value="4"/>
@@ -138,13 +138,13 @@
 			<member name="WNCK_WINDOW_ACTION_ABOVE" value="131072"/>
 			<member name="WNCK_WINDOW_ACTION_BELOW" value="262144"/>
 		</flags>
-		<flags name="WnckWindowMoveResizeMask">
+		<flags name="WnckWindowMoveResizeMask" type-name="WnckWindowMoveResizeMask" get-type="wnck_window_move_resize_mask_get_type">
 			<member name="WNCK_WINDOW_CHANGE_X" value="1"/>
 			<member name="WNCK_WINDOW_CHANGE_Y" value="2"/>
 			<member name="WNCK_WINDOW_CHANGE_WIDTH" value="4"/>
 			<member name="WNCK_WINDOW_CHANGE_HEIGHT" value="8"/>
 		</flags>
-		<flags name="WnckWindowState">
+		<flags name="WnckWindowState" type-name="WnckWindowState" get-type="wnck_window_state_get_type">
 			<member name="WNCK_WINDOW_STATE_MINIMIZED" value="1"/>
 			<member name="WNCK_WINDOW_STATE_MAXIMIZED_HORIZONTALLY" value="2"/>
 			<member name="WNCK_WINDOW_STATE_MAXIMIZED_VERTICALLY" value="4"/>
@@ -804,6 +804,13 @@
 					<parameter name="size" type="gint"/>
 				</parameters>
 			</method>
+			<method name="set_orientation" symbol="wnck_tasklist_set_orientation">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="tasklist" type="WnckTasklist*"/>
+					<parameter name="orient" type="GtkOrientation"/>
+				</parameters>
+			</method>
 			<method name="set_screen" symbol="wnck_tasklist_set_screen">
 				<return-type type="void"/>
 				<parameters>
diff --git a/vapi/packages/pango/pango.gi b/vapi/packages/pango/pango.gi
index 04fc67a..022081a 100644
--- a/vapi/packages/pango/pango.gi
+++ b/vapi/packages/pango/pango.gi
@@ -187,6 +187,15 @@
 				<parameter name="hint" type="PangoGravityHint"/>
 			</parameters>
 		</function>
+		<function name="gravity_get_for_script_and_width" symbol="pango_gravity_get_for_script_and_width">
+			<return-type type="PangoGravity"/>
+			<parameters>
+				<parameter name="script" type="PangoScript"/>
+				<parameter name="wide" type="gboolean"/>
+				<parameter name="base_gravity" type="PangoGravity"/>
+				<parameter name="hint" type="PangoGravityHint"/>
+			</parameters>
+		</function>
 		<function name="gravity_to_rotation" symbol="pango_gravity_to_rotation">
 			<return-type type="double"/>
 			<parameters>
@@ -1113,6 +1122,14 @@
 					<parameter name="glyph_item" type="PangoGlyphItem*"/>
 				</parameters>
 			</method>
+			<method name="get_logical_widths" symbol="pango_glyph_item_get_logical_widths">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="glyph_item" type="PangoGlyphItem*"/>
+					<parameter name="text" type="char*"/>
+					<parameter name="logical_widths" type="int*"/>
+				</parameters>
+			</method>
 			<method name="letter_space" symbol="pango_glyph_item_letter_space">
 				<return-type type="void"/>
 				<parameters>
@@ -2860,8 +2877,8 @@
 		<constant name="PANGO_UNKNOWN_GLYPH_HEIGHT" type="int" value="14"/>
 		<constant name="PANGO_UNKNOWN_GLYPH_WIDTH" type="int" value="10"/>
 		<constant name="PANGO_VERSION_MAJOR" type="int" value="1"/>
-		<constant name="PANGO_VERSION_MICRO" type="int" value="0"/>
-		<constant name="PANGO_VERSION_MINOR" type="int" value="24"/>
-		<constant name="PANGO_VERSION_STRING" type="char*" value="1.24.0"/>
+		<constant name="PANGO_VERSION_MICRO" type="int" value="1"/>
+		<constant name="PANGO_VERSION_MINOR" type="int" value="28"/>
+		<constant name="PANGO_VERSION_STRING" type="char*" value="1.28.1"/>
 	</namespace>
 </api>
diff --git a/vapi/packages/poppler-glib/poppler-glib.gi b/vapi/packages/poppler-glib/poppler-glib.gi
index d5be391..abadaec 100644
--- a/vapi/packages/poppler-glib/poppler-glib.gi
+++ b/vapi/packages/poppler-glib/poppler-glib.gi
@@ -1,6 +1,13 @@
 <?xml version="1.0"?>
 <api version="1.0">
 	<namespace name="Poppler">
+		<function name="date_parse" symbol="poppler_date_parse">
+			<return-type type="gboolean"/>
+			<parameters>
+				<parameter name="date" type="gchar*"/>
+				<parameter name="timet" type="time_t*"/>
+			</parameters>
+		</function>
 		<function name="error_quark" symbol="poppler_error_quark">
 			<return-type type="GQuark"/>
 		</function>
@@ -76,6 +83,69 @@
 			<field name="named" type="PopplerActionNamed"/>
 			<field name="movie" type="PopplerActionMovie"/>
 		</boxed>
+		<boxed name="PopplerAnnotCalloutLine" type-name="PopplerAnnotCalloutLine" get-type="poppler_annot_callout_line_get_type">
+			<method name="copy" symbol="poppler_annot_callout_line_copy">
+				<return-type type="PopplerAnnotCalloutLine*"/>
+				<parameters>
+					<parameter name="callout" type="PopplerAnnotCalloutLine*"/>
+				</parameters>
+			</method>
+			<method name="free" symbol="poppler_annot_callout_line_free">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="callout" type="PopplerAnnotCalloutLine*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="poppler_annot_callout_line_new">
+				<return-type type="PopplerAnnotCalloutLine*"/>
+			</constructor>
+			<field name="multiline" type="gboolean"/>
+			<field name="x1" type="gdouble"/>
+			<field name="y1" type="gdouble"/>
+			<field name="x2" type="gdouble"/>
+			<field name="y2" type="gdouble"/>
+			<field name="x3" type="gdouble"/>
+			<field name="y3" type="gdouble"/>
+		</boxed>
+		<boxed name="PopplerAnnotMapping" type-name="PopplerAnnotMapping" get-type="poppler_annot_mapping_get_type">
+			<method name="copy" symbol="poppler_annot_mapping_copy">
+				<return-type type="PopplerAnnotMapping*"/>
+				<parameters>
+					<parameter name="mapping" type="PopplerAnnotMapping*"/>
+				</parameters>
+			</method>
+			<method name="free" symbol="poppler_annot_mapping_free">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="mapping" type="PopplerAnnotMapping*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="poppler_annot_mapping_new">
+				<return-type type="PopplerAnnotMapping*"/>
+			</constructor>
+			<field name="area" type="PopplerRectangle"/>
+			<field name="annot" type="PopplerAnnot*"/>
+		</boxed>
+		<boxed name="PopplerColor" type-name="PopplerColor" get-type="poppler_color_get_type">
+			<method name="copy" symbol="poppler_color_copy">
+				<return-type type="PopplerColor*"/>
+				<parameters>
+					<parameter name="color" type="PopplerColor*"/>
+				</parameters>
+			</method>
+			<method name="free" symbol="poppler_color_free">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="color" type="PopplerColor*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="poppler_color_new">
+				<return-type type="PopplerColor*"/>
+			</constructor>
+			<field name="red" type="guint16"/>
+			<field name="green" type="guint16"/>
+			<field name="blue" type="guint16"/>
+		</boxed>
 		<boxed name="PopplerDest" type-name="PopplerDest" get-type="poppler_dest_get_type">
 			<method name="copy" symbol="poppler_dest_copy">
 				<return-type type="PopplerDest*"/>
@@ -193,7 +263,7 @@
 				<return-type type="PopplerImageMapping*"/>
 			</constructor>
 			<field name="area" type="PopplerRectangle"/>
-			<field name="image" type="GdkPixbuf*"/>
+			<field name="image_id" type="gint"/>
 		</boxed>
 		<boxed name="PopplerIndexIter" type-name="PopplerIndexIter" get-type="poppler_index_iter_get_type">
 			<method name="copy" symbol="poppler_index_iter_copy">
@@ -239,6 +309,50 @@
 				</parameters>
 			</method>
 		</boxed>
+		<boxed name="PopplerLayersIter" type-name="PopplerLayersIter" get-type="poppler_layers_iter_get_type">
+			<method name="copy" symbol="poppler_layers_iter_copy">
+				<return-type type="PopplerLayersIter*"/>
+				<parameters>
+					<parameter name="iter" type="PopplerLayersIter*"/>
+				</parameters>
+			</method>
+			<method name="free" symbol="poppler_layers_iter_free">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="iter" type="PopplerLayersIter*"/>
+				</parameters>
+			</method>
+			<method name="get_child" symbol="poppler_layers_iter_get_child">
+				<return-type type="PopplerLayersIter*"/>
+				<parameters>
+					<parameter name="parent" type="PopplerLayersIter*"/>
+				</parameters>
+			</method>
+			<method name="get_layer" symbol="poppler_layers_iter_get_layer">
+				<return-type type="PopplerLayer*"/>
+				<parameters>
+					<parameter name="iter" type="PopplerLayersIter*"/>
+				</parameters>
+			</method>
+			<method name="get_title" symbol="poppler_layers_iter_get_title">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="iter" type="PopplerLayersIter*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="poppler_layers_iter_new">
+				<return-type type="PopplerLayersIter*"/>
+				<parameters>
+					<parameter name="document" type="PopplerDocument*"/>
+				</parameters>
+			</constructor>
+			<method name="next" symbol="poppler_layers_iter_next">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="iter" type="PopplerLayersIter*"/>
+				</parameters>
+			</method>
+		</boxed>
 		<boxed name="PopplerLinkMapping" type-name="PopplerLinkMapping" get-type="poppler_link_mapping_get_type">
 			<method name="copy" symbol="poppler_link_mapping_copy">
 				<return-type type="PopplerLinkMapping*"/>
@@ -303,21 +417,73 @@
 			<field name="x2" type="gdouble"/>
 			<field name="y2" type="gdouble"/>
 		</boxed>
-		<enum name="PopplerActionType">
+		<enum name="PopplerActionType" type-name="PopplerActionType" get-type="poppler_action_type_get_type">
 			<member name="POPPLER_ACTION_UNKNOWN" value="0"/>
-			<member name="POPPLER_ACTION_GOTO_DEST" value="1"/>
-			<member name="POPPLER_ACTION_GOTO_REMOTE" value="2"/>
-			<member name="POPPLER_ACTION_LAUNCH" value="3"/>
-			<member name="POPPLER_ACTION_URI" value="4"/>
-			<member name="POPPLER_ACTION_NAMED" value="5"/>
-			<member name="POPPLER_ACTION_MOVIE" value="6"/>
+			<member name="POPPLER_ACTION_NONE" value="1"/>
+			<member name="POPPLER_ACTION_GOTO_DEST" value="2"/>
+			<member name="POPPLER_ACTION_GOTO_REMOTE" value="3"/>
+			<member name="POPPLER_ACTION_LAUNCH" value="4"/>
+			<member name="POPPLER_ACTION_URI" value="5"/>
+			<member name="POPPLER_ACTION_NAMED" value="6"/>
+			<member name="POPPLER_ACTION_MOVIE" value="7"/>
+		</enum>
+		<enum name="PopplerAnnotExternalDataType" type-name="PopplerAnnotExternalDataType" get-type="poppler_annot_external_data_type_get_type">
+			<member name="POPPLER_ANNOT_EXTERNAL_DATA_MARKUP_3D" value="0"/>
+			<member name="POPPLER_ANNOT_EXTERNAL_DATA_MARKUP_UNKNOWN" value="1"/>
 		</enum>
-		<enum name="PopplerBackend">
+		<enum name="PopplerAnnotFreeTextQuadding" type-name="PopplerAnnotFreeTextQuadding" get-type="poppler_annot_free_text_quadding_get_type">
+			<member name="POPPLER_ANNOT_FREE_TEXT_QUADDING_LEFT_JUSTIFIED" value="0"/>
+			<member name="POPPLER_ANNOT_FREE_TEXT_QUADDING_CENTERED" value="1"/>
+			<member name="POPPLER_ANNOT_FREE_TEXT_QUADDING_RIGHT_JUSTIFIED" value="2"/>
+		</enum>
+		<enum name="PopplerAnnotMarkupReplyType" type-name="PopplerAnnotMarkupReplyType" get-type="poppler_annot_markup_reply_type_get_type">
+			<member name="POPPLER_ANNOT_MARKUP_REPLY_TYPE_R" value="0"/>
+			<member name="POPPLER_ANNOT_MARKUP_REPLY_TYPE_GROUP" value="1"/>
+		</enum>
+		<enum name="PopplerAnnotTextState" type-name="PopplerAnnotTextState" get-type="poppler_annot_text_state_get_type">
+			<member name="POPPLER_ANNOT_TEXT_STATE_MARKED" value="0"/>
+			<member name="POPPLER_ANNOT_TEXT_STATE_UNMARKED" value="1"/>
+			<member name="POPPLER_ANNOT_TEXT_STATE_ACCEPTED" value="2"/>
+			<member name="POPPLER_ANNOT_TEXT_STATE_REJECTED" value="3"/>
+			<member name="POPPLER_ANNOT_TEXT_STATE_CANCELLED" value="4"/>
+			<member name="POPPLER_ANNOT_TEXT_STATE_COMPLETED" value="5"/>
+			<member name="POPPLER_ANNOT_TEXT_STATE_NONE" value="6"/>
+			<member name="POPPLER_ANNOT_TEXT_STATE_UNKNOWN" value="7"/>
+		</enum>
+		<enum name="PopplerAnnotType" type-name="PopplerAnnotType" get-type="poppler_annot_type_get_type">
+			<member name="POPPLER_ANNOT_UNKNOWN" value="0"/>
+			<member name="POPPLER_ANNOT_TEXT" value="1"/>
+			<member name="POPPLER_ANNOT_LINK" value="2"/>
+			<member name="POPPLER_ANNOT_FREE_TEXT" value="3"/>
+			<member name="POPPLER_ANNOT_LINE" value="4"/>
+			<member name="POPPLER_ANNOT_SQUARE" value="5"/>
+			<member name="POPPLER_ANNOT_CIRCLE" value="6"/>
+			<member name="POPPLER_ANNOT_POLYGON" value="7"/>
+			<member name="POPPLER_ANNOT_POLY_LINE" value="8"/>
+			<member name="POPPLER_ANNOT_HIGHLIGHT" value="9"/>
+			<member name="POPPLER_ANNOT_UNDERLINE" value="10"/>
+			<member name="POPPLER_ANNOT_SQUIGGLY" value="11"/>
+			<member name="POPPLER_ANNOT_STRIKE_OUT" value="12"/>
+			<member name="POPPLER_ANNOT_STAMP" value="13"/>
+			<member name="POPPLER_ANNOT_CARET" value="14"/>
+			<member name="POPPLER_ANNOT_INK" value="15"/>
+			<member name="POPPLER_ANNOT_POPUP" value="16"/>
+			<member name="POPPLER_ANNOT_FILE_ATTACHMENT" value="17"/>
+			<member name="POPPLER_ANNOT_SOUND" value="18"/>
+			<member name="POPPLER_ANNOT_MOVIE" value="19"/>
+			<member name="POPPLER_ANNOT_WIDGET" value="20"/>
+			<member name="POPPLER_ANNOT_SCREEN" value="21"/>
+			<member name="POPPLER_ANNOT_PRINTER_MARK" value="22"/>
+			<member name="POPPLER_ANNOT_TRAP_NET" value="23"/>
+			<member name="POPPLER_ANNOT_WATERMARK" value="24"/>
+			<member name="POPPLER_ANNOT_3D" value="25"/>
+		</enum>
+		<enum name="PopplerBackend" type-name="PopplerBackend" get-type="poppler_backend_get_type">
 			<member name="POPPLER_BACKEND_UNKNOWN" value="0"/>
 			<member name="POPPLER_BACKEND_SPLASH" value="1"/>
 			<member name="POPPLER_BACKEND_CAIRO" value="2"/>
 		</enum>
-		<enum name="PopplerDestType">
+		<enum name="PopplerDestType" type-name="PopplerDestType" get-type="poppler_dest_type_get_type">
 			<member name="POPPLER_DEST_UNKNOWN" value="0"/>
 			<member name="POPPLER_DEST_XYZ" value="1"/>
 			<member name="POPPLER_DEST_FIT" value="2"/>
@@ -329,11 +495,14 @@
 			<member name="POPPLER_DEST_FITBV" value="8"/>
 			<member name="POPPLER_DEST_NAMED" value="9"/>
 		</enum>
-		<enum name="PopplerError">
+		<enum name="PopplerError" type-name="PopplerError" get-type="poppler_error_get_type">
 			<member name="POPPLER_ERROR_INVALID" value="0"/>
 			<member name="POPPLER_ERROR_ENCRYPTED" value="1"/>
+			<member name="POPPLER_ERROR_OPEN_FILE" value="2"/>
+			<member name="POPPLER_ERROR_BAD_CATALOG" value="3"/>
+			<member name="POPPLER_ERROR_DAMAGED" value="4"/>
 		</enum>
-		<enum name="PopplerFontType">
+		<enum name="PopplerFontType" type-name="PopplerFontType" get-type="poppler_font_type_get_type">
 			<member name="POPPLER_FONT_TYPE_UNKNOWN" value="0"/>
 			<member name="POPPLER_FONT_TYPE_TYPE1" value="1"/>
 			<member name="POPPLER_FONT_TYPE_TYPE1C" value="2"/>
@@ -347,34 +516,34 @@
 			<member name="POPPLER_FONT_TYPE_CID_TYPE2" value="10"/>
 			<member name="POPPLER_FONT_TYPE_CID_TYPE2OT" value="11"/>
 		</enum>
-		<enum name="PopplerFormButtonType">
+		<enum name="PopplerFormButtonType" type-name="PopplerFormButtonType" get-type="poppler_form_button_type_get_type">
 			<member name="POPPLER_FORM_BUTTON_PUSH" value="0"/>
 			<member name="POPPLER_FORM_BUTTON_CHECK" value="1"/>
 			<member name="POPPLER_FORM_BUTTON_RADIO" value="2"/>
 		</enum>
-		<enum name="PopplerFormChoiceType">
+		<enum name="PopplerFormChoiceType" type-name="PopplerFormChoiceType" get-type="poppler_form_choice_type_get_type">
 			<member name="POPPLER_FORM_CHOICE_COMBO" value="0"/>
 			<member name="POPPLER_FORM_CHOICE_LIST" value="1"/>
 		</enum>
-		<enum name="PopplerFormFieldType">
+		<enum name="PopplerFormFieldType" type-name="PopplerFormFieldType" get-type="poppler_form_field_type_get_type">
 			<member name="POPPLER_FORM_FIELD_UNKNOWN" value="0"/>
 			<member name="POPPLER_FORM_FIELD_BUTTON" value="1"/>
 			<member name="POPPLER_FORM_FIELD_TEXT" value="2"/>
 			<member name="POPPLER_FORM_FIELD_CHOICE" value="3"/>
 			<member name="POPPLER_FORM_FIELD_SIGNATURE" value="4"/>
 		</enum>
-		<enum name="PopplerFormTextType">
+		<enum name="PopplerFormTextType" type-name="PopplerFormTextType" get-type="poppler_form_text_type_get_type">
 			<member name="POPPLER_FORM_TEXT_NORMAL" value="0"/>
 			<member name="POPPLER_FORM_TEXT_MULTILINE" value="1"/>
 			<member name="POPPLER_FORM_TEXT_FILE_SELECT" value="2"/>
 		</enum>
-		<enum name="PopplerOrientation">
+		<enum name="PopplerOrientation" type-name="PopplerOrientation" get-type="poppler_orientation_get_type">
 			<member name="POPPLER_ORIENTATION_PORTRAIT" value="0"/>
 			<member name="POPPLER_ORIENTATION_LANDSCAPE" value="1"/>
 			<member name="POPPLER_ORIENTATION_UPSIDEDOWN" value="2"/>
 			<member name="POPPLER_ORIENTATION_SEASCAPE" value="3"/>
 		</enum>
-		<enum name="PopplerPageLayout">
+		<enum name="PopplerPageLayout" type-name="PopplerPageLayout" get-type="poppler_page_layout_get_type">
 			<member name="POPPLER_PAGE_LAYOUT_UNSET" value="0"/>
 			<member name="POPPLER_PAGE_LAYOUT_SINGLE_PAGE" value="1"/>
 			<member name="POPPLER_PAGE_LAYOUT_ONE_COLUMN" value="2"/>
@@ -383,7 +552,7 @@
 			<member name="POPPLER_PAGE_LAYOUT_TWO_PAGE_LEFT" value="5"/>
 			<member name="POPPLER_PAGE_LAYOUT_TWO_PAGE_RIGHT" value="6"/>
 		</enum>
-		<enum name="PopplerPageMode">
+		<enum name="PopplerPageMode" type-name="PopplerPageMode" get-type="poppler_page_mode_get_type">
 			<member name="POPPLER_PAGE_MODE_UNSET" value="0"/>
 			<member name="POPPLER_PAGE_MODE_NONE" value="1"/>
 			<member name="POPPLER_PAGE_MODE_USE_OUTLINES" value="2"/>
@@ -392,15 +561,15 @@
 			<member name="POPPLER_PAGE_MODE_USE_OC" value="5"/>
 			<member name="POPPLER_PAGE_MODE_USE_ATTACHMENTS" value="6"/>
 		</enum>
-		<enum name="PopplerPageTransitionAlignment">
+		<enum name="PopplerPageTransitionAlignment" type-name="PopplerPageTransitionAlignment" get-type="poppler_page_transition_alignment_get_type">
 			<member name="POPPLER_PAGE_TRANSITION_HORIZONTAL" value="0"/>
 			<member name="POPPLER_PAGE_TRANSITION_VERTICAL" value="1"/>
 		</enum>
-		<enum name="PopplerPageTransitionDirection">
+		<enum name="PopplerPageTransitionDirection" type-name="PopplerPageTransitionDirection" get-type="poppler_page_transition_direction_get_type">
 			<member name="POPPLER_PAGE_TRANSITION_INWARD" value="0"/>
 			<member name="POPPLER_PAGE_TRANSITION_OUTWARD" value="1"/>
 		</enum>
-		<enum name="PopplerPageTransitionType">
+		<enum name="PopplerPageTransitionType" type-name="PopplerPageTransitionType" get-type="poppler_page_transition_type_get_type">
 			<member name="POPPLER_PAGE_TRANSITION_REPLACE" value="0"/>
 			<member name="POPPLER_PAGE_TRANSITION_SPLIT" value="1"/>
 			<member name="POPPLER_PAGE_TRANSITION_BLINDS" value="2"/>
@@ -414,19 +583,33 @@
 			<member name="POPPLER_PAGE_TRANSITION_UNCOVER" value="10"/>
 			<member name="POPPLER_PAGE_TRANSITION_FADE" value="11"/>
 		</enum>
-		<enum name="PopplerSelectionStyle">
+		<enum name="PopplerSelectionStyle" type-name="PopplerSelectionStyle" get-type="poppler_selection_style_get_type">
 			<member name="POPPLER_SELECTION_GLYPH" value="0"/>
 			<member name="POPPLER_SELECTION_WORD" value="1"/>
 			<member name="POPPLER_SELECTION_LINE" value="2"/>
 		</enum>
-		<flags name="PopplerPermissions">
+		<flags name="PopplerAnnotFlag" type-name="PopplerAnnotFlag" get-type="poppler_annot_flag_get_type">
+			<member name="POPPLER_ANNOT_FLAG_UNKNOWN" value="0"/>
+			<member name="POPPLER_ANNOT_FLAG_INVISIBLE" value="1"/>
+			<member name="POPPLER_ANNOT_FLAG_HIDDEN" value="2"/>
+			<member name="POPPLER_ANNOT_FLAG_PRINT" value="4"/>
+			<member name="POPPLER_ANNOT_FLAG_NO_ZOOM" value="8"/>
+			<member name="POPPLER_ANNOT_FLAG_NO_ROTATE" value="16"/>
+			<member name="POPPLER_ANNOT_FLAG_NO_VIEW" value="32"/>
+			<member name="POPPLER_ANNOT_FLAG_READ_ONLY" value="64"/>
+			<member name="POPPLER_ANNOT_FLAG_LOCKED" value="128"/>
+			<member name="POPPLER_ANNOT_FLAG_TOGGLE_NO_VIEW" value="256"/>
+			<member name="POPPLER_ANNOT_FLAG_LOCKED_CONTENTS" value="512"/>
+		</flags>
+		<flags name="PopplerPermissions" type-name="PopplerPermissions" get-type="poppler_permissions_get_type">
 			<member name="POPPLER_PERMISSIONS_OK_TO_PRINT" value="1"/>
 			<member name="POPPLER_PERMISSIONS_OK_TO_MODIFY" value="2"/>
 			<member name="POPPLER_PERMISSIONS_OK_TO_COPY" value="4"/>
 			<member name="POPPLER_PERMISSIONS_OK_TO_ADD_NOTES" value="8"/>
-			<member name="POPPLER_PERMISSIONS_FULL" value="15"/>
+			<member name="POPPLER_PERMISSIONS_OK_TO_FILL_FORM" value="16"/>
+			<member name="POPPLER_PERMISSIONS_FULL" value="31"/>
 		</flags>
-		<flags name="PopplerViewerPreferences">
+		<flags name="PopplerViewerPreferences" type-name="PopplerViewerPreferences" get-type="poppler_viewer_preferences_get_type">
 			<member name="POPPLER_VIEWER_PREFERENCES_UNSET" value="0"/>
 			<member name="POPPLER_VIEWER_PREFERENCES_HIDE_TOOLBAR" value="1"/>
 			<member name="POPPLER_VIEWER_PREFERENCES_HIDE_MENUBAR" value="2"/>
@@ -436,6 +619,142 @@
 			<member name="POPPLER_VIEWER_PREFERENCES_DISPLAY_DOC_TITLE" value="32"/>
 			<member name="POPPLER_VIEWER_PREFERENCES_DIRECTION_RTL" value="64"/>
 		</flags>
+		<object name="PopplerAnnot" parent="GObject" type-name="PopplerAnnot" get-type="poppler_annot_get_type">
+			<method name="get_annot_type" symbol="poppler_annot_get_annot_type">
+				<return-type type="PopplerAnnotType"/>
+				<parameters>
+					<parameter name="poppler_annot" type="PopplerAnnot*"/>
+				</parameters>
+			</method>
+			<method name="get_color" symbol="poppler_annot_get_color">
+				<return-type type="PopplerColor*"/>
+				<parameters>
+					<parameter name="poppler_annot" type="PopplerAnnot*"/>
+				</parameters>
+			</method>
+			<method name="get_contents" symbol="poppler_annot_get_contents">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="poppler_annot" type="PopplerAnnot*"/>
+				</parameters>
+			</method>
+			<method name="get_flags" symbol="poppler_annot_get_flags">
+				<return-type type="PopplerAnnotFlag"/>
+				<parameters>
+					<parameter name="poppler_annot" type="PopplerAnnot*"/>
+				</parameters>
+			</method>
+			<method name="get_modified" symbol="poppler_annot_get_modified">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="poppler_annot" type="PopplerAnnot*"/>
+				</parameters>
+			</method>
+			<method name="get_name" symbol="poppler_annot_get_name">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="poppler_annot" type="PopplerAnnot*"/>
+				</parameters>
+			</method>
+			<method name="set_contents" symbol="poppler_annot_set_contents">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="poppler_annot" type="PopplerAnnot*"/>
+					<parameter name="contents" type="gchar*"/>
+				</parameters>
+			</method>
+		</object>
+		<object name="PopplerAnnotFreeText" parent="PopplerAnnotMarkup" type-name="PopplerAnnotFreeText" get-type="poppler_annot_free_text_get_type">
+			<method name="get_callout_line" symbol="poppler_annot_free_text_get_callout_line">
+				<return-type type="PopplerAnnotCalloutLine*"/>
+				<parameters>
+					<parameter name="poppler_annot" type="PopplerAnnotFreeText*"/>
+				</parameters>
+			</method>
+			<method name="get_quadding" symbol="poppler_annot_free_text_get_quadding">
+				<return-type type="PopplerAnnotFreeTextQuadding"/>
+				<parameters>
+					<parameter name="poppler_annot" type="PopplerAnnotFreeText*"/>
+				</parameters>
+			</method>
+		</object>
+		<object name="PopplerAnnotMarkup" parent="PopplerAnnot" type-name="PopplerAnnotMarkup" get-type="poppler_annot_markup_get_type">
+			<method name="get_date" symbol="poppler_annot_markup_get_date">
+				<return-type type="GDate*"/>
+				<parameters>
+					<parameter name="poppler_annot" type="PopplerAnnotMarkup*"/>
+				</parameters>
+			</method>
+			<method name="get_external_data" symbol="poppler_annot_markup_get_external_data">
+				<return-type type="PopplerAnnotExternalDataType"/>
+				<parameters>
+					<parameter name="poppler_annot" type="PopplerAnnotMarkup*"/>
+				</parameters>
+			</method>
+			<method name="get_label" symbol="poppler_annot_markup_get_label">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="poppler_annot" type="PopplerAnnotMarkup*"/>
+				</parameters>
+			</method>
+			<method name="get_opacity" symbol="poppler_annot_markup_get_opacity">
+				<return-type type="gdouble"/>
+				<parameters>
+					<parameter name="poppler_annot" type="PopplerAnnotMarkup*"/>
+				</parameters>
+			</method>
+			<method name="get_popup_is_open" symbol="poppler_annot_markup_get_popup_is_open">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="poppler_annot" type="PopplerAnnotMarkup*"/>
+				</parameters>
+			</method>
+			<method name="get_popup_rectangle" symbol="poppler_annot_markup_get_popup_rectangle">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="poppler_annot" type="PopplerAnnotMarkup*"/>
+					<parameter name="poppler_rect" type="PopplerRectangle*"/>
+				</parameters>
+			</method>
+			<method name="get_reply_to" symbol="poppler_annot_markup_get_reply_to">
+				<return-type type="PopplerAnnotMarkupReplyType"/>
+				<parameters>
+					<parameter name="poppler_annot" type="PopplerAnnotMarkup*"/>
+				</parameters>
+			</method>
+			<method name="get_subject" symbol="poppler_annot_markup_get_subject">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="poppler_annot" type="PopplerAnnotMarkup*"/>
+				</parameters>
+			</method>
+			<method name="has_popup" symbol="poppler_annot_markup_has_popup">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="poppler_annot" type="PopplerAnnotMarkup*"/>
+				</parameters>
+			</method>
+		</object>
+		<object name="PopplerAnnotText" parent="PopplerAnnotMarkup" type-name="PopplerAnnotText" get-type="poppler_annot_text_get_type">
+			<method name="get_icon" symbol="poppler_annot_text_get_icon">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="poppler_annot" type="PopplerAnnotText*"/>
+				</parameters>
+			</method>
+			<method name="get_is_open" symbol="poppler_annot_text_get_is_open">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="poppler_annot" type="PopplerAnnotText*"/>
+				</parameters>
+			</method>
+			<method name="get_state" symbol="poppler_annot_text_get_state">
+				<return-type type="PopplerAnnotTextState"/>
+				<parameters>
+					<parameter name="poppler_annot" type="PopplerAnnotText*"/>
+				</parameters>
+			</method>
+		</object>
 		<object name="PopplerAttachment" parent="GObject" type-name="PopplerAttachment" get-type="poppler_attachment_get_type">
 			<method name="save" symbol="poppler_attachment_save">
 				<return-type type="gboolean"/>
@@ -533,10 +852,20 @@
 					<parameter name="error" type="GError**"/>
 				</parameters>
 			</method>
+			<method name="save_a_copy" symbol="poppler_document_save_a_copy">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="document" type="PopplerDocument*"/>
+					<parameter name="uri" type="char*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
 			<property name="author" type="char*" readable="1" writable="0" construct="0" construct-only="0"/>
 			<property name="creation-date" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
 			<property name="creator" type="char*" readable="1" writable="0" construct="0" construct-only="0"/>
 			<property name="format" type="char*" readable="1" writable="0" construct="0" construct-only="0"/>
+			<property name="format-major" type="guint" readable="1" writable="0" construct="0" construct-only="0"/>
+			<property name="format-minor" type="guint" readable="1" writable="0" construct="0" construct-only="0"/>
 			<property name="keywords" type="char*" readable="1" writable="0" construct="0" construct-only="0"/>
 			<property name="linearized" type="char*" readable="1" writable="0" construct="0" construct-only="0"/>
 			<property name="metadata" type="char*" readable="1" writable="0" construct="0" construct-only="0"/>
@@ -748,6 +1077,44 @@
 				</parameters>
 			</method>
 		</object>
+		<object name="PopplerLayer" parent="GObject" type-name="PopplerLayer" get-type="poppler_layer_get_type">
+			<method name="get_radio_button_group_id" symbol="poppler_layer_get_radio_button_group_id">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="layer" type="PopplerLayer*"/>
+				</parameters>
+			</method>
+			<method name="get_title" symbol="poppler_layer_get_title">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="layer" type="PopplerLayer*"/>
+				</parameters>
+			</method>
+			<method name="hide" symbol="poppler_layer_hide">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="layer" type="PopplerLayer*"/>
+				</parameters>
+			</method>
+			<method name="is_parent" symbol="poppler_layer_is_parent">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="layer" type="PopplerLayer*"/>
+				</parameters>
+			</method>
+			<method name="is_visible" symbol="poppler_layer_is_visible">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="layer" type="PopplerLayer*"/>
+				</parameters>
+			</method>
+			<method name="show" symbol="poppler_layer_show">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="layer" type="PopplerLayer*"/>
+				</parameters>
+			</method>
+		</object>
 		<object name="PopplerPSFile" parent="GObject" type-name="PopplerPSFile" get-type="poppler_ps_file_get_type">
 			<method name="free" symbol="poppler_ps_file_free">
 				<return-type type="void"/>
@@ -788,6 +1155,12 @@
 					<parameter name="text" type="char*"/>
 				</parameters>
 			</method>
+			<method name="free_annot_mapping" symbol="poppler_page_free_annot_mapping">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="list" type="GList*"/>
+				</parameters>
+			</method>
 			<method name="free_form_field_mapping" symbol="poppler_page_free_form_field_mapping">
 				<return-type type="void"/>
 				<parameters>
@@ -806,6 +1179,12 @@
 					<parameter name="list" type="GList*"/>
 				</parameters>
 			</method>
+			<method name="get_annot_mapping" symbol="poppler_page_get_annot_mapping">
+				<return-type type="GList*"/>
+				<parameters>
+					<parameter name="page" type="PopplerPage*"/>
+				</parameters>
+			</method>
 			<method name="get_crop_box" symbol="poppler_page_get_crop_box">
 				<return-type type="void"/>
 				<parameters>
@@ -825,6 +1204,13 @@
 					<parameter name="page" type="PopplerPage*"/>
 				</parameters>
 			</method>
+			<method name="get_image" symbol="poppler_page_get_image">
+				<return-type type="cairo_surface_t*"/>
+				<parameters>
+					<parameter name="page" type="PopplerPage*"/>
+					<parameter name="image_id" type="gint"/>
+				</parameters>
+			</method>
 			<method name="get_image_mapping" symbol="poppler_page_get_image_mapping">
 				<return-type type="GList*"/>
 				<parameters>
@@ -844,7 +1230,7 @@
 				</parameters>
 			</method>
 			<method name="get_selection_region" symbol="poppler_page_get_selection_region">
-				<return-type type="GdkRegion*"/>
+				<return-type type="GList*"/>
 				<parameters>
 					<parameter name="page" type="PopplerPage*"/>
 					<parameter name="scale" type="gdouble"/>
@@ -869,6 +1255,12 @@
 				</parameters>
 			</method>
 			<method name="get_thumbnail" symbol="poppler_page_get_thumbnail">
+				<return-type type="cairo_surface_t*"/>
+				<parameters>
+					<parameter name="page" type="PopplerPage*"/>
+				</parameters>
+			</method>
+			<method name="get_thumbnail_pixbuf" symbol="poppler_page_get_thumbnail_pixbuf">
 				<return-type type="GdkPixbuf*"/>
 				<parameters>
 					<parameter name="page" type="PopplerPage*"/>
@@ -895,6 +1287,13 @@
 					<parameter name="cairo" type="cairo_t*"/>
 				</parameters>
 			</method>
+			<method name="render_for_printing" symbol="poppler_page_render_for_printing">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="page" type="PopplerPage*"/>
+					<parameter name="cairo" type="cairo_t*"/>
+				</parameters>
+			</method>
 			<method name="render_selection" symbol="poppler_page_render_selection">
 				<return-type type="void"/>
 				<parameters>
@@ -903,8 +1302,8 @@
 					<parameter name="selection" type="PopplerRectangle*"/>
 					<parameter name="old_selection" type="PopplerRectangle*"/>
 					<parameter name="style" type="PopplerSelectionStyle"/>
-					<parameter name="glyph_color" type="GdkColor*"/>
-					<parameter name="background_color" type="GdkColor*"/>
+					<parameter name="glyph_color" type="PopplerColor*"/>
+					<parameter name="background_color" type="PopplerColor*"/>
 				</parameters>
 			</method>
 			<method name="render_selection_to_pixbuf" symbol="poppler_page_render_selection_to_pixbuf">
@@ -934,6 +1333,19 @@
 					<parameter name="pixbuf" type="GdkPixbuf*"/>
 				</parameters>
 			</method>
+			<method name="render_to_pixbuf_for_printing" symbol="poppler_page_render_to_pixbuf_for_printing">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="page" type="PopplerPage*"/>
+					<parameter name="src_x" type="int"/>
+					<parameter name="src_y" type="int"/>
+					<parameter name="src_width" type="int"/>
+					<parameter name="src_height" type="int"/>
+					<parameter name="scale" type="double"/>
+					<parameter name="rotation" type="int"/>
+					<parameter name="pixbuf" type="GdkPixbuf*"/>
+				</parameters>
+			</method>
 			<method name="render_to_ps" symbol="poppler_page_render_to_ps">
 				<return-type type="void"/>
 				<parameters>
@@ -941,8 +1353,18 @@
 					<parameter name="ps_file" type="PopplerPSFile*"/>
 				</parameters>
 			</method>
+			<method name="selection_region_free" symbol="poppler_page_selection_region_free">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="region" type="GList*"/>
+				</parameters>
+			</method>
 			<property name="label" type="char*" readable="1" writable="0" construct="0" construct-only="0"/>
 		</object>
 		<constant name="POPPLER_HAS_CAIRO" type="int" value="1"/>
+		<constant name="POPPLER_MAJOR_VERSION" type="int" value="0"/>
+		<constant name="POPPLER_MICRO_VERSION" type="int" value="4"/>
+		<constant name="POPPLER_MINOR_VERSION" type="int" value="12"/>
+		<constant name="POPPLER_WITH_GDK" type="int" value="1"/>
 	</namespace>
 </api>
diff --git a/vapi/packages/webkit-1.0/webkit-1.0.gi b/vapi/packages/webkit-1.0/webkit-1.0.gi
index ac25bbd..76794ab 100644
--- a/vapi/packages/webkit-1.0/webkit-1.0.gi
+++ b/vapi/packages/webkit-1.0/webkit-1.0.gi
@@ -9,6 +9,18 @@
 				<parameter name="micro" type="guint"/>
 			</parameters>
 		</function>
+		<function name="geolocation_policy_allow" symbol="webkit_geolocation_policy_allow">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="decision" type="WebKitGeolocationPolicyDecision*"/>
+			</parameters>
+		</function>
+		<function name="geolocation_policy_deny" symbol="webkit_geolocation_policy_deny">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="decision" type="WebKitGeolocationPolicyDecision*"/>
+			</parameters>
+		</function>
 		<function name="get_cache_model" symbol="webkit_get_cache_model">
 			<return-type type="WebKitCacheModel"/>
 		</function>
@@ -241,6 +253,8 @@
 				</parameters>
 			</signal>
 		</object>
+		<object name="WebKitGeolocationPolicyDecision" parent="GObject" type-name="WebKitGeolocationPolicyDecision" get-type="webkit_geolocation_policy_decision_get_type">
+		</object>
 		<object name="WebKitHitTestResult" parent="GObject" type-name="WebKitHitTestResult" get-type="webkit_hit_test_result_get_type">
 			<property name="context" type="WebKitHitTestResultContext" readable="1" writable="1" construct="0" construct-only="1"/>
 			<property name="image-uri" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
@@ -375,6 +389,12 @@
 					<parameter name="history_item" type="WebKitWebHistoryItem*"/>
 				</parameters>
 			</method>
+			<method name="clear" symbol="webkit_web_back_forward_list_clear">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="web_back_forward_list" type="WebKitWebBackForwardList*"/>
+				</parameters>
+			</method>
 			<method name="contains_item" symbol="webkit_web_back_forward_list_contains_item">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -1078,11 +1098,13 @@
 			<property name="enable-private-browsing" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
 			<property name="enable-scripts" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
 			<property name="enable-site-specific-quirks" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
+			<property name="enable-spatial-navigation" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
 			<property name="enable-spell-checking" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
 			<property name="enable-universal-access-from-file-uris" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
 			<property name="enable-xss-auditor" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
 			<property name="enforce-96-dpi" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
 			<property name="fantasy-font-family" type="char*" readable="1" writable="1" construct="1" construct-only="0"/>
+			<property name="javascript-can-access-clipboard" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
 			<property name="javascript-can-open-windows-automatically" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
 			<property name="minimum-font-size" type="gint" readable="1" writable="1" construct="1" construct-only="0"/>
 			<property name="minimum-logical-font-size" type="gint" readable="1" writable="1" construct="1" construct-only="0"/>
@@ -1602,6 +1624,13 @@
 					<parameter name="p1" type="GObject*"/>
 				</parameters>
 			</signal>
+			<signal name="document-load-finished" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="object" type="WebKitWebView*"/>
+					<parameter name="p0" type="WebKitWebFrame*"/>
+				</parameters>
+			</signal>
 			<signal name="download-requested" when="LAST">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -1609,6 +1638,21 @@
 					<parameter name="p0" type="GObject*"/>
 				</parameters>
 			</signal>
+			<signal name="geolocation-policy-decision-cancelled" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="object" type="WebKitWebView*"/>
+					<parameter name="p0" type="WebKitWebFrame*"/>
+				</parameters>
+			</signal>
+			<signal name="geolocation-policy-decision-requested" when="LAST">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="object" type="WebKitWebView*"/>
+					<parameter name="p0" type="WebKitWebFrame*"/>
+					<parameter name="p1" type="WebKitGeolocationPolicyDecision*"/>
+				</parameters>
+			</signal>
 			<signal name="hovering-over-link" when="LAST">
 				<return-type type="void"/>
 				<parameters>
@@ -1858,8 +1902,8 @@
 			<property name="y" type="gint" readable="1" writable="1" construct="1" construct-only="0"/>
 		</object>
 		<constant name="WEBKIT_MAJOR_VERSION" type="int" value="1"/>
-		<constant name="WEBKIT_MICRO_VERSION" type="int" value="22"/>
-		<constant name="WEBKIT_MINOR_VERSION" type="int" value="1"/>
+		<constant name="WEBKIT_MICRO_VERSION" type="int" value="3"/>
+		<constant name="WEBKIT_MINOR_VERSION" type="int" value="2"/>
 		<constant name="WEBKIT_USER_AGENT_MAJOR_VERSION" type="int" value="531"/>
 		<constant name="WEBKIT_USER_AGENT_MINOR_VERSION" type="int" value="2"/>
 	</namespace>
diff --git a/vapi/pango.vapi b/vapi/pango.vapi
index 58f1e4a..8ad4840 100644
--- a/vapi/pango.vapi
+++ b/vapi/pango.vapi
@@ -272,6 +272,7 @@ namespace Pango {
 		public weak Pango.Item item;
 		public unowned GLib.SList apply_attrs (string text, Pango.AttrList list);
 		public Pango.GlyphItem copy ();
+		public void get_logical_widths (string text, int logical_widths);
 		public void letter_space (string text, Pango.LogAttr[] log_attrs, int letter_spacing);
 		public unowned Pango.GlyphItem split (string text, int split_index);
 	}
@@ -897,6 +898,8 @@ namespace Pango {
 	[CCode (cheader_filename = "pango/pango.h")]
 	public static Pango.Gravity gravity_get_for_script (Pango.Script script, Pango.Gravity base_gravity, Pango.GravityHint hint);
 	[CCode (cheader_filename = "pango/pango.h")]
+	public static Pango.Gravity gravity_get_for_script_and_width (Pango.Script script, bool wide, Pango.Gravity base_gravity, Pango.GravityHint hint);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static double gravity_to_rotation (Pango.Gravity gravity);
 	[CCode (cheader_filename = "pango/pango.h")]
 	public static bool is_zero_width (unichar ch);
diff --git a/vapi/poppler-glib.vapi b/vapi/poppler-glib.vapi
index 83155bc..8f3b99d 100644
--- a/vapi/poppler-glib.vapi
+++ b/vapi/poppler-glib.vapi
@@ -65,6 +65,62 @@ namespace Poppler {
 		public weak string uri;
 	}
 	[CCode (cheader_filename = "poppler.h")]
+	public class Annot : GLib.Object {
+		public Poppler.AnnotType get_annot_type ();
+		public unowned Poppler.Color get_color ();
+		public unowned string get_contents ();
+		public Poppler.AnnotFlag get_flags ();
+		public unowned string get_modified ();
+		public unowned string get_name ();
+		public void set_contents (string contents);
+	}
+	[Compact]
+	[CCode (copy_function = "poppler_annot_callout_line_copy", type_id = "POPPLER_TYPE_ANNOT_CALLOUT_LINE", cheader_filename = "poppler.h")]
+	public class AnnotCalloutLine {
+		public bool multiline;
+		public double x1;
+		public double x2;
+		public double x3;
+		public double y1;
+		public double y2;
+		public double y3;
+		[CCode (has_construct_function = false)]
+		public AnnotCalloutLine ();
+		public unowned Poppler.AnnotCalloutLine copy ();
+	}
+	[CCode (cheader_filename = "poppler.h")]
+	public class AnnotFreeText : Poppler.AnnotMarkup {
+		public unowned Poppler.AnnotCalloutLine get_callout_line ();
+		public Poppler.AnnotFreeTextQuadding get_quadding ();
+	}
+	[Compact]
+	[CCode (copy_function = "poppler_annot_mapping_copy", type_id = "POPPLER_TYPE_ANNOT_MAPPING", cheader_filename = "poppler.h")]
+	public class AnnotMapping {
+		public weak Poppler.Annot annot;
+		public Poppler.Rectangle area;
+		[CCode (has_construct_function = false)]
+		public AnnotMapping ();
+		public unowned Poppler.AnnotMapping copy ();
+	}
+	[CCode (cheader_filename = "poppler.h")]
+	public class AnnotMarkup : Poppler.Annot {
+		public GLib.Date get_date ();
+		public Poppler.AnnotExternalDataType get_external_data ();
+		public unowned string get_label ();
+		public double get_opacity ();
+		public bool get_popup_is_open ();
+		public bool get_popup_rectangle (Poppler.Rectangle poppler_rect);
+		public Poppler.AnnotMarkupReplyType get_reply_to ();
+		public unowned string get_subject ();
+		public bool has_popup ();
+	}
+	[CCode (cheader_filename = "poppler.h")]
+	public class AnnotText : Poppler.AnnotMarkup {
+		public unowned string get_icon ();
+		public bool get_is_open ();
+		public Poppler.AnnotTextState get_state ();
+	}
+	[CCode (cheader_filename = "poppler.h")]
 	public class Attachment : GLib.Object {
 		public weak GLib.StringBuilder checksum;
 		public GLib.Time ctime;
@@ -76,6 +132,16 @@ namespace Poppler {
 		public bool save_to_callback (Poppler.AttachmentSaveFunc save_func) throws GLib.Error;
 	}
 	[Compact]
+	[CCode (copy_function = "poppler_color_copy", type_id = "POPPLER_TYPE_COLOR", cheader_filename = "poppler.h")]
+	public class Color {
+		public uint16 blue;
+		public uint16 green;
+		public uint16 red;
+		[CCode (has_construct_function = false)]
+		public Color ();
+		public unowned Poppler.Color copy ();
+	}
+	[Compact]
 	[CCode (copy_function = "poppler_dest_copy", type_id = "POPPLER_TYPE_DEST", cheader_filename = "poppler.h")]
 	public class Dest {
 		public double bottom;
@@ -105,6 +171,7 @@ namespace Poppler {
 		public unowned Poppler.Page get_page_by_label (string label);
 		public bool has_attachments ();
 		public bool save (string uri) throws GLib.Error;
+		public bool save_a_copy (string uri) throws GLib.Error;
 		[NoAccessorMethod]
 		public string author { owned get; }
 		[NoAccessorMethod]
@@ -114,6 +181,10 @@ namespace Poppler {
 		[NoAccessorMethod]
 		public string format { owned get; }
 		[NoAccessorMethod]
+		public uint format_major { get; }
+		[NoAccessorMethod]
+		public uint format_minor { get; }
+		[NoAccessorMethod]
 		public string keywords { owned get; }
 		[NoAccessorMethod]
 		public string linearized { owned get; }
@@ -199,7 +270,7 @@ namespace Poppler {
 	[CCode (copy_function = "poppler_image_mapping_copy", type_id = "POPPLER_TYPE_IMAGE_MAPPING", cheader_filename = "poppler.h")]
 	public class ImageMapping {
 		public Poppler.Rectangle area;
-		public weak Gdk.Pixbuf image;
+		public int image_id;
 		[CCode (has_construct_function = false)]
 		public ImageMapping ();
 		public Poppler.ImageMapping copy ();
@@ -215,6 +286,26 @@ namespace Poppler {
 		public bool is_open ();
 		public bool next ();
 	}
+	[CCode (cheader_filename = "poppler.h")]
+	public class Layer : GLib.Object {
+		public int get_radio_button_group_id ();
+		public unowned string get_title ();
+		public void hide ();
+		public bool is_parent ();
+		public bool is_visible ();
+		public void show ();
+	}
+	[Compact]
+	[CCode (copy_function = "poppler_layers_iter_copy", type_id = "POPPLER_TYPE_LAYERS_ITER", cheader_filename = "poppler.h")]
+	public class LayersIter {
+		[CCode (has_construct_function = false)]
+		public LayersIter (Poppler.Document document);
+		public unowned Poppler.LayersIter copy ();
+		public unowned Poppler.LayersIter get_child ();
+		public unowned Poppler.Layer get_layer ();
+		public unowned string get_title ();
+		public bool next ();
+	}
 	[Compact]
 	[CCode (copy_function = "poppler_link_mapping_copy", type_id = "POPPLER_TYPE_LINK_MAPPING", cheader_filename = "poppler.h")]
 	public class LinkMapping {
@@ -235,26 +326,33 @@ namespace Poppler {
 	[CCode (cheader_filename = "poppler.h")]
 	public class Page : GLib.Object {
 		public unowned GLib.List find_text (string text);
+		public static void free_annot_mapping (GLib.List list);
 		public static void free_form_field_mapping (GLib.List list);
 		public static void free_image_mapping (GLib.List list);
 		public static void free_link_mapping (GLib.List list);
+		public unowned GLib.List get_annot_mapping ();
 		public void get_crop_box (out Poppler.Rectangle rect);
 		public double get_duration ();
 		public unowned GLib.List get_form_field_mapping ();
+		public unowned Cairo.Surface get_image (int image_id);
 		public unowned GLib.List get_image_mapping ();
 		public int get_index ();
 		public unowned GLib.List get_link_mapping ();
-		public unowned Gdk.Region get_selection_region (double scale, Poppler.SelectionStyle style, Poppler.Rectangle selection);
+		public unowned GLib.List get_selection_region (double scale, Poppler.SelectionStyle style, Poppler.Rectangle selection);
 		public void get_size (out double width, out double height);
 		public unowned string get_text (Poppler.SelectionStyle style, Poppler.Rectangle rect);
-		public unowned Gdk.Pixbuf get_thumbnail ();
+		public unowned Cairo.Surface get_thumbnail ();
+		public unowned Gdk.Pixbuf get_thumbnail_pixbuf ();
 		public bool get_thumbnail_size (int width, int height);
 		public unowned Poppler.PageTransition get_transition ();
 		public void render (Cairo.Context cairo);
-		public void render_selection (Cairo.Context cairo, Poppler.Rectangle selection, Poppler.Rectangle old_selection, Poppler.SelectionStyle style, Gdk.Color glyph_color, Gdk.Color background_color);
+		public void render_for_printing (Cairo.Context cairo);
+		public void render_selection (Cairo.Context cairo, Poppler.Rectangle selection, Poppler.Rectangle old_selection, Poppler.SelectionStyle style, Poppler.Color glyph_color, Poppler.Color background_color);
 		public void render_selection_to_pixbuf (double scale, int rotation, Gdk.Pixbuf pixbuf, Poppler.Rectangle selection, Poppler.Rectangle old_selection, Poppler.SelectionStyle style, Gdk.Color glyph_color, Gdk.Color background_color);
 		public void render_to_pixbuf (int src_x, int src_y, int src_width, int src_height, double scale, int rotation, Gdk.Pixbuf pixbuf);
+		public void render_to_pixbuf_for_printing (int src_x, int src_y, int src_width, int src_height, double scale, int rotation, Gdk.Pixbuf pixbuf);
 		public void render_to_ps (Poppler.PSFile ps_file);
+		public static void selection_region_free (GLib.List region);
 		[NoAccessorMethod]
 		public string label { owned get; }
 	}
@@ -279,9 +377,10 @@ namespace Poppler {
 		public double x2;
 		public double y2;
 	}
-	[CCode (cprefix = "POPPLER_ACTION_", has_type_id = false, cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_ACTION_", cheader_filename = "poppler.h")]
 	public enum ActionType {
 		UNKNOWN,
+		NONE,
 		GOTO_DEST,
 		GOTO_REMOTE,
 		LAUNCH,
@@ -289,13 +388,84 @@ namespace Poppler {
 		NAMED,
 		MOVIE
 	}
-	[CCode (cprefix = "POPPLER_BACKEND_", has_type_id = false, cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_ANNOT_EXTERNAL_DATA_MARKUP_", cheader_filename = "poppler.h")]
+	public enum AnnotExternalDataType {
+		@3D,
+		UNKNOWN
+	}
+	[CCode (cprefix = "POPPLER_ANNOT_FLAG_", cheader_filename = "poppler.h")]
+	[Flags]
+	public enum AnnotFlag {
+		UNKNOWN,
+		INVISIBLE,
+		HIDDEN,
+		PRINT,
+		NO_ZOOM,
+		NO_ROTATE,
+		NO_VIEW,
+		READ_ONLY,
+		LOCKED,
+		TOGGLE_NO_VIEW,
+		LOCKED_CONTENTS
+	}
+	[CCode (cprefix = "POPPLER_ANNOT_FREE_TEXT_QUADDING_", cheader_filename = "poppler.h")]
+	public enum AnnotFreeTextQuadding {
+		LEFT_JUSTIFIED,
+		CENTERED,
+		RIGHT_JUSTIFIED
+	}
+	[CCode (cprefix = "POPPLER_ANNOT_MARKUP_REPLY_TYPE_", cheader_filename = "poppler.h")]
+	public enum AnnotMarkupReplyType {
+		R,
+		GROUP
+	}
+	[CCode (cprefix = "POPPLER_ANNOT_TEXT_STATE_", cheader_filename = "poppler.h")]
+	public enum AnnotTextState {
+		MARKED,
+		UNMARKED,
+		ACCEPTED,
+		REJECTED,
+		CANCELLED,
+		COMPLETED,
+		NONE,
+		UNKNOWN
+	}
+	[CCode (cprefix = "POPPLER_ANNOT_", cheader_filename = "poppler.h")]
+	public enum AnnotType {
+		UNKNOWN,
+		TEXT,
+		LINK,
+		FREE_TEXT,
+		LINE,
+		SQUARE,
+		CIRCLE,
+		POLYGON,
+		POLY_LINE,
+		HIGHLIGHT,
+		UNDERLINE,
+		SQUIGGLY,
+		STRIKE_OUT,
+		STAMP,
+		CARET,
+		INK,
+		POPUP,
+		FILE_ATTACHMENT,
+		SOUND,
+		MOVIE,
+		WIDGET,
+		SCREEN,
+		PRINTER_MARK,
+		TRAP_NET,
+		WATERMARK,
+		@3D
+	}
+	[CCode (cprefix = "POPPLER_BACKEND_", cheader_filename = "poppler.h")]
 	public enum Backend {
 		UNKNOWN,
 		SPLASH,
 		CAIRO
 	}
-	[CCode (cprefix = "POPPLER_DEST_", has_type_id = false, cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_DEST_", cheader_filename = "poppler.h")]
 	public enum DestType {
 		UNKNOWN,
 		XYZ,
@@ -308,12 +478,15 @@ namespace Poppler {
 		FITBV,
 		NAMED
 	}
-	[CCode (cprefix = "POPPLER_ERROR_", has_type_id = false, cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_ERROR_", cheader_filename = "poppler.h")]
 	public enum Error {
 		INVALID,
-		ENCRYPTED
+		ENCRYPTED,
+		OPEN_FILE,
+		BAD_CATALOG,
+		DAMAGED
 	}
-	[CCode (cprefix = "POPPLER_FONT_TYPE_", has_type_id = false, cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_FONT_TYPE_", cheader_filename = "poppler.h")]
 	public enum FontType {
 		UNKNOWN,
 		TYPE1,
@@ -328,18 +501,18 @@ namespace Poppler {
 		CID_TYPE2,
 		CID_TYPE2OT
 	}
-	[CCode (cprefix = "POPPLER_FORM_BUTTON_", has_type_id = false, cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_FORM_BUTTON_", cheader_filename = "poppler.h")]
 	public enum FormButtonType {
 		PUSH,
 		CHECK,
 		RADIO
 	}
-	[CCode (cprefix = "POPPLER_FORM_CHOICE_", has_type_id = false, cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_FORM_CHOICE_", cheader_filename = "poppler.h")]
 	public enum FormChoiceType {
 		COMBO,
 		LIST
 	}
-	[CCode (cprefix = "POPPLER_FORM_FIELD_", has_type_id = false, cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_FORM_FIELD_", cheader_filename = "poppler.h")]
 	public enum FormFieldType {
 		UNKNOWN,
 		BUTTON,
@@ -347,20 +520,20 @@ namespace Poppler {
 		CHOICE,
 		SIGNATURE
 	}
-	[CCode (cprefix = "POPPLER_FORM_TEXT_", has_type_id = false, cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_FORM_TEXT_", cheader_filename = "poppler.h")]
 	public enum FormTextType {
 		NORMAL,
 		MULTILINE,
 		FILE_SELECT
 	}
-	[CCode (cprefix = "POPPLER_ORIENTATION_", has_type_id = false, cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_ORIENTATION_", cheader_filename = "poppler.h")]
 	public enum Orientation {
 		PORTRAIT,
 		LANDSCAPE,
 		UPSIDEDOWN,
 		SEASCAPE
 	}
-	[CCode (cprefix = "POPPLER_PAGE_LAYOUT_", has_type_id = false, cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_PAGE_LAYOUT_", cheader_filename = "poppler.h")]
 	public enum PageLayout {
 		UNSET,
 		SINGLE_PAGE,
@@ -370,7 +543,7 @@ namespace Poppler {
 		TWO_PAGE_LEFT,
 		TWO_PAGE_RIGHT
 	}
-	[CCode (cprefix = "POPPLER_PAGE_MODE_", has_type_id = false, cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_PAGE_MODE_", cheader_filename = "poppler.h")]
 	public enum PageMode {
 		UNSET,
 		NONE,
@@ -380,17 +553,17 @@ namespace Poppler {
 		USE_OC,
 		USE_ATTACHMENTS
 	}
-	[CCode (cprefix = "POPPLER_PAGE_TRANSITION_", has_type_id = false, cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_PAGE_TRANSITION_", cheader_filename = "poppler.h")]
 	public enum PageTransitionAlignment {
 		HORIZONTAL,
 		VERTICAL
 	}
-	[CCode (cprefix = "POPPLER_PAGE_TRANSITION_", has_type_id = false, cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_PAGE_TRANSITION_", cheader_filename = "poppler.h")]
 	public enum PageTransitionDirection {
 		INWARD,
 		OUTWARD
 	}
-	[CCode (cprefix = "POPPLER_PAGE_TRANSITION_", has_type_id = false, cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_PAGE_TRANSITION_", cheader_filename = "poppler.h")]
 	public enum PageTransitionType {
 		REPLACE,
 		SPLIT,
@@ -405,22 +578,23 @@ namespace Poppler {
 		UNCOVER,
 		FADE
 	}
-	[CCode (cprefix = "POPPLER_PERMISSIONS_", has_type_id = false, cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_PERMISSIONS_", cheader_filename = "poppler.h")]
 	[Flags]
 	public enum Permissions {
 		OK_TO_PRINT,
 		OK_TO_MODIFY,
 		OK_TO_COPY,
 		OK_TO_ADD_NOTES,
+		OK_TO_FILL_FORM,
 		FULL
 	}
-	[CCode (cprefix = "POPPLER_SELECTION_", has_type_id = false, cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_SELECTION_", cheader_filename = "poppler.h")]
 	public enum SelectionStyle {
 		GLYPH,
 		WORD,
 		LINE
 	}
-	[CCode (cprefix = "POPPLER_VIEWER_PREFERENCES_", has_type_id = false, cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_VIEWER_PREFERENCES_", cheader_filename = "poppler.h")]
 	[Flags]
 	public enum ViewerPreferences {
 		UNSET,
@@ -437,6 +611,16 @@ namespace Poppler {
 	[CCode (cheader_filename = "poppler.h")]
 	public const int HAS_CAIRO;
 	[CCode (cheader_filename = "poppler.h")]
+	public const int MAJOR_VERSION;
+	[CCode (cheader_filename = "poppler.h")]
+	public const int MICRO_VERSION;
+	[CCode (cheader_filename = "poppler.h")]
+	public const int MINOR_VERSION;
+	[CCode (cheader_filename = "poppler.h")]
+	public const int WITH_GDK;
+	[CCode (cheader_filename = "poppler.h")]
+	public static bool date_parse (string date, ulong timet);
+	[CCode (cheader_filename = "poppler.h")]
 	public static GLib.Quark error_quark ();
 	[CCode (cheader_filename = "poppler.h")]
 	public static Poppler.Backend get_backend ();
diff --git a/vapi/webkit-1.0.vapi b/vapi/webkit-1.0.vapi
index 3873712..93e1f78 100644
--- a/vapi/webkit-1.0.vapi
+++ b/vapi/webkit-1.0.vapi
@@ -30,6 +30,9 @@ namespace WebKit {
 		public virtual signal bool error (int p0, int p1, string p2);
 	}
 	[CCode (cheader_filename = "webkit/webkit.h")]
+	public class GeolocationPolicyDecision : GLib.Object {
+	}
+	[CCode (cheader_filename = "webkit/webkit.h")]
 	public class HitTestResult : GLib.Object {
 		[NoAccessorMethod]
 		public WebKit.HitTestResultContext context { get; construct; }
@@ -82,6 +85,7 @@ namespace WebKit {
 	[CCode (cheader_filename = "webkit/webkit.h")]
 	public class WebBackForwardList : GLib.Object {
 		public void add_item (WebKit.WebHistoryItem history_item);
+		public void clear ();
 		public bool contains_item (WebKit.WebHistoryItem history_item);
 		public unowned WebKit.WebHistoryItem get_back_item ();
 		public int get_back_length ();
@@ -296,6 +300,8 @@ namespace WebKit {
 		[NoAccessorMethod]
 		public bool enable_site_specific_quirks { get; set construct; }
 		[NoAccessorMethod]
+		public bool enable_spatial_navigation { get; set construct; }
+		[NoAccessorMethod]
 		public bool enable_spell_checking { get; set construct; }
 		[NoAccessorMethod]
 		public bool enable_universal_access_from_file_uris { get; set construct; }
@@ -306,6 +312,8 @@ namespace WebKit {
 		[NoAccessorMethod]
 		public string fantasy_font_family { owned get; set construct; }
 		[NoAccessorMethod]
+		public bool javascript_can_access_clipboard { get; set construct; }
+		[NoAccessorMethod]
 		public bool javascript_can_open_windows_automatically { get; set construct; }
 		[NoAccessorMethod]
 		public int minimum_font_size { get; set construct; }
@@ -426,7 +434,10 @@ namespace WebKit {
 		[HasEmitter]
 		public virtual signal void cut_clipboard ();
 		public virtual signal void database_quota_exceeded (GLib.Object p0, GLib.Object p1);
+		public virtual signal void document_load_finished (WebKit.WebFrame p0);
 		public virtual signal bool download_requested (GLib.Object p0);
+		public virtual signal void geolocation_policy_decision_cancelled (WebKit.WebFrame p0);
+		public virtual signal bool geolocation_policy_decision_requested (WebKit.WebFrame p0, WebKit.GeolocationPolicyDecision p1);
 		public virtual signal void hovering_over_link (string? p0, string p1);
 		public virtual signal void icon_loaded (string p0);
 		public virtual signal void load_committed (WebKit.WebFrame p0);
@@ -590,6 +601,10 @@ namespace WebKit {
 	[CCode (cheader_filename = "webkit/webkit.h")]
 	public static bool check_version (uint major, uint minor, uint micro);
 	[CCode (cheader_filename = "webkit/webkit.h")]
+	public static void geolocation_policy_allow (WebKit.GeolocationPolicyDecision decision);
+	[CCode (cheader_filename = "webkit/webkit.h")]
+	public static void geolocation_policy_deny (WebKit.GeolocationPolicyDecision decision);
+	[CCode (cheader_filename = "webkit/webkit.h")]
 	public static WebKit.CacheModel get_cache_model ();
 	[CCode (cheader_filename = "webkit/webkit.h")]
 	public static unowned Soup.Session get_default_session ();



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