Support ssize_t and size_t

2008-11-28  Jürg Billeter  <j@bitron.ch>

	* vapigen/valagidlparser.vala:

	Support ssize_t and size_t

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

	Regenerated

svn path=/trunk/; revision=2080

diff --git a/ChangeLog b/ChangeLog
index c1ddc1535ba7947f05d3ba5033c65a89ddca0965..0dd7d2a3ecb24e32dae1971994d64e5545c85f7f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-11-28  Jürg Billeter  <j@bitron.ch>
+
+       * vapigen/valagidlparser.vala:
+
+       Support ssize_t and size_t
+
+       * vapi/gdk-pixbuf-2.0.vapi:
+       * vapi/gio-2.0.vapi:
+       * vapi/gtk+-2.0.vapi:
+       * vapi/pango.vapi:
+
+       Regenerated
+
 2008-11-28  Jürg Billeter  <j@bitron.ch>
 
        * vapigen/valagirparser.vala:

diff --git a/vapi/gdk-pixbuf-2.0.vapi b/vapi/gdk-pixbuf-2.0.vapi
index f494d2f1987606c0f42b135a9f46622437e1e8cd..c467908c4e53e4b46070db911a0681af73460cc7 100644 (file)
--- a/vapi/gdk-pixbuf-2.0.vapi
+++ b/vapi/gdk-pixbuf-2.0.vapi
@@ -50,8 +50,8 @@ namespace Gdk {
                public weak Gdk.Pixbuf rotate_simple (Gdk.PixbufRotation angle);
                public void saturate_and_pixelate (Gdk.Pixbuf dest, float saturation, bool pixelate);
                public bool save (string filename, string type, ...) throws GLib.Error;
-               public bool save_to_buffer (string buffer, ulong buffer_size, string type, ...) throws GLib.Error;
-               public bool save_to_bufferv (string buffer, ulong buffer_size, string type, string[] option_keys, string[] option_values) throws GLib.Error;
+               public bool save_to_buffer (string buffer, size_t buffer_size, string type, ...) throws GLib.Error;
+               public bool save_to_bufferv (string buffer, size_t buffer_size, string type, string[] option_keys, string[] option_values) throws GLib.Error;
                public bool save_to_callback (Gdk.PixbufSaveFunc save_func, string type) throws GLib.Error;
                public bool save_to_callbackv (Gdk.PixbufSaveFunc save_func, string type, string[] option_keys, string[] option_values) throws GLib.Error;
                public bool save_to_stream (GLib.OutputStream stream, string type, GLib.Cancellable cancellable) throws GLib.Error;
@@ -211,7 +211,7 @@ namespace Gdk {
        [CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
        public delegate void PixbufDestroyNotify (uchar[] pixels);
        [CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
-       public delegate bool PixbufSaveFunc (string buf, ulong count, GLib.Error error);
+       public delegate bool PixbufSaveFunc (string buf, size_t count, GLib.Error error);
        [CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
        public const int PIXBUF_FEATURES_H;
        [CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 3a166085d6dca28247d5db414a51f6f10b2370ad..2770dbaedd4b9d585f00a70b4784798c4cd517eb 100644 (file)
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -12,31 +12,31 @@ namespace GLib {
        }
        [CCode (cheader_filename = "gio/gio.h")]
        public class BufferedInputStream : GLib.FilterInputStream {
-               public virtual long fill (long count, GLib.Cancellable? cancellable) throws GLib.Error;
-               public virtual void fill_async (long count, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
-               public virtual long fill_finish (GLib.AsyncResult _result) throws GLib.Error;
-               public ulong get_available ();
-               public ulong get_buffer_size ();
+               public virtual ssize_t fill (ssize_t count, GLib.Cancellable? cancellable) throws GLib.Error;
+               public virtual void fill_async (ssize_t count, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
+               public virtual ssize_t fill_finish (GLib.AsyncResult _result) throws GLib.Error;
+               public size_t get_available ();
+               public size_t get_buffer_size ();
                [CCode (type = "GInputStream*", has_construct_function = false)]
                public BufferedInputStream (GLib.InputStream base_stream);
-               public ulong peek (void* buffer, ulong offset, ulong count);
-               public void* peek_buffer (ulong count);
+               public size_t peek (void* buffer, size_t offset, size_t count);
+               public void* peek_buffer (size_t count);
                public int read_byte (GLib.Cancellable? cancellable) throws GLib.Error;
-               public void set_buffer_size (ulong size);
+               public void set_buffer_size (size_t size);
                [CCode (type = "GInputStream*", has_construct_function = false)]
-               public BufferedInputStream.sized (GLib.InputStream base_stream, ulong size);
+               public BufferedInputStream.sized (GLib.InputStream base_stream, size_t size);
                public uint buffer_size { get; set construct; }
        }
        [CCode (cheader_filename = "gio/gio.h")]
        public class BufferedOutputStream : GLib.FilterOutputStream {
                public bool get_auto_grow ();
-               public ulong get_buffer_size ();
+               public size_t get_buffer_size ();
                [CCode (type = "GOutputStream*", has_construct_function = false)]
                public BufferedOutputStream (GLib.OutputStream base_stream);
                public void set_auto_grow (bool auto_grow);
-               public void set_buffer_size (ulong size);
+               public void set_buffer_size (size_t size);
                [CCode (type = "GOutputStream*", has_construct_function = false)]
-               public BufferedOutputStream.sized (GLib.OutputStream base_stream, ulong size);
+               public BufferedOutputStream.sized (GLib.OutputStream base_stream, size_t size);
                public bool auto_grow { get; set; }
                public uint buffer_size { get; set construct; }
        }
@@ -64,11 +64,11 @@ namespace GLib {
                public short read_int16 (GLib.Cancellable? cancellable) throws GLib.Error;
                public int read_int32 (GLib.Cancellable? cancellable) throws GLib.Error;
                public int64 read_int64 (GLib.Cancellable? cancellable) throws GLib.Error;
-               public weak string read_line (out ulong length, GLib.Cancellable? cancellable) throws GLib.Error;
+               public weak string read_line (out size_t length, GLib.Cancellable? cancellable) throws GLib.Error;
                public ushort read_uint16 (GLib.Cancellable? cancellable) throws GLib.Error;
                public uint read_uint32 (GLib.Cancellable? cancellable) throws GLib.Error;
                public uint64 read_uint64 (GLib.Cancellable? cancellable) throws GLib.Error;
-               public weak string read_until (string stop_chars, out ulong length, GLib.Cancellable? cancellable) throws GLib.Error;
+               public weak string read_until (string stop_chars, out size_t length, GLib.Cancellable? cancellable) throws GLib.Error;
                public void set_byte_order (GLib.DataStreamByteOrder order);
                public void set_newline_type (GLib.DataStreamNewlineType type);
                public GLib.DataStreamByteOrder byte_order { get; set; }
@@ -315,32 +315,32 @@ namespace GLib {
                public virtual bool close_fn (GLib.Cancellable? cancellable) throws GLib.Error;
                public bool has_pending ();
                public bool is_closed ();
-               public long read (void* buffer, ulong count, GLib.Cancellable? cancellable) throws GLib.Error;
-               public bool read_all (void* buffer, ulong count, out ulong bytes_read, GLib.Cancellable? cancellable) throws GLib.Error;
-               public virtual void read_async (void* buffer, ulong count, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
-               public virtual long read_finish (GLib.AsyncResult _result) throws GLib.Error;
+               public ssize_t read (void* buffer, size_t count, GLib.Cancellable? cancellable) throws GLib.Error;
+               public bool read_all (void* buffer, size_t count, out size_t bytes_read, GLib.Cancellable? cancellable) throws GLib.Error;
+               public virtual void read_async (void* buffer, size_t count, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
+               public virtual ssize_t read_finish (GLib.AsyncResult _result) throws GLib.Error;
                [NoWrapper]
-               public virtual long read_fn (void* buffer, ulong count, GLib.Cancellable? cancellable) throws GLib.Error;
+               public virtual ssize_t read_fn (void* buffer, size_t count, GLib.Cancellable? cancellable) throws GLib.Error;
                public bool set_pending () throws GLib.Error;
-               public virtual long skip (ulong count, GLib.Cancellable? cancellable) throws GLib.Error;
-               public virtual void skip_async (ulong count, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
-               public virtual long skip_finish (GLib.AsyncResult _result) throws GLib.Error;
+               public virtual ssize_t skip (size_t count, GLib.Cancellable? cancellable) throws GLib.Error;
+               public virtual void skip_async (size_t count, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
+               public virtual ssize_t skip_finish (GLib.AsyncResult _result) throws GLib.Error;
        }
        [CCode (cheader_filename = "gio/gio.h")]
        public class MemoryInputStream : GLib.InputStream, GLib.Seekable {
-               public void add_data (void* data, long len, GLib.DestroyNotify? destroy);
+               public void add_data (void* data, ssize_t len, GLib.DestroyNotify? destroy);
                [CCode (type = "GInputStream*", has_construct_function = false)]
-               public MemoryInputStream.from_data (void* data, long len, GLib.DestroyNotify? destroy);
+               public MemoryInputStream.from_data (void* data, ssize_t len, GLib.DestroyNotify? destroy);
                [CCode (type = "GInputStream*", has_construct_function = false)]
                public MemoryInputStream ();
        }
        [CCode (cheader_filename = "gio/gio.h")]
        public class MemoryOutputStream : GLib.OutputStream, GLib.Seekable {
                public void* get_data ();
-               public ulong get_data_size ();
-               public ulong get_size ();
+               public size_t get_data_size ();
+               public size_t get_size ();
                [CCode (type = "GOutputStream*", has_construct_function = false)]
-               public MemoryOutputStream (void* data, ulong len, GLib.ReallocFunc realloc_fn, GLib.DestroyNotify? destroy);
+               public MemoryOutputStream (void* data, size_t len, GLib.ReallocFunc realloc_fn, GLib.DestroyNotify? destroy);
        }
        [CCode (cheader_filename = "gio/gio.h")]
        public class MountOperation : GLib.Object {
@@ -388,15 +388,15 @@ namespace GLib {
                public bool has_pending ();
                public bool is_closed ();
                public bool set_pending () throws GLib.Error;
-               public virtual long splice (GLib.InputStream source, GLib.OutputStreamSpliceFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
+               public virtual ssize_t splice (GLib.InputStream source, GLib.OutputStreamSpliceFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
                public virtual void splice_async (GLib.InputStream source, GLib.OutputStreamSpliceFlags flags, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
-               public virtual long splice_finish (GLib.AsyncResult _result) throws GLib.Error;
-               public long write (void* buffer, ulong count, GLib.Cancellable? cancellable) throws GLib.Error;
-               public bool write_all (void* buffer, ulong count, out ulong bytes_written, GLib.Cancellable? cancellable) throws GLib.Error;
-               public virtual void write_async (void* buffer, ulong count, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
-               public virtual long write_finish (GLib.AsyncResult _result) throws GLib.Error;
+               public virtual ssize_t splice_finish (GLib.AsyncResult _result) throws GLib.Error;
+               public ssize_t write (void* buffer, size_t count, GLib.Cancellable? cancellable) throws GLib.Error;
+               public bool write_all (void* buffer, size_t count, out size_t bytes_written, GLib.Cancellable? cancellable) throws GLib.Error;
+               public virtual void write_async (void* buffer, size_t count, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
+               public virtual ssize_t write_finish (GLib.AsyncResult _result) throws GLib.Error;
                [NoWrapper]
-               public virtual long write_fn (void* buffer, ulong count, GLib.Cancellable? cancellable) throws GLib.Error;
+               public virtual ssize_t write_fn (void* buffer, size_t count, GLib.Cancellable? cancellable) throws GLib.Error;
        }
        [CCode (cheader_filename = "gio/gio.h")]
        public class SimpleAsyncResult : GLib.Object, GLib.AsyncResult {
@@ -408,7 +408,7 @@ namespace GLib {
                public SimpleAsyncResult.from_error (GLib.Object source_object, GLib.AsyncReadyCallback callback, GLib.Error error);
                public bool get_op_res_gboolean ();
                public void* get_op_res_gpointer ();
-               public long get_op_res_gssize ();
+               public ssize_t get_op_res_gssize ();
                public void* get_source_tag ();
                [CCode (has_construct_function = false)]
                public SimpleAsyncResult (GLib.Object source_object, GLib.AsyncReadyCallback callback, void* source_tag);
@@ -420,7 +420,7 @@ namespace GLib {
                public void set_handle_cancellation (bool handle_cancellation);
                public void set_op_res_gboolean (bool op_res);
                public void set_op_res_gpointer (void* op_res, GLib.DestroyNotify destroy_op_res);
-               public void set_op_res_gssize (long op_res);
+               public void set_op_res_gssize (ssize_t op_res);
        }
        [Compact]
        [CCode (cheader_filename = "gio/gio.h")]
@@ -571,11 +571,11 @@ namespace GLib {
                public abstract bool has_uri_scheme (string uri_scheme);
                public abstract uint hash (void* file);
                public abstract bool is_native ();
-               public bool load_contents (GLib.Cancellable? cancellable, out weak string contents, out ulong length, out weak string etag_out) throws GLib.Error;
+               public bool load_contents (GLib.Cancellable? cancellable, out weak string contents, out size_t length, out weak string etag_out) throws GLib.Error;
                public void load_contents_async (GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
-               public bool load_contents_finish (GLib.AsyncResult res, out weak string contents, out ulong length, out weak string etag_out) throws GLib.Error;
+               public bool load_contents_finish (GLib.AsyncResult res, out weak string contents, out size_t length, out weak string etag_out) throws GLib.Error;
                public void load_partial_contents_async (GLib.Cancellable? cancellable, GLib.FileReadMoreCallback read_more_callback, GLib.AsyncReadyCallback callback);
-               public bool load_partial_contents_finish (GLib.AsyncResult res, out weak string contents, ulong length, out weak string etag_out) throws GLib.Error;
+               public bool load_partial_contents_finish (GLib.AsyncResult res, out weak string contents, size_t length, out weak string etag_out) throws GLib.Error;
                public abstract bool make_directory (GLib.Cancellable? cancellable) throws GLib.Error;
                public bool make_directory_with_parents (GLib.Cancellable? cancellable) throws GLib.Error;
                public abstract bool make_symbolic_link (string symlink_value, GLib.Cancellable? cancellable) throws GLib.Error;
@@ -612,8 +612,8 @@ namespace GLib {
                public abstract weak GLib.FileInputStream read_fn (GLib.Cancellable? cancellable) throws GLib.Error;
                public abstract GLib.FileOutputStream replace (string? etag, bool make_backup, GLib.FileCreateFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
                public abstract void replace_async (string? etag, bool make_backup, GLib.FileCreateFlags flags, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
-               public bool replace_contents (string contents, ulong length, string? etag, bool make_backup, GLib.FileCreateFlags flags, out weak string new_etag, GLib.Cancellable? cancellable) throws GLib.Error;
-               public void replace_contents_async (string contents, ulong length, string? etag, bool make_backup, GLib.FileCreateFlags flags, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
+               public bool replace_contents (string contents, size_t length, string? etag, bool make_backup, GLib.FileCreateFlags flags, out weak string new_etag, GLib.Cancellable? cancellable) throws GLib.Error;
+               public void replace_contents_async (string contents, size_t length, string? etag, bool make_backup, GLib.FileCreateFlags flags, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
                public bool replace_contents_finish (GLib.AsyncResult res, out weak string new_etag) throws GLib.Error;
                public abstract GLib.FileOutputStream replace_finish (GLib.AsyncResult res) throws GLib.Error;
                public abstract GLib.File resolve_relative_path (string relative_path);
@@ -875,7 +875,7 @@ namespace GLib {
        [CCode (cheader_filename = "gio/gio.h")]
        public delegate bool IOSchedulerJobFunc (GLib.IOSchedulerJob job, GLib.Cancellable cancellable);
        [CCode (cheader_filename = "gio/gio.h")]
-       public static delegate void* ReallocFunc (void* data, ulong size);
+       public static delegate void* ReallocFunc (void* data, size_t size);
        [CCode (cheader_filename = "gio/gio.h")]
        public static delegate void SimpleAsyncThreadFunc (GLib.SimpleAsyncResult res, GLib.Object object, GLib.Cancellable cancellable);
        [CCode (cheader_filename = "gio/gio.h")]

diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index 629fb8d4b5c3000163dc8f64812f67db804b07e9..408231ddd85bd88fcdc9a45b7ffb8517b649509a 100644 (file)
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -412,7 +412,7 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Builder : GLib.Object {
                public uint add_from_file (string filename) throws GLib.Error;
-               public uint add_from_string (string buffer, ulong length) throws GLib.Error;
+               public uint add_from_string (string buffer, size_t length) throws GLib.Error;
                public void connect_signals (void* user_data);
                public void connect_signals_full (Gtk.BuilderConnectFunc func);
                public static GLib.Quark error_quark ();
@@ -878,7 +878,7 @@ namespace Gtk {
                public void store ();
                public weak Gtk.SelectionData wait_for_contents (Gdk.Atom target);
                public weak Gdk.Pixbuf wait_for_image ();
-               public uchar wait_for_rich_text (Gtk.TextBuffer buffer, out Gdk.Atom format, ulong length);
+               public uchar wait_for_rich_text (Gtk.TextBuffer buffer, out Gdk.Atom format, size_t length);
                public bool wait_for_targets (Gdk.Atom[] targets);
                public weak string wait_for_text ();
                public bool wait_is_image_available ();
@@ -2980,10 +2980,10 @@ namespace Gtk {
                public ulong get_added ();
                public int get_age ();
                public bool get_application_info (string app_name, string app_exec, uint count, ulong time_);
-               public weak string get_applications (ulong length);
+               public weak string get_applications (size_t length);
                public weak string get_description ();
                public weak string get_display_name ();
-               public weak string get_groups (ulong length);
+               public weak string get_groups (size_t length);
                public weak Gdk.Pixbuf get_icon (int size);
                public weak string get_mime_type ();
                public ulong get_modified ();
@@ -3747,7 +3747,7 @@ namespace Gtk {
                public void delete_mark (Gtk.TextMark mark);
                public void delete_mark_by_name (string name);
                public bool delete_selection (bool interactive, bool default_editable);
-               public bool deserialize (Gtk.TextBuffer content_buffer, Gdk.Atom format, Gtk.TextIter iter, uchar data, ulong length) throws GLib.Error;
+               public bool deserialize (Gtk.TextBuffer content_buffer, Gdk.Atom format, Gtk.TextIter iter, uchar data, size_t length) throws GLib.Error;
                public bool deserialize_get_can_create_tags (Gdk.Atom format);
                public void deserialize_set_can_create_tags (Gdk.Atom format, bool can_create_tags);
                public void get_bounds (out Gtk.TextIter start, out Gtk.TextIter end);
@@ -3796,7 +3796,7 @@ namespace Gtk {
                public void remove_selection_clipboard (Gtk.Clipboard clipboard);
                public void remove_tag_by_name (string name, Gtk.TextIter start, Gtk.TextIter end);
                public void select_range (Gtk.TextIter ins, Gtk.TextIter bound);
-               public uchar serialize (Gtk.TextBuffer content_buffer, Gdk.Atom format, Gtk.TextIter start, Gtk.TextIter end, ulong length);
+               public uchar serialize (Gtk.TextBuffer content_buffer, Gdk.Atom format, Gtk.TextIter start, Gtk.TextIter end, size_t length);
                public void set_modified (bool setting);
                public void set_text (string text, int len);
                public void unregister_deserialize_format (Gdk.Atom format);
@@ -4712,7 +4712,7 @@ namespace Gtk {
        public class UIManager : GLib.Object, Gtk.Buildable {
                public void add_ui (uint merge_id, string path, string name, string action, Gtk.UIManagerItemType type, bool top);
                public uint add_ui_from_file (string filename) throws GLib.Error;
-               public uint add_ui_from_string (string buffer, long length) throws GLib.Error;
+               public uint add_ui_from_string (string buffer, ssize_t length) throws GLib.Error;
                public void ensure_update ();
                public weak Gtk.AccelGroup get_accel_group ();
                public virtual weak Gtk.Action get_action (string path);
@@ -5403,7 +5403,7 @@ namespace Gtk {
                public bool get_show_private ();
                public bool get_show_tips ();
                public Gtk.RecentSortType get_sort_type ();
-               public weak string get_uris (ulong length);
+               public weak string get_uris (size_t length);
                public abstract weak GLib.SList list_filters ();
                public abstract void remove_filter (Gtk.RecentFilter filter);
                public abstract void select_all ();
@@ -6645,7 +6645,7 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public delegate void ClipboardReceivedFunc (Gtk.Clipboard clipboard, Gtk.SelectionData selection_data);
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public delegate void ClipboardRichTextReceivedFunc (Gtk.Clipboard clipboard, Gdk.Atom format, uchar text, ulong length);
+       public delegate void ClipboardRichTextReceivedFunc (Gtk.Clipboard clipboard, Gdk.Atom format, uchar text, size_t length);
        [CCode (cheader_filename = "gtk/gtk.h")]
        public delegate void ClipboardTargetsReceivedFunc (Gtk.Clipboard clipboard, out Gdk.Atom atoms, int n_atoms);
        [CCode (cheader_filename = "gtk/gtk.h")]
@@ -6693,9 +6693,9 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static delegate void SignalFunc ();
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public static delegate bool TextBufferDeserializeFunc (Gtk.TextBuffer register_buffer, Gtk.TextBuffer content_buffer, Gtk.TextIter iter, uchar data, ulong length, bool create_tags, void* user_data, GLib.Error error);
+       public static delegate bool TextBufferDeserializeFunc (Gtk.TextBuffer register_buffer, Gtk.TextBuffer content_buffer, Gtk.TextIter iter, uchar data, size_t length, bool create_tags, void* user_data, GLib.Error error);
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public delegate uchar TextBufferSerializeFunc (Gtk.TextBuffer register_buffer, Gtk.TextBuffer content_buffer, Gtk.TextIter start, Gtk.TextIter end, ulong length);
+       public delegate uchar TextBufferSerializeFunc (Gtk.TextBuffer register_buffer, Gtk.TextBuffer content_buffer, Gtk.TextIter start, Gtk.TextIter end, size_t length);
        [CCode (cheader_filename = "gtk/gtk.h")]
        public delegate bool TextCharPredicate (unichar ch);
        [CCode (cheader_filename = "gtk/gtk.h")]

diff --git a/vapi/pango.vapi b/vapi/pango.vapi
index 52469894ec786d4a49a4dad1bf524ab1568a6fe5..34bf8c276b563da7ade80256b8fe093237f3f785 100644 (file)
--- a/vapi/pango.vapi
+++ b/vapi/pango.vapi
@@ -321,7 +321,6 @@ namespace Pango {
                public weak string get_sample_string ();
                public bool includes_script (Pango.Script script);
                public bool matches (string range_list);
-               public Language ();
                public weak string to_string ();
        }
        [CCode (cheader_filename = "pango/pango.h")]

diff --git a/vapigen/valagidlparser.vala b/vapigen/valagidlparser.vala
index c7d8fbb7c141e93fbf2ec69f1557244ea666d489..8fe811d5e4b3ae66f8ee07bf53f2aa40302836e1 100644 (file)
--- a/vapigen/valagidlparser.vala
+++ b/vapigen/valagidlparser.vala
@@ -1068,9 +1068,9 @@ public class Vala.GIdlParser : CodeVisitor {
                } else if (type_node.tag == TypeTag.ULONG) {
                        type.unresolved_symbol = new UnresolvedSymbol (null, "ulong");
                } else if (type_node.tag == TypeTag.SSIZE) {
-                       type.unresolved_symbol = new UnresolvedSymbol (null, "long");
+                       type.unresolved_symbol = new UnresolvedSymbol (null, "ssize_t");
                } else if (type_node.tag == TypeTag.SIZE) {
-                       type.unresolved_symbol = new UnresolvedSymbol (null, "ulong");
+                       type.unresolved_symbol = new UnresolvedSymbol (null, "size_t");
                } else if (type_node.tag == TypeTag.FLOAT) {
                        type.unresolved_symbol = new UnresolvedSymbol (null, "float");
                } else if (type_node.tag == TypeTag.DOUBLE) {