From: Evan Nemerson Date: Mon, 19 Jul 2010 09:24:26 +0000 (-0700) Subject: Update several bindings to newer versions X-Git-Tag: 0.9.4~31 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1364c251d74e171872939109f30b87276a1fb5c9;p=thirdparty%2Fvala.git 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 --- diff --git a/vapi/atk.vapi b/vapi/atk.vapi index 6114340f6..c81ca5eb1 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 77f919bc3..5294bcf4a 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 562acf5e7..b8a2b7879 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 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 4827ea5d9..2f5dac412 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 82c5c303c..114a84c0a 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 25d8f07ea..eaaccd3b9 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 f496c2cc1..219e1fb20 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 a762535f7..844fa5a07 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 9d5aade1d..f9019779f 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 b59bb53a6..230dc8a4e 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 header_parse_list (string header); [CCode (cheader_filename = "libsoup/soup.h")] public static GLib.HashTable header_parse_param_list (string header); diff --git a/vapi/libwnck-1.0.vapi b/vapi/libwnck-1.0.vapi index 42fc37785..fa2e43e8a 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 1d7fd5a74..6af80b56b 100644 --- a/vapi/packages/atk/atk.gi +++ b/vapi/packages/atk/atk.gi @@ -229,7 +229,8 @@ - + + @@ -573,16 +574,16 @@ - - - - + + - - + + + + @@ -966,6 +967,23 @@ + + + + + + + + + + + + + + + + + @@ -1105,6 +1123,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vapi/packages/gconf-2.0/gconf-2.0.gi b/vapi/packages/gconf-2.0/gconf-2.0.gi index b3805820c..e5ed3fe52 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 @@ + + + + + + + + + + + + @@ -1187,17 +1199,17 @@ - + - + - + @@ -1216,7 +1228,7 @@ - + @@ -1226,7 +1238,7 @@ - + @@ -1621,7 +1633,7 @@ - + diff --git a/vapi/packages/gdk-2.0/gdk-2.0.gi b/vapi/packages/gdk-2.0/gdk-2.0.gi index 1456c060e..34fd946fc 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 @@ + + + + + + + + + + + + + @@ -2780,6 +2793,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3161,6 +3201,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3765,12 +3835,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3779,6 +3891,18 @@ + + + + + + + + + + + + @@ -4356,6 +4480,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4365,6 +4540,12 @@ + + + + + + @@ -4480,6 +4661,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -4560,12 +4761,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4587,12 +4815,30 @@ + + + + + + + + + + + + + + + + + + @@ -4626,6 +4872,12 @@ + + + + + + @@ -4773,6 +5025,18 @@ + + + + + + + + + + + + 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 baef917a9..0dec2ec81 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 @@ + + + + + + @@ -196,6 +202,13 @@ + + + + + + + @@ -237,6 +250,12 @@ + + + + + + diff --git a/vapi/packages/gio-2.0/gio-2.0.gi b/vapi/packages/gio-2.0/gio-2.0.gi index c76e87c32..33adcfac9 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 @@ - + - - + + - + - + - + - + - + - + - + - + - + - + @@ -182,14 +182,14 @@ - - + + - + @@ -499,6 +499,7 @@ + @@ -592,6 +593,14 @@ + + + + + + + + @@ -616,14 +625,7 @@ - - - - - - - - + @@ -1332,6 +1334,7 @@ + @@ -1368,6 +1371,7 @@ + @@ -2014,9 +2018,9 @@ - - - + + + @@ -2093,6 +2097,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2198,7 +2227,7 @@ - + @@ -2292,6 +2321,12 @@ + + + + + + @@ -2318,9 +2353,9 @@ - - - + + + @@ -3022,8 +3057,8 @@ - - + + @@ -5807,6 +5842,13 @@ + + + + + + + @@ -5820,6 +5862,15 @@ + + + + + + + + + @@ -5848,6 +5899,15 @@ + + + + + + + + + @@ -5914,6 +5974,14 @@ + + + + + + + + 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 f4ee24c51..7fd5e0a6d 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 @@ - + - + @@ -2659,7 +2659,7 @@ - + @@ -2669,30 +2669,30 @@ - + - + - + - + - + - + @@ -2700,11 +2700,11 @@ - + - + @@ -2759,39 +2759,39 @@ - + - + - + - + - + - + - + @@ -2811,24 +2811,24 @@ - + - + - + - + @@ -2849,7 +2849,7 @@ - + @@ -2860,7 +2860,7 @@ - + @@ -2880,12 +2880,12 @@ - + - + @@ -2893,17 +2893,17 @@ - + - + - + @@ -2913,7 +2913,7 @@ - + @@ -2922,7 +2922,7 @@ - + @@ -3474,9 +3474,9 @@ - + - + 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 76e1bfeda..35aa0a0af 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 @@ - + + + + + @@ -872,9 +876,9 @@ - - + + - + diff --git a/vapi/packages/libgnome-menu/libgnome-menu.gi b/vapi/packages/libgnome-menu/libgnome-menu.gi index ea29b0483..9d726e98f 100644 --- a/vapi/packages/libgnome-menu/libgnome-menu.gi +++ b/vapi/packages/libgnome-menu/libgnome-menu.gi @@ -36,6 +36,12 @@ + + + + + + @@ -63,6 +69,13 @@ + + + + + + + @@ -168,12 +181,24 @@ + + + + + + + + + + + + @@ -254,7 +279,8 @@ - + + @@ -264,5 +290,9 @@ + + + + diff --git a/vapi/packages/libnotify/libnotify.gi b/vapi/packages/libnotify/libnotify.gi index d51441293..81cdc2c03 100644 --- a/vapi/packages/libnotify/libnotify.gi +++ b/vapi/packages/libnotify/libnotify.gi @@ -31,12 +31,12 @@ - - - + + + - + @@ -86,21 +86,27 @@ + + + + + + - - - + + + - - - + + + @@ -124,7 +130,7 @@ - + @@ -132,7 +138,7 @@ - + @@ -141,7 +147,7 @@ - + @@ -149,7 +155,7 @@ - + @@ -157,8 +163,16 @@ - - + + + + + + + + + + @@ -168,6 +182,13 @@ + + + + + + + @@ -193,14 +214,16 @@ - - - + + + + + diff --git a/vapi/packages/libsoup-2.4/libsoup-2.4.gi b/vapi/packages/libsoup-2.4/libsoup-2.4.gi index d8f67fb05..13bf3ea5b 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 @@ + + + + + + + + @@ -1439,6 +1447,7 @@ + @@ -1512,6 +1521,7 @@ + @@ -3144,6 +3154,11 @@ + + + + + diff --git a/vapi/packages/libwnck-1.0/libwnck-1.0.gi b/vapi/packages/libwnck-1.0/libwnck-1.0.gi index ebb523361..fdcd15e36 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 @@ - + - + - + - + - + @@ -107,7 +107,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -138,13 +138,13 @@ - + - + @@ -804,6 +804,13 @@ + + + + + + + diff --git a/vapi/packages/pango/pango.gi b/vapi/packages/pango/pango.gi index 04fc67ad3..022081af0 100644 --- a/vapi/packages/pango/pango.gi +++ b/vapi/packages/pango/pango.gi @@ -187,6 +187,15 @@ + + + + + + + + + @@ -1113,6 +1122,14 @@ + + + + + + + + @@ -2860,8 +2877,8 @@ - - - + + + diff --git a/vapi/packages/poppler-glib/poppler-glib.gi b/vapi/packages/poppler-glib/poppler-glib.gi index d5be391bd..abadaecf0 100644 --- a/vapi/packages/poppler-glib/poppler-glib.gi +++ b/vapi/packages/poppler-glib/poppler-glib.gi @@ -1,6 +1,13 @@ + + + + + + + @@ -76,6 +83,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -193,7 +263,7 @@ - + @@ -239,6 +309,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -303,21 +417,73 @@ - + - - - - - - + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -329,11 +495,14 @@ - + + + + - + @@ -347,34 +516,34 @@ - + - + - + - + - + - + @@ -383,7 +552,7 @@ - + @@ -392,15 +561,15 @@ - + - + - + @@ -414,19 +583,33 @@ - + - + + + + + + + + + + + + + + - + + - + @@ -436,6 +619,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -533,10 +852,20 @@ + + + + + + + + + + @@ -748,6 +1077,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -788,6 +1155,12 @@ + + + + + + @@ -806,6 +1179,12 @@ + + + + + + @@ -825,6 +1204,13 @@ + + + + + + + @@ -844,7 +1230,7 @@ - + @@ -869,6 +1255,12 @@ + + + + + + @@ -895,6 +1287,13 @@ + + + + + + + @@ -903,8 +1302,8 @@ - - + + @@ -934,6 +1333,19 @@ + + + + + + + + + + + + + @@ -941,8 +1353,18 @@ + + + + + + + + + + diff --git a/vapi/packages/webkit-1.0/webkit-1.0.gi b/vapi/packages/webkit-1.0/webkit-1.0.gi index ac25bbdc5..76794ab51 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 @@ + + + + + + + + + + + + @@ -241,6 +253,8 @@ + + @@ -375,6 +389,12 @@ + + + + + + @@ -1078,11 +1098,13 @@ + + @@ -1602,6 +1624,13 @@ + + + + + + + @@ -1609,6 +1638,21 @@ + + + + + + + + + + + + + + + @@ -1858,8 +1902,8 @@ - - + + diff --git a/vapi/pango.vapi b/vapi/pango.vapi index 58f1e4ad6..8ad4840d0 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 83155bcfa..8f3b99d60 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 387371221..93e1f7870 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 ();