diff options
author | Evan Nemerson <evan@coeus-group.com> | 2012-05-25 10:51:15 -0700 |
---|---|---|
committer | Jürg Billeter <j@bitron.ch> | 2012-06-23 17:25:29 +0200 |
commit | 2ec31b8f25f6349f1114ac739a5dcc6e642e4e7c (patch) | |
tree | 181447c672544e1e5ce18199777f92151c3ca5bf | |
parent | e6564d7f4a794ba87f81b6204541349104a8d504 (diff) | |
download | vala-2ec31b8f25f6349f1114ac739a5dcc6e642e4e7c.tar.gz |
gdk-3.0, libsoup-2.4, poppler-glib, rest-0.7, vte-2.90: update
-rw-r--r-- | vapi/Makefile.am | 2 | ||||
-rw-r--r-- | vapi/gdk-3.0.vapi | 75 | ||||
-rw-r--r-- | vapi/libsoup-2.4.vapi | 24 | ||||
-rw-r--r-- | vapi/metadata/Vte-2.90.metadata | 1 | ||||
-rw-r--r-- | vapi/poppler-glib.vapi | 2 | ||||
-rw-r--r-- | vapi/rest-0.7.vapi | 3 | ||||
-rw-r--r-- | vapi/vte-2.90.vapi | 28 |
7 files changed, 108 insertions, 27 deletions
diff --git a/vapi/Makefile.am b/vapi/Makefile.am index 7c55fa03a..dde4bbae1 100644 --- a/vapi/Makefile.am +++ b/vapi/Makefile.am @@ -594,7 +594,7 @@ rest-extras-0.6: $(GENVAPI) --library $(srcdir)/rest-extras-0.6 $(PACKAGESDIR)/rest-extras-0.6/rest-extras-0.6-custom.vala $(PACKAGESDIR)/rest-extras-0.6/rest-extras-0.6.gi rest-0.7: - $(GENVAPI) --library $(srcdir)/rest-0.7 --metadatadir $(METADATADIR) $(GIRDIR)/Rest-0.7.gir + $(GENVAPI) --library $(srcdir)/rest-0.7 --metadatadir $(METADATADIR) --pkg gio-2.0 $(GIRDIR)/Rest-0.7.gir tracker-indexer-module-1.0: $(GENVAPI) --library $(srcdir)/tracker-indexer-module-1.0 $(PACKAGESDIR)/tracker-indexer-module-1.0/tracker-indexer-module-1.0-custom.vala $(PACKAGESDIR)/tracker-indexer-module-1.0/tracker-indexer-module-1.0.gi diff --git a/vapi/gdk-3.0.vapi b/vapi/gdk-3.0.vapi index 3d708c99f..da2876eaa 100644 --- a/vapi/gdk-3.0.vapi +++ b/vapi/gdk-3.0.vapi @@ -551,6 +551,12 @@ namespace Gdk { public const int C; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_CD")] public const int CD; + [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_CH")] + public const int CH; + [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_C_H")] + public const int C_H; + [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_C_h")] + public const int C_h; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_Cabovedot")] public const int Cabovedot; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_Cacute")] @@ -569,6 +575,8 @@ namespace Gdk { public const int Ccedilla; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_Ccircumflex")] public const int Ccircumflex; + [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_Ch")] + public const int Ch; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_Clear")] public const int Clear; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_ClearGrab")] @@ -829,6 +837,8 @@ namespace Gdk { public const int ENG; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_ETH")] public const int ETH; + [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_EZH")] + public const int EZH; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_Eabovedot")] public const int Eabovedot; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_Eacute")] @@ -1765,8 +1775,12 @@ namespace Gdk { public const int Linefeed; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_LiraSign")] public const int LiraSign; + [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_LogGrabInfo")] + public const int LogGrabInfo; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_LogOff")] public const int LogOff; + [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_LogWindowTree")] + public const int LogWindowTree; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_Lstroke")] public const int Lstroke; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_M")] @@ -3383,6 +3397,8 @@ namespace Gdk { public const int brokenbar; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_c")] public const int c; + [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_c_h")] + public const int c_h; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_cabovedot")] public const int cabovedot; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_cacute")] @@ -3403,6 +3419,8 @@ namespace Gdk { public const int cedilla; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_cent")] public const int cent; + [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_ch")] + public const int ch; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_checkerboard")] public const int checkerboard; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_checkmark")] @@ -3499,6 +3517,8 @@ namespace Gdk { public const int dead_e; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_dead_grave")] public const int dead_grave; + [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_dead_greek")] + public const int dead_greek; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_dead_hook")] public const int dead_hook; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_dead_horn")] @@ -3649,6 +3669,8 @@ namespace Gdk { public const int exclam; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_exclamdown")] public const int exclamdown; + [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_ezh")] + public const int ezh; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_f")] public const int f; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_fabovedot")] @@ -4219,6 +4241,8 @@ namespace Gdk { public const int period; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_periodcentered")] public const int periodcentered; + [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_permille")] + public const int permille; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_phonographcopyright")] public const int phonographcopyright; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_KEY_plus")] @@ -4728,6 +4752,7 @@ namespace Gdk { public Gdk.EventScroll scroll; public Gdk.EventSelection selection; public Gdk.EventSetting setting; + public Gdk.EventTouch touch; public Gdk.EventType type; public Gdk.EventVisibility visibility; public Gdk.EventWindowState window_state; @@ -4745,6 +4770,7 @@ namespace Gdk { public bool get_keyval (out uint keyval); public bool get_root_coords (out double x_root, out double y_root); public unowned Gdk.Screen get_screen (); + public bool get_scroll_deltas (double delta_x, double delta_y); public bool get_scroll_direction (out Gdk.ScrollDirection direction); public unowned Gdk.Device get_source_device (); public bool get_state (out Gdk.ModifierType state); @@ -4758,6 +4784,10 @@ namespace Gdk { public void set_source_device (Gdk.Device device); public bool triggers_context_menu (); } + [CCode (cheader_filename = "gdk/gdk.h")] + [Compact] + public class EventSequence { + } [CCode (cheader_filename = "gdk/gdk.h", type_id = "gdk_keymap_get_type ()")] public class Keymap : GLib.Object { [CCode (has_construct_function = false)] @@ -4770,6 +4800,7 @@ namespace Gdk { public bool get_entries_for_keyval (uint keyval, [CCode (array_length_cname = "n_keys", array_length_pos = 2.1)] out Gdk.KeymapKey[] keys); public static unowned Gdk.Keymap get_for_display (Gdk.Display display); public Gdk.ModifierType get_modifier_mask (Gdk.ModifierIntent intent); + public uint get_modifier_state (); public bool get_num_lock_state (); public bool have_bidi_layouts (); public uint lookup_key (Gdk.KeymapKey key); @@ -5177,6 +5208,8 @@ namespace Gdk { public weak Gdk.Device device; public double x_root; public double y_root; + public double delta_x; + public double delta_y; } [CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)] public struct EventSelection { @@ -5198,6 +5231,22 @@ namespace Gdk { public weak string name; } [CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)] + public struct EventTouch { + public Gdk.EventType type; + public weak Gdk.Window window; + public int8 send_event; + public uint32 time; + public double x; + public double y; + public double axes; + public Gdk.ModifierType state; + public weak Gdk.EventSequence sequence; + public bool emulating_pointer; + public weak Gdk.Device device; + public double x_root; + public double y_root; + } + [CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)] public struct EventVisibility { public Gdk.EventType type; public weak Gdk.Window window; @@ -5301,7 +5350,10 @@ namespace Gdk { UNGRAB, GTK_GRAB, GTK_UNGRAB, - STATE_CHANGED + STATE_CHANGED, + TOUCH_BEGIN, + TOUCH_END, + DEVICE_SWITCH } [CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_")] public enum CursorType { @@ -5436,6 +5488,8 @@ namespace Gdk { PROXIMITY_OUT_MASK, SUBSTRUCTURE_MASK, SCROLL_MASK, + TOUCH_MASK, + SMOOTH_SCROLL_MASK, ALL_EVENTS_MASK } [CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_")] @@ -5447,7 +5501,9 @@ namespace Gdk { MOTION_NOTIFY, BUTTON_PRESS, @2BUTTON_PRESS, + DOUBLE_BUTTON_PRESS, @3BUTTON_PRESS, + TRIPLE_BUTTON_PRESS, BUTTON_RELEASE, KEY_PRESS, KEY_RELEASE, @@ -5477,14 +5533,12 @@ namespace Gdk { OWNER_CHANGE, GRAB_BROKEN, DAMAGE, + TOUCH_BEGIN, + TOUCH_UPDATE, + TOUCH_END, + TOUCH_CANCEL, EVENT_LAST } - [CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_EXTENSION_EVENTS_")] - public enum ExtensionMode { - NONE, - ALL, - CURSOR - } [CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_FILTER_")] public enum FilterReturn { CONTINUE, @@ -5530,7 +5584,9 @@ namespace Gdk { PEN, ERASER, CURSOR, - KEYBOARD + KEYBOARD, + TOUCHSCREEN, + TOUCHPAD } [CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_MODIFIER_INTENT_")] public enum ModifierIntent { @@ -5594,7 +5650,8 @@ namespace Gdk { UP, DOWN, LEFT, - RIGHT + RIGHT, + SMOOTH } [CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_SETTING_ACTION_")] public enum SettingAction { diff --git a/vapi/libsoup-2.4.vapi b/vapi/libsoup-2.4.vapi index d086eca06..76c2b8a24 100644 --- a/vapi/libsoup-2.4.vapi +++ b/vapi/libsoup-2.4.vapi @@ -6,7 +6,7 @@ namespace Soup { [CCode (cheader_filename = "libsoup/soup.h")] public static GLib.HashTable<string,string> decode (string encoded_form); [CCode (cheader_filename = "libsoup/soup.h")] - public static GLib.HashTable<string,string> decode_multipart (Soup.Message msg, string file_control_name, out string filename, out string content_type, out Soup.Buffer file); + public static GLib.HashTable<string,string> decode_multipart (Soup.Message msg, string? file_control_name, out string filename, out string content_type, out Soup.Buffer file); [CCode (cheader_filename = "libsoup/soup.h")] public static string encode (...); [CCode (cheader_filename = "libsoup/soup.h")] @@ -98,6 +98,8 @@ namespace Soup { public string physical { get; } public int port { get; construct; } [NoAccessorMethod] + public string protocol { owned get; construct; } + [NoAccessorMethod] public void* sockaddr { get; construct; } } [CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_auth_get_type ()")] @@ -230,7 +232,6 @@ namespace Soup { public class ContentSniffer : GLib.Object, Soup.SessionFeature { [CCode (has_construct_function = false)] public ContentSniffer (); - [NoWrapper] public virtual size_t get_buffer_size (); public virtual string sniff (Soup.Message msg, Soup.Buffer buffer, out GLib.HashTable<string,string>? @params); } @@ -279,6 +280,7 @@ namespace Soup { public void delete_cookie (Soup.Cookie cookie); public Soup.CookieJarAcceptPolicy get_accept_policy (); public string get_cookies (Soup.URI uri, bool for_http); + public virtual bool is_persistent (); public virtual void save (); public void set_accept_policy (Soup.CookieJarAcceptPolicy policy); public void set_cookie (Soup.URI uri, string cookie); @@ -548,6 +550,8 @@ namespace Soup { [NoWrapper] public virtual void kick (); public void pause_message (Soup.Message msg); + public void prefetch_dns (string hostname, GLib.Cancellable? cancellable, Soup.AddressCallback? callback); + [Deprecated (since = "2.38")] public void prepare_for_uri (Soup.URI uri); public virtual void queue_message (owned Soup.Message msg, Soup.SessionCallback? callback); public bool redirect_message (Soup.Message msg); @@ -655,6 +659,8 @@ namespace Soup { [NoAccessorMethod] public bool trusted_certificate { get; } [NoAccessorMethod] + public bool use_proxy { get; construct; } + [NoAccessorMethod] public bool use_thread_context { get; construct; } public virtual signal void disconnected (); public signal void event (GLib.SocketClientEvent event, GLib.IOStream connection); @@ -674,7 +680,7 @@ namespace Soup { public weak string scheme; public weak string user; [CCode (has_construct_function = false)] - public URI (string uri_string); + public URI (string? uri_string); public Soup.URI copy (); public Soup.URI copy_host (); public static string decode (string part); @@ -692,16 +698,16 @@ namespace Soup { public bool host_equal (Soup.URI v2); public uint host_hash (); public static string normalize (string part, string unescape_extra); - public void set_fragment (string fragment); - public void set_host (string host); - public void set_password (string password); + public void set_fragment (string? fragment); + public void set_host (string? host); + public void set_password (string? password); public void set_path (string path); public void set_port (uint port); - public void set_query (string query); + public void set_query (string? query); public void set_query_from_fields (...); public void set_query_from_form (GLib.HashTable<string,string> form); public void set_scheme (string scheme); - public void set_user (string user); + public void set_user (string? user); public string to_string (bool just_path_and_query); public bool uses_default_port (); [CCode (has_construct_function = false)] @@ -966,6 +972,8 @@ namespace Soup { public const string ADDRESS_PHYSICAL; [CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_ADDRESS_PORT")] public const string ADDRESS_PORT; + [CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_ADDRESS_PROTOCOL")] + public const string ADDRESS_PROTOCOL; [CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_ADDRESS_SOCKADDR")] public const string ADDRESS_SOCKADDR; [CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_DOMAIN_ADD_PATH")] diff --git a/vapi/metadata/Vte-2.90.metadata b/vapi/metadata/Vte-2.90.metadata index a5cf89199..b4fcf1c9b 100644 --- a/vapi/metadata/Vte-2.90.metadata +++ b/vapi/metadata/Vte-2.90.metadata @@ -6,5 +6,4 @@ Vte cheader_filename="vte/vte.h" Pty.new_foreign.fd owned=false Terminal.get_cursor_position.* out Terminal.match_set_cursor.cursor nullable -TerminalWriteFlags.terminal_write_default name="DEFAULT" SelectionFunc.data closure=3 diff --git a/vapi/poppler-glib.vapi b/vapi/poppler-glib.vapi index 2be38a092..ffa952b06 100644 --- a/vapi/poppler-glib.vapi +++ b/vapi/poppler-glib.vapi @@ -409,7 +409,7 @@ namespace Poppler { public GLib.List<Poppler.TextAttributes> get_text_attributes (); public bool get_text_layout ([CCode (array_length_cname = "n_rectangles", array_length_pos = 1.1, array_length_type = "guint")] out Poppler.Rectangle[] rectangles); public Cairo.Surface get_thumbnail (); - public bool get_thumbnail_size (int width, int height); + public bool get_thumbnail_size (out int width, out int height); public Poppler.PageTransition get_transition (); public void render ([CCode (type = "cairo_t*")] Cairo.Context cairo); public void render_for_printing ([CCode (type = "cairo_t*")] Cairo.Context cairo); diff --git a/vapi/rest-0.7.vapi b/vapi/rest-0.7.vapi index fabdddb83..6d4133ad8 100644 --- a/vapi/rest-0.7.vapi +++ b/vapi/rest-0.7.vapi @@ -122,6 +122,7 @@ namespace Rest { public void add_param (string name, string value); public void add_param_full (Rest.Param param); public void add_params (...); + public bool cancel (); public bool continuous ([CCode (delegate_target_pos = 2.1)] Rest.ProxyCallContinuousCallback callback, GLib.Object weak_object) throws GLib.Error; public unowned string get_method (); public unowned Rest.Params get_params (); @@ -163,7 +164,9 @@ namespace Rest { public void free (); public unowned string get_attr (string attr_name); public string print (); + public Rest.XmlNode @ref (); public void set_content (string value); + public void unref (); } [CCode (cheader_filename = "rest/rest-xml-parser.h", type_id = "rest_xml_parser_get_type ()")] public class XmlParser : GLib.Object { diff --git a/vapi/vte-2.90.vapi b/vapi/vte-2.90.vapi index 14816e27f..f39ecb0b2 100644 --- a/vapi/vte-2.90.vapi +++ b/vapi/vte-2.90.vapi @@ -8,7 +8,6 @@ namespace Vte { public Pty (Vte.PtyFlags flags) throws GLib.Error; public void child_setup (); public void close (); - public static GLib.Quark error_quark (); [CCode (has_construct_function = false)] public Pty.foreign (int fd) throws GLib.Error; public int get_fd (); @@ -18,11 +17,13 @@ namespace Vte { public bool set_utf8 (bool utf8) throws GLib.Error; public int fd { get; construct; } [NoAccessorMethod] + public Vte.PtyFlags flags { get; construct; } + [NoAccessorMethod] public string term { owned get; set; } } [CCode (cheader_filename = "vte/vte.h", type_id = "vte_terminal_get_type ()")] public class Terminal : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.Scrollable { - [CCode (has_construct_function = false)] + [CCode (has_construct_function = false, type = "GtkWidget*")] public Terminal (); public void copy_primary (); public void feed (string data, long length); @@ -126,6 +127,12 @@ namespace Vte { public Gdk.Color background_tint_color { get; set; } [NoAccessorMethod] public bool background_transparent { get; set; } + [NoAccessorMethod] + public Vte.TerminalEraseBinding backspace_binding { get; set; } + public Vte.TerminalCursorBlinkMode cursor_blink_mode { get; set; } + public Vte.TerminalCursorShape cursor_shape { get; set; } + [NoAccessorMethod] + public Vte.TerminalEraseBinding delete_binding { get; set; } public string emulation { get; set; } public string encoding { get; set; } [NoAccessorMethod] @@ -182,11 +189,6 @@ namespace Vte { [CCode (cheader_filename = "vte/vte.h", cname = "_VteCharAttributes", has_type_id = false)] public struct _CharAttributes { } - [CCode (cheader_filename = "vte/vte.h", cprefix = "VTE_PTY_ERROR_")] - public enum PtyError { - PTY_HELPER_FAILED, - PTY98_FAILED - } [CCode (cheader_filename = "vte/vte.h", cprefix = "VTE_PTY_")] [Flags] public enum PtyFlags { @@ -197,6 +199,12 @@ namespace Vte { NO_FALLBACK, DEFAULT } + [CCode (cheader_filename = "vte/vte.h", cprefix = "VTE_ANTI_ALIAS_")] + public enum TerminalAntiAlias { + USE_DEFAULT, + FORCE_ENABLE, + FORCE_DISABLE + } [CCode (cheader_filename = "vte/vte.h", cprefix = "VTE_CURSOR_BLINK_")] public enum TerminalCursorBlinkMode { SYSTEM, @@ -221,6 +229,12 @@ namespace Vte { public enum TerminalWriteFlags { DEFAULT } + [CCode (cheader_filename = "vte/vte.h", cprefix = "VTE_PTY_ERROR_")] + public errordomain PtyError { + PTY_HELPER_FAILED, + PTY98_FAILED; + public static GLib.Quark quark (); + } [CCode (cheader_filename = "vte/vte.h", instance_pos = 3.9)] public delegate bool SelectionFunc (Vte.Terminal terminal, long column, long row); [CCode (cheader_filename = "vte/vte.h")] |