From: Juerg Billeter Date: Thu, 17 Jan 2008 14:52:28 +0000 (+0000) Subject: remove outdated type name heuristics, fixes bug 509597 X-Git-Tag: VALA_0_1_6~25 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e203384e3f42e064be6278821458fadc8f37d784;p=platform%2Fupstream%2Fvala.git remove outdated type name heuristics, fixes bug 509597 2008-01-17 Juerg Billeter * vapigen/valagidlparser.vala: remove outdated type name heuristics, fixes bug 509597 * vapi/packages/gdk-2.0/, vapi/packages/gstreamer-0.10/, vapi/packages/gtk+-2.0/, vapi/packages/libgnome-2.0/: fix type names in metadata * vapi/atk.vapi, vapi/gdk-2.0.vapi, vapi/gio-2.0.vapi, vapi/gnome-vfs-2.0.vapi, vapi/gstreamer-0.10.vapi, vapi/libgnomeui-2.0.vapi, vapi/libsoup-2.2.vapi, vapi/pango.vapi: regenerated svn path=/trunk/; revision=842 --- diff --git a/ChangeLog b/ChangeLog index fd6a3c9..8a70c3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,19 @@ 2008-01-17 Jürg Billeter + * vapigen/valagidlparser.vala: remove outdated type name heuristics, + fixes bug 509597 + + * vapi/packages/gdk-2.0/, vapi/packages/gstreamer-0.10/, + vapi/packages/gtk+-2.0/, vapi/packages/libgnome-2.0/: fix type names + in metadata + + * vapi/atk.vapi, vapi/gdk-2.0.vapi, vapi/gio-2.0.vapi, + vapi/gnome-vfs-2.0.vapi, vapi/gstreamer-0.10.vapi, + vapi/libgnomeui-2.0.vapi, vapi/libsoup-2.2.vapi, vapi/pango.vapi: + regenerated + +2008-01-17 Jürg Billeter + * gobject/valaccodegeneratorsignal.vala: fix gcc warning for signals with string parameters, fixes bug 509177 diff --git a/vapi/atk.vapi b/vapi/atk.vapi index c8e302a..d32bd89 100644 --- a/vapi/atk.vapi +++ b/vapi/atk.vapi @@ -323,7 +323,7 @@ namespace Atk { public Atk.Layer layer; public bool add_relationship (Atk.RelationType relationship, Atk.Object target); public virtual uint connect_property_change_handler (Atk.PropertyChangeHandler handler); - public virtual weak GLib.SList get_attributes (); + public virtual weak Atk.AttributeSet get_attributes (); public virtual weak string get_description (); public virtual int get_index_in_parent (); public virtual Atk.Layer get_layer (); @@ -472,7 +472,7 @@ namespace Atk { [CCode (cheader_filename = "atk/atk.h")] public interface Document { public weak string get_attribute_value (string attribute_name); - public weak GLib.SList get_attributes (); + public weak Atk.AttributeSet get_attributes (); public abstract pointer get_document (); public abstract weak string get_document_type (); public weak string get_locale (); @@ -488,7 +488,7 @@ namespace Atk { public abstract void delete_text (int start_pos, int end_pos); public abstract void insert_text (string string, int length, int position); public abstract void paste_text (int position); - public abstract bool set_run_attributes (GLib.SList attrib_set, int start_offset, int end_offset); + public abstract bool set_run_attributes (Atk.AttributeSet attrib_set, int start_offset, int end_offset); public abstract void set_text_contents (string string); } [CCode (cheader_filename = "atk/atk.h")] @@ -584,11 +584,11 @@ namespace Atk { public abstract unichar get_character_at_offset (int offset); public abstract int get_character_count (); public abstract void get_character_extents (int offset, int x, int y, int width, int height, Atk.CoordType coords); - public abstract weak GLib.SList get_default_attributes (); + public abstract weak Atk.AttributeSet get_default_attributes (); public abstract int get_n_selections (); public abstract int get_offset_at_point (int x, int y, Atk.CoordType coords); public abstract void get_range_extents (int start_offset, int end_offset, Atk.CoordType coord_type, Atk.TextRectangle rect); - public abstract weak GLib.SList get_run_attributes (int offset, int start_offset, int end_offset); + public abstract weak Atk.AttributeSet get_run_attributes (int offset, int start_offset, int end_offset); public abstract weak string get_selection (int selection_num, int start_offset, int end_offset); public abstract weak string get_text (int start_offset, int end_offset); public abstract weak string get_text_after_offset (int offset, Atk.TextBoundary boundary_type, int start_offset, int end_offset); diff --git a/vapi/gdk-2.0.vapi b/vapi/gdk-2.0.vapi index 4c49705..eeded8b 100644 --- a/vapi/gdk-2.0.vapi +++ b/vapi/gdk-2.0.vapi @@ -739,7 +739,7 @@ namespace Gdk { public Gdk.EventType type; public weak Gdk.Window window; public char send_event; - public pointer owner; + public weak Gdk.NativeWindow owner; public Gdk.OwnerChange reason; public Gdk.Atom selection; public uint time; @@ -785,7 +785,7 @@ namespace Gdk { public Gdk.Atom target; public Gdk.Atom property; public uint time; - public pointer requestor; + public weak Gdk.NativeWindow requestor; } [CCode (cheader_filename = "gdk/gdk.h")] public class EventSetting { @@ -905,16 +905,6 @@ namespace Gdk { public weak GLib.String to_csource (string name, Gdk.PixdataDumpType dump_type); } [CCode (cheader_filename = "gdk/gdk.h")] - public class PixmapObject { - public weak Gdk.Drawable parent_instance; - public weak Gdk.Drawable impl; - public int depth; - } - [CCode (cheader_filename = "gdk/gdk.h")] - public class PixmapObjectClass { - public pointer parent_class; - } - [CCode (cheader_filename = "gdk/gdk.h")] public class Point { public int x; public int y; @@ -989,41 +979,6 @@ namespace Gdk { public class WChar { } [CCode (cheader_filename = "gdk/gdk.h")] - public class WindowObject { - public weak Gdk.Drawable parent_instance; - public weak Gdk.Drawable impl; - public weak Gdk.WindowObject parent; - public pointer user_data; - public int x; - public int y; - public int extension_events; - public weak GLib.List filters; - public weak GLib.List children; - public Gdk.Color bg_color; - public weak Gdk.Pixmap bg_pixmap; - public weak GLib.SList paint_stack; - public weak Gdk.Region update_area; - public uint update_freeze_count; - public uchar window_type; - public uchar depth; - public uchar resize_count; - public Gdk.WindowState state; - public uint guffaw_gravity; - public uint input_only; - public uint modal_hint; - public uint composited; - public uint destroyed; - public uint accept_focus; - public uint focus_on_map; - public uint shaped; - public Gdk.EventMask event_mask; - public uint update_and_descendants_freeze_count; - } - [CCode (cheader_filename = "gdk/gdk.h")] - public class WindowObjectClass { - public pointer parent_class; - } - [CCode (cheader_filename = "gdk/gdk.h")] public class XEvent { } [CCode (ref_function = "gdk_cursor_ref", unref_function = "gdk_cursor_unref", cheader_filename = "gdk/gdk.h")] @@ -1075,8 +1030,8 @@ namespace Gdk { public static weak Gdk.Event peek (); public void put (); public static void request_motions (Gdk.EventMotion event); - public bool send_client_message (pointer winid); - public static bool send_client_message_for_display (Gdk.Display display, Gdk.Event event, pointer winid); + public bool send_client_message (Gdk.NativeWindow winid); + public static bool send_client_message_for_display (Gdk.Display display, Gdk.Event event, Gdk.NativeWindow winid); public void send_clientmessage_toall (); public void set_screen (Gdk.Screen screen); } @@ -1095,7 +1050,7 @@ namespace Gdk { public static weak Gdk.Colormap get_system (); public weak Gdk.Visual get_visual (); public Colormap (Gdk.Visual visual, bool allocate); - public void query_color (ulong pixel, out Gdk.Color result); + public void query_color (ulong pixel, out Gdk.Color _result); } [CCode (cheader_filename = "gdk/gdk.h")] public class Device : GLib.Object { @@ -1408,11 +1363,11 @@ namespace Gdk { public static weak Gdk.Pixmap create_from_data (Gdk.Drawable drawable, string data, int width, int height, int depth, Gdk.Color fg, Gdk.Color bg); public static weak Gdk.Pixmap create_from_xpm (Gdk.Drawable drawable, out weak Gdk.Bitmap mask, Gdk.Color transparent_color, string filename); public static weak Gdk.Pixmap create_from_xpm_d (Gdk.Drawable drawable, out weak Gdk.Bitmap mask, Gdk.Color transparent_color, string data); - public static weak Gdk.Pixmap foreign_new (pointer anid); - public static weak Gdk.Pixmap foreign_new_for_display (Gdk.Display display, pointer anid); - public static weak Gdk.Pixmap foreign_new_for_screen (Gdk.Screen screen, pointer anid, int width, int height, int depth); - public static weak Gdk.Pixmap lookup (pointer anid); - public static weak Gdk.Pixmap lookup_for_display (Gdk.Display display, pointer anid); + public static weak Gdk.Pixmap foreign_new (Gdk.NativeWindow anid); + public static weak Gdk.Pixmap foreign_new_for_display (Gdk.Display display, Gdk.NativeWindow anid); + public static weak Gdk.Pixmap foreign_new_for_screen (Gdk.Screen screen, Gdk.NativeWindow anid, int width, int height, int depth); + public static weak Gdk.Pixmap lookup (Gdk.NativeWindow anid); + public static weak Gdk.Pixmap lookup_for_display (Gdk.Display display, Gdk.NativeWindow anid); public Pixmap (Gdk.Drawable drawable, int width, int height, int depth); } [CCode (cheader_filename = "gdk/gdk.h")] @@ -1506,8 +1461,8 @@ namespace Gdk { public void enable_synchronized_configure (); public void end_paint (); public void focus (uint timestamp); - public static weak Gdk.Window foreign_new (pointer anid); - public static weak Gdk.Window foreign_new_for_display (Gdk.Display display, pointer anid); + public static weak Gdk.Window foreign_new (Gdk.NativeWindow anid); + public static weak Gdk.Window foreign_new_for_display (Gdk.Display display, Gdk.NativeWindow anid); public void freeze_toplevel_updates_libgtk_only (); public void freeze_updates (); public void fullscreen (); @@ -1539,8 +1494,8 @@ namespace Gdk { public void invalidate_region (Gdk.Region region, bool invalidate_children); public bool is_viewable (); public bool is_visible (); - public static weak Gdk.Window lookup (pointer anid); - public static weak Gdk.Window lookup_for_display (Gdk.Display display, pointer anid); + public static weak Gdk.Window lookup (Gdk.NativeWindow anid); + public static weak Gdk.Window lookup_for_display (Gdk.Display display, Gdk.NativeWindow anid); public void lower (); public void maximize (); public void merge_child_input_shapes (); @@ -1617,7 +1572,7 @@ namespace Gdk { public int y; public int width; public int height; - public pointer wclass; + public Gdk.WindowClass wclass; public weak Gdk.Visual visual; public weak Gdk.Colormap colormap; public Gdk.WindowType window_type; @@ -1651,7 +1606,7 @@ namespace Gdk { } public static delegate void DestroyNotify (pointer data); public static delegate void EventFunc (Gdk.Event event, pointer data); - public static delegate Gdk.FilterReturn FilterFunc (pointer xevent, Gdk.Event event, pointer data); + public static delegate Gdk.FilterReturn FilterFunc (Gdk.XEvent xevent, Gdk.Event event, pointer data); public static delegate void InputFunction (pointer data, int source, Gdk.InputCondition condition); public static delegate void PixbufDestroyNotify (uchar[] pixels, pointer data); public static delegate bool PixbufSaveFunc (string buf, ulong count, GLib.Error error, pointer data); diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi index 76fb5e0..3342a15 100644 --- a/vapi/gio-2.0.vapi +++ b/vapi/gio-2.0.vapi @@ -210,7 +210,7 @@ namespace GLib { 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, pointer user_data); - public virtual long fill_finish (GLib.AsyncResult result) throws GLib.Error; + public virtual long fill_finish (GLib.AsyncResult _result) throws GLib.Error; public ulong get_available (); public ulong get_buffer_size (); public BufferedInputStream (GLib.InputStream base_stream); @@ -283,12 +283,12 @@ namespace GLib { public class FileEnumerator : GLib.Object { public bool close (GLib.Cancellable cancellable) throws GLib.Error; public virtual void close_async (int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data); - public virtual bool close_finish (GLib.AsyncResult result) throws GLib.Error; + public virtual bool close_finish (GLib.AsyncResult _result) throws GLib.Error; public bool has_pending (); public bool is_closed (); public virtual weak GLib.FileInfo next_file (GLib.Cancellable cancellable) throws GLib.Error; public virtual void next_files_async (int num_files, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data); - public virtual weak GLib.List next_files_finish (GLib.AsyncResult result) throws GLib.Error; + public virtual weak GLib.List next_files_finish (GLib.AsyncResult _result) throws GLib.Error; public void set_pending (bool pending); } [CCode (cheader_filename = "gio/gio.h")] @@ -322,7 +322,7 @@ namespace GLib { public bool get_is_backup (); public bool get_is_hidden (); public bool get_is_symlink (); - public void get_modification_time (GLib.TimeVal result); + public void get_modification_time (GLib.TimeVal _result); public weak string get_name (); public int64 get_size (); public int get_sort_order (); @@ -360,7 +360,7 @@ namespace GLib { public virtual bool can_seek (); public virtual weak GLib.FileInfo query_info (string attributes, GLib.Cancellable cancellable) throws GLib.Error; public virtual void query_info_async (string attributes, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data); - public virtual weak GLib.FileInfo query_info_finish (GLib.AsyncResult result) throws GLib.Error; + public virtual weak GLib.FileInfo query_info_finish (GLib.AsyncResult _result) throws GLib.Error; public virtual bool seek (int64 offset, GLib.SeekType type, GLib.Cancellable cancellable) throws GLib.Error; public virtual int64 tell (); } @@ -385,7 +385,7 @@ namespace GLib { public virtual weak string get_etag (); public virtual weak GLib.FileInfo query_info (string attributes, GLib.Cancellable cancellable) throws GLib.Error; public virtual void query_info_async (string attributes, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data); - public virtual weak GLib.FileInfo query_info_finish (GLib.AsyncResult result) throws GLib.Error; + public virtual weak GLib.FileInfo query_info_finish (GLib.AsyncResult _result) throws GLib.Error; public virtual bool seek (int64 offset, GLib.SeekType type, GLib.Cancellable cancellable) throws GLib.Error; public virtual int64 tell (); public bool truncate (int64 size, GLib.Cancellable cancellable) throws GLib.Error; @@ -421,17 +421,17 @@ namespace GLib { public void clear_pending (); public bool close (GLib.Cancellable cancellable) throws GLib.Error; public virtual void close_async (int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data); - public virtual bool close_finish (GLib.AsyncResult result) throws GLib.Error; + public virtual bool close_finish (GLib.AsyncResult _result) throws GLib.Error; public bool has_pending (); public bool is_closed (); public long read (pointer buffer, ulong count, GLib.Cancellable cancellable) throws GLib.Error; public bool read_all (pointer buffer, ulong count, ulong bytes_read, GLib.Cancellable cancellable) throws GLib.Error; public virtual void read_async (pointer buffer, ulong count, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data); - public virtual long read_finish (GLib.AsyncResult result) throws GLib.Error; + public virtual long read_finish (GLib.AsyncResult _result) 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, pointer user_data); - public virtual long skip_finish (GLib.AsyncResult result) throws GLib.Error; + public virtual long skip_finish (GLib.AsyncResult _result) throws GLib.Error; } [CCode (cheader_filename = "gio/gio.h")] public class MemoryInputStream : GLib.InputStream, GLib.Seekable { @@ -479,20 +479,20 @@ namespace GLib { public void clear_pending (); public bool close (GLib.Cancellable cancellable) throws GLib.Error; public virtual void close_async (int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data); - public virtual bool close_finish (GLib.AsyncResult result) throws GLib.Error; + public virtual bool close_finish (GLib.AsyncResult _result) throws GLib.Error; public virtual bool flush (GLib.Cancellable cancellable) throws GLib.Error; public virtual void flush_async (int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data); - public virtual bool flush_finish (GLib.AsyncResult result) throws GLib.Error; + public virtual bool flush_finish (GLib.AsyncResult _result) throws GLib.Error; public bool has_pending (); public bool is_closed (); public bool set_pending () throws GLib.Error; public virtual long splice (GLib.InputStream source, GLib.OutputStreamSpliceFlags flags, GLib.Cancellable cancellable) throws GLib.Error; public virtual void splice_async (GLib.InputStream source, GLib.OutputStreamSpliceFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data); - public virtual long splice_finish (GLib.AsyncResult result) throws GLib.Error; + public virtual long splice_finish (GLib.AsyncResult _result) throws GLib.Error; public long write (pointer buffer, ulong count, GLib.Cancellable cancellable) throws GLib.Error; public bool write_all (pointer buffer, ulong count, ulong bytes_written, GLib.Cancellable cancellable) throws GLib.Error; public virtual void write_async (pointer buffer, ulong count, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data); - public virtual long write_finish (GLib.AsyncResult result) throws GLib.Error; + public virtual long write_finish (GLib.AsyncResult _result) throws GLib.Error; } [CCode (cheader_filename = "gio/gio.h")] public class SimpleAsyncResult : GLib.Object, GLib.AsyncResult { @@ -587,7 +587,7 @@ namespace GLib { public abstract bool can_eject (); public abstract bool can_poll_for_media (); public abstract void eject (GLib.MountUnmountFlags flags, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data); - public abstract bool eject_finish (GLib.AsyncResult result) throws GLib.Error; + public abstract bool eject_finish (GLib.AsyncResult _result) throws GLib.Error; public abstract weak GLib.Icon get_icon (); public abstract weak string get_name (); public abstract weak GLib.List get_volumes (); @@ -596,7 +596,7 @@ namespace GLib { public abstract bool is_media_check_automatic (); public abstract bool is_media_removable (); public abstract void poll_for_media (GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data); - public abstract bool poll_for_media_finish (GLib.AsyncResult result) throws GLib.Error; + public abstract bool poll_for_media_finish (GLib.AsyncResult _result) throws GLib.Error; public signal void changed (); public signal void disconnected (); public signal void eject_button (); @@ -615,7 +615,7 @@ namespace GLib { public bool delete (GLib.Cancellable cancellable) throws GLib.Error; public abstract weak GLib.File dup (); public abstract void eject_mountable (GLib.MountUnmountFlags flags, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data); - public abstract bool eject_mountable_finish (GLib.AsyncResult result) throws GLib.Error; + public abstract bool eject_mountable_finish (GLib.AsyncResult _result) throws GLib.Error; public abstract weak GLib.FileEnumerator enumerate_children (string attributes, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error; public abstract void enumerate_children_async (string attributes, GLib.FileQueryInfoFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data); public abstract weak GLib.FileEnumerator enumerate_children_finish (GLib.AsyncResult res) throws GLib.Error; @@ -641,9 +641,9 @@ namespace GLib { public abstract bool make_directory (GLib.Cancellable cancellable) throws GLib.Error; public abstract bool make_symbolic_link (string symlink_value, GLib.Cancellable cancellable) throws GLib.Error; public abstract void mount_enclosing_volume (GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data); - public abstract bool mount_enclosing_volume_finish (GLib.AsyncResult result) throws GLib.Error; + public abstract bool mount_enclosing_volume_finish (GLib.AsyncResult _result) throws GLib.Error; public abstract void mount_mountable (GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data); - public abstract weak GLib.File mount_mountable_finish (GLib.AsyncResult result) throws GLib.Error; + public abstract weak GLib.File mount_mountable_finish (GLib.AsyncResult _result) throws GLib.Error; public abstract bool move (GLib.File destination, GLib.FileCopyFlags flags, GLib.Cancellable cancellable, GLib.FileProgressCallback progress_callback, pointer progress_callback_data) throws GLib.Error; public static weak GLib.File new_for_commandline_arg (string arg); public static weak GLib.File new_for_path (string path); @@ -673,14 +673,14 @@ namespace GLib { public bool set_attribute_uint32 (string attribute, uint value, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error; public bool set_attribute_uint64 (string attribute, uint64 value, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error; public abstract void set_attributes_async (GLib.FileInfo info, GLib.FileQueryInfoFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data); - public abstract bool set_attributes_finish (GLib.AsyncResult result, out weak GLib.FileInfo info) throws GLib.Error; + public abstract bool set_attributes_finish (GLib.AsyncResult _result, out weak GLib.FileInfo info) throws GLib.Error; public abstract bool set_attributes_from_info (GLib.FileInfo info, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error; public abstract weak GLib.File set_display_name (string display_name, GLib.Cancellable cancellable) throws GLib.Error; public abstract void set_display_name_async (string display_name, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data); public abstract weak GLib.File set_display_name_finish (GLib.AsyncResult res) throws GLib.Error; public abstract bool trash (GLib.Cancellable cancellable) throws GLib.Error; public abstract void unmount_mountable (GLib.MountUnmountFlags flags, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data); - public abstract bool unmount_mountable_finish (GLib.AsyncResult result) throws GLib.Error; + public abstract bool unmount_mountable_finish (GLib.AsyncResult _result) throws GLib.Error; } [CCode (cheader_filename = "gio/gio.h")] public interface Icon : GLib.Object { @@ -698,7 +698,7 @@ namespace GLib { public abstract bool can_eject (); public abstract bool can_unmount (); public abstract void eject (GLib.MountUnmountFlags flags, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data); - public abstract bool eject_finish (GLib.AsyncResult result) throws GLib.Error; + public abstract bool eject_finish (GLib.AsyncResult _result) throws GLib.Error; public abstract weak GLib.Drive get_drive (); public abstract weak GLib.Icon get_icon (); public abstract weak string get_name (); @@ -706,9 +706,9 @@ namespace GLib { public abstract weak string get_uuid (); public abstract weak GLib.Volume get_volume (); public abstract void remount (GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data); - public abstract bool remount_finish (GLib.AsyncResult result) throws GLib.Error; + public abstract bool remount_finish (GLib.AsyncResult _result) throws GLib.Error; public abstract void unmount (GLib.MountUnmountFlags flags, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data); - public abstract bool unmount_finish (GLib.AsyncResult result) throws GLib.Error; + public abstract bool unmount_finish (GLib.AsyncResult _result) throws GLib.Error; public signal void changed (); public signal void unmounted (); } @@ -725,14 +725,14 @@ namespace GLib { public abstract bool can_eject (); public abstract bool can_mount (); public abstract void eject (GLib.MountUnmountFlags flags, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data); - public abstract bool eject_finish (GLib.AsyncResult result) throws GLib.Error; + public abstract bool eject_finish (GLib.AsyncResult _result) throws GLib.Error; public abstract weak GLib.Drive get_drive (); public abstract weak GLib.Icon get_icon (); public abstract weak GLib.Mount get_mount (); public abstract weak string get_name (); public abstract weak string get_uuid (); public void mount (GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data); - public abstract bool mount_finish (GLib.AsyncResult result) throws GLib.Error; + public abstract bool mount_finish (GLib.AsyncResult _result) throws GLib.Error; public signal void changed (); public signal void removed (); } diff --git a/vapi/gnome-vfs-2.0.vapi b/vapi/gnome-vfs-2.0.vapi index 2430341..122d095 100644 --- a/vapi/gnome-vfs-2.0.vapi +++ b/vapi/gnome-vfs-2.0.vapi @@ -982,7 +982,7 @@ namespace GnomeVFS { public static weak string escape_string (string string); public static weak string expand_initial_tilde (string path); public static GnomeVFS.Result file_control (GnomeVFS.Handle handle, string operation, pointer operation_data); - public static GnomeVFS.Result find_directory (GnomeVFS.URI near_uri, GnomeVFS.FindDirectoryKind kind, out weak GnomeVFS.URI result, bool create_if_needed, bool find_if_needed, uint permissions); + public static GnomeVFS.Result find_directory (GnomeVFS.URI near_uri, GnomeVFS.FindDirectoryKind kind, out weak GnomeVFS.URI _result, bool create_if_needed, bool find_if_needed, uint permissions); public static GnomeVFS.Result forget_cache (GnomeVFS.Handle handle, GnomeVFS.FileOffset offset, GnomeVFS.FileSize size); public static weak string format_file_size_for_display (GnomeVFS.FileSize size); public static weak string format_uri_for_display (string uri); @@ -1093,7 +1093,7 @@ namespace GnomeVFS { public static GnomeVFS.Result result_from_errno_code (int errno_code); public static GnomeVFS.Result result_from_h_errno (); public static GnomeVFS.Result result_from_h_errno_val (int h_errno_code); - public static weak string result_to_string (GnomeVFS.Result result); + public static weak string result_to_string (GnomeVFS.Result _result); public static GnomeVFS.Result seek (GnomeVFS.Handle handle, GnomeVFS.SeekPosition whence, GnomeVFS.FileOffset offset); public static GnomeVFS.Result set_file_info (string text_uri, GnomeVFS.FileInfo info, GnomeVFS.SetFileInfoMask mask); public static GnomeVFS.Result set_file_info_uri (GnomeVFS.URI uri, GnomeVFS.FileInfo info, GnomeVFS.SetFileInfoMask mask); diff --git a/vapi/gstreamer-0.10.vapi b/vapi/gstreamer-0.10.vapi index 4957c6a..a43c2d9 100644 --- a/vapi/gstreamer-0.10.vapi +++ b/vapi/gstreamer-0.10.vapi @@ -521,8 +521,8 @@ namespace Gst { public weak Gst.MiniObject mini_object; public uchar data; public uint size; - public uint64 timestamp; - public uint64 duration; + public weak Gst.ClockTime timestamp; + public weak Gst.ClockTime duration; public weak Gst.Caps caps; public uint64 offset; public uint64 offset_end; @@ -545,15 +545,15 @@ namespace Gst { } [CCode (cheader_filename = "gst/gst.h")] public class BufferClass { - public pointer mini_object_class; + public weak Gst.MiniObjectClass mini_object_class; } [CCode (cheader_filename = "gst/gst.h")] public class ClockEntry { public int refcount; public weak Gst.Clock clock; public Gst.ClockEntryType type; - public uint64 time; - public uint64 interval; + public weak Gst.ClockTime time; + public weak Gst.ClockTime interval; public Gst.ClockReturn status; public Gst.ClockCallback func; public pointer user_data; @@ -561,9 +561,9 @@ namespace Gst { [CCode (ref_function = "gst_clock_id_ref", unref_function = "gst_clock_id_unref", cheader_filename = "gst/gst.h")] public class ClockID { public static int compare_func (pointer id1, pointer id2); - public uint64 get_time (); + public weak Gst.ClockTime get_time (); public void unschedule (); - public Gst.ClockReturn wait (int64 jitter); + public Gst.ClockReturn wait (Gst.ClockTimeDiff jitter); public Gst.ClockReturn wait_async (Gst.ClockCallback func, pointer user_data); } [CCode (cheader_filename = "gst/gst.h")] @@ -634,18 +634,18 @@ namespace Gst { public Event.eos (); public Event.flush_start (); public Event.flush_stop (); - public Event.latency (uint64 latency); + public Event.latency (Gst.ClockTime latency); public Event.navigation (Gst.Structure structure); public Event.new_segment (bool update, double rate, Gst.Format format, int64 start, int64 stop, int64 position); public Event.new_segment_full (bool update, double rate, double applied_rate, Gst.Format format, int64 start, int64 stop, int64 position); - public Event.qos (double proportion, int64 diff, uint64 timestamp); + public Event.qos (double proportion, Gst.ClockTimeDiff diff, Gst.ClockTime timestamp); public Event.seek (double rate, Gst.Format format, Gst.SeekFlags flags, Gst.SeekType start_type, int64 start, Gst.SeekType stop_type, int64 stop); public Event.tag (Gst.TagList taglist); public void parse_buffer_size (Gst.Format format, int64 minsize, int64 maxsize, bool async); - public void parse_latency (uint64 latency); + public void parse_latency (Gst.ClockTime latency); public void parse_new_segment (bool update, double rate, Gst.Format format, int64 start, int64 stop, int64 position); public void parse_new_segment_full (bool update, double rate, double applied_rate, Gst.Format format, int64 start, int64 stop, int64 position); - public void parse_qos (double proportion, int64 diff, uint64 timestamp); + public void parse_qos (double proportion, Gst.ClockTimeDiff diff, Gst.ClockTime timestamp); public void parse_seek (double rate, Gst.Format format, Gst.SeekFlags flags, Gst.SeekType start_type, int64 start, Gst.SeekType stop_type, int64 stop); public void parse_tag (out weak Gst.TagList taglist); public static Gst.EventTypeFlags type_get_flags (Gst.EventType type); @@ -654,7 +654,7 @@ namespace Gst { } [CCode (cheader_filename = "gst/gst.h")] public class EventClass { - public pointer mini_object_class; + public weak Gst.MiniObjectClass mini_object_class; public weak pointer[] _gst_reserved; } [CCode (cheader_filename = "gst/gst.h")] @@ -745,7 +745,7 @@ namespace Gst { } [CCode (cheader_filename = "gst/gst.h")] public class MessageClass { - public pointer mini_object_class; + public weak Gst.MiniObjectClass mini_object_class; public weak pointer[] _gst_reserved; } [CCode (ref_function = "gst_mini_object_ref", unref_function = "gst_mini_object_unref", cheader_filename = "gst/gst.h")] @@ -810,7 +810,7 @@ namespace Gst { public void parse_duration (Gst.Format format, int64 duration); public void parse_formats_length (uint n_formats); public void parse_formats_nth (uint nth, Gst.Format format); - public void parse_latency (bool live, uint64 min_latency, uint64 max_latency); + public void parse_latency (bool live, Gst.ClockTime min_latency, Gst.ClockTime max_latency); public void parse_position (Gst.Format format, int64 cur); public void parse_seeking (Gst.Format format, bool seekable, int64 segment_start, int64 segment_end); public void parse_segment (double rate, Gst.Format format, int64 start_value, int64 stop_value); @@ -818,7 +818,7 @@ namespace Gst { public void set_duration (Gst.Format format, int64 duration); public void set_formats (int n_formats); public void set_formatsv (int n_formats, Gst.Format formats); - public void set_latency (bool live, uint64 min_latency, uint64 max_latency); + public void set_latency (bool live, Gst.ClockTime min_latency, Gst.ClockTime max_latency); public void set_position (Gst.Format format, int64 cur); public void set_seeking (Gst.Format format, bool seekable, int64 segment_start, int64 segment_end); public void set_segment (double rate, Gst.Format format, int64 start_value, int64 stop_value); @@ -832,7 +832,7 @@ namespace Gst { } [CCode (cheader_filename = "gst/gst.h")] public class QueryClass { - public pointer mini_object_class; + public weak Gst.MiniObjectClass mini_object_class; public weak pointer[] _gst_reserved; } [CCode (cheader_filename = "gst/gst.h")] @@ -1055,7 +1055,7 @@ namespace Gst { public bool @foreach (Gst.StructureForeachFunc func, pointer user_data); public static weak Gst.Structure from_string (string string, string end); public bool get_boolean (string fieldname, out bool value); - public bool get_clock_time (string fieldname, uint64 value); + public bool get_clock_time (string fieldname, Gst.ClockTime value); public bool get_date (string fieldname, out weak GLib.Date value); public bool get_double (string fieldname, out double value); public bool get_enum (string fieldname, GLib.Type enumtype, out int value); @@ -1131,24 +1131,24 @@ namespace Gst { public bool playing_async; public bool have_newsegment; public weak Gst.Segment segment; - public pointer clock_id; - public uint64 end_time; + public weak Gst.ClockID clock_id; + public weak Gst.ClockTime end_time; public bool flushing; public pointer abidata; public weak Gst.Buffer get_last_buffer (); - public uint64 get_latency (); + public weak Gst.ClockTime get_latency (); public int64 get_max_lateness (); public bool get_sync (); - public int64 get_ts_offset (); + public weak Gst.ClockTimeDiff get_ts_offset (); public bool is_async_enabled (); public bool is_qos_enabled (); - public bool query_latency (bool live, bool upstream_live, uint64 min_latency, uint64 max_latency); + public bool query_latency (bool live, bool upstream_live, Gst.ClockTime min_latency, Gst.ClockTime max_latency); public void set_async_enabled (bool enabled); public void set_max_lateness (int64 max_lateness); public void set_qos_enabled (bool enabled); public void set_sync (bool sync); - public void set_ts_offset (int64 offset); - public Gst.FlowReturn wait_eos (uint64 time, int64 jitter); + public void set_ts_offset (Gst.ClockTimeDiff offset); + public Gst.FlowReturn wait_eos (Gst.ClockTime time, Gst.ClockTimeDiff jitter); public Gst.FlowReturn wait_preroll (); [NoAccessorMethod] public weak bool async { get; set; } @@ -1171,8 +1171,8 @@ namespace Gst { public Gst.ActivateMode pad_mode; public bool seekable; public bool random_access; - public pointer clock_id; - public uint64 end_time; + public weak Gst.ClockID clock_id; + public weak Gst.ClockTime end_time; public weak Gst.Segment segment; public bool need_newsegment; public uint64 offset; @@ -1181,7 +1181,7 @@ namespace Gst { public pointer data; public bool get_do_timestamp (); public bool is_live (); - public bool query_latency (bool live, uint64 min_latency, uint64 max_latency); + public bool query_latency (bool live, Gst.ClockTime min_latency, Gst.ClockTime max_latency); public void set_do_timestamp (bool live); public void set_format (Gst.Format format); public void set_live (bool live); @@ -1217,7 +1217,7 @@ namespace Gst { public void set_in_place (bool in_place); public void set_passthrough (bool passthrough); public void set_qos_enabled (bool enabled); - public void update_qos (double proportion, int64 diff, uint64 timestamp); + public void update_qos (double proportion, Gst.ClockTimeDiff diff, Gst.ClockTime timestamp); [NoAccessorMethod] public weak bool qos { get; set; } } @@ -1272,7 +1272,7 @@ namespace Gst { public bool have_pending (); public Bus (); public weak Gst.Message peek (); - public weak Gst.Message poll (Gst.MessageType events, int64 timeout); + public weak Gst.Message poll (Gst.MessageType events, Gst.ClockTimeDiff timeout); public weak Gst.Message pop (); public weak Gst.Message pop_filtered (Gst.MessageType types); public bool post (Gst.Message message); @@ -1280,40 +1280,40 @@ namespace Gst { public void set_flushing (bool flushing); public void set_sync_handler (Gst.BusSyncHandler func, pointer data); public Gst.BusSyncReply sync_signal_handler (Gst.Message message, pointer data); - public weak Gst.Message timed_pop (uint64 timeout); - public weak Gst.Message timed_pop_filtered (uint64 timeout, Gst.MessageType types); + public weak Gst.Message timed_pop (Gst.ClockTime timeout); + public weak Gst.Message timed_pop_filtered (Gst.ClockTime timeout, Gst.MessageType types); public signal void message (Gst.Message message); public signal void sync_message (Gst.Message message); } [CCode (cheader_filename = "gst/gst.h")] public class Clock : Gst.Object { public weak GLib.Mutex slave_lock; - public uint64 internal_calibration; - public uint64 external_calibration; - public uint64 rate_numerator; - public uint64 rate_denominator; - public uint64 last_time; + public weak Gst.ClockTime internal_calibration; + public weak Gst.ClockTime external_calibration; + public weak Gst.ClockTime rate_numerator; + public weak Gst.ClockTime rate_denominator; + public weak Gst.ClockTime last_time; public weak GLib.List entries; public weak GLib.Cond entries_changed; - public uint64 resolution; + public weak Gst.ClockTime resolution; public weak Gst.Clock master; public bool filling; public int time_index; - public uint64 times; - public pointer clockid; - public bool add_observation (uint64 slave, uint64 master, double r_squared); - public uint64 adjust_unlocked (uint64 internal); - public void get_calibration (uint64 internal, uint64 external, uint64 rate_num, uint64 rate_denom); - public virtual uint64 get_internal_time (); + public weak Gst.ClockTime times; + public weak Gst.ClockID clockid; + public bool add_observation (Gst.ClockTime slave, Gst.ClockTime master, double r_squared); + public weak Gst.ClockTime adjust_unlocked (Gst.ClockTime internal); + public void get_calibration (Gst.ClockTime internal, Gst.ClockTime external, Gst.ClockTime rate_num, Gst.ClockTime rate_denom); + public virtual weak Gst.ClockTime get_internal_time (); public weak Gst.Clock get_master (); - public virtual uint64 get_resolution (); - public uint64 get_time (); - public Clock.periodic_id (Gst.Clock clock, uint64 start_time, uint64 interval); - public Clock.single_shot_id (Gst.Clock clock, uint64 time); - public void set_calibration (uint64 internal, uint64 external, uint64 rate_num, uint64 rate_denom); + public virtual weak Gst.ClockTime get_resolution (); + public weak Gst.ClockTime get_time (); + public Clock.periodic_id (Gst.Clock clock, Gst.ClockTime start_time, Gst.ClockTime interval); + public Clock.single_shot_id (Gst.Clock clock, Gst.ClockTime time); + public void set_calibration (Gst.ClockTime internal, Gst.ClockTime external, Gst.ClockTime rate_num, Gst.ClockTime rate_denom); public bool set_master (Gst.Clock master); - public uint64 set_resolution (uint64 resolution); - public uint64 unadjust_unlocked (uint64 external); + public weak Gst.ClockTime set_resolution (Gst.ClockTime resolution); + public weak Gst.ClockTime unadjust_unlocked (Gst.ClockTime external); [NoAccessorMethod] public weak bool stats { get; set; } [NoAccessorMethod] @@ -1392,7 +1392,7 @@ namespace Gst { public Gst.StateChangeReturn last_return; public weak Gst.Bus bus; public weak Gst.Clock clock; - public int64 base_time; + public weak Gst.ClockTimeDiff base_time; public ushort numpads; public weak GLib.List pads; public ushort numsrcpads; @@ -1414,7 +1414,7 @@ namespace Gst { public void create_all_pads (); public void found_tags (Gst.TagList list); public void found_tags_for_pad (Gst.Pad pad, Gst.TagList list); - public uint64 get_base_time (); + public weak Gst.ClockTime get_base_time (); public weak Gst.Bus get_bus (); public weak Gst.Clock get_clock (); public weak Gst.Pad get_compatible_pad (Gst.Pad pad, Gst.Caps caps); @@ -1424,7 +1424,7 @@ namespace Gst { public weak Gst.Pad get_pad (string name); public virtual Gst.QueryType get_query_types (); public weak Gst.Pad get_request_pad (string name); - public virtual Gst.StateChangeReturn get_state (out Gst.State state, out Gst.State pending, uint64 timeout); + public virtual Gst.StateChangeReturn get_state (out Gst.State state, out Gst.State pending, Gst.ClockTime timeout); public weak Gst.Pad get_static_pad (string name); public bool implements_interface (GLib.Type iface_type); public bool is_indexable (); @@ -1454,7 +1454,7 @@ namespace Gst { public bool seek (double rate, Gst.Format format, Gst.SeekFlags flags, Gst.SeekType cur_type, int64 cur, Gst.SeekType stop_type, int64 stop); public bool seek_simple (Gst.Format format, Gst.SeekFlags seek_flags, int64 seek_pos); public virtual bool send_event (Gst.Event event); - public void set_base_time (uint64 time); + public void set_base_time (Gst.ClockTime time); public virtual void set_bus (Gst.Bus bus); public virtual bool set_clock (Gst.Clock clock); public virtual void set_index (Gst.Index index); @@ -1711,18 +1711,18 @@ namespace Gst { [CCode (cheader_filename = "gst/gst.h")] public class Pipeline : Gst.Bin, Gst.ChildProxy { public weak Gst.Clock fixed_clock; - public uint64 stream_time; + public weak Gst.ClockTime stream_time; public void auto_clock (); public bool get_auto_flush_bus (); public weak Gst.Bus get_bus (); public weak Gst.Clock get_clock (); - public uint64 get_delay (); - public uint64 get_last_stream_time (); + public weak Gst.ClockTime get_delay (); + public weak Gst.ClockTime get_last_stream_time (); public Pipeline (string name); public void set_auto_flush_bus (bool auto_flush); public bool set_clock (Gst.Clock clock); - public void set_delay (uint64 delay); - public void set_new_stream_time (uint64 time); + public void set_delay (Gst.ClockTime delay); + public void set_new_stream_time (Gst.ClockTime time); public void use_clock (Gst.Clock clock); public weak bool auto_flush_bus { get; set; } public weak uint64 delay { get; set; } @@ -1896,7 +1896,7 @@ namespace Gst { } public static delegate bool BusFunc (Gst.Bus bus, Gst.Message message, pointer data); public static delegate Gst.BusSyncReply BusSyncHandler (Gst.Bus bus, Gst.Message message, pointer data); - public static delegate bool ClockCallback (Gst.Clock clock, uint64 time, pointer id, pointer user_data); + public static delegate bool ClockCallback (Gst.Clock clock, Gst.ClockTime time, Gst.ClockID id, pointer user_data); public static delegate void CollectDataDestroyNotify (Gst.CollectData data); public static delegate Gst.FlowReturn CollectPadsFunction (Gst.CollectPads pads, pointer user_data); public static delegate bool DataQueueCheckFullFunction (Gst.DataQueue queue, uint visible, uint bytes, uint64 time, pointer checkdata); diff --git a/vapi/libgnomeui-2.0.vapi b/vapi/libgnomeui-2.0.vapi index b0c34f2..867f700 100644 --- a/vapi/libgnomeui-2.0.vapi +++ b/vapi/libgnomeui-2.0.vapi @@ -571,8 +571,8 @@ namespace Gnome { public static bool help_display_uri_on_screen (string help_uri, Gdk.Screen screen) throws GLib.Error; public static bool help_display_with_doc_id_on_screen (Gnome.Program program, string doc_id, string file_name, string link_id, Gdk.Screen screen) throws GLib.Error; public static void ice_init (); - public static weak string icon_lookup (Gtk.IconTheme icon_theme, Gnome.ThumbnailFactory thumbnail_factory, string file_uri, string custom_icon, GnomeVFS.FileInfo file_info, string mime_type, Gnome.IconLookupFlags flags, Gnome.IconLookupResultFlags result); - public static weak string icon_lookup_sync (Gtk.IconTheme icon_theme, Gnome.ThumbnailFactory thumbnail_factory, string file_uri, string custom_icon, Gnome.IconLookupFlags flags, Gnome.IconLookupResultFlags result); + public static weak string icon_lookup (Gtk.IconTheme icon_theme, Gnome.ThumbnailFactory thumbnail_factory, string file_uri, string custom_icon, GnomeVFS.FileInfo file_info, string mime_type, Gnome.IconLookupFlags flags, Gnome.IconLookupResultFlags _result); + public static weak string icon_lookup_sync (Gtk.IconTheme icon_theme, Gnome.ThumbnailFactory thumbnail_factory, string file_uri, string custom_icon, Gnome.IconLookupFlags flags, Gnome.IconLookupResultFlags _result); public static void interaction_key_return (int key, bool cancel_shutdown); [CCode (cname = "libgnomeui_module_info_get")] public static weak Gnome.ModuleInfo libgnomeui_module_info_get (); diff --git a/vapi/libsoup-2.2.vapi b/vapi/libsoup-2.2.vapi index e0a9cd5..14935f4 100644 --- a/vapi/libsoup-2.2.vapi +++ b/vapi/libsoup-2.2.vapi @@ -256,7 +256,7 @@ namespace Soup { } [CCode (copy_function = "soup_uri_copy", cheader_filename = "libsoup/soup.h")] public class Uri { - public GLib.Quark protocol; + public weak Soup.Protocol protocol; public weak string user; public weak string passwd; public weak string host; @@ -351,7 +351,7 @@ namespace Soup { public void add_handler (Soup.HandlerPhase phase, Soup.MessageCallbackFn handler_cb, pointer user_data); public static void add_header (GLib.HashTable hash, string name, string value); public void add_header_handler (string header, Soup.HandlerPhase phase, Soup.MessageCallbackFn handler_cb, pointer user_data); - public void add_status_class_handler (pointer status_class, Soup.HandlerPhase phase, Soup.MessageCallbackFn handler_cb, pointer user_data); + public void add_status_class_handler (Soup.StatusClass status_class, Soup.HandlerPhase phase, Soup.MessageCallbackFn handler_cb, pointer user_data); public void add_status_code_handler (uint status_code, Soup.HandlerPhase phase, Soup.MessageCallbackFn handler_cb, pointer user_data); public static void clear_headers (GLib.HashTable hash); public uint get_flags (); @@ -408,7 +408,7 @@ namespace Soup { public weak Soup.ServerHandler get_handler (string path); public weak Soup.Socket get_listener (); public uint get_port (); - public GLib.Quark get_protocol (); + public weak Soup.Protocol get_protocol (); public weak GLib.SList list_handlers (); public Server (string optname1, ...); public void quit (); diff --git a/vapi/packages/gdk-2.0/gdk-2.0.metadata b/vapi/packages/gdk-2.0/gdk-2.0.metadata index 78436ef..611b2e0 100644 --- a/vapi/packages/gdk-2.0/gdk-2.0.metadata +++ b/vapi/packages/gdk-2.0/gdk-2.0.metadata @@ -13,6 +13,8 @@ gdk_pixbuf_save_to_bufferv.option_keys is_array="1" gdk_pixbuf_save_to_bufferv.option_values is_array="1" gdk_pixbuf_save_to_callbackv.option_keys is_array="1" gdk_pixbuf_save_to_callbackv.option_values is_array="1" +GdkPixmapObject hidden="1" +GdkPixmapObjectClass hidden="1" gdk_property_get.actual_property_type is_out="1" GdkRectangle is_value_type="1" gdk_rectangle_union.dest is_out="1" @@ -21,4 +23,6 @@ gdk_rgb_find_color.color is_ref="1" gdk_screen_get_monitor_geometry.dest is_out="1" gdk_window_get_frame_extents.rect is_out="1" GdkWindowAttr is_value_type="1" +GdkWindowObject hidden="1" +GdkWindowObjectClass hidden="1" diff --git a/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata b/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata index faed00b..c615008 100644 --- a/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata +++ b/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata @@ -20,10 +20,12 @@ gst_element_query_duration.format is_ref="1" gst_element_query_duration.duration is_out="1" gst_element_query_position.format is_ref="1" gst_element_query_position.cur is_out="1" +GstElementClass name="pointer" gst_init hidden="1" gst_iterator_free hidden="1" gst_iterator_next hidden="1" gst_iterator_resync hidden="1" +GstObjectClass name="pointer" GstPad.querytypefunc hidden="1" gst_pad_set_query_type_function hidden="1" GstPadTemplate::pad_created has_emitter="1" @@ -65,3 +67,7 @@ gst_structure_get_enum.value is_out="1" gst_caps_new_simple ellipsis="1" gst_caps_new_full ellipsis="1" gst_caps_set_simple ellipsis="1" + +GStaticRecMutex name="pointer" +xml* name="pointer" + diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata index cf6807f..0d0e340 100644 --- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata +++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata @@ -44,6 +44,7 @@ GtkContainer::add has_emitter="1" GtkContainer::check_resize has_emitter="1" GtkContainer::remove has_emitter="1" GtkContainer::set_focus_child has_emitter="1" +GtkContainerClass name="pointer" gtk_dialog_set_alternative_button_order sentinel="-1" GtkDialog::response has_emitter="1" GtkEditable::delete_text has_emitter="1" @@ -248,6 +249,7 @@ GtkWidget::size_request has_emitter="1" GtkWidget::show has_emitter="1" GtkWidget::unmap has_emitter="1" GtkWidget::unrealize has_emitter="1" +GtkWidgetClass name="pointer" gtk_window_get_position.root_x is_out="1" gtk_window_get_position.root_y is_out="1" gtk_window_get_size.width is_out="1" diff --git a/vapi/packages/libgnome-2.0/libgnome-2.0.metadata b/vapi/packages/libgnome-2.0/libgnome-2.0.metadata index e3c27d6..ceaeca9 100644 --- a/vapi/packages/libgnome-2.0/libgnome-2.0.metadata +++ b/vapi/packages/libgnome-2.0/libgnome-2.0.metadata @@ -4,3 +4,4 @@ gnome_program_init.argv is_array="1" gnome_program_init_paramv.argv is_array="1" gnome_program_initv.argv is_array="1" gnome_program_preinit hidden="1" +GnomeProgramClass name="pointer" diff --git a/vapi/pango.vapi b/vapi/pango.vapi index cfd5090..ae33bcc 100644 --- a/vapi/pango.vapi +++ b/vapi/pango.vapi @@ -302,12 +302,12 @@ namespace Pango { } [CCode (copy_function = "pango_attribute_copy", free_function = "pango_attribute_destroy", cheader_filename = "pango/pango.h")] public class Attribute { - public pointer klass; + public weak Pango.AttrClass klass; public uint start_index; public uint end_index; public weak Pango.Attribute copy (); public bool equal (Pango.Attribute attr2); - public void init (pointer klass); + public void init (Pango.AttrClass klass); } [CCode (cheader_filename = "pango/pango.h")] public class ContextClass { @@ -335,13 +335,13 @@ namespace Pango { } [CCode (cheader_filename = "pango/pango.h")] public class GlyphGeometry { - public int width; - public int x_offset; - public int y_offset; + public weak Pango.GlyphUnit width; + public weak Pango.GlyphUnit x_offset; + public weak Pango.GlyphUnit y_offset; } [CCode (cheader_filename = "pango/pango.h")] public class GlyphInfo { - public uint glyph; + public weak Pango.Glyph glyph; public weak Pango.GlyphGeometry geometry; public weak Pango.GlyphVisAttr attr; } @@ -535,7 +535,7 @@ namespace Pango { public weak Pango.EngineShape find_shaper (Pango.Language language, uint ch); public weak Pango.Coverage get_coverage (Pango.Language language); public weak Pango.FontMap get_font_map (); - public void get_glyph_extents (uint glyph, out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect); + public void get_glyph_extents (Pango.Glyph glyph, out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect); public weak Pango.FontMetrics get_metrics (Pango.Language language); } [CCode (cheader_filename = "pango/pango.h")] @@ -630,7 +630,7 @@ namespace Pango { public void activate (); public void deactivate (); public virtual void draw_error_underline (int x, int y, int width, int height); - public virtual void draw_glyph (Pango.Font font, uint glyph, double x, double y); + public virtual void draw_glyph (Pango.Font font, Pango.Glyph glyph, double x, double y); public virtual void draw_glyphs (Pango.Font font, Pango.GlyphString glyphs, int x, int y); public void draw_layout (Pango.Layout layout, int x, int y); public void draw_layout_line (Pango.LayoutLine line, int x, int y); diff --git a/vapigen/valagidlparser.vala b/vapigen/valagidlparser.vala index 20a6556..2ff1fb8 100644 --- a/vapigen/valagidlparser.vala +++ b/vapigen/valagidlparser.vala @@ -1065,38 +1065,9 @@ public class Vala.GIdlParser : CodeVisitor { return; } - if (n == "HFONT" || n == "HGLOBAL" || n == "GStaticRecMutex" || n.has_suffix ("Class") || n == "va_list" || n.has_prefix ("LOGFONT") || n.has_prefix ("xml") || n == "GdkNativeWindow" || n == "GdkXEvent" || n == "GtkTextLayout" || n == "GstClockID" || n.has_prefix ("GstXml")) { + if (n == "va_list") { // unsupported type.type_name = "pointer"; - } else if (n.has_prefix ("cairo")) { - type.namespace_name = "Cairo"; - if (n == "cairo_t") { - type.type_name = "Context"; - } else if (n == "cairo_surface_t") { - type.type_name = "Surface"; - } else { - type.namespace_name = null; - type.type_name = "pointer"; - } - } else if (n == "AtkAttributeSet") { - type.namespace_name = "GLib"; - type.type_name = "SList"; - } else if (n == "GstClockTime") { - type.type_name = "uint64"; - } else if (n == "GstClockTimeDiff") { - type.type_name = "int64"; - } else if (n == "PangoGlyph") { - type.type_name = "uint"; - } else if (n == "PangoGlyphUnit") { - type.type_name = "int"; - } else if (n == "ClutterFixed" || n == "ClutterUnit" || n == "ClutterAngle") { - type.type_name = "int32"; - } else if (n == "SoupProtocol") { - type.namespace_name = "GLib"; - type.type_name = "Quark"; - } else if (n == "GStrv") { - type.type_name = "string"; - type.array_rank = 1; } else if (n.has_prefix (current_namespace.name)) { type.namespace_name = current_namespace.name; type.type_name = n.offset (current_namespace.name.len ()); @@ -1144,7 +1115,11 @@ public class Vala.GIdlParser : CodeVisitor { m.name = m.name.offset ("new_".len ()); } } else { - m = new Method (node.name, return_type, current_source_reference); + if (return_type.type_name == "void") { + m = new Method (node.name, new VoidType (), current_source_reference); + } else { + m = new Method (node.name, return_type, current_source_reference); + } } m.access = SymbolAccessibility.PUBLIC; @@ -1235,8 +1210,13 @@ public class Vala.GIdlParser : CodeVisitor { continue; } + string param_name = param_node.name; + if (param_name == "result") { + // avoid conflict with generated result variable + param_name = "_result"; + } var param_type = parse_param (param); - var p = new FormalParameter (param_node.name, param_type); + var p = new FormalParameter (param_name, param_type); m.add_parameter (p); var attributes = get_attributes ("%s.%s".printf (f.symbol, param_node.name));