From: Luca Bruno Date: Mon, 1 Aug 2011 16:46:51 +0000 (+0200) Subject: Regenerate all bindings X-Git-Tag: 0.13.2~49 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=a15c3fc0e9765ac166da22658c7a60e3b0a42680;p=thirdparty%2Fvala.git Regenerate all bindings --- diff --git a/vapi/atk.vapi b/vapi/atk.vapi index 3e211fd3b..8ee37e782 100644 --- a/vapi/atk.vapi +++ b/vapi/atk.vapi @@ -1,6 +1,6 @@ /* atk.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Atk", gir_namespace = "Atk", gir_version = "1.0", lower_case_cprefix = "atk_")] +[CCode (gir_namespace = "Atk", gir_version = "1.0")] namespace Atk { [CCode (cheader_filename = "atk/atk.h")] [Compact] @@ -183,7 +183,7 @@ namespace Atk { public Relation (Atk.Object[] targets, Atk.RelationType relationship); public void add_target (Atk.Object target); public Atk.RelationType get_relation_type (); - public unowned GLib.GenericArray get_target (); + public unowned GLib.PtrArray get_target (); public bool remove_target (Atk.Object target); public static Atk.RelationType type_for_name (string name); public static unowned string type_get_name (Atk.RelationType type); @@ -195,7 +195,7 @@ namespace Atk { } [CCode (cheader_filename = "atk/atk.h")] public class RelationSet : GLib.Object { - public weak GLib.GenericArray relations; + public weak GLib.PtrArray relations; [CCode (has_construct_function = false)] public RelationSet (); public void add (Atk.Relation relation); @@ -441,7 +441,7 @@ namespace Atk { public abstract void get_minimum_value (GLib.Value value); public abstract bool set_current_value (GLib.Value value); } - [CCode (cheader_filename = "atk/atk.h", type_id = "ATK_TYPE_RECTANGLE")] + [CCode (cheader_filename = "atk/atk.h")] public struct Rectangle { public int x; public int y; @@ -449,7 +449,6 @@ namespace Atk { public int height; } [CCode (cheader_filename = "atk/atk.h")] - [IntegerType (rank = 11)] [SimpleType] public struct State : uint64 { public static Atk.StateType type_for_name (string name); diff --git a/vapi/clutter-1.0.vapi b/vapi/clutter-1.0.vapi index 44857bfaf..9053c1d69 100644 --- a/vapi/clutter-1.0.vapi +++ b/vapi/clutter-1.0.vapi @@ -2,35 +2,30 @@ [CCode (cprefix = "Clutter", gir_namespace = "Clutter", gir_version = "1.0", lower_case_cprefix = "clutter_")] namespace Clutter { - [CCode (cprefix = "ClutterFrameSource", lower_case_cprefix = "clutter_frame_source_")] namespace FrameSource { [CCode (cheader_filename = "clutter/clutter.h")] - public static uint add (uint fps, [CCode (delegate_target_pos = 2.1)] GLib.SourceFunc func); + public static uint add (uint fps, GLib.SourceFunc func); [CCode (cheader_filename = "clutter/clutter.h")] - public static uint add_full (int priority, uint fps, [CCode (delegate_target_pos = 3.1)] owned GLib.SourceFunc func); + public static uint add_full (int priority, uint fps, owned GLib.SourceFunc func); } - [CCode (cprefix = "ClutterThreads", lower_case_cprefix = "clutter_threads_")] namespace Threads { - [CCode (cprefix = "ClutterThreadsFrameSource", lower_case_cprefix = "clutter_threads_frame_source_")] namespace FrameSource { [CCode (cheader_filename = "clutter/clutter.h", cname = "clutter_threads_add_frame_source")] - public static uint add (uint fps, [CCode (delegate_target_pos = 2.1)] GLib.SourceFunc func); + public static uint add (uint fps, GLib.SourceFunc func); [CCode (cheader_filename = "clutter/clutter.h", cname = "clutter_threads_add_frame_source_full")] - public static uint add_full (int priority, uint fps, [CCode (delegate_target_pos = 3.1)] owned GLib.SourceFunc func); + public static uint add_full (int priority, uint fps, owned GLib.SourceFunc func); } - [CCode (cprefix = "ClutterThreadsIdle", lower_case_cprefix = "clutter_threads_idle_")] namespace Idle { [CCode (cheader_filename = "clutter/clutter.h", cname = "clutter_threads_add_idle")] public static uint add (GLib.SourceFunc func); [CCode (cheader_filename = "clutter/clutter.h", cname = "clutter_threads_add_idle_full")] - public static uint add_full (int priority, [CCode (delegate_target_pos = 2.1)] owned GLib.SourceFunc func); + public static uint add_full (int priority, owned GLib.SourceFunc func); } - [CCode (cprefix = "ClutterThreadsTimeout", lower_case_cprefix = "clutter_threads_timeout_")] namespace Timeout { [CCode (cheader_filename = "clutter/clutter.h", cname = "clutter_threads_add_timeout")] - public static uint add (uint interval, [CCode (delegate_target_pos = 2.1)] GLib.SourceFunc func); + public static uint add (uint interval, GLib.SourceFunc func); [CCode (cheader_filename = "clutter/clutter.h", cname = "clutter_threads_add_timeout_full")] - public static uint add_full (int priority, uint interval, [CCode (delegate_target_pos = 3.1)] owned GLib.SourceFunc func); + public static uint add_full (int priority, uint interval, owned GLib.SourceFunc func); } [CCode (cheader_filename = "clutter/clutter.h")] public static uint add_repaint_func (owned GLib.SourceFunc func); @@ -45,12 +40,10 @@ namespace Clutter { [CCode (cheader_filename = "clutter/clutter.h")] public static void set_lock_functions (GLib.Callback enter_fn, GLib.Callback leave_fn); } - [CCode (cprefix = "ClutterUtil", lower_case_cprefix = "clutter_util_")] namespace Util { [CCode (cheader_filename = "clutter/clutter.h", cname = "clutter_util_next_p2")] public static int next_power_of_2 (int a); } - [CCode (cprefix = "ClutterValue", lower_case_cprefix = "clutter_value_")] namespace Value { [CCode (cheader_filename = "clutter/clutter.h")] public static unowned Clutter.Color? get_color (GLib.Value value); @@ -392,7 +385,7 @@ namespace Clutter { public void set_mode (ulong mode); public void set_timeline (Clutter.Timeline timeline); [CCode (has_construct_function = false)] - public Alpha.with_func (Clutter.Timeline timeline, [CCode (delegate_target_pos = 2.1)] owned Clutter.AlphaFunc func); + public Alpha.with_func (Clutter.Timeline timeline, owned Clutter.AlphaFunc func); public double alpha { get; } public ulong mode { get; set construct; } public Clutter.Timeline timeline { get; set; } @@ -676,9 +669,9 @@ namespace Clutter { public static unowned Clutter.BindingPool find (string name); public unowned string find_action (uint key_val, Clutter.ModifierType modifiers); public static unowned Clutter.BindingPool get_for_class (void* klass); - public void install_action (string action_name, uint key_val, Clutter.ModifierType modifiers, [CCode (delegate_target_pos = 4.1, type = "GCallback")] owned Clutter.BindingActionFunc callback); + public void install_action (string action_name, uint key_val, Clutter.ModifierType modifiers, [CCode (type = "GCallback")] owned Clutter.BindingActionFunc callback); public void install_closure (string action_name, uint key_val, Clutter.ModifierType modifiers, [CCode (type = "GClosure*")] owned Clutter.BindingActionFunc closure); - public void override_action (uint key_val, Clutter.ModifierType modifiers, [CCode (delegate_target_pos = 3.1)] owned GLib.Callback callback); + public void override_action (uint key_val, Clutter.ModifierType modifiers, owned GLib.Callback callback); public void override_closure (uint key_val, Clutter.ModifierType modifiers, GLib.Closure closure); public void remove_action (uint key_val, Clutter.ModifierType modifiers); public void unblock_action (string action_name); @@ -1092,7 +1085,7 @@ namespace Clutter { public void resort (); public void set_filter (owned Clutter.ModelFilterFunc? func); public void set_names ([CCode (array_length_cname = "n_columns", array_length_pos = 0.5, array_length_type = "guint")] string[] names); - public void set_sort (int column, [CCode (delegate_target_pos = 2.1)] owned Clutter.ModelSortFunc? func); + public void set_sort (int column, owned Clutter.ModelSortFunc? func); public void set_sorting_column (int column); public void set_types ([CCode (array_length_cname = "n_columns", array_length_pos = 0.5, array_length_type = "guint")] GLib.Type[] types); public bool filter_set { get; } @@ -1160,7 +1153,7 @@ namespace Clutter { public void set_width (float width); public void union (Clutter.PaintVolume another_pv); } - [CCode (cheader_filename = "clutter/clutter.h", cprefix = "clutter_param_units_", ref_function = "clutter_param_units_ref", type_id = "clutter_param_units_get_type ()", unref_function = "clutter_param_units_unref")] + [CCode (cheader_filename = "clutter/clutter.h", cprefix = "clutter_param_units_", type_id = "clutter_param_units_get_type ()")] public class ParamSpecUnit { [CCode (has_construct_function = false)] protected ParamSpecUnit (); @@ -1256,7 +1249,7 @@ namespace Clutter { public class Script : GLib.Object { [CCode (has_construct_function = false)] public Script (); - public void add_search_paths ([CCode (array_length_cname = "n_paths", array_length_type = "gsize", type = "gchar*")] string[] paths); + public void add_search_paths ([CCode (array_length_cname = "n_paths", array_length_pos = 1.1, array_length_type = "gsize", type = "gchar*")] string[] paths); public void connect_signals (void* user_data); public void connect_signals_full (Clutter.ScriptConnectFunc func); public void ensure_objects (); @@ -1318,9 +1311,9 @@ namespace Clutter { [NoAccessorMethod] public bool enabled { get; set; } [NoAccessorMethod] - public string fragment_source { get; set; } + public string fragment_source { owned get; set; } [NoAccessorMethod] - public string vertex_source { get; set; } + public string vertex_source { owned get; set; } } [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_shader_effect_get_type ()")] public abstract class ShaderEffect : Clutter.OffscreenEffect { @@ -1464,7 +1457,7 @@ namespace Clutter { [NoAccessorMethod] public uint duration { get; set; } [NoAccessorMethod] - public string state { get; set; } + public string state { owned get; set; } public virtual signal void completed (); } [CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_state_key_get_type ()")] @@ -1714,7 +1707,7 @@ namespace Clutter { public class TimeoutPool { [CCode (has_construct_function = false)] public TimeoutPool (int priority); - public uint add (uint fps, [CCode (delegate_target_pos = 2.1)] owned GLib.SourceFunc func); + public uint add (uint fps, owned GLib.SourceFunc func); public void remove (uint id_); } [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_animatable_get_type ()")] @@ -1724,7 +1717,7 @@ namespace Clutter { public abstract void get_initial_state (string property_name, GLib.Value value); public abstract void set_final_state (string property_name, GLib.Value value); } - [CCode (cheader_filename = "clutter/clutter.h")] + [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_container_get_type ()")] public interface Container : GLib.Object { public void add (params Clutter.Actor[] actors); [CCode (vfunc_name = "add")] @@ -1858,7 +1851,7 @@ namespace Clutter { public void set_size (float width, float height); public Clutter.ActorBox union (Clutter.ActorBox b); } - [CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_ANY_EVENT")] + [CCode (cheader_filename = "clutter/clutter.h")] public struct AnyEvent { public Clutter.EventType type; public uint32 time; @@ -1866,7 +1859,7 @@ namespace Clutter { public weak Clutter.Stage stage; public weak Clutter.Actor source; } - [CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_BUTTON_EVENT")] + [CCode (cheader_filename = "clutter/clutter.h")] public struct ButtonEvent { public Clutter.EventType type; public uint32 time; @@ -1910,7 +1903,7 @@ namespace Clutter { public uint32 to_pixel (); public string to_string (); } - [CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_CROSSING_EVENT")] + [CCode (cheader_filename = "clutter/clutter.h")] public struct CrossingEvent { public Clutter.EventType type; public uint32 time; @@ -1922,12 +1915,12 @@ namespace Clutter { public weak Clutter.InputDevice device; public weak Clutter.Actor related; } - [CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_FOG")] + [CCode (cheader_filename = "clutter/clutter.h")] public struct Fog { public float z_near; public float z_far; } - [CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_GEOMETRY")] + [CCode (cheader_filename = "clutter/clutter.h")] public struct Geometry { public int x; public int y; @@ -1936,7 +1929,7 @@ namespace Clutter { public bool intersects (Clutter.Geometry geometry1); public Clutter.Geometry union (Clutter.Geometry geometry_b); } - [CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_KEY_EVENT")] + [CCode (cheader_filename = "clutter/clutter.h")] public struct KeyEvent { public Clutter.EventType type; public uint32 time; @@ -1949,7 +1942,7 @@ namespace Clutter { public unichar unicode_value; public weak Clutter.InputDevice device; } - [CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_KNOT")] + [CCode (cheader_filename = "clutter/clutter.h")] public struct Knot { public int x; public int y; @@ -1957,7 +1950,7 @@ namespace Clutter { public bool equal (Clutter.Knot knot_b); public void free (); } - [CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_MOTION_EVENT")] + [CCode (cheader_filename = "clutter/clutter.h")] public struct MotionEvent { public Clutter.EventType type; public uint32 time; @@ -1970,7 +1963,7 @@ namespace Clutter { public double axes; public weak Clutter.InputDevice device; } - [CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_PATH_NODE")] + [CCode (cheader_filename = "clutter/clutter.h")] public struct PathNode { public Clutter.PathNodeType type; [CCode (array_length = false, array_null_terminated = true)] @@ -1979,14 +1972,14 @@ namespace Clutter { public bool equal (Clutter.PathNode node_b); public void free (); } - [CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_PERSPECTIVE")] + [CCode (cheader_filename = "clutter/clutter.h")] public struct Perspective { public float fovy; public float aspect; public float z_near; public float z_far; } - [CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_SCROLL_EVENT")] + [CCode (cheader_filename = "clutter/clutter.h")] public struct ScrollEvent { public Clutter.EventType type; public uint32 time; @@ -2000,7 +1993,7 @@ namespace Clutter { public double axes; public weak Clutter.InputDevice device; } - [CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_STAGE_STATE_EVENT")] + [CCode (cheader_filename = "clutter/clutter.h")] public struct StageStateEvent { public Clutter.EventType type; public uint32 time; @@ -2031,7 +2024,7 @@ namespace Clutter { public float to_pixels (); public string to_string (); } - [CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_VERTEX")] + [CCode (cheader_filename = "clutter/clutter.h")] public struct Vertex { public float x; public float y; diff --git a/vapi/clutter-gtk-0.10.vapi b/vapi/clutter-gtk-0.10.vapi index a7412884d..62db541d2 100644 --- a/vapi/clutter-gtk-0.10.vapi +++ b/vapi/clutter-gtk-0.10.vapi @@ -1,6 +1,5 @@ /* clutter-gtk-0.10.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "GtkClutter", lower_case_cprefix = "gtk_clutter_")] namespace GtkClutter { [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")] public class Embed : Gtk.Container, Atk.Implementor, Gtk.Buildable { diff --git a/vapi/clutter-gtk-1.0.vapi b/vapi/clutter-gtk-1.0.vapi index 2ef241a3e..434d4fb9d 100644 --- a/vapi/clutter-gtk-1.0.vapi +++ b/vapi/clutter-gtk-1.0.vapi @@ -1,6 +1,5 @@ /* clutter-gtk-1.0.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "GtkClutter", lower_case_cprefix = "gtk_clutter_")] namespace GtkClutter { [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")] public class Actor : Clutter.Actor, Clutter.Scriptable, Clutter.Animatable, Atk.Implementor, Clutter.Container { diff --git a/vapi/cogl-1.0.vapi b/vapi/cogl-1.0.vapi index a9b8ca003..42fc8988d 100644 --- a/vapi/cogl-1.0.vapi +++ b/vapi/cogl-1.0.vapi @@ -1,6 +1,6 @@ /* cogl-1.0.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Cogl", gir_namespace = "Cogl", gir_version = "1.0", lower_case_cprefix = "cogl_")] +[CCode (gir_namespace = "Cogl", gir_version = "1.0")] namespace Cogl { [CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle")] [Compact] @@ -133,7 +133,7 @@ namespace Cogl { public static void push_draw_buffer (); [CCode (instance_pos = -1)] public void set_draw_buffer (Cogl.BufferTarget target); - [CCode (has_construct_function = false, type = "CoglHandle*")] + [CCode (cname = "cogl_offscreen_new_to_texture", has_construct_function = false, type = "CoglHandle*")] public Offscreen.to_texture (Cogl.Texture handle); } [CCode (cheader_filename = "cogl/cogl.h")] @@ -269,7 +269,7 @@ namespace Cogl { public static unowned Cogl.VertexBufferIndices get_for_quads (uint n_indices); public Cogl.IndicesType get_type (); } - [CCode (cheader_filename = "cogl/cogl.h", type_id = "COGL_TYPE_ANGLE")] + [CCode (cheader_filename = "cogl/cogl.h")] public struct Angle { public Cogl.Fixed cos (); public Cogl.Fixed sin (); @@ -320,7 +320,7 @@ namespace Cogl { public void set_red_float (float red); public void unpremultiply (); } - [CCode (cheader_filename = "cogl/cogl.h", type_id = "COGL_TYPE_FIXED")] + [CCode (cheader_filename = "cogl/cogl.h")] public struct Fixed { public Cogl.Fixed atan (); public Cogl.Fixed atan2 (Cogl.Fixed b); @@ -358,11 +358,13 @@ namespace Cogl { public uint type; public uint flags; public static bool equal (void* v1, void* v2); + [CCode (array_length = false, array_null_terminated = false, cname = "cogl_matrix_init_from_array")] public Matrix.from_array ([CCode (array_length = false)] float[] array); public void frustum (float left, float right, float bottom, float top, float z_near, float z_far); [CCode (array_length = false)] public unowned float[] get_array (); public bool get_inverse (out Cogl.Matrix inverse); + [CCode (cname = "cogl_matrix_init_identity")] public Matrix.identity (); [CCode (cname = "cogl_matrix_multiply")] public Matrix.multiply (Cogl.Matrix a, Cogl.Matrix b); @@ -373,7 +375,7 @@ namespace Cogl { public void transform_point (ref float x, ref float y, ref float z, ref float w); public void translate (float x, float y, float z); } - [CCode (cheader_filename = "cogl/cogl.h", type_id = "COGL_TYPE_TEXTURE_VERTEX")] + [CCode (cheader_filename = "cogl/cogl.h")] public struct TextureVertex { public float x; public float y; diff --git a/vapi/gconf-2.0.vapi b/vapi/gconf-2.0.vapi index b482faf3f..63b7d5fcf 100644 --- a/vapi/gconf-2.0.vapi +++ b/vapi/gconf-2.0.vapi @@ -1,8 +1,7 @@ /* gconf-2.0.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "GConf", lower_case_cprefix = "gconf_")] namespace GConf { - [CCode (cheader_filename = "gconf/gconf.h", ref_function = "gconf_change_set_ref", ref_function_void = true, type_id = "GCONF_TYPE_CHANGE_SET", unref_function = "gconf_change_set_unref")] + [CCode (cheader_filename = "gconf/gconf.h", ref_function = "gconf_change_set_ref", ref_function_void = true, unref_function = "gconf_change_set_unref")] [Compact] public class ChangeSet { [CCode (has_construct_function = false)] diff --git a/vapi/gdk-2.0.vapi b/vapi/gdk-2.0.vapi index 2f4fc969b..267d33ed1 100644 --- a/vapi/gdk-2.0.vapi +++ b/vapi/gdk-2.0.vapi @@ -1,8 +1,7 @@ /* gdk-2.0.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Gdk", gir_namespace = "Gdk", gir_version = "2.0", lower_case_cprefix = "gdk_")] +[CCode (gir_namespace = "Gdk", gir_version = "2.0")] namespace Gdk { - [CCode (cprefix = "GdkSelection", lower_case_cprefix = "gdk_selection_")] namespace Selection { [CCode (cheader_filename = "gdk/gdk.h")] public static void convert (Gdk.Window requestor, Gdk.Atom selection, Gdk.Atom target, uint32 time_); @@ -35,6 +34,7 @@ namespace Gdk { [CCode (cheader_filename = "gdk/gdk.h", ref_function = "g_object_ref", unref_function = "g_object_unref")] public class Bitmap { public weak GLib.Object parent_instance; + [Deprecated (since = "2.22")] public static Gdk.Bitmap create_from_data (Gdk.Drawable drawable, string data, int width, int height); } [CCode (cheader_filename = "gdk/gdk.h")] @@ -54,7 +54,7 @@ namespace Gdk { public unowned Gdk.Visual get_visual (); public void query_color (ulong pixel, out Gdk.Color _result); } - [CCode (cheader_filename = "gdk/gdk.h", ref_function = "gdk_cursor_ref", type_id = "GDK_TYPE_CURSOR", unref_function = "gdk_cursor_unref")] + [CCode (cheader_filename = "gdk/gdk.h", ref_function = "gdk_cursor_ref", unref_function = "gdk_cursor_unref")] [Compact] public class Cursor { public uint ref_count; @@ -267,7 +267,7 @@ namespace Gdk { public virtual void set_cairo_clip (Cairo.Context cr); public virtual void set_colormap (Gdk.Colormap colormap); } - [CCode (cheader_filename = "gdk/gdk.h", copy_function = "gdk_event_copy", type_id = "GDK_TYPE_EVENT")] + [CCode (cheader_filename = "gdk/gdk.h", copy_function = "gdk_event_copy")] [Compact] public class Event { public Gdk.EventAny any; @@ -310,7 +310,7 @@ namespace Gdk { public void send_clientmessage_toall (); public void set_screen (Gdk.Screen screen); } - [CCode (cheader_filename = "gdk/gdk.h", ref_function = "gdk_font_ref", type_id = "GDK_TYPE_FONT", unref_function = "gdk_font_unref")] + [CCode (cheader_filename = "gdk/gdk.h", ref_function = "gdk_font_ref", unref_function = "gdk_font_unref")] [Compact] public class Font { public int ascent; @@ -734,7 +734,7 @@ namespace Gdk { public static Gdk.Atom intern_static_string (string atom_name); public string name (); } - [CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_COLOR")] + [CCode (cheader_filename = "gdk/gdk.h")] public struct Color { public uint32 pixel; public uint16 red; @@ -747,13 +747,13 @@ namespace Gdk { public static bool parse (string spec, out Gdk.Color color); public string to_string (); } - [CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_DEVICE_AXIS")] + [CCode (cheader_filename = "gdk/gdk.h")] public struct DeviceAxis { public Gdk.AxisUse use; public double min; public double max; } - [CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_DEVICE_KEY")] + [CCode (cheader_filename = "gdk/gdk.h")] public struct DeviceKey { public uint keyval; public Gdk.ModifierType modifiers; @@ -963,7 +963,7 @@ namespace Gdk { public Gdk.WindowState changed_mask; public Gdk.WindowState new_window_state; } - [CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_GC_VALUES")] + [CCode (cheader_filename = "gdk/gdk.h")] public struct GCValues { public Gdk.Color foreground; public Gdk.Color background; @@ -984,7 +984,7 @@ namespace Gdk { public Gdk.CapStyle cap_style; public Gdk.JoinStyle join_style; } - [CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_GEOMETRY")] + [CCode (cheader_filename = "gdk/gdk.h")] public struct Geometry { public int min_width; public int min_height; @@ -998,7 +998,7 @@ namespace Gdk { public double max_aspect; public Gdk.Gravity win_gravity; } - [CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_KEYMAP_KEY")] + [CCode (cheader_filename = "gdk/gdk.h")] public struct KeymapKey { public uint keycode; public int group; @@ -1008,33 +1008,33 @@ namespace Gdk { [SimpleType] public struct NativeWindow { } - [CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_PANGO_ATTR_EMBOSS_COLOR")] + [CCode (cheader_filename = "gdk/gdk.h")] public struct PangoAttrEmbossColor { public weak Pango.Attribute attr; public Pango.Color color; - [CCode (cname = "gdk_pango_attr_emboss_color_new", has_construct_function = false)] + [CCode (has_construct_function = false)] public PangoAttrEmbossColor (Gdk.Color color); } - [CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_PANGO_ATTR_EMBOSSED")] + [CCode (cheader_filename = "gdk/gdk.h")] public struct PangoAttrEmbossed { public weak Pango.Attribute attr; public bool embossed; - [CCode (cname = "gdk_pango_attr_embossed_new", has_construct_function = false)] + [CCode (has_construct_function = false)] public PangoAttrEmbossed (bool embossed); } - [CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_PANGO_ATTR_STIPPLE")] + [CCode (cheader_filename = "gdk/gdk.h")] public struct PangoAttrStipple { public weak Pango.Attribute attr; public weak Gdk.Bitmap stipple; - [CCode (cname = "gdk_pango_attr_stipple_new", has_construct_function = false)] + [CCode (has_construct_function = false)] public PangoAttrStipple (Gdk.Bitmap stipple); } - [CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_POINT")] + [CCode (cheader_filename = "gdk/gdk.h")] public struct Point { public int x; public int y; } - [CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_RECTANGLE")] + [CCode (cheader_filename = "gdk/gdk.h")] public struct Rectangle { public int x; public int y; @@ -1043,39 +1043,39 @@ namespace Gdk { public bool intersect (Gdk.Rectangle src2, out Gdk.Rectangle dest); public void union (Gdk.Rectangle src2, out Gdk.Rectangle dest); } - [CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_RGB_CMAP")] + [CCode (cheader_filename = "gdk/gdk.h")] [Deprecated (since = "2.22")] public struct RgbCmap { [CCode (array_length = false)] public weak uint32[] colors; public int n_colors; public weak GLib.SList info_list; - [CCode (cname = "gdk_rgb_cmap_new", has_construct_function = false)] + [CCode (has_construct_function = false)] [Deprecated (since = "2.22")] public RgbCmap (uint32[] colors); [Deprecated (since = "2.22")] public void free (); } - [CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_SEGMENT")] + [CCode (cheader_filename = "gdk/gdk.h")] public struct Segment { public int x1; public int y1; public int x2; public int y2; } - [CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_SPAN")] + [CCode (cheader_filename = "gdk/gdk.h")] public struct Span { public int x; public int y; public int width; } - [CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_TIME_COORD")] + [CCode (cheader_filename = "gdk/gdk.h")] public struct TimeCoord { public uint32 time; [CCode (array_length = false)] public weak double[] axes; } - [CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_TRAPEZOID")] + [CCode (cheader_filename = "gdk/gdk.h")] public struct Trapezoid { public double y1; public double x11; @@ -1084,10 +1084,10 @@ namespace Gdk { public double x12; public double x22; } - [CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_WCHAR")] + [CCode (cheader_filename = "gdk/gdk.h")] public struct WChar { } - [CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_WINDOW_ATTR")] + [CCode (cheader_filename = "gdk/gdk.h")] public struct WindowAttr { public weak string title; public int event_mask; @@ -1105,11 +1105,11 @@ namespace Gdk { public bool override_redirect; public Gdk.WindowTypeHint type_hint; } - [CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_WINDOW_REDIRECT")] + [CCode (cheader_filename = "gdk/gdk.h")] public struct WindowRedirect { public static void to_drawable (Gdk.Window window, Gdk.Drawable drawable, int src_x, int src_y, int dest_x, int dest_y, int width, int height); } - [CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_XEVENT")] + [CCode (cheader_filename = "gdk/gdk.h")] public struct XEvent { } [CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_AXIS_")] diff --git a/vapi/gdk-3.0.vapi b/vapi/gdk-3.0.vapi index 996b78410..2b50dfdb6 100644 --- a/vapi/gdk-3.0.vapi +++ b/vapi/gdk-3.0.vapi @@ -1,8 +1,7 @@ /* gdk-3.0.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Gdk", gir_namespace = "Gdk", gir_version = "3.0", lower_case_cprefix = "gdk_")] +[CCode (gir_namespace = "Gdk", gir_version = "3.0")] namespace Gdk { - [CCode (cprefix = "GdkSelection", lower_case_cprefix = "gdk_selection_")] namespace Selection { [CCode (cheader_filename = "gdk/gdk.h")] public static void convert (Gdk.Window requestor, Gdk.Atom selection, Gdk.Atom target, uint32 time_); @@ -177,7 +176,7 @@ namespace Gdk { public unowned GLib.List list_targets (); public void set_device (Gdk.Device device); } - [CCode (cheader_filename = "gdk/gdk.h", copy_function = "gdk_event_copy", type_id = "GDK_TYPE_EVENT")] + [CCode (cheader_filename = "gdk/gdk.h", copy_function = "gdk_event_copy")] [Compact] public class Event { public Gdk.EventAny any; @@ -460,7 +459,7 @@ namespace Gdk { public static Gdk.Atom intern_static_string (string atom_name); public string name (); } - [CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_COLOR")] + [CCode (cheader_filename = "gdk/gdk.h")] public struct Color { public uint32 pixel; public uint16 red; @@ -663,7 +662,7 @@ namespace Gdk { public Gdk.WindowState changed_mask; public Gdk.WindowState new_window_state; } - [CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_GEOMETRY")] + [CCode (cheader_filename = "gdk/gdk.h")] public struct Geometry { public int min_width; public int min_height; @@ -677,18 +676,18 @@ namespace Gdk { public double max_aspect; public Gdk.Gravity win_gravity; } - [CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_KEYMAP_KEY")] + [CCode (cheader_filename = "gdk/gdk.h")] public struct KeymapKey { public uint keycode; public int group; public int level; } - [CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_POINT")] + [CCode (cheader_filename = "gdk/gdk.h")] public struct Point { public int x; public int y; } - [CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_RGBA")] + [CCode (cheader_filename = "gdk/gdk.h")] public struct RGBA { public double red; public double green; @@ -701,7 +700,7 @@ namespace Gdk { public bool parse (string spec); public unowned string to_string (); } - [CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_RECTANGLE")] + [CCode (cheader_filename = "gdk/gdk.h")] public struct Rectangle { public int x; public int y; @@ -710,13 +709,13 @@ namespace Gdk { public bool intersect (Gdk.Rectangle src2, out Gdk.Rectangle dest); public void union (Gdk.Rectangle src2, out Gdk.Rectangle dest); } - [CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_TIME_COORD")] + [CCode (cheader_filename = "gdk/gdk.h")] public struct TimeCoord { public uint32 time; [CCode (array_length = false)] public weak double[] axes; } - [CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_WINDOW_ATTR")] + [CCode (cheader_filename = "gdk/gdk.h")] public struct WindowAttr { public weak string title; public int event_mask; @@ -733,10 +732,10 @@ namespace Gdk { public bool override_redirect; public Gdk.WindowTypeHint type_hint; } - [CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_WINDOW_REDIRECT")] + [CCode (cheader_filename = "gdk/gdk.h")] public struct WindowRedirect { } - [CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_XEVENT")] + [CCode (cheader_filename = "gdk/gdk.h")] public struct XEvent { } [CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_AXIS_")] diff --git a/vapi/gdk-pixbuf-2.0.vapi b/vapi/gdk-pixbuf-2.0.vapi index 4009a7455..523c156d7 100644 --- a/vapi/gdk-pixbuf-2.0.vapi +++ b/vapi/gdk-pixbuf-2.0.vapi @@ -1,6 +1,6 @@ /* gdk-pixbuf-2.0.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Gdk", gir_namespace = "GdkPixbuf", gir_version = "2.0", lower_case_cprefix = "gdk_")] +[CCode (gir_namespace = "GdkPixbuf", gir_version = "2.0")] namespace Gdk { [CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")] public class Pixbuf : GLib.Object, GLib.Icon { @@ -93,7 +93,7 @@ namespace Gdk { public unowned Gdk.Pixbuf get_pixbuf (); public bool on_currently_loading_frame (); } - [CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h", copy_function = "gdk_pixbuf_format_copy", type_id = "GDK_TYPE_PIXBUF_FORMAT")] + [CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h", copy_function = "gdk_pixbuf_format_copy")] [Compact] public class PixbufFormat { public unowned Gdk.PixbufFormat copy (); @@ -146,7 +146,7 @@ namespace Gdk { [CCode (has_construct_function = false)] protected PixbufSimpleAnimIter (); } - [CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h", type_id = "GDK_TYPE_PIXDATA")] + [CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")] public struct Pixdata { public uint32 magic; public int32 length; diff --git a/vapi/gdk-x11-2.0.vapi b/vapi/gdk-x11-2.0.vapi index 6a48be138..4973a1728 100644 --- a/vapi/gdk-x11-2.0.vapi +++ b/vapi/gdk-x11-2.0.vapi @@ -1,6 +1,5 @@ /* gdk-x11-2.0.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Gdk", lower_case_cprefix = "gdk_")] namespace Gdk { [CCode (cheader_filename = "gdk/gdkx.h")] public static X.Atom x11_atom_to_xatom (Gdk.Atom atom); @@ -85,7 +84,7 @@ namespace Gdk { [CCode (cheader_filename = "gdk/gdkx.h", cname = "gdkx_visual_get")] public static unowned Gdk.Visual x11_visual_get (uint32 xvisualid); [CCode (cheader_filename = "gdk/gdkx.h")] - public static unowned Gdk.Visual x11_visual_get_xvisual (Gdk.Visual visual); + public static X.Visual x11_visual_get_xvisual (Gdk.Visual visual); [CCode (cheader_filename = "gdk/gdkx.h")] public static unowned Gdk.Drawable x11_window_get_drawable_impl (Gdk.Window window); [CCode (cheader_filename = "gdk/gdkx.h")] diff --git a/vapi/gdk-x11-3.0.vapi b/vapi/gdk-x11-3.0.vapi index 1d326a25c..2ab66c7d5 100644 --- a/vapi/gdk-x11-3.0.vapi +++ b/vapi/gdk-x11-3.0.vapi @@ -1,6 +1,5 @@ /* gdk-x11-3.0.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Gdk", lower_case_cprefix = "gdk_")] namespace Gdk { [CCode (cheader_filename = "gdk/gdkx.h")] public class X11AppLaunchContext : Gdk.AppLaunchContext { @@ -92,7 +91,7 @@ namespace Gdk { public class X11Visual : Gdk.Visual { [CCode (has_construct_function = false)] protected X11Visual (); - public static unowned Gdk.Visual get_xvisual (Gdk.Visual visual); + public static X.Visual get_xvisual (Gdk.Visual visual); } [CCode (cheader_filename = "gdk/gdkx.h")] [Compact] diff --git a/vapi/gdl-1.0.vapi b/vapi/gdl-1.0.vapi index 37bd9385d..cc77b87f8 100644 --- a/vapi/gdl-1.0.vapi +++ b/vapi/gdl-1.0.vapi @@ -1,6 +1,5 @@ /* gdl-1.0.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Gdl", lower_case_cprefix = "gdl_")] namespace Gdl { [CCode (cheader_filename = "gdl/gdl.h")] public class Dock : Gdl.DockObject, Atk.Implementor, Gtk.Buildable { @@ -188,7 +187,9 @@ namespace Gdl { public string name { owned get; construct; } [NoAccessorMethod] public string stock_id { owned get; set; } + [CCode (cname = "detach")] public virtual signal void detached (bool recursive); + [CCode (cname = "dock")] public virtual signal void docked (Gdl.DockObject requestor, Gdl.DockPlacement position, GLib.Value other_data); } [CCode (cheader_filename = "gdl/gdl.h")] diff --git a/vapi/gdu-gtk.vapi b/vapi/gdu-gtk.vapi index 82e6c774b..06fb307a6 100644 --- a/vapi/gdu-gtk.vapi +++ b/vapi/gdu-gtk.vapi @@ -1,6 +1,5 @@ /* gdu-gtk.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Gdu", lower_case_cprefix = "gdu_")] namespace Gdu { [CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")] public class AddComponentLinuxMdDialog : Gdu.Dialog, Atk.Implementor, Gtk.Buildable { diff --git a/vapi/gdu.vapi b/vapi/gdu.vapi index 20e0850e9..695b6aa6f 100644 --- a/vapi/gdu.vapi +++ b/vapi/gdu.vapi @@ -1,6 +1,5 @@ /* gdu.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Gdu", lower_case_cprefix = "gdu_")] namespace Gdu { [CCode (cheader_filename = "gdu/gdu.h")] public class Adapter : GLib.Object { @@ -461,7 +460,7 @@ namespace Gdu { [CCode (cheader_filename = "gdu/gdu.h")] public delegate void DeviceDriveAtaSmartRefreshDataCompletedFunc (Gdu.Device device, GLib.Error error); [CCode (cheader_filename = "gdu/gdu.h")] - public delegate void DeviceDriveBenchmarkCompletedFunc (Gdu.Device device, GLib.GenericArray read_transfer_rate_results, GLib.GenericArray write_transfer_rate_results, GLib.GenericArray access_time_results, GLib.Error error); + public delegate void DeviceDriveBenchmarkCompletedFunc (Gdu.Device device, GLib.PtrArray read_transfer_rate_results, GLib.PtrArray write_transfer_rate_results, GLib.PtrArray access_time_results, GLib.Error error); [CCode (cheader_filename = "gdu/gdu.h")] public delegate void DeviceDriveDetachCompletedFunc (Gdu.Device device, GLib.Error error); [CCode (cheader_filename = "gdu/gdu.h")] diff --git a/vapi/gedit-2.20.vapi b/vapi/gedit-2.20.vapi index 0c4ecd131..cbb9cb35b 100644 --- a/vapi/gedit-2.20.vapi +++ b/vapi/gedit-2.20.vapi @@ -1,6 +1,5 @@ /* gedit-2.20.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Gedit", lower_case_cprefix = "gedit_")] namespace Gedit { [CCode (cheader_filename = "gedit/gedit-app.h")] public class App : GLib.Object { @@ -54,7 +53,7 @@ namespace Gedit { public void set_short_name_for_display (string name); public void set_uri (string uri); } - [CCode (cheader_filename = "gedit/gedit-encodings.h")] + [CCode (cheader_filename = "gedit/gedit-encodings.h", copy_function = "gedit_encoding_copy")] public class Encoding : GLib.Object { public unowned Gedit.Encoding copy (); public unowned string get_charset (); @@ -195,6 +194,7 @@ namespace Gedit { [CCode (has_construct_function = false, type = "GtkWidget*")] public Statusbar (); public void clear_overwrite (); + [CCode (cheader_filename = "gedit/gedit-statusbar.h")] public void flash_message (uint context_id, string format, ...); public void set_cursor_position (int line, int col); public void set_overwrite (bool overwrite); diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi index ee882a2ae..558e834ba 100644 --- a/vapi/gio-2.0.vapi +++ b/vapi/gio-2.0.vapi @@ -2,7 +2,6 @@ [CCode (cprefix = "G", gir_namespace = "Gio", gir_version = "2.0", lower_case_cprefix = "g_")] namespace GLib { - [CCode (cprefix = "GBus", lower_case_cprefix = "g_bus_")] namespace Bus { [CCode (cheader_filename = "gio/gio.h")] public static async GLib.DBusConnection @get (GLib.BusType bus_type, GLib.Cancellable? cancellable = null) throws GLib.IOError; @@ -25,7 +24,6 @@ namespace GLib { [CCode (cheader_filename = "gio/gio.h", cname = "g_bus_watch_name_on_connection_with_closures")] public static uint watch_name_on_connection (GLib.DBusConnection connection, string name, GLib.BusNameWatcherFlags flags, [CCode (type = "GClosure*")] owned GLib.BusNameAppearedCallback? name_appeared_handler, [CCode (type = "GClosure*")] owned GLib.BusNameVanishedCallback? name_vanished_handler); } - [CCode (cprefix = "GContentType", lower_case_cprefix = "g_content_type_")] namespace ContentType { [CCode (cheader_filename = "gio/gio.h")] public static bool can_be_executable (string type); @@ -67,7 +65,7 @@ namespace GLib { public virtual string get_startup_notify_id (GLib.AppInfo info, GLib.List files); public virtual void launch_failed (string startup_notify_id); } - [CCode (cheader_filename = "gio/gio.h")] + [CCode (cheader_filename = "gio/gio.h", cname = "GApplication")] public class Application : GLib.Object, GLib.ActionGroup { [CCode (has_construct_function = false)] public Application (string application_id, GLib.ApplicationFlags flags); @@ -225,7 +223,7 @@ namespace GLib { [Compact] public class CredentialsClass { } - [CCode (cheader_filename = "gio/gio.h", ref_function = "g_dbus_annotation_info_ref", type_id = "G_TYPE_DBUS_ANNOTATION_INFO", unref_function = "g_dbus_annotation_info_unref")] + [CCode (cheader_filename = "gio/gio.h", ref_function = "g_dbus_annotation_info_ref", unref_function = "g_dbus_annotation_info_unref")] [Compact] public class DBusAnnotationInfo { [CCode (array_length = false, array_null_terminated = true)] @@ -235,7 +233,7 @@ namespace GLib { public weak string value; public unowned string lookup (string name); } - [CCode (cheader_filename = "gio/gio.h", ref_function = "g_dbus_arg_info_ref", type_id = "G_TYPE_DBUS_ARG_INFO", unref_function = "g_dbus_arg_info_unref")] + [CCode (cheader_filename = "gio/gio.h", ref_function = "g_dbus_arg_info_ref", unref_function = "g_dbus_arg_info_unref")] [Compact] public class DBusArgInfo { [CCode (array_length = false, array_null_terminated = true)] @@ -251,7 +249,7 @@ namespace GLib { [HasEmitter] public virtual signal bool authorize_authenticated_peer (GLib.IOStream p0, GLib.Credentials p1); } - [CCode (cheader_filename = "gio/gio.h")] + [CCode (cheader_filename = "gio/gio.h", cname = "GDBusConnection")] public class DBusConnection : GLib.Object, GLib.Initable, GLib.AsyncInitable { [CCode (has_construct_function = false, type = "void")] public async DBusConnection (GLib.IOStream stream, string guid, GLib.DBusConnectionFlags flags, GLib.DBusAuthObserver? observer = null, GLib.Cancellable? cancellable = null) throws GLib.Error; @@ -306,7 +304,7 @@ namespace GLib { public weak string dbus_error_name; public int error_code; } - [CCode (cheader_filename = "gio/gio.h", ref_function = "g_dbus_interface_info_ref", type_id = "G_TYPE_DBUS_INTERFACE_INFO", unref_function = "g_dbus_interface_info_unref")] + [CCode (cheader_filename = "gio/gio.h", ref_function = "g_dbus_interface_info_ref", unref_function = "g_dbus_interface_info_unref")] [Compact] public class DBusInterfaceInfo { [CCode (array_length = false, array_null_terminated = true)] @@ -413,7 +411,7 @@ namespace GLib { public bool to_gerror () throws GLib.Error; public bool locked { get; } } - [CCode (cheader_filename = "gio/gio.h", ref_function = "g_dbus_method_info_ref", type_id = "G_TYPE_DBUS_METHOD_INFO", unref_function = "g_dbus_method_info_unref")] + [CCode (cheader_filename = "gio/gio.h", ref_function = "g_dbus_method_info_ref", unref_function = "g_dbus_method_info_unref")] [Compact] public class DBusMethodInfo { [CCode (array_length = false, array_null_terminated = true)] @@ -446,7 +444,7 @@ namespace GLib { public void return_value (GLib.Variant parameters); public void take_error (GLib.Error error); } - [CCode (cheader_filename = "gio/gio.h", ref_function = "g_dbus_node_info_ref", type_id = "G_TYPE_DBUS_NODE_INFO", unref_function = "g_dbus_node_info_unref")] + [CCode (cheader_filename = "gio/gio.h", ref_function = "g_dbus_node_info_ref", unref_function = "g_dbus_node_info_unref")] [Compact] public class DBusNodeInfo { [CCode (array_length = false, array_null_terminated = true)] @@ -531,7 +529,7 @@ namespace GLib { public string object_path { owned get; set construct; } public virtual signal bool authorize_method (GLib.DBusInterfaceSkeleton interface_, GLib.DBusMethodInvocation invocation); } - [CCode (cheader_filename = "gio/gio.h", ref_function = "g_dbus_property_info_ref", type_id = "G_TYPE_DBUS_PROPERTY_INFO", unref_function = "g_dbus_property_info_unref")] + [CCode (cheader_filename = "gio/gio.h", ref_function = "g_dbus_property_info_ref", unref_function = "g_dbus_property_info_unref")] [Compact] public class DBusPropertyInfo { [CCode (array_length = false, array_null_terminated = true)] @@ -609,7 +607,7 @@ namespace GLib { public string guid { get; construct; } public virtual signal bool new_connection (GLib.DBusConnection p0); } - [CCode (cheader_filename = "gio/gio.h", ref_function = "g_dbus_signal_info_ref", type_id = "G_TYPE_DBUS_SIGNAL_INFO", unref_function = "g_dbus_signal_info_unref")] + [CCode (cheader_filename = "gio/gio.h", ref_function = "g_dbus_signal_info_ref", unref_function = "g_dbus_signal_info_unref")] [Compact] public class DBusSignalInfo { [CCode (array_length = false, array_null_terminated = true)] @@ -702,7 +700,7 @@ namespace GLib { public weak string name; public GLib.FileAttributeType type; } - [CCode (cheader_filename = "gio/gio.h", ref_function = "g_file_attribute_info_list_ref", type_id = "G_TYPE_FILE_ATTRIBUTE_INFO_LIST", unref_function = "g_file_attribute_info_list_unref")] + [CCode (cheader_filename = "gio/gio.h", ref_function = "g_file_attribute_info_list_ref", unref_function = "g_file_attribute_info_list_unref")] [Compact] public class FileAttributeInfoList { public weak GLib.FileAttributeInfo infos; @@ -713,7 +711,7 @@ namespace GLib { public unowned GLib.FileAttributeInfoList dup (); public unowned GLib.FileAttributeInfo lookup (string name); } - [CCode (cheader_filename = "gio/gio.h", ref_function = "g_file_attribute_matcher_ref", type_id = "G_TYPE_FILE_ATTRIBUTE_MATCHER", unref_function = "g_file_attribute_matcher_unref")] + [CCode (cheader_filename = "gio/gio.h", ref_function = "g_file_attribute_matcher_ref", unref_function = "g_file_attribute_matcher_unref")] [Compact] public class FileAttributeMatcher { [CCode (has_construct_function = false)] @@ -910,7 +908,7 @@ namespace GLib { public GLib.OutputStream base_stream { get; construct; } public bool close_base_stream { get; construct; } } - [CCode (cheader_filename = "gio/gio.h")] + [CCode (cheader_filename = "gio/gio.h", cname = "GIOExtension")] [Compact] public class IOExtension { public unowned string get_name (); @@ -1519,13 +1517,13 @@ namespace GLib { public void stop (); public virtual signal bool incoming (GLib.SocketConnection connection, GLib.Object? source_object); } - [CCode (cheader_filename = "gio/gio.h", cname = "GSource")] + [CCode (cheader_filename = "gio/gio.h", cname = "GSource", ref_function = "g_source_ref", unref_function = "g_source_unref")] [Compact] public class SocketSource : GLib.Source { [CCode (cname = "g_source_set_callback")] public void set_callback ([CCode (type = "GSourceFunc")] owned GLib.SocketSourceFunc func); } - [CCode (cheader_filename = "gio/gio.h", copy_function = "g_srv_target_copy", type_id = "G_TYPE_SRV_TARGET")] + [CCode (cheader_filename = "gio/gio.h", copy_function = "g_srv_target_copy")] [Compact] public class SrvTarget { [CCode (has_construct_function = false)] @@ -1856,7 +1854,7 @@ namespace GLib { public signal void eject_button (); public signal void stop_button (); } - [CCode (cheader_filename = "gio/gio.h")] + [CCode (cheader_filename = "gio/gio.h", cname = "GFile")] public interface File : GLib.Object { public abstract GLib.FileOutputStream append_to (GLib.FileCreateFlags flags, GLib.Cancellable? cancellable = null) throws GLib.Error; public abstract async GLib.FileOutputStream append_to_async (GLib.FileCreateFlags flags, int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null) throws GLib.Error; @@ -1961,7 +1959,7 @@ namespace GLib { public static GLib.Icon? new_for_string (string str) throws GLib.Error; public string? to_string (); [NoWrapper] - public virtual bool to_tokens (GLib.GenericArray tokens, out int out_version); + public virtual bool to_tokens (GLib.PtrArray tokens, out int out_version); } [CCode (cheader_filename = "gio/gio.h")] public interface Initable : GLib.Object { @@ -2656,9 +2654,9 @@ namespace GLib { public delegate void SimpleAsyncThreadFunc (GLib.SimpleAsyncResult res, GLib.Object object, GLib.Cancellable? cancellable); [CCode (cheader_filename = "gio/gio.h")] public delegate bool SocketSourceFunc (GLib.Socket socket, GLib.IOCondition condition); - [CCode (cheader_filename = "gio/gio.h")] + [CCode (cheader_filename = "gio/gio.h", cname = "g_file_equal")] public static GLib.EqualFunc file_equal; - [CCode (cheader_filename = "gio/gio.h")] + [CCode (cheader_filename = "gio/gio.h", cname = "g_file_hash")] public static GLib.HashFunc file_hash; [CCode (cheader_filename = "gio/gio.h")] public const string FILE_ATTRIBUTE_ACCESS_CAN_DELETE; diff --git a/vapi/gio-unix-2.0.vapi b/vapi/gio-unix-2.0.vapi index 43daa97bb..89f5d6498 100644 --- a/vapi/gio-unix-2.0.vapi +++ b/vapi/gio-unix-2.0.vapi @@ -45,14 +45,14 @@ namespace GLib { public bool close_fd { get; set; } public int fd { get; construct; } } - [CCode (cheader_filename = "gio/gunixmounts.h", free_function = "g_unix_mount_free")] + [CCode (cheader_filename = "gio/gunixmounts.h", cname = "GUnixMountEntry", free_function = "g_unix_mount_free", lower_case_prefix = "g_unix_mount_")] [Compact] public class UnixMountEntry { [CCode (cname = "g_unix_mount_at")] public UnixMountEntry (string mount_path, uint64 time_read); [CCode (cname = "g_unix_mount_compare")] public int compare (GLib.UnixMountEntry mount); - [CCode (cname = "g_unix_mounts_get")] + [CCode (cheader_filename = "gio/gunixmounts.h", cname = "g_unix_mounts_get")] public static GLib.List @get (out uint64 time_read = null); [CCode (cname = "g_unix_mount_get_device_path")] public unowned string get_device_path (); diff --git a/vapi/gnome-desktop-2.0.vapi b/vapi/gnome-desktop-2.0.vapi index 53a4636f2..a3c29f7d3 100644 --- a/vapi/gnome-desktop-2.0.vapi +++ b/vapi/gnome-desktop-2.0.vapi @@ -1,6 +1,5 @@ /* gnome-desktop-2.0.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Gnome", lower_case_cprefix = "gnome_")] namespace Gnome { [CCode (cheader_filename = "libgnomeui/gnome-ditem-edit.h")] public class DItemEdit : Gtk.Notebook, Atk.Implementor, Gtk.Buildable { @@ -19,7 +18,7 @@ namespace Gnome { public virtual signal void icon_changed (); public virtual signal void name_changed (); } - [CCode (cheader_filename = "libgnome/gnome-desktop-item.h", ref_function = "gnome_desktop_item_ref", type_id = "GNOME_TYPE_DESKTOP_ITEM", unref_function = "gnome_desktop_item_unref")] + [CCode (cheader_filename = "libgnome/gnome-desktop-item.h", ref_function = "gnome_desktop_item_ref", unref_function = "gnome_desktop_item_unref")] [Compact] public class DesktopItem { [CCode (has_construct_function = false)] diff --git a/vapi/gnome-keyring-1.vapi b/vapi/gnome-keyring-1.vapi index cbf4609a6..32242b75c 100644 --- a/vapi/gnome-keyring-1.vapi +++ b/vapi/gnome-keyring-1.vapi @@ -1,6 +1,5 @@ /* gnome-keyring-1.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "GnomeKeyring", lower_case_cprefix = "gnome_keyring_")] namespace GnomeKeyring { [CCode (cheader_filename = "gnome-keyring.h", copy_function = "gnome_keyring_access_control_copy")] [Compact] @@ -16,7 +15,7 @@ namespace GnomeKeyring { public ApplicationRef (); public GnomeKeyring.ApplicationRef copy (); } - [CCode (cheader_filename = "gnome-keyring.h", copy_function = "gnome_keyring_attribute_list_copy")] + [CCode (cheader_filename = "gnome-keyring.h", copy_function = "gnome_keyring_attribute_list_copy", free_function = "gnome_keyring_attribute_list_free")] [Compact] public class AttributeList { [CCode (array_length = false)] @@ -85,7 +84,7 @@ namespace GnomeKeyring { public void* reserved2; public void* reserved3; } - [CCode (cheader_filename = "gnome-keyring.h", type_id = "GNOME_KEYRING_TYPE_ATTRIBUTE")] + [CCode (cheader_filename = "gnome-keyring.h")] public struct Attribute { public weak string name; public GnomeKeyring.AttributeType type; @@ -157,7 +156,7 @@ namespace GnomeKeyring { public static GnomeKeyring.PasswordSchema NETWORK_PASSWORD; [CCode (cheader_filename = "gnome-keyring.h")] public const string DEFAULT; - [CCode (cheader_filename = "gnome-keyring.h")] + [CCode (cheader_filename = "gnome-keyring.h", cname = "GNOME_KEYRING_SESSION")] public const string SESSION; [CCode (cheader_filename = "gnome-keyring.h")] public static GLib.List acl_copy (GLib.List list); diff --git a/vapi/gnome-vfs-2.0.vapi b/vapi/gnome-vfs-2.0.vapi index 991527bcb..a81e21499 100644 --- a/vapi/gnome-vfs-2.0.vapi +++ b/vapi/gnome-vfs-2.0.vapi @@ -1,6 +1,5 @@ /* gnome-vfs-2.0.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "GnomeVFS", lower_case_cprefix = "gnome_vfs_")] namespace GnomeVFS { [CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")] public class ACE : GLib.Object { @@ -56,7 +55,7 @@ namespace GnomeVFS { public class ACLPerm { public unowned string to_string (); } - [CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", type_id = "GNOME_VFS_TYPE_ADDRESS")] + [CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")] [Compact] public class Address { public unowned GnomeVFS.Address dup (); @@ -143,7 +142,7 @@ namespace GnomeVFS { public virtual signal void volume_pre_unmount (GnomeVFS.Volume volume); public virtual signal void volume_unmounted (GnomeVFS.Volume volume); } - [CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", ref_function = "gnome_vfs_file_info_ref", ref_function_void = true, type_id = "GNOME_VFS_TYPE_FILE_INFO", unref_function = "gnome_vfs_file_info_unref")] + [CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", ref_function = "gnome_vfs_file_info_ref", ref_function_void = true, unref_function = "gnome_vfs_file_info_unref")] [Compact] public class FileInfo { public weak GnomeVFS.ACL acl; @@ -202,11 +201,11 @@ namespace GnomeVFS { public weak GnomeVFS.URI uri; public unowned GnomeVFS.GetFileInfoResult dup (); } - [CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", type_id = "GNOME_VFS_TYPE_GNOME_VFS_FIND_DIRECTORY_RESULT")] + [CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")] [Compact] public class GnomeVfsFindDirectoryResult { } - [CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", type_id = "GNOME_VFS_TYPE_GNOME_VFS_GET_FILE_INFO_RESULT")] + [CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")] [Compact] public class GnomeVfsGetFileInfoResult { } @@ -569,8 +568,6 @@ namespace GnomeVFS { public GnomeVFS.Result vfs_status; } [CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")] - [IntegerType (rank = 0)] - [SimpleType] public struct FileSize : uint64 { } [CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_DNS_SD_SERVICE_")] diff --git a/vapi/goocanvas.vapi b/vapi/goocanvas.vapi index 8f7348e17..999a81a64 100644 --- a/vapi/goocanvas.vapi +++ b/vapi/goocanvas.vapi @@ -13,7 +13,7 @@ namespace Goo { public double yy; public static Cairo.Matrix copy (Cairo.Matrix matrix); } - [CCode (cheader_filename = "goocanvas.h", type_id = "GOO_TYPE_CAIRO_PATTERN")] + [CCode (cheader_filename = "goocanvas.h")] [Compact] public class CairoPattern { } @@ -887,14 +887,14 @@ namespace Goo { public signal void child_notify (GLib.ParamSpec pspec); public signal void child_removed (int child_num); } - [CCode (cheader_filename = "goocanvas.h", type_id = "GOO_TYPE_CANVAS_BOUNDS")] + [CCode (cheader_filename = "goocanvas.h")] public struct CanvasBounds { public double x1; public double y1; public double x2; public double y2; } - [CCode (cheader_filename = "goocanvas.h", type_id = "GOO_TYPE_CANVAS_ITEM_SIMPLE_DATA")] + [CCode (cheader_filename = "goocanvas.h")] public struct CanvasItemSimpleData { public Cairo.Matrix? transform; public weak GLib.Array clip_path_commands; @@ -916,7 +916,7 @@ namespace Goo { public Goo.CanvasPathCommandCurve curve; public Goo.CanvasPathCommandArc arc; } - [CCode (cheader_filename = "goocanvas.h", type_id = "GOO_TYPE_CANVAS_PATH_COMMAND_ARC")] + [CCode (cheader_filename = "goocanvas.h")] public struct CanvasPathCommandArc { public uint type; public uint relative; @@ -928,7 +928,7 @@ namespace Goo { public double x; public double y; } - [CCode (cheader_filename = "goocanvas.h", type_id = "GOO_TYPE_CANVAS_PATH_COMMAND_CURVE")] + [CCode (cheader_filename = "goocanvas.h")] public struct CanvasPathCommandCurve { public uint type; public uint relative; @@ -939,14 +939,14 @@ namespace Goo { public double x2; public double y2; } - [CCode (cheader_filename = "goocanvas.h", type_id = "GOO_TYPE_CANVAS_PATH_COMMAND_SIMPLE")] + [CCode (cheader_filename = "goocanvas.h")] public struct CanvasPathCommandSimple { public uint type; public uint relative; public double x; public double y; } - [CCode (cheader_filename = "goocanvas.h", type_id = "GOO_TYPE_CANVAS_STYLE_PROPERTY")] + [CCode (cheader_filename = "goocanvas.h")] public struct CanvasStyleProperty { public GLib.Quark id; public GLib.Value value; diff --git a/vapi/gstreamer-0.10.vapi b/vapi/gstreamer-0.10.vapi index 2b4149989..978622d32 100644 --- a/vapi/gstreamer-0.10.vapi +++ b/vapi/gstreamer-0.10.vapi @@ -141,7 +141,7 @@ namespace Gst { public unowned Gst.BufferList @ref (); public void unref (); } - [CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_BUFFER_LIST_ITERATOR")] + [CCode (cheader_filename = "gst/gst.h")] [Compact] public class BufferListIterator { public void add (owned Gst.Buffer buffer); @@ -230,7 +230,7 @@ namespace Gst { public void* save_thyself (void* parent); public void set_simple (string field, ...); public void set_simple_valist (string field, void* varargs); - public void set_value (string field, Gst.Value value); + public void set_value (string field, GLib.Value value); [CCode (has_construct_function = false)] public Caps.simple (string media_type, string fieldname, ...); public unowned Gst.Structure steal_structure (uint index); @@ -320,11 +320,11 @@ namespace Gst { public Gst.ClockReturn wait_async (Gst.ClockCallback func); public Gst.ClockReturn wait_async_full (Gst.ClockCallback func, GLib.DestroyNotify destroy_data); } - [CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_DATE")] + [CCode (cheader_filename = "gst/gst.h")] [Compact] public class Date { } - [CCode (cheader_filename = "gst/gst.h", ref_function = "gst_date_time_ref", type_id = "GST_TYPE_DATE_TIME", unref_function = "gst_date_time_unref")] + [CCode (cheader_filename = "gst/gst.h", ref_function = "gst_date_time_ref", unref_function = "gst_date_time_unref")] [Compact] public class DateTime { [CCode (has_construct_function = false)] @@ -405,7 +405,7 @@ namespace Gst { public weak GLib.List srcpads; public weak GLib.Cond state_cond; public uint32 state_cookie; - public void* state_lock; + public GLib.StaticRecMutex state_lock; [CCode (cname = "abidata.ABI.target_state")] public Gst.State target_state; [CCode (has_construct_function = false)] @@ -599,7 +599,7 @@ namespace Gst { public static GLib.Quark type_to_quark (Gst.EventType type); public void unref (); } - [CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_GERROR")] + [CCode (cheader_filename = "gst/gst.h")] [Compact] public class GError { } @@ -830,7 +830,7 @@ namespace Gst { public void weak_ref (Gst.MiniObjectWeakNotify notify, void* data); public void weak_unref (Gst.MiniObjectWeakNotify notify, void* data); } - [CCode (cheader_filename = "gst/gst.h", ref_function = "gst_object_ref", unref_function = "gst_object_unref")] + [CCode (cheader_filename = "gst/gst.h", ref_function = "gst_object_ref", ref_sink_function = "gst_object_ref_sink", unref_function = "gst_object_unref")] public abstract class Object : GLib.Object { public Gst.ObjectFlags flags; public weak GLib.Mutex @lock; @@ -1038,7 +1038,7 @@ namespace Gst { [CCode (cheader_filename = "gst/gst.h")] public class ParamSpecMiniObject : GLib.ParamSpec { } - [CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_PARSE_CONTEXT")] + [CCode (cheader_filename = "gst/gst.h")] [Compact] public class ParseContext { [CCode (has_construct_function = false)] @@ -1231,7 +1231,7 @@ namespace Gst { public virtual signal void feature_added (void* feature); public virtual signal void plugin_added (void* plugin); } - [CCode (cheader_filename = "gst/gst.h", copy_function = "gst_segment_copy", type_id = "GST_TYPE_SEGMENT")] + [CCode (cheader_filename = "gst/gst.h", copy_function = "gst_segment_copy")] [Compact] public class Segment { public double abs_rate; @@ -1308,8 +1308,8 @@ namespace Gst { public bool id_has_field_typed (GLib.Quark field, GLib.Type type); public void id_set (GLib.Quark fieldname, ...); public void id_set_valist (GLib.Quark fieldname, va_list varargs); - public void id_set_value (GLib.Quark field, Gst.Value value); - public void id_take_value (GLib.Quark field, Gst.Value value); + public void id_set_value (GLib.Quark field, GLib.Value value); + public void id_take_value (GLib.Quark field, GLib.Value value); public unowned Gst.Structure intersect (Gst.Structure struct2); public bool is_equal (Gst.Structure structure2); public bool is_subset (Gst.Structure superset); @@ -1324,8 +1324,8 @@ namespace Gst { public void set_name (string name); public void set_parent_refcount (ref int refcount); public void set_valist (string fieldname, va_list varargs); - public void set_value (string fieldname, Gst.Value value); - public void take_value (string fieldname, Gst.Value value); + public void set_value (string fieldname, GLib.Value value); + public void take_value (string fieldname, GLib.Value value); public string to_string (); [CCode (has_construct_function = false)] public Structure.valist (string name, string firstfield, va_list varargs); @@ -1346,7 +1346,7 @@ namespace Gst { public void add (Gst.TagMergeMode mode, string tag, ...); public void add_valist (Gst.TagMergeMode mode, string tag, void* var_args); public void add_valist_values (Gst.TagMergeMode mode, string tag, void* var_args); - public void add_value (Gst.TagMergeMode mode, string tag, Gst.Value value); + public void add_value (Gst.TagMergeMode mode, string tag, GLib.Value value); public void add_values (Gst.TagMergeMode mode, string tag, ...); public Gst.TagList copy (); public static bool copy_value (out Gst.Value dest, Gst.TagList list, string tag); @@ -1401,7 +1401,7 @@ namespace Gst { public weak GLib.Cond cond; public void* data; public weak Gst.TaskFunction func; - public void* @lock; + public GLib.StaticRecMutex @lock; public bool running; public Gst.TaskState state; [CCode (has_construct_function = false)] @@ -1412,7 +1412,7 @@ namespace Gst { public Gst.TaskState get_state (); public bool join (); public bool pause (); - public void set_lock (void* mutex); + public void set_lock (GLib.StaticRecMutex mutex); public void set_pool (Gst.TaskPool pool); public void set_priority (GLib.ThreadPriority priority); public bool set_state (Gst.TaskState state); @@ -1566,7 +1566,7 @@ namespace Gst { public interface TagSetter : Gst.Element { public void add_tag_valist (Gst.TagMergeMode mode, string tag, void* var_args); public void add_tag_valist_values (Gst.TagMergeMode mode, string tag, void* var_args); - public void add_tag_value (Gst.TagMergeMode mode, string tag, Gst.Value value); + public void add_tag_value (Gst.TagMergeMode mode, string tag, GLib.Value value); public void add_tag_values (Gst.TagMergeMode mode, string tag, ...); public void add_tags (Gst.TagMergeMode mode, string tag, ...); public unowned Gst.TagList get_tag_list (); @@ -1590,12 +1590,10 @@ namespace Gst { [HasEmitter] public signal void new_uri (string uri); } - [CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_ARRAY")] + [CCode (cheader_filename = "gst/gst.h")] public struct Array { } [CCode (cheader_filename = "gst/gst.h")] - [IntegerType (rank = 0)] - [SimpleType] public struct ClockTime : uint64 { [CCode (cname = "GST_TIME_ARGS")] public unowned string args (); @@ -1603,45 +1601,43 @@ namespace Gst { public bool is_valid (); } [CCode (cheader_filename = "gst/gst.h")] - [IntegerType (rank = 0)] - [SimpleType] public struct ClockTimeDiff : int64 { } - [CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_DOUBLE_RANGE")] + [CCode (cheader_filename = "gst/gst.h")] public struct DoubleRange { } - [CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_ELEMENT_DETAILS")] + [CCode (cheader_filename = "gst/gst.h")] public struct ElementDetails { public weak string longname; public weak string klass; public weak string description; public weak string author; } - [CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_FORMAT_DEFINITION")] + [CCode (cheader_filename = "gst/gst.h")] public struct FormatDefinition { public Gst.Format value; public weak string nick; public weak string description; public GLib.Quark quark; } - [CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_FRACTION")] + [CCode (cheader_filename = "gst/gst.h")] public struct Fraction { } - [CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_FRACTION_RANGE")] + [CCode (cheader_filename = "gst/gst.h")] public struct FractionRange { } - [CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_INDEX_ASSOCIATION")] + [CCode (cheader_filename = "gst/gst.h")] public struct IndexAssociation { public Gst.Format format; public int64 value; } - [CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_INT_RANGE")] + [CCode (cheader_filename = "gst/gst.h")] public struct IntRange { } - [CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_LIST")] + [CCode (cheader_filename = "gst/gst.h")] public struct List { } - [CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_PLUGIN_DESC")] + [CCode (cheader_filename = "gst/gst.h")] public struct PluginDesc { public int major_version; public int minor_version; @@ -1655,7 +1651,7 @@ namespace Gst { public weak string origin; public weak void*[] _gst_reserved; } - [CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_POLL_FD")] + [CCode (cheader_filename = "gst/gst.h")] public struct PollFD { public int fd; public int idx; @@ -1668,20 +1664,20 @@ namespace Gst { public static void ignored (Gst.Poll @set, Gst.PollFD fd); public void init (); } - [CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_QUERY_TYPE_DEFINITION")] + [CCode (cheader_filename = "gst/gst.h")] public struct QueryTypeDefinition { public weak string description; public weak string nick; public GLib.Quark quark; public Gst.QueryType value; } - [CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_STATIC_CAPS")] + [CCode (cheader_filename = "gst/gst.h")] public struct StaticCaps { [CCode (cname = "string")] public weak string str; public Gst.Caps @get (); } - [CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_STATIC_PAD_TEMPLATE")] + [CCode (cheader_filename = "gst/gst.h")] public struct StaticPadTemplate { public weak string name_template; public Gst.PadDirection direction; @@ -1938,8 +1934,11 @@ namespace Gst { CUSTOM_DOWNSTREAM_OOB, CUSTOM_BOTH, CUSTOM_BOTH_OOB; + [CCode (cname = "gst_event_type_get_flags")] public Gst.EventTypeFlags get_flags (); + [CCode (cname = "gst_event_type_to_quark")] public GLib.Quark to_quark (); + [CCode (cname = "gst_event_type_get_name")] public unowned string get_name (); [CCode (cname = "gst_event_type_get_name")] public unowned string to_string (); @@ -1982,12 +1981,17 @@ namespace Gst { TIME, BUFFERS, PERCENT; + [CCode (cname = "gst_format_get_details")] public Gst.FormatDefinition get_details (); + [CCode (cname = "gst_format_to_quark")] public GLib.Quark to_quark (); + [CCode (cname = "gst_format_get_name")] public unowned string get_name (); [CCode (cname = "gst_format_get_name")] public unowned string to_string (); + [CCode (cname = "GST_FORMAT_PERCENT_MAX")] public const int64 PERCENT_MAX; + [CCode (cname = "GST_FORMAT_PERCENT_SCALE")] public const int64 PERCENT_SCALE; } [CCode (cheader_filename = "gst/gst.h", cprefix = "GST_INDEX_")] @@ -2402,7 +2406,7 @@ namespace Gst { public delegate unowned Gst.Buffer BufferListDoFunction (Gst.Buffer buffer); [CCode (cheader_filename = "gst/gst.h")] public delegate Gst.BufferListItem BufferListFunc (out unowned Gst.Buffer buffer, uint group, uint idx); - [CCode (cheader_filename = "gst/gst.h")] + [CCode (cheader_filename = "gst/gst.h", cname = "GCallback")] public delegate bool BufferProbeCallback (Gst.Pad pad, Gst.Buffer buffer); [CCode (cheader_filename = "gst/gst.h")] public delegate bool BusFunc (Gst.Bus bus, Gst.Message message); @@ -2412,11 +2416,11 @@ namespace Gst { public delegate bool ClockCallback (Gst.Clock clock, Gst.ClockTime time, Gst.ClockID id); [CCode (cheader_filename = "gst/gst.h", has_target = false)] public delegate void* CopyFunction (void* object); - [CCode (cheader_filename = "gst/gst.h")] + [CCode (cheader_filename = "gst/gst.h", cname = "GCallback")] public delegate bool DataProbeCallback (Gst.Pad pad, Gst.MiniObject data); [CCode (cheader_filename = "gst/gst.h", has_target = false)] public delegate void DebugFuncPtr (); - [CCode (cheader_filename = "gst/gst.h")] + [CCode (cheader_filename = "gst/gst.h", cname = "GCallback")] public delegate bool EventProbeCallback (Gst.Pad pad, Gst.Event event); [CCode (cheader_filename = "gst/gst.h")] public delegate bool FilterFunc (void* obj); @@ -2909,37 +2913,37 @@ namespace Gst { [CCode (cheader_filename = "gst/gst.h")] public static GLib.Quark library_error_quark (); [CCode (cheader_filename = "gst/gst.h")] - public static void marshal_BOOLEAN__POINTER (GLib.Closure closure, Gst.Value return_value, uint n_param_values, Gst.Value param_values, void* invocation_hint, void* marshal_data); + public static void marshal_BOOLEAN__POINTER (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data); [CCode (cheader_filename = "gst/gst.h")] - public static void marshal_BOOLEAN__VOID (GLib.Closure closure, Gst.Value return_value, uint n_param_values, Gst.Value param_values, void* invocation_hint, void* marshal_data); + public static void marshal_BOOLEAN__VOID (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data); [CCode (cheader_filename = "gst/gst.h")] - public static void marshal_BOXED__BOXED (GLib.Closure closure, Gst.Value return_value, uint n_param_values, Gst.Value param_values, void* invocation_hint, void* marshal_data); + public static void marshal_BOXED__BOXED (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data); [CCode (cheader_filename = "gst/gst.h")] - public static void marshal_POINTER__POINTER (GLib.Closure closure, Gst.Value return_value, uint n_param_values, Gst.Value param_values, void* invocation_hint, void* marshal_data); + public static void marshal_POINTER__POINTER (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data); [CCode (cheader_filename = "gst/gst.h")] - public static void marshal_VOID__BOXED_OBJECT (GLib.Closure closure, Gst.Value return_value, uint n_param_values, Gst.Value param_values, void* invocation_hint, void* marshal_data); + public static void marshal_VOID__BOXED_OBJECT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data); [CCode (cheader_filename = "gst/gst.h")] - public static void marshal_VOID__INT64 (GLib.Closure closure, Gst.Value return_value, uint n_param_values, Gst.Value param_values, void* invocation_hint, void* marshal_data); + public static void marshal_VOID__INT64 (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data); [CCode (cheader_filename = "gst/gst.h")] - public static void marshal_VOID__INT_INT (GLib.Closure closure, Gst.Value return_value, uint n_param_values, Gst.Value param_values, void* invocation_hint, void* marshal_data); + public static void marshal_VOID__INT_INT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data); [CCode (cheader_filename = "gst/gst.h")] - public static void marshal_VOID__OBJECT_BOXED (GLib.Closure closure, Gst.Value return_value, uint n_param_values, Gst.Value param_values, void* invocation_hint, void* marshal_data); + public static void marshal_VOID__OBJECT_BOXED (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data); [CCode (cheader_filename = "gst/gst.h")] - public static void marshal_VOID__OBJECT_BOXED_STRING (GLib.Closure closure, Gst.Value return_value, uint n_param_values, Gst.Value param_values, void* invocation_hint, void* marshal_data); + public static void marshal_VOID__OBJECT_BOXED_STRING (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data); [CCode (cheader_filename = "gst/gst.h")] - public static void marshal_VOID__OBJECT_OBJECT (GLib.Closure closure, Gst.Value return_value, uint n_param_values, Gst.Value param_values, void* invocation_hint, void* marshal_data); + public static void marshal_VOID__OBJECT_OBJECT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data); [CCode (cheader_filename = "gst/gst.h")] - public static void marshal_VOID__OBJECT_OBJECT_STRING (GLib.Closure closure, Gst.Value return_value, uint n_param_values, Gst.Value param_values, void* invocation_hint, void* marshal_data); + public static void marshal_VOID__OBJECT_OBJECT_STRING (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data); [CCode (cheader_filename = "gst/gst.h")] - public static void marshal_VOID__OBJECT_PARAM (GLib.Closure closure, Gst.Value return_value, uint n_param_values, Gst.Value param_values, void* invocation_hint, void* marshal_data); + public static void marshal_VOID__OBJECT_PARAM (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data); [CCode (cheader_filename = "gst/gst.h")] - public static void marshal_VOID__OBJECT_POINTER (GLib.Closure closure, Gst.Value return_value, uint n_param_values, Gst.Value param_values, void* invocation_hint, void* marshal_data); + public static void marshal_VOID__OBJECT_POINTER (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data); [CCode (cheader_filename = "gst/gst.h")] - public static void marshal_VOID__OBJECT_STRING (GLib.Closure closure, Gst.Value return_value, uint n_param_values, Gst.Value param_values, void* invocation_hint, void* marshal_data); + public static void marshal_VOID__OBJECT_STRING (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data); [CCode (cheader_filename = "gst/gst.h")] - public static void marshal_VOID__POINTER_OBJECT (GLib.Closure closure, Gst.Value return_value, uint n_param_values, Gst.Value param_values, void* invocation_hint, void* marshal_data); + public static void marshal_VOID__POINTER_OBJECT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data); [CCode (cheader_filename = "gst/gst.h")] - public static void marshal_VOID__UINT_BOXED (GLib.Closure closure, Gst.Value return_value, uint n_param_values, Gst.Value param_values, void* invocation_hint, void* marshal_data); + public static void marshal_VOID__UINT_BOXED (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data); [CCode (cheader_filename = "gst/gst.h")] public static unowned GLib.ParamSpec param_spec_fraction (string name, string nick, string blurb, int min_num, int min_denom, int max_num, int max_denom, int default_num, int default_denom, GLib.ParamFlags flags); [CCode (cheader_filename = "gst/gst.h")] @@ -2983,9 +2987,9 @@ namespace Gst { [CCode (cheader_filename = "gst/gst.h")] public static bool tag_is_fixed (string tag); [CCode (cheader_filename = "gst/gst.h")] - public static void tag_merge_strings_with_comma (Gst.Value dest, Gst.Value src); + public static void tag_merge_strings_with_comma (GLib.Value dest, GLib.Value src); [CCode (cheader_filename = "gst/gst.h")] - public static void tag_merge_use_first (Gst.Value dest, Gst.Value src); + public static void tag_merge_use_first (GLib.Value dest, GLib.Value src); [CCode (cheader_filename = "gst/gst.h")] public static void tag_register (string name, Gst.TagFlag flag, GLib.Type type, string nick, string blurb, Gst.TagMergeFunc func); [CCode (cheader_filename = "gst/gst.h")] @@ -3033,7 +3037,7 @@ namespace Gst { [CCode (cheader_filename = "gst/gst.h")] public static void util_set_object_arg (GLib.Object object, string name, string value); [CCode (cheader_filename = "gst/gst.h")] - public static void util_set_value_from_string (Gst.Value value, string value_str); + public static void util_set_value_from_string (GLib.Value value, string value_str); [CCode (cheader_filename = "gst/gst.h")] public static uint64 util_uint64_scale (uint64 val, uint64 num, uint64 denom); [CCode (cheader_filename = "gst/gst.h")] @@ -3047,15 +3051,15 @@ namespace Gst { [CCode (cheader_filename = "gst/gst.h")] public static uint64 util_uint64_scale_round (uint64 val, uint64 num, uint64 denom); [CCode (cheader_filename = "gst/gst.h")] - public static unowned Gst.MiniObject value_dup_mini_object (Gst.Value value); + public static unowned Gst.MiniObject value_dup_mini_object (GLib.Value value); [CCode (cheader_filename = "gst/gst.h")] - public static int64 value_get_int64_range_max (Gst.Value value); + public static int64 value_get_int64_range_max (GLib.Value value); [CCode (cheader_filename = "gst/gst.h")] - public static int64 value_get_int64_range_min (Gst.Value value); + public static int64 value_get_int64_range_min (GLib.Value value); [CCode (cheader_filename = "gst/gst.h")] - public static void value_list_merge (Gst.Value dest, Gst.Value value1, Gst.Value value2); + public static void value_list_merge (GLib.Value dest, GLib.Value value1, GLib.Value value2); [CCode (cheader_filename = "gst/gst.h")] - public static void value_set_int64_range (Gst.Value value, int64 start, int64 end); + public static void value_set_int64_range (GLib.Value value, int64 start, int64 end); [CCode (cheader_filename = "gst/gst.h")] public static void version (out uint major, out uint minor, out uint micro, out uint nano); [CCode (cheader_filename = "gst/gst.h")] diff --git a/vapi/gstreamer-base-0.10.vapi b/vapi/gstreamer-base-0.10.vapi index bec20fc30..ab34a0241 100644 --- a/vapi/gstreamer-base-0.10.vapi +++ b/vapi/gstreamer-base-0.10.vapi @@ -59,7 +59,7 @@ namespace Gst { [NoWrapper] public virtual bool stop (); } - [CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_BASE_PARSE_FRAME")] + [CCode (cheader_filename = "gst/gst.h")] [Compact] public class BaseParseFrame { public weak Gst.Buffer buffer; @@ -256,7 +256,9 @@ namespace Gst { public Gst.Pad sinkpad; public Gst.Pad srcpad; public GLib.Mutex transform_lock; + [CCode (cname = "GST_BASE_TRANSFORM_SINK_NAME")] public const string SINK_NAME; + [CCode (cname = "GST_BASE_TRANSFORM_SRC_NAME")] public const string SRC_NAME; [CCode (has_construct_function = false)] protected BaseTransform (); @@ -403,8 +405,7 @@ namespace Gst { public bool skip_string_utf32 (); public bool skip_string_utf8 (); } - [CCode (cheader_filename = "gst/base/gstbytewriter.h", free_function = "gst_byte_writer_free")] - [Compact] + [CCode (cheader_filename = "gst/base/gstbytewriter.h")] public class ByteWriter : Gst.ByteReader { public uint alloc_size; public bool fixed; diff --git a/vapi/gstreamer-controller-0.10.vapi b/vapi/gstreamer-controller-0.10.vapi index 5a884daa7..b390e48f0 100644 --- a/vapi/gstreamer-controller-0.10.vapi +++ b/vapi/gstreamer-controller-0.10.vapi @@ -8,7 +8,7 @@ namespace Gst { [CCode (has_construct_function = false)] protected ControlSource (); public bool bind (GLib.ParamSpec pspec); - public bool get_value (Gst.ClockTime timestamp, Gst.Value value); + public bool get_value (Gst.ClockTime timestamp, GLib.Value value); public bool get_value_array (Gst.ClockTime timestamp, Gst.ValueArray value_array); } [CCode (cheader_filename = "gst/controller/gstcontroller.h")] @@ -18,7 +18,7 @@ namespace Gst { public weak GLib.List properties; [CCode (has_construct_function = false)] public Controller (GLib.Object object, ...); - public Gst.Value @get (string property_name, Gst.ClockTime timestamp); + public GLib.Value @get (string property_name, Gst.ClockTime timestamp); public GLib.List get_all (string property_name); public unowned Gst.ControlSource get_control_source (string property_name); public bool get_value_array (Gst.ClockTime timestamp, Gst.ValueArray value_array); @@ -29,7 +29,7 @@ namespace Gst { public bool remove_properties (...); public bool remove_properties_list (GLib.List list); public bool remove_properties_valist (void* var_args); - public bool @set (string property_name, Gst.ClockTime timestamp, Gst.Value value); + public bool @set (string property_name, Gst.ClockTime timestamp, GLib.Value value); public bool set_control_source (string property_name, Gst.ControlSource csource); public void set_disabled (bool disabled); public bool set_from_list (string property_name, GLib.SList timedvalues); @@ -51,7 +51,7 @@ namespace Gst { public InterpolationControlSource (); public GLib.List get_all (); public int get_count (); - public bool @set (Gst.ClockTime timestamp, Gst.Value value); + public bool @set (Gst.ClockTime timestamp, GLib.Value value); public bool set_from_list (GLib.SList timedvalues); public bool set_interpolation_mode (Gst.InterpolateMode mode); public bool unset (Gst.ClockTime timestamp); @@ -63,11 +63,11 @@ namespace Gst { [CCode (has_construct_function = false)] public LFOControlSource (); [NoAccessorMethod] - public Gst.Value amplitude { get; set; } + public Gst.Value amplitude { owned get; set; } [NoAccessorMethod] public double frequency { get; set; } [NoAccessorMethod] - public Gst.Value offset { get; set; } + public Gst.Value offset { owned get; set; } [NoAccessorMethod] public uint64 timeshift { get; set; } [NoAccessorMethod] @@ -96,7 +96,7 @@ namespace Gst { CUBIC, USER } - [CCode (cheader_filename = "gst/controller/gstlfocontrolsource.h", cprefix = "GST_LFO_WAVEFORM_")] + [CCode (cheader_filename = "gst/controller/gstlfocontrolsource.h")] public enum LFOWaveform { SINE, SQUARE, diff --git a/vapi/gstreamer-interfaces-0.10.vapi b/vapi/gstreamer-interfaces-0.10.vapi index 45aec5007..ea5c280bb 100644 --- a/vapi/gstreamer-interfaces-0.10.vapi +++ b/vapi/gstreamer-interfaces-0.10.vapi @@ -172,13 +172,21 @@ namespace Gst { } [CCode (cheader_filename = "gst/interfaces/xoverlay.h", lower_case_csuffix = "x_overlay")] public interface XOverlay : Gst.ImplementsInterface, Gst.Element { + [CCode (cname = "gst_x_overlay_expose")] public abstract void expose (); + [CCode (cname = "gst_x_overlay_got_window_handle")] public void got_window_handle (uint handle); + [CCode (cname = "gst_x_overlay_got_xwindow_id")] public void got_xwindow_id (ulong xwindow_id); + [CCode (cname = "gst_x_overlay_handle_events")] public abstract void handle_events (bool handle_events); + [CCode (cname = "gst_x_overlay_prepare_xwindow_id")] public void prepare_xwindow_id (); + [CCode (cname = "gst_x_overlay_set_render_rectangle")] public abstract void set_render_rectangle (int x, int y, int width, int height); + [CCode (cname = "gst_x_overlay_set_window_handle")] public abstract void set_window_handle (uint handle); + [CCode (cname = "gst_x_overlay_set_xwindow_id")] public abstract void set_xwindow_id (ulong xwindow_id); } [CCode (cheader_filename = "gst/interfaces/colorbalance.h", cprefix = "GST_COLOR_BALANCE_")] diff --git a/vapi/gstreamer-netbuffer-0.10.vapi b/vapi/gstreamer-netbuffer-0.10.vapi index 42aca31ba..13909b21a 100644 --- a/vapi/gstreamer-netbuffer-0.10.vapi +++ b/vapi/gstreamer-netbuffer-0.10.vapi @@ -10,7 +10,7 @@ namespace Gst { [CCode (cname = "gst_netbuffer_new", has_construct_function = false)] public NetBuffer (); } - [CCode (cheader_filename = "gst/netbuffer/gstnetbuffer.h", type_id = "GST_TYPE_NET_ADDRESS")] + [CCode (cheader_filename = "gst/netbuffer/gstnetbuffer.h")] public struct NetAddress { public Gst.NetType type; public void* address; diff --git a/vapi/gstreamer-pbutils-0.10.vapi b/vapi/gstreamer-pbutils-0.10.vapi index 1ca7921fa..59648b63e 100644 --- a/vapi/gstreamer-pbutils-0.10.vapi +++ b/vapi/gstreamer-pbutils-0.10.vapi @@ -28,7 +28,7 @@ namespace Gst { public class DiscovererContainerInfo : Gst.DiscovererStreamInfo { public GLib.List get_streams (); } - [CCode (cheader_filename = "gst/pbutils/pbutils.h")] + [CCode (cheader_filename = "gst/pbutils/pbutils.h", copy_function = "gst_discoverer_info_copy")] public class DiscovererInfo : Gst.MiniObject { public GLib.List get_audio_streams (); public GLib.List get_container_streams (); @@ -127,7 +127,7 @@ namespace Gst { public void set_pass (uint pass); public void set_variableframerate (bool variableframerate); } - [CCode (cheader_filename = "gst/pbutils/pbutils.h", type_id = "GST_TYPE_INSTALL_PLUGINS_CONTEXT")] + [CCode (cheader_filename = "gst/pbutils/pbutils.h")] [Compact] public class InstallPluginsContext { [CCode (has_construct_function = false)] diff --git a/vapi/gstreamer-rtp-0.10.vapi b/vapi/gstreamer-rtp-0.10.vapi index 6a9f628f9..036899213 100644 --- a/vapi/gstreamer-rtp-0.10.vapi +++ b/vapi/gstreamer-rtp-0.10.vapi @@ -26,7 +26,7 @@ namespace Gst { public uint clock_rate; public bool need_newsegment; public weak GLib.Queue queue; - public void* queuelock; + public GLib.StaticRecMutex queuelock; public weak Gst.Segment segment; public weak Gst.Pad sinkpad; public weak Gst.Pad srcpad; @@ -124,7 +124,7 @@ namespace Gst { public static unowned Gst.RTPPayloadInfo for_name (string media, string encoding_name); public static unowned Gst.RTPPayloadInfo for_pt (uchar payload_type); } - [CCode (cheader_filename = "gst/rtp/gstrtcpbuffer.h", type_id = "GST_TYPE_RTCP_PACKET")] + [CCode (cheader_filename = "gst/rtp/gstrtcpbuffer.h")] public struct RTCPPacket { public weak Gst.Buffer buffer; public uint offset; diff --git a/vapi/gstreamer-rtsp-0.10.vapi b/vapi/gstreamer-rtsp-0.10.vapi index 8f68465b5..af3ffa94f 100644 --- a/vapi/gstreamer-rtsp-0.10.vapi +++ b/vapi/gstreamer-rtsp-0.10.vapi @@ -34,7 +34,7 @@ namespace Gst { public void set_tunneled (bool tunneled); public Gst.RTSPResult write (uchar data, uint size, GLib.TimeVal timeout); } - [CCode (cheader_filename = "gst/rtsp/gstrtspmessage.h")] + [CCode (cheader_filename = "gst/rtsp/gstrtspmessage.h", free_function = "gst_rtsp_message_free")] [Compact] public class RTSPMessage { public uchar body; @@ -86,7 +86,7 @@ namespace Gst { public Gst.RTSPTime min; public Gst.RTSPRangeUnit unit; } - [CCode (cheader_filename = "gst/rtsp/gstrtsptransport.h")] + [CCode (cheader_filename = "gst/rtsp/gstrtsptransport.h", free_function = "gst_rtsp_transport_free")] [Compact] public class RTSPTransport { public bool append; @@ -111,7 +111,7 @@ namespace Gst { public static Gst.RTSPResult @new (out Gst.RTSPTransport transport); public static Gst.RTSPResult parse (string str, Gst.RTSPTransport transport); } - [CCode (cheader_filename = "gst/rtsp/gstrtspconnection.h", copy_function = "gst_rtsp_url_copy", type_id = "GST_TYPE_RTSP_URL")] + [CCode (cheader_filename = "gst/rtsp/gstrtspconnection.h", copy_function = "gst_rtsp_url_copy")] [Compact] public class RTSPUrl { public string abspath; @@ -129,7 +129,7 @@ namespace Gst { public static Gst.RTSPResult parse (string urlstr, out Gst.RTSPUrl url); public Gst.RTSPResult set_port (uint16 port); } - [CCode (cheader_filename = "gst/rtsp/gstrtspconnection.h")] + [CCode (cheader_filename = "gst/rtsp/gstrtspconnection.h", unref_function = "gst_rtsp_watch_unref")] [Compact] public class RTSPWatch { [CCode (has_construct_function = false)] diff --git a/vapi/gstreamer-video-0.10.vapi b/vapi/gstreamer-video-0.10.vapi index 0cee371f6..07ffd00b2 100644 --- a/vapi/gstreamer-video-0.10.vapi +++ b/vapi/gstreamer-video-0.10.vapi @@ -2,7 +2,7 @@ [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")] namespace Gst { - [CCode (cprefix = "GST_VIDEO_CAPS_", lower_case_cprefix = "gst_video_caps_")] + [CCode (cprefix = "GST_VIDEO_CAPS_")] namespace VideoCaps { [CCode (cheader_filename = "gst/video/video.h")] public const string ABGR; @@ -35,7 +35,6 @@ namespace Gst { [CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_CAPS_YUV")] public static unowned string YUV (string fourcc); } - [CCode (cprefix = "GstVideoMask15", lower_case_cprefix = "gst_video_mask15_")] namespace VideoMask15 { [CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_BLUE_MASK_15")] public const string BLUE; @@ -50,7 +49,6 @@ namespace Gst { [CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_RED_MASK_15_INT")] public const int RED_INT; } - [CCode (cprefix = "GstVideoMask16", lower_case_cprefix = "gst_video_mask16_")] namespace VideoMask16 { [CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_BLUE_MASK_16")] public const string BLUE; @@ -65,7 +63,6 @@ namespace Gst { [CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_RED_MASK_16_INT")] public const int RED_INT; } - [CCode (cprefix = "GstVideoMask24", lower_case_cprefix = "gst_video_mask24_")] namespace VideoMask24 { [CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_BYTE1_MASK_24")] public const string BYTE1; @@ -80,7 +77,6 @@ namespace Gst { [CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_BYTE3_MASK_24_INT")] public const int BYTE3_INT; } - [CCode (cprefix = "GstVideoMask32", lower_case_cprefix = "gst_video_mask32_")] namespace VideoMask32 { [CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_BYTE1_MASK_32")] public const string BYTE1; @@ -99,7 +95,6 @@ namespace Gst { [CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_BYTE4_MASK_32_INT")] public const int BYTE4_INT; } - [CCode (cprefix = "GstVideoRange", lower_case_cprefix = "gst_video_range_")] namespace VideoRange { [CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_FPS_RANGE")] public const string FPS; @@ -229,7 +224,7 @@ namespace Gst { [CCode (cheader_filename = "gst/video/video.h")] public static uint32 video_format_to_fourcc (Gst.VideoFormat format); [CCode (cheader_filename = "gst/video/video.h")] - public static Gst.Value video_frame_rate (Gst.Pad pad); + public static GLib.Value video_frame_rate (Gst.Pad pad); [CCode (cheader_filename = "gst/video/video.h")] public static bool video_get_size (Gst.Pad pad, ref int width, ref int height); [CCode (cheader_filename = "gst/video/video.h")] diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi index 2c2a31a6e..225dadef1 100644 --- a/vapi/gtk+-2.0.vapi +++ b/vapi/gtk+-2.0.vapi @@ -1,8 +1,7 @@ /* gtk+-2.0.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Gtk", gir_namespace = "Gtk", gir_version = "2.0", lower_case_cprefix = "gtk_")] +[CCode (gir_namespace = "Gtk", gir_version = "2.0")] namespace Gtk { - [CCode (cprefix = "GtkStock", lower_case_cprefix = "gtk_stock_")] namespace Stock { [CCode (cheader_filename = "gtk/gtk.h")] public const string ABOUT; @@ -623,7 +622,7 @@ namespace Gtk { public weak Gtk.BindingSignal next; public weak string signal_name; } - [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_border_copy", type_id = "GTK_TYPE_BORDER")] + [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_border_copy")] [Compact] public class Border { public int bottom; @@ -2024,7 +2023,7 @@ namespace Gtk { public static unowned Gtk.IconSet lookup_default (string stock_id); public void remove_default (); } - [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_icon_info_copy", type_id = "GTK_TYPE_ICON_INFO")] + [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_icon_info_copy")] [Compact] public class IconInfo { public Gtk.IconInfo copy (); @@ -2039,7 +2038,7 @@ namespace Gtk { public Gdk.Pixbuf load_icon () throws GLib.Error; public void set_raw_coordinates (bool raw_coordinates); } - [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_icon_set_ref", type_id = "GTK_TYPE_ICON_SET", unref_function = "gtk_icon_set_unref")] + [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_icon_set_ref", unref_function = "gtk_icon_set_unref")] [Compact] public class IconSet { [CCode (has_construct_function = false)] @@ -2051,7 +2050,7 @@ namespace Gtk { public void get_sizes (Gtk.IconSize[] sizes); public unowned Gdk.Pixbuf render_icon (Gtk.Style style, Gtk.TextDirection direction, Gtk.StateType state, Gtk.IconSize size, Gtk.Widget widget, string detail); } - [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_icon_source_copy", type_id = "GTK_TYPE_ICON_SOURCE")] + [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_icon_source_copy")] [Compact] public class IconSource { [CCode (has_construct_function = false)] @@ -2989,7 +2988,7 @@ namespace Gtk { public virtual signal bool move_handle (Gtk.ScrollType scroll); public virtual signal bool toggle_handle_focus (); } - [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_paper_size_copy", type_id = "GTK_TYPE_PAPER_SIZE")] + [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_paper_size_copy")] [Compact] public class PaperSize { [CCode (has_construct_function = false)] @@ -3505,7 +3504,7 @@ namespace Gtk { public weak string mime_type; public weak string uri; } - [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_recent_info_ref", type_id = "GTK_TYPE_RECENT_INFO", unref_function = "gtk_recent_info_unref")] + [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_recent_info_ref", unref_function = "gtk_recent_info_unref")] [Compact] public class RecentInfo { public bool exists (); @@ -3677,7 +3676,7 @@ namespace Gtk { public virtual signal void move_focus_out (Gtk.DirectionType direction); public virtual signal bool scroll_child (Gtk.ScrollType scroll, bool horizontal); } - [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_selection_data_copy", type_id = "GTK_TYPE_SELECTION_DATA")] + [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_selection_data_copy")] [Compact] public class SelectionData { [CCode (array_length = false)] @@ -4241,7 +4240,7 @@ namespace Gtk { public uint shrink; public uint16 spacing; } - [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_target_list_ref", type_id = "GTK_TYPE_TARGET_LIST", unref_function = "gtk_target_list_unref")] + [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_target_list_ref", unref_function = "gtk_target_list_unref")] [Compact] public class TargetList { public weak GLib.List list; @@ -4289,7 +4288,7 @@ namespace Gtk { public uint strikethrough; public uint underline; } - [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_text_attributes_ref", type_id = "GTK_TYPE_TEXT_ATTRIBUTES", unref_function = "gtk_text_attributes_unref")] + [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_text_attributes_ref", unref_function = "gtk_text_attributes_unref")] [Compact] public class TextAttributes { public weak Gtk.TextAppearance appearance; @@ -5023,7 +5022,7 @@ namespace Gtk { public TreeModelSort.with_model (Gtk.TreeModel child_model); public Gtk.TreeModel model { get; construct; } } - [CCode (cheader_filename = "gtk/gtk.h", const_cname = "GtkTreePath", copy_function = "gtk_tree_path_copy", type_id = "GTK_TYPE_TREE_PATH")] + [CCode (cheader_filename = "gtk/gtk.h", const_cname = "GtkTreePath", copy_function = "gtk_tree_path_copy")] [Compact] [Immutable] public class TreePath { @@ -5050,7 +5049,7 @@ namespace Gtk { public unowned string to_string (); public bool up (); } - [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_tree_row_reference_copy", type_id = "GTK_TYPE_TREE_ROW_REFERENCE")] + [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_tree_row_reference_copy")] [Compact] [Immutable] public class TreeRowReference { @@ -5935,8 +5934,10 @@ namespace Gtk { public bool urgency_hint { get; set; } [NoAccessorMethod] public Gtk.WindowPosition window_position { get; set; } + [CCode (cname = "activate_default")] [Experimental] public virtual signal void default_activated (); + [CCode (cname = "activate_focus")] [Experimental] public virtual signal void focus_activated (); public virtual signal bool frame_event (Gdk.Event event); @@ -6239,13 +6240,13 @@ namespace Gtk { [HasEmitter] public signal void sort_column_changed (); } - [CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_ACCEL_KEY")] + [CCode (cheader_filename = "gtk/gtk.h")] public struct AccelKey { public uint accel_key; public Gdk.ModifierType accel_mods; public uint accel_flags; } - [CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_ACTION_ENTRY")] + [CCode (cheader_filename = "gtk/gtk.h")] public struct ActionEntry { public weak string name; public weak string stock_id; @@ -6255,14 +6256,14 @@ namespace Gtk { [CCode (delegate_target = false, type = "GCallback")] public weak Gtk.ActionCallback callback; } - [CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_ALLOCATION")] + [CCode (cheader_filename = "gtk/gtk.h")] public struct Allocation { public int x; public int y; public int width; public int height; } - [CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_IM_CONTEXT_INFO")] + [CCode (cheader_filename = "gtk/gtk.h")] public struct IMContextInfo { public weak string context_id; public weak string context_name; @@ -6270,7 +6271,7 @@ namespace Gtk { public weak string domain_dirname; public weak string default_locales; } - [CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_RADIO_ACTION_ENTRY")] + [CCode (cheader_filename = "gtk/gtk.h")] public struct RadioActionEntry { public weak string name; public weak string stock_id; @@ -6279,7 +6280,7 @@ namespace Gtk { public weak string tooltip; public int value; } - [CCode (cheader_filename = "gtk/gtk.h", has_copy_function = false, has_destroy_function = false, type_id = "GTK_TYPE_RECENT_DATA")] + [CCode (cheader_filename = "gtk/gtk.h", has_copy_function = false, has_destroy_function = false)] public struct RecentData { public string display_name; public string description; @@ -6290,14 +6291,14 @@ namespace Gtk { public string[] groups; public bool is_private; } - [CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_REQUISITION")] + [CCode (cheader_filename = "gtk/gtk.h")] public struct Requisition { public int width; public int height; public Gtk.Requisition copy (); public void free (); } - [CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_STOCK_ITEM")] + [CCode (cheader_filename = "gtk/gtk.h")] public struct StockItem { public weak string stock_id; public weak string label; @@ -6307,13 +6308,13 @@ namespace Gtk { public Gtk.StockItem copy (); public void free (); } - [CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_TARGET_ENTRY")] + [CCode (cheader_filename = "gtk/gtk.h")] public struct TargetEntry { public weak string target; public uint flags; public uint info; } - [CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_TEXT_ITER")] + [CCode (cheader_filename = "gtk/gtk.h")] public struct TextIter { public void* dummy1; public void* dummy2; @@ -6420,7 +6421,7 @@ namespace Gtk { public bool starts_word (); public bool toggles_tag (Gtk.TextTag tag); } - [CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_TOGGLE_ACTION_ENTRY")] + [CCode (cheader_filename = "gtk/gtk.h")] public struct ToggleActionEntry { public weak string name; public weak string stock_id; @@ -6431,7 +6432,7 @@ namespace Gtk { public weak Gtk.ActionCallback callback; public bool is_active; } - [CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_TREE_ITER")] + [CCode (cheader_filename = "gtk/gtk.h")] public struct TreeIter { public int stamp; public void* user_data; @@ -7175,7 +7176,7 @@ namespace Gtk { VERTICAL, BOTH } - [CCode (cheader_filename = "gtk/gtk.h", cname = "gint", cprefix = "GTK_SORT_COLUMN_")] + [CCode (cheader_filename = "gtk/gtk.h", cname = "gint")] public enum SortColumn { [CCode (cname = "GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID")] DEFAULT, diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi index bedffde39..7b1417793 100644 --- a/vapi/gtk+-3.0.vapi +++ b/vapi/gtk+-3.0.vapi @@ -1,8 +1,7 @@ /* gtk+-3.0.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Gtk", gir_namespace = "Gtk", gir_version = "3.0", lower_case_cprefix = "gtk_")] +[CCode (gir_namespace = "Gtk", gir_version = "3.0")] namespace Gtk { - [CCode (cprefix = "GtkStock", lower_case_cprefix = "gtk_stock_")] namespace Stock { [CCode (cheader_filename = "gtk/gtk.h")] public const string ABOUT; @@ -1964,7 +1963,7 @@ namespace Gtk { public float label_yalign { get; set; } public Gtk.ShadowType shadow_type { get; set; } } - [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_gradient_ref", type_id = "GTK_TYPE_GRADIENT", unref_function = "gtk_gradient_unref")] + [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_gradient_ref", unref_function = "gtk_gradient_unref")] [Compact] public class Gradient { public void add_color_stop (double offset, Gtk.SymbolicColor color); @@ -2104,7 +2103,7 @@ namespace Gtk { public static unowned Gtk.IconSet lookup_default (string stock_id); public void remove_default (); } - [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_icon_info_copy", type_id = "GTK_TYPE_ICON_INFO")] + [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_icon_info_copy")] [Compact] public class IconInfo { public Gtk.IconInfo copy (); @@ -2122,7 +2121,7 @@ namespace Gtk { public unowned Gdk.Pixbuf load_symbolic_for_style (Gtk.Style style, Gtk.StateType state, bool was_symbolic) throws GLib.Error; public void set_raw_coordinates (bool raw_coordinates); } - [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_icon_set_ref", type_id = "GTK_TYPE_ICON_SET", unref_function = "gtk_icon_set_unref")] + [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_icon_set_ref", unref_function = "gtk_icon_set_unref")] [Compact] public class IconSet { [CCode (has_construct_function = false)] @@ -2135,7 +2134,7 @@ namespace Gtk { public unowned Gdk.Pixbuf render_icon (Gtk.Style style, Gtk.TextDirection direction, Gtk.StateType state, Gtk.IconSize size, Gtk.Widget widget, string detail); public unowned Gdk.Pixbuf render_icon_pixbuf (Gtk.StyleContext context, Gtk.IconSize size); } - [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_icon_source_copy", type_id = "GTK_TYPE_ICON_SOURCE")] + [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_icon_source_copy")] [Compact] public class IconSource { [CCode (has_construct_function = false)] @@ -2917,7 +2916,7 @@ namespace Gtk { public virtual signal bool move_handle (Gtk.ScrollType scroll); public virtual signal bool toggle_handle_focus (); } - [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_paper_size_copy", type_id = "GTK_TYPE_PAPER_SIZE")] + [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_paper_size_copy")] [Compact] public class PaperSize { [CCode (has_construct_function = false)] @@ -3387,7 +3386,7 @@ namespace Gtk { public weak string mime_type; public weak string uri; } - [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_recent_info_ref", type_id = "GTK_TYPE_RECENT_INFO", unref_function = "gtk_recent_info_unref")] + [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_recent_info_ref", unref_function = "gtk_recent_info_unref")] [Compact] public class RecentInfo { public unowned GLib.AppInfo create_app_info (string app_name) throws GLib.Error; @@ -3530,7 +3529,7 @@ namespace Gtk { public virtual signal void move_focus_out (Gtk.DirectionType direction); public virtual signal bool scroll_child (Gtk.ScrollType scroll, bool horizontal); } - [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_selection_data_copy", type_id = "GTK_TYPE_SELECTION_DATA")] + [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_selection_data_copy")] [Compact] public class SelectionData { public Gtk.SelectionData copy (); @@ -4071,7 +4070,7 @@ namespace Gtk { public bool active { get; set; } public virtual signal void activate (); } - [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_symbolic_color_ref", type_id = "GTK_TYPE_SYMBOLIC_COLOR", unref_function = "gtk_symbolic_color_unref")] + [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_symbolic_color_ref", unref_function = "gtk_symbolic_color_unref")] [Compact] public class SymbolicColor { [CCode (has_construct_function = false)] @@ -4144,7 +4143,7 @@ namespace Gtk { public uint shrink; public uint16 spacing; } - [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_target_list_ref", type_id = "GTK_TYPE_TARGET_LIST", unref_function = "gtk_target_list_unref")] + [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_target_list_ref", unref_function = "gtk_target_list_unref")] [Compact] public class TargetList { [CCode (has_construct_function = false)] @@ -4177,7 +4176,7 @@ namespace Gtk { public uint strikethrough; public uint underline; } - [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_text_attributes_ref", type_id = "GTK_TYPE_TEXT_ATTRIBUTES", unref_function = "gtk_text_attributes_unref")] + [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_text_attributes_ref", unref_function = "gtk_text_attributes_unref")] [Compact] public class TextAttributes { public weak Gtk.TextAppearance appearance; @@ -4890,7 +4889,7 @@ namespace Gtk { public TreeModelSort.with_model (Gtk.TreeModel child_model); public Gtk.TreeModel model { get; construct; } } - [CCode (cheader_filename = "gtk/gtk.h", const_cname = "GtkTreePath", copy_function = "gtk_tree_path_copy", type_id = "GTK_TYPE_TREE_PATH")] + [CCode (cheader_filename = "gtk/gtk.h", const_cname = "GtkTreePath", copy_function = "gtk_tree_path_copy")] [Compact] [Immutable] public class TreePath { @@ -4917,7 +4916,7 @@ namespace Gtk { public unowned string to_string (); public bool up (); } - [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_tree_row_reference_copy", type_id = "GTK_TYPE_TREE_ROW_REFERENCE")] + [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_tree_row_reference_copy")] [Compact] [Immutable] public class TreeRowReference { @@ -5618,7 +5617,7 @@ namespace Gtk { public uint valign; public int width; } - [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_widget_path_ref", type_id = "GTK_TYPE_WIDGET_PATH", unref_function = "gtk_widget_path_unref")] + [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_widget_path_ref", unref_function = "gtk_widget_path_unref")] [Compact] public class WidgetPath { [CCode (has_construct_function = false)] @@ -5798,8 +5797,10 @@ namespace Gtk { public bool urgency_hint { get; set; } [NoAccessorMethod] public Gtk.WindowPosition window_position { get; set; } + [CCode (cname = "activate_default")] [Experimental] public virtual signal void default_activated (); + [CCode (cname = "activate_focus")] [Experimental] public virtual signal void focus_activated (); public virtual signal void keys_changed (); @@ -6132,13 +6133,13 @@ namespace Gtk { [HasEmitter] public signal void sort_column_changed (); } - [CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_ACCEL_KEY")] + [CCode (cheader_filename = "gtk/gtk.h")] public struct AccelKey { public uint accel_key; public Gdk.ModifierType accel_mods; public uint accel_flags; } - [CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_ACTION_ENTRY")] + [CCode (cheader_filename = "gtk/gtk.h")] public struct ActionEntry { public weak string name; public weak string stock_id; @@ -6148,21 +6149,21 @@ namespace Gtk { [CCode (delegate_target = false, type = "GCallback")] public weak Gtk.ActionCallback callback; } - [CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_ALLOCATION")] + [CCode (cheader_filename = "gtk/gtk.h")] public struct Allocation { public int x; public int y; public int width; public int height; } - [CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_BORDER")] + [CCode (cheader_filename = "gtk/gtk.h")] public struct Border { public int16 left; public int16 right; public int16 top; public int16 bottom; } - [CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_IM_CONTEXT_INFO")] + [CCode (cheader_filename = "gtk/gtk.h")] public struct IMContextInfo { public weak string context_id; public weak string context_name; @@ -6170,7 +6171,7 @@ namespace Gtk { public weak string domain_dirname; public weak string default_locales; } - [CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_RADIO_ACTION_ENTRY")] + [CCode (cheader_filename = "gtk/gtk.h")] public struct RadioActionEntry { public weak string name; public weak string stock_id; @@ -6179,7 +6180,7 @@ namespace Gtk { public weak string tooltip; public int value; } - [CCode (cheader_filename = "gtk/gtk.h", has_copy_function = false, has_destroy_function = false, type_id = "GTK_TYPE_RECENT_DATA")] + [CCode (cheader_filename = "gtk/gtk.h", has_copy_function = false, has_destroy_function = false)] public struct RecentData { public string display_name; public string description; @@ -6190,14 +6191,14 @@ namespace Gtk { public string[] groups; public bool is_private; } - [CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_REQUISITION")] + [CCode (cheader_filename = "gtk/gtk.h")] public struct Requisition { public int width; public int height; public Gtk.Requisition copy (); public void free (); } - [CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_STOCK_ITEM")] + [CCode (cheader_filename = "gtk/gtk.h")] public struct StockItem { public weak string stock_id; public weak string label; @@ -6207,17 +6208,17 @@ namespace Gtk { public Gtk.StockItem copy (); public void free (); } - [CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_TARGET_ENTRY")] + [CCode (cheader_filename = "gtk/gtk.h")] public struct TargetEntry { public weak string target; public uint flags; public uint info; - [CCode (cname = "gtk_target_entry_new", has_construct_function = false)] + [CCode (has_construct_function = false)] public TargetEntry (string target, uint flags, uint info); public Gtk.TargetEntry copy (); public void free (); } - [CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_TEXT_ITER")] + [CCode (cheader_filename = "gtk/gtk.h")] public struct TextIter { public void* dummy1; public void* dummy2; @@ -6324,7 +6325,7 @@ namespace Gtk { public bool starts_word (); public bool toggles_tag (Gtk.TextTag tag); } - [CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_TOGGLE_ACTION_ENTRY")] + [CCode (cheader_filename = "gtk/gtk.h")] public struct ToggleActionEntry { public weak string name; public weak string stock_id; @@ -6335,7 +6336,7 @@ namespace Gtk { public weak Gtk.ActionCallback callback; public bool is_active; } - [CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_TREE_ITER")] + [CCode (cheader_filename = "gtk/gtk.h")] public struct TreeIter { public int stamp; public void* user_data; @@ -6982,7 +6983,7 @@ namespace Gtk { WIDTH_FOR_HEIGHT, CONSTANT_SIZE } - [CCode (cheader_filename = "gtk/gtk.h", cname = "gint", cprefix = "GTK_SORT_COLUMN_")] + [CCode (cheader_filename = "gtk/gtk.h", cname = "gint")] public enum SortColumn { [CCode (cname = "GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID")] DEFAULT, diff --git a/vapi/gtksourceview-2.0.vapi b/vapi/gtksourceview-2.0.vapi index d44f1eecf..1129e0821 100644 --- a/vapi/gtksourceview-2.0.vapi +++ b/vapi/gtksourceview-2.0.vapi @@ -1,6 +1,5 @@ /* gtksourceview-2.0.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Gtk", lower_case_cprefix = "gtk_")] namespace Gtk { [CCode (cheader_filename = "gtksourceview/gtksourceview.h")] public class SourceBuffer : Gtk.TextBuffer { diff --git a/vapi/gtksourceview-3.0.vapi b/vapi/gtksourceview-3.0.vapi index 2e1036703..8ecfedf27 100644 --- a/vapi/gtksourceview-3.0.vapi +++ b/vapi/gtksourceview-3.0.vapi @@ -2,7 +2,6 @@ [CCode (cprefix = "Gtk", gir_namespace = "GtkSource", gir_version = "3.0", lower_case_cprefix = "gtk_")] namespace Gtk { - [CCode (cprefix = "GtkSourceCompletionCapability", lower_case_cprefix = "gtk_source_completion_capability_")] namespace SourceCompletionCapability { [CCode (cheader_filename = "gtksourceview/gtksource.h")] public const string AUTOMATIC; diff --git a/vapi/gudev-1.0.vapi b/vapi/gudev-1.0.vapi index d8a308805..fff03686c 100644 --- a/vapi/gudev-1.0.vapi +++ b/vapi/gudev-1.0.vapi @@ -1,6 +1,6 @@ /* gudev-1.0.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "GUdev", lower_case_cprefix = "g_udev_")] +[CCode (lower_case_cprefix = "g_udev_")] namespace GUdev { [CCode (cheader_filename = "gudev/gudev.h")] public class Client : GLib.Object { @@ -86,7 +86,6 @@ namespace GUdev { public virtual void reserved8 (); } [CCode (cheader_filename = "gudev/gudev.h")] - [IntegerType (rank = 9)] [SimpleType] public struct DeviceNumber : Posix.dev_t { } diff --git a/vapi/hildon-fm-2.vapi b/vapi/hildon-fm-2.vapi index d36eeb251..8b6f59339 100644 --- a/vapi/hildon-fm-2.vapi +++ b/vapi/hildon-fm-2.vapi @@ -1,6 +1,5 @@ /* hildon-fm-2.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Hildon", lower_case_cprefix = "hildon_")] namespace Hildon { [CCode (cheader_filename = "hildon/hildon-file-chooser-dialog.h")] public class FileChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.FileChooser { diff --git a/vapi/libepc-1.0.vapi b/vapi/libepc-1.0.vapi index 243ee12f0..b00950aa4 100644 --- a/vapi/libepc-1.0.vapi +++ b/vapi/libepc-1.0.vapi @@ -1,6 +1,5 @@ /* libepc-1.0.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Epc", lower_case_cprefix = "epc_")] namespace Epc { [CCode (cheader_filename = "libepc/publisher.h")] [Compact] @@ -128,7 +127,7 @@ namespace Epc { public string service_domain { owned get; set construct; } public string service_name { get; set construct; } } - [CCode (cheader_filename = "libepc/service-info.h", ref_function = "epc_service_info_ref", type_id = "EPC_TYPE_SERVICE_INFO", unref_function = "epc_service_info_unref")] + [CCode (cheader_filename = "libepc/service-info.h", ref_function = "epc_service_info_ref", unref_function = "epc_service_info_unref")] [Compact] public class ServiceInfo { public Epc.AddressFamily get_address_family (); diff --git a/vapi/libgda-4.0.vapi b/vapi/libgda-4.0.vapi index 758a1dd5b..9b8ae46c4 100644 --- a/vapi/libgda-4.0.vapi +++ b/vapi/libgda-4.0.vapi @@ -1,6 +1,5 @@ /* libgda-4.0.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Gda", lower_case_cprefix = "gda_")] namespace Gda { [CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_attributes_manager_copy")] [Compact] @@ -27,7 +26,7 @@ namespace Gda { public unowned string serialize (); public virtual signal void changed (GLib.Object changed_stmt); } - [CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_binary_copy", type_id = "GDA_TYPE_BINARY")] + [CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_binary_copy")] [Compact] public class Binary { public long binary_length; @@ -36,7 +35,7 @@ namespace Gda { public static void* copy (void* boxed); public unowned string to_string (uint maxlen); } - [CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_blob_copy", type_id = "GDA_TYPE_BLOB")] + [CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_blob_copy")] [Compact] public class Blob { public weak Gda.Binary data; @@ -423,7 +422,7 @@ namespace Gda { public Gda.DiffType type; public weak GLib.HashTable values; } - [CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_geometricpoint_copy", free_function = "gda_geometricpoint_free", type_id = "GDA_TYPE_GEOMETRIC_POINT")] + [CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_geometricpoint_copy", free_function = "gda_geometricpoint_free")] [Compact] public class GeometricPoint { public double x; @@ -681,7 +680,7 @@ namespace Gda { public bool trylock (); public void unlock (); } - [CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_numeric_copy", type_id = "GDA_TYPE_NUMERIC")] + [CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_numeric_copy")] [Compact] public class Numeric { public weak string number; @@ -713,7 +712,7 @@ namespace Gda { public weak string id; public weak string location; } - [CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_quark_list_copy", type_id = "GDA_TYPE_QUARK_LIST")] + [CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_quark_list_copy")] [Compact] public class QuarkList { [CCode (has_construct_function = false)] @@ -1058,7 +1057,7 @@ namespace Gda { [Compact] public class SqlErrorType { } - [CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_sql_expr_copy", type_id = "GDA_TYPE_SQL_EXPR")] + [CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_sql_expr_copy")] [Compact] public class SqlExpr { public weak Gda.SqlAnyPart any; @@ -1275,7 +1274,7 @@ namespace Gda { public void take_select (Gda.SqlStatement stmt); public void take_table_name (GLib.Value value); } - [CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_sql_statement_copy", type_id = "GDA_TYPE_SQL_STATEMENT")] + [CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_sql_statement_copy")] [Compact] public class SqlStatement { public void* contents; @@ -1456,7 +1455,7 @@ namespace Gda { public void iterate (bool may_block); public void steal_signal (ulong id); } - [CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_time_copy", type_id = "GDA_TYPE_TIME")] + [CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_time_copy")] [Compact] public class Time { public ulong fraction; @@ -1467,7 +1466,7 @@ namespace Gda { public static void* copy (void* boxed); public bool valid (); } - [CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_timestamp_copy", type_id = "GDA_TYPE_TIMESTAMP")] + [CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_timestamp_copy")] [Compact] public class Timestamp { public ushort day; @@ -1794,7 +1793,7 @@ namespace Gda { [CCode (vfunc_name = "i_unlock")] public virtual void unlock (); } - [CCode (cheader_filename = "libgda/libgda.h", type_id = "GDA_TYPE_DSN_INFO")] + [CCode (cheader_filename = "libgda/libgda.h")] public struct DsnInfo { public weak string name; public weak string provider; @@ -1804,11 +1803,10 @@ namespace Gda { public bool is_system; } [CCode (cheader_filename = "libgda/libgda.h")] - [IntegerType (rank = 7)] [SimpleType] public struct SqlBuilderId : uint { } - [CCode (cheader_filename = "libgda/libgda.h", type_id = "GDA_TYPE_SQL_PARSER_IFACE")] + [CCode (cheader_filename = "libgda/libgda.h")] protected struct SqlParserIface { public Gda.SqlParser parser; public Gda.SqlStatement parsed_statement; @@ -2373,7 +2371,7 @@ namespace Gda { DTP_NOT_SUPPORTED_ERROR, CONNECTION_BRANCH_LENGTH_ERROR } - [CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SQL_ERROR_")] + [CCode (cheader_filename = "libgda/libgda.h")] public errordomain SqlError { STRUCTURE_CONTENTS_ERROR, MALFORMED_IDENTIFIER_ERROR, diff --git a/vapi/libgda-report-4.0.vapi b/vapi/libgda-report-4.0.vapi index f93d5535a..e75ea4b27 100644 --- a/vapi/libgda-report-4.0.vapi +++ b/vapi/libgda-report-4.0.vapi @@ -1,6 +1,5 @@ /* libgda-report-4.0.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Gda", lower_case_cprefix = "gda_")] namespace Gda { [CCode (cheader_filename = "libgda-report/libgda-report.h")] public class ReportDocbookDocument : Gda.ReportDocument { diff --git a/vapi/libgdata.vapi b/vapi/libgdata.vapi index 08cd860bc..1987d8f4c 100644 --- a/vapi/libgdata.vapi +++ b/vapi/libgdata.vapi @@ -1,6 +1,5 @@ /* libgdata.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "GData", lower_case_cprefix = "gdata_")] namespace GData { [CCode (cheader_filename = "gdata/gdata.h")] public class AccessRule : GData.Entry { @@ -175,7 +174,7 @@ namespace GData { public string scheme { get; set; } public string term { get; set; } } - [CCode (cheader_filename = "gdata/gdata.h", type_id = "GDATA_TYPE_COLOR")] + [CCode (cheader_filename = "gdata/gdata.h")] [Compact] public class Color { public uint16 blue; @@ -803,7 +802,7 @@ namespace GData { public string relation_type { get; set; } public string value_string { get; set; } } - [CCode (cheader_filename = "gdata/gdata.h", type_id = "GDATA_TYPE_GTIME_VAL")] + [CCode (cheader_filename = "gdata/gdata.h")] [Compact] public class GTimeVal { } @@ -1177,13 +1176,13 @@ namespace GData { public unowned GData.PicasaWebAlbum insert_album (GData.PicasaWebAlbum album, GLib.Cancellable cancellable) throws GLib.Error; [CCode (cname = "gdata_picasaweb_service_query_all_albums")] public unowned GData.Feed query_all_albums (GData.Query? query, string? username, GLib.Cancellable? cancellable, GData.QueryProgressCallback? progress_callback) throws GLib.Error; - [CCode (cname = "gdata_picasaweb_service_query_all_albums_async", finish_name = "gdata_picasa_web_service_query_all_albums_finish")] + [CCode (cname = "gdata_picasaweb_service_query_all_albums_async")] public async void query_all_albums_async (GData.Query? query, string username, GLib.Cancellable? cancellable, GData.QueryProgressCallback progress_callback); [CCode (cname = "gdata_picasaweb_service_query_files")] public unowned GData.Feed query_files (GData.PicasaWebAlbum album, GData.Query? query, GLib.Cancellable? cancellable, GData.QueryProgressCallback? progress_callback) throws GLib.Error; [CCode (cname = "gdata_picasaweb_service_upload_file")] public unowned GData.PicasaWebFile upload_file (GData.PicasaWebAlbum album, GData.PicasaWebFile file_entry, GLib.File file_data, GLib.Cancellable cancellable) throws GLib.Error; - [CCode (cname = "gdata_picasaweb_service_upload_file_async", finish_name = "gdata_picasa_web_service_upload_file_finish")] + [CCode (cname = "gdata_picasaweb_service_upload_file_async")] public async GData.PicasaWebFile upload_file_async (GData.PicasaWebAlbum album, GData.PicasaWebFile file_entry, GLib.File file_data, GLib.Cancellable? cancellable = null) throws GLib.Error; } [CCode (cheader_filename = "gdata/gdata.h")] diff --git a/vapi/libglade-2.0.vapi b/vapi/libglade-2.0.vapi index 49ad9f4e9..0af9a9410 100644 --- a/vapi/libglade-2.0.vapi +++ b/vapi/libglade-2.0.vapi @@ -1,6 +1,5 @@ /* libglade-2.0.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Glade", lower_case_cprefix = "glade_")] namespace Glade { [CCode (cheader_filename = "glade/glade.h")] [Compact] diff --git a/vapi/libgnome-2.0.vapi b/vapi/libgnome-2.0.vapi index 490c3bdcf..0766e850e 100644 --- a/vapi/libgnome-2.0.vapi +++ b/vapi/libgnome-2.0.vapi @@ -1,8 +1,7 @@ /* libgnome-2.0.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Gnome", lower_case_cprefix = "gnome_")] namespace Gnome { - [CCode (cheader_filename = "libgnome/libgnome.h", type_id = "GNOME_TYPE_MODULE_INFO")] + [CCode (cheader_filename = "libgnome/libgnome.h")] [Compact] public class ModuleInfo { public weak Gnome.ModuleClassInitHook class_init; diff --git a/vapi/libgnome-menu.vapi b/vapi/libgnome-menu.vapi index 5946da872..68d74b987 100644 --- a/vapi/libgnome-menu.vapi +++ b/vapi/libgnome-menu.vapi @@ -1,6 +1,5 @@ /* libgnome-menu.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "GMenu", lower_case_cprefix = "gmenu_")] namespace GMenu { [CCode (cheader_filename = "gnome-menus/gmenu-tree.h", ref_function = "gmenu_tree_ref", unref_function = "gmenu_tree_unref")] [Compact] @@ -17,13 +16,11 @@ namespace GMenu { public void set_user_data (void* user_data, GLib.DestroyNotify dnotify); } [CCode (cheader_filename = "gnome-menus/gmenu-tree.h")] - [Compact] public class TreeAlias : GMenu.TreeItem { public unowned GMenu.TreeDirectory get_directory (); public unowned GMenu.TreeItem get_item (); } [CCode (cheader_filename = "gnome-menus/gmenu-tree.h")] - [Compact] public class TreeDirectory : GMenu.TreeItem { public unowned string get_comment (); public unowned GLib.SList get_contents (); @@ -36,7 +33,6 @@ namespace GMenu { public unowned string make_path (GMenu.TreeEntry entry); } [CCode (cheader_filename = "gnome-menus/gmenu-tree.h")] - [Compact] public class TreeEntry : GMenu.TreeItem { public unowned string get_comment (); public unowned string get_desktop_file_id (); @@ -51,7 +47,6 @@ namespace GMenu { public unowned string get_name (); } [CCode (cheader_filename = "gnome-menus/gmenu-tree.h")] - [Compact] public class TreeHeader : GMenu.TreeItem { public unowned GMenu.TreeDirectory get_directory (); } @@ -64,7 +59,6 @@ namespace GMenu { public void set_user_data (void* user_data, GLib.DestroyNotify dnotify); } [CCode (cheader_filename = "gnome-menus/gmenu-tree.h")] - [Compact] public class TreeSeparator : GMenu.TreeItem { } [CCode (cheader_filename = "gnome-menus/gmenu-tree.h", cprefix = "GMENU_TREE_FLAGS_", has_type_id = false)] diff --git a/vapi/libgnomeui-2.0.vapi b/vapi/libgnomeui-2.0.vapi index 74c429026..fc121e5a4 100644 --- a/vapi/libgnomeui-2.0.vapi +++ b/vapi/libgnomeui-2.0.vapi @@ -1,6 +1,5 @@ /* libgnomeui-2.0.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Gnome", lower_case_cprefix = "gnome_")] namespace Gnome { [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] public class App : Gtk.Window, Gtk.Buildable, Atk.Implementor { diff --git a/vapi/libgsf-1.vapi b/vapi/libgsf-1.vapi index 33367c13c..32b70f69e 100644 --- a/vapi/libgsf-1.vapi +++ b/vapi/libgsf-1.vapi @@ -1,6 +1,5 @@ /* libgsf-1.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Gsf", lower_case_cprefix = "gsf_")] namespace Gsf { [CCode (cheader_filename = "gsf/gsf-blob.h")] public class Blob : GLib.Object { @@ -397,7 +396,7 @@ namespace Gsf { public static Gsf.StructuredBlob read (Gsf.Input input); public bool write (Gsf.Outfile container); } - [CCode (cheader_filename = "gsf/gsf-timestamp.h", copy_function = "gsf_timestamp_copy", type_id = "GSF_TYPE_TIMESTAMP")] + [CCode (cheader_filename = "gsf/gsf-timestamp.h", copy_function = "gsf_timestamp_copy")] [Compact] public class Timestamp { public GLib.Date date; @@ -484,7 +483,7 @@ namespace Gsf { [NoAccessorMethod] public bool pretty_print { get; set; } } - [CCode (cheader_filename = "glib.h", cname = "gint64")] + [CCode (cheader_filename = "glib.h", cname = "gint64", default_value = "0LL", get_value_function = "g_value_get_int64", marshaller_type_name = "INT64", set_value_function = "g_value_set_int64", type_id = "G_TYPE_INT64", type_signature = "x")] [IntegerType (rank = 10)] [SimpleType] public struct off_t : int64 { diff --git a/vapi/libnotify.vapi b/vapi/libnotify.vapi index 044de5bba..94d72d74b 100644 --- a/vapi/libnotify.vapi +++ b/vapi/libnotify.vapi @@ -1,6 +1,5 @@ /* libnotify.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Notify", lower_case_cprefix = "notify_")] namespace Notify { [CCode (cheader_filename = "libnotify/notify.h")] public class Notification : GLib.Object { diff --git a/vapi/liboobs-1.vapi b/vapi/liboobs-1.vapi index 0730c847d..80f561b8d 100644 --- a/vapi/liboobs-1.vapi +++ b/vapi/liboobs-1.vapi @@ -1,6 +1,5 @@ /* liboobs-1.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Oobs", lower_case_cprefix = "oobs_")] namespace Oobs { [CCode (cheader_filename = "oobs/oobs.h")] public class Group : Oobs.Object { @@ -204,7 +203,7 @@ namespace Oobs { public void @set (Oobs.ListIter iter, void* data); public void* contained_type { construct; } } - [CCode (cheader_filename = "oobs/oobs.h", copy_function = "oobs_list_iter_copy", type_id = "OOBS_TYPE_LIST_ITER")] + [CCode (cheader_filename = "oobs/oobs.h", copy_function = "oobs_list_iter_copy")] [Compact] public class ListIter { public void* data; diff --git a/vapi/libpeas-1.0.vapi b/vapi/libpeas-1.0.vapi index 2b09f2ac3..9e3ff770b 100644 --- a/vapi/libpeas-1.0.vapi +++ b/vapi/libpeas-1.0.vapi @@ -62,7 +62,7 @@ namespace Peas { public class ObjectModule : GLib.TypeModule, GLib.TypePlugin { [CCode (has_construct_function = false)] protected ObjectModule (); - public void register_extension_factory (GLib.Type iface_type, [CCode (delegate_target_pos = 2.1)] owned Peas.FactoryFunc factory_func); + public void register_extension_factory (GLib.Type iface_type, owned Peas.FactoryFunc factory_func); public void register_extension_type (GLib.Type iface_type, GLib.Type extension_type); [NoAccessorMethod] public string module_name { owned get; construct; } diff --git a/vapi/librsvg-2.0.vapi b/vapi/librsvg-2.0.vapi index e55abca7f..7c7654e2c 100644 --- a/vapi/librsvg-2.0.vapi +++ b/vapi/librsvg-2.0.vapi @@ -1,6 +1,5 @@ /* librsvg-2.0.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Rsvg", lower_case_cprefix = "rsvg_")] namespace Rsvg { [CCode (cheader_filename = "librsvg/rsvg.h")] public class Handle : GLib.Object { diff --git a/vapi/libsexy.vapi b/vapi/libsexy.vapi index cdc193764..95e5e6299 100644 --- a/vapi/libsexy.vapi +++ b/vapi/libsexy.vapi @@ -1,6 +1,5 @@ /* libsexy.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Sexy", lower_case_cprefix = "sexy_")] namespace Sexy { [CCode (cheader_filename = "libsexy/sexy.h")] public class IconEntry : Gtk.Entry, Atk.Implementor, Gtk.Buildable, Gtk.Editable, Gtk.CellEditable { diff --git a/vapi/libsoup-2.2.vapi b/vapi/libsoup-2.2.vapi index b2212c841..50e200cef 100644 --- a/vapi/libsoup-2.2.vapi +++ b/vapi/libsoup-2.2.vapi @@ -1,6 +1,5 @@ /* libsoup-2.2.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Soup", lower_case_cprefix = "soup_")] namespace Soup { [CCode (cheader_filename = "libsoup/soup.h")] public class Address : GLib.Object { @@ -382,7 +381,7 @@ namespace Soup { public interface MessageFilter { public abstract void setup_message (Soup.Message msg); } - [CCode (cheader_filename = "libsoup/soup.h", type_id = "SOUP_TYPE_DATA_BUFFER")] + [CCode (cheader_filename = "libsoup/soup.h")] public struct DataBuffer { public Soup.Ownership owner; public string body; diff --git a/vapi/libsoup-2.4.vapi b/vapi/libsoup-2.4.vapi index db3f9bf75..3c3a40024 100644 --- a/vapi/libsoup-2.4.vapi +++ b/vapi/libsoup-2.4.vapi @@ -2,7 +2,6 @@ [CCode (cprefix = "Soup", gir_namespace = "Soup", gir_version = "2.4", lower_case_cprefix = "soup_")] namespace Soup { - [CCode (cprefix = "SoupForm", lower_case_cprefix = "soup_form_")] namespace Form { [CCode (cheader_filename = "libsoup/soup.h")] public static GLib.HashTable decode (string encoded_form); @@ -25,7 +24,6 @@ namespace Soup { [CCode (cheader_filename = "libsoup/soup.h")] public static Soup.Message request_new_from_multipart (string uri, Soup.Multipart multipart); } - [CCode (cprefix = "SoupXMLRPC", lower_case_cprefix = "soup_xmlrpc_")] namespace XMLRPC { [CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_XMLRPC_ERROR_")] public errordomain Error { @@ -90,7 +88,7 @@ namespace Soup { public static uint hash_by_ip (void* addr); public static uint hash_by_name (void* addr); public bool is_resolved (); - public void resolve_async (GLib.MainContext? async_context, GLib.Cancellable? cancellable, [CCode (delegate_target_pos = 3.1)] Soup.AddressCallback callback); + public void resolve_async (GLib.MainContext? async_context, GLib.Cancellable? cancellable, Soup.AddressCallback callback); public uint resolve_sync (GLib.Cancellable? cancellable); [NoAccessorMethod] public Soup.AddressFamily family { get; construct; } @@ -128,6 +126,7 @@ namespace Soup { [NoWrapper] public virtual string accepts (Soup.Message msg, string header); public void add_path (string path); + [CCode (vfunc_name = "challenge")] public virtual string challenge (Soup.Message msg); public virtual bool check_password (Soup.Message msg, string username, string password); public bool covers (Soup.Message msg); @@ -179,12 +178,12 @@ namespace Soup { public Buffer (Soup.MemoryUse use, [CCode (array_length_cname = "length", array_length_pos = 2.1, array_length_type = "gsize", type = "gconstpointer")] uint8[] data); public Soup.Buffer copy (); public void free (); - public void get_data ([CCode (array_length_cname = "length", array_length_type = "gsize")] out unowned uint8[] data); + public void get_data ([CCode (array_length_cname = "length", array_length_pos = 1.1, array_length_type = "gsize")] out unowned uint8[] data); public void* get_owner (); [CCode (has_construct_function = false)] public Buffer.subbuffer (Soup.Buffer parent, size_t offset, size_t length); [CCode (has_construct_function = false)] - public Buffer.take ([CCode (array_length_cname = "length", array_length_type = "gsize")] owned uint8[] data); + public Buffer.take ([CCode (array_length_cname = "length", array_length_pos = 1.1, array_length_type = "gsize")] owned uint8[] data); [CCode (has_construct_function = false)] public Buffer.with_owner ([CCode (array_length_cname = "length", array_length_pos = 1.5, array_length_type = "gsize", type = "gconstpointer")] uint8[] data, void* owner, GLib.DestroyNotify? owner_dnotify); } @@ -329,8 +328,8 @@ namespace Soup { public weak Soup.MessageHeaders response_headers; [CCode (has_construct_function = false)] public Message (string method, string uri_string); - public uint add_header_handler (string @signal, string header, [CCode (delegate_target_pos = 3.1)] GLib.Callback callback); - public uint add_status_code_handler (string @signal, uint status_code, [CCode (delegate_target_pos = 3.1)] GLib.Callback callback); + public uint add_header_handler (string @signal, string header, GLib.Callback callback); + public uint add_status_code_handler (string @signal, uint status_code, GLib.Callback callback); public void disable_feature (GLib.Type feature_type); [CCode (has_construct_function = false)] public Message.from_uri (string method, Soup.URI uri); @@ -396,7 +395,7 @@ namespace Soup { public MessageBody (); public void append (Soup.MemoryUse use, [CCode (array_length_cname = "length", array_length_pos = 2.1, array_length_type = "gsize")] uint8[] data); public void append_buffer (Soup.Buffer buffer); - public void append_take ([CCode (array_length_cname = "length", array_length_type = "gsize")] owned uint8[] data); + public void append_take ([CCode (array_length_cname = "length", array_length_pos = 1.1, array_length_type = "gsize")] owned uint8[] data); public void complete (); public Soup.Buffer flatten (); public void free (); @@ -466,7 +465,7 @@ namespace Soup { [CCode (has_construct_function = false)] public Server (string optname1, ...); public void add_auth_domain (Soup.AuthDomain auth_domain); - public void add_handler (string? path, [CCode (delegate_target_pos = 2.1)] owned Soup.ServerCallback callback); + public void add_handler (string? path, owned Soup.ServerCallback callback); public unowned GLib.MainContext get_async_context (); public unowned Soup.Socket get_listener (); public uint get_port (); @@ -509,7 +508,7 @@ namespace Soup { public GLib.SList get_features (GLib.Type feature_type); public void pause_message (Soup.Message msg); public void prepare_for_uri (Soup.URI uri); - public virtual void queue_message (owned Soup.Message msg, [CCode (delegate_target_pos = 2.1)] Soup.SessionCallback? callback); + public virtual void queue_message (owned Soup.Message msg, Soup.SessionCallback? callback); public void remove_feature (Soup.SessionFeature feature); public virtual void requeue_message (Soup.Message msg); public virtual uint send_message (Soup.Message msg); @@ -568,7 +567,7 @@ namespace Soup { public class Socket : GLib.Object { [CCode (has_construct_function = false)] public Socket (string optname1, ...); - public void connect_async (GLib.Cancellable? cancellable, [CCode (delegate_target_pos = 2.1)] Soup.SocketCallback callback); + public void connect_async (GLib.Cancellable? cancellable, Soup.SocketCallback callback); public uint connect_sync (GLib.Cancellable? cancellable); public void disconnect (); public int get_fd (); @@ -583,7 +582,7 @@ namespace Soup { public bool start_ssl (GLib.Cancellable? cancellable); public Soup.SocketIOStatus write ([CCode (array_length_cname = "len", array_length_pos = 1.5, array_length_type = "gsize", type = "gconstpointer")] uint8[] buffer, out size_t nwrote, GLib.Cancellable? cancellable) throws GLib.Error; [NoAccessorMethod] - public GLib.MainContext async_context { owned get; owned construct; } + public GLib.MainContext async_context { owned get; construct; } public bool clean_dispose { construct; } [NoAccessorMethod] public bool is_server { get; } @@ -651,12 +650,12 @@ namespace Soup { } [CCode (cheader_filename = "libsoup/soup.h", type_cname = "SoupProxyResolverInterface", type_id = "soup_proxy_resolver_get_type ()")] public interface ProxyResolver : Soup.SessionFeature, GLib.Object { - public abstract void get_proxy_async (Soup.Message msg, GLib.MainContext async_context, GLib.Cancellable? cancellable, [CCode (delegate_target_pos = 4.1)] Soup.ProxyResolverCallback callaback); + public abstract void get_proxy_async (Soup.Message msg, GLib.MainContext async_context, GLib.Cancellable? cancellable, Soup.ProxyResolverCallback callaback); public abstract uint get_proxy_sync (Soup.Message msg, GLib.Cancellable? cancellable, out unowned Soup.Address addr); } [CCode (cheader_filename = "libsoup/soup.h", type_cname = "SoupProxyURIResolverInterface", type_id = "soup_proxy_uri_resolver_get_type ()")] public interface ProxyURIResolver : GLib.Object { - public abstract void get_proxy_uri_async (Soup.URI uri, GLib.MainContext? async_context, GLib.Cancellable? cancellable, [CCode (delegate_target_pos = 4.1)] Soup.ProxyURIResolverCallback callback); + public abstract void get_proxy_uri_async (Soup.URI uri, GLib.MainContext? async_context, GLib.Cancellable? cancellable, Soup.ProxyURIResolverCallback callback); public abstract uint get_proxy_uri_sync (Soup.URI uri, GLib.Cancellable? cancellable, out unowned Soup.URI proxy_uri); } [CCode (cheader_filename = "libsoup/soup.h", type_cname = "SoupSessionFeatureInterface", type_id = "soup_session_feature_get_type ()")] @@ -670,14 +669,14 @@ namespace Soup { [NoWrapper] public abstract void request_unqueued (Soup.Session session, Soup.Message msg); } - [CCode (cheader_filename = "libsoup/soup.h", type_id = "SOUP_TYPE_MESSAGE_HEADERS_ITER")] + [CCode (cheader_filename = "libsoup/soup.h")] public struct MessageHeadersIter { [CCode (array_length = false, array_null_terminated = true)] public weak void*[] dummy; public void init (Soup.MessageHeaders hdrs); public bool next (out unowned string name, out unowned string value); } - [CCode (cheader_filename = "libsoup/soup.h", type_id = "SOUP_TYPE_RANGE")] + [CCode (cheader_filename = "libsoup/soup.h")] public struct Range { public int64 start; public int64 end; @@ -1096,13 +1095,13 @@ namespace Soup { [CCode (cheader_filename = "libsoup/soup.h")] public const int XMLRPC_H; [CCode (cheader_filename = "libsoup/soup.h")] - public static unowned GLib.TimeoutSource add_completion (GLib.MainContext? async_context, [CCode (delegate_target_pos = 2.1)] GLib.SourceFunc function); + public static unowned GLib.TimeoutSource add_completion (GLib.MainContext? async_context, GLib.SourceFunc function); [CCode (cheader_filename = "libsoup/soup.h")] - public static unowned GLib.TimeoutSource add_idle (GLib.MainContext? async_context, [CCode (delegate_target_pos = 2.1)] GLib.SourceFunc function); + public static unowned GLib.TimeoutSource add_idle (GLib.MainContext? async_context, GLib.SourceFunc function); [CCode (cheader_filename = "libsoup/soup.h")] - public static unowned GLib.TimeoutSource add_io_watch (GLib.MainContext? async_context, GLib.IOChannel chan, GLib.IOCondition condition, [CCode (delegate_target_pos = 4.1)] GLib.IOFunc function); + public static unowned GLib.TimeoutSource add_io_watch (GLib.MainContext? async_context, GLib.IOChannel chan, GLib.IOCondition condition, GLib.IOFunc function); [CCode (cheader_filename = "libsoup/soup.h")] - public static unowned GLib.TimeoutSource add_timeout (GLib.MainContext? async_context, uint interval, [CCode (delegate_target_pos = 3.1)] GLib.SourceFunc function); + public static unowned GLib.TimeoutSource add_timeout (GLib.MainContext? async_context, uint interval, GLib.SourceFunc function); [CCode (cheader_filename = "libsoup/soup.h")] public static GLib.SList cookies_from_request (Soup.Message msg); [CCode (cheader_filename = "libsoup/soup.h")] diff --git a/vapi/libwnck-1.0.vapi b/vapi/libwnck-1.0.vapi index 313b29e05..75d8dda64 100644 --- a/vapi/libwnck-1.0.vapi +++ b/vapi/libwnck-1.0.vapi @@ -1,6 +1,5 @@ /* libwnck-1.0.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Wnck", lower_case_cprefix = "wnck_")] namespace Wnck { [CCode (cheader_filename = "libwnck/libwnck.h")] public class ActionMenu : Gtk.Menu, Atk.Implementor, Gtk.Buildable { diff --git a/vapi/loudmouth-1.0.vapi b/vapi/loudmouth-1.0.vapi index bdbe068ab..596d95cfd 100644 --- a/vapi/loudmouth-1.0.vapi +++ b/vapi/loudmouth-1.0.vapi @@ -1,6 +1,5 @@ /* loudmouth-1.0.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Lm", lower_case_cprefix = "lm_")] namespace Lm { [CCode (cheader_filename = "loudmouth/loudmouth.h", ref_function = "lm_connection_ref", unref_function = "lm_connection_unref")] [Compact] diff --git a/vapi/mx-1.0.vapi b/vapi/mx-1.0.vapi index e1bfe5bd0..151f15b60 100644 --- a/vapi/mx-1.0.vapi +++ b/vapi/mx-1.0.vapi @@ -1,6 +1,5 @@ /* mx-1.0.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Mx", lower_case_cprefix = "mx_")] namespace Mx { [CCode (cheader_filename = "mx/mx.h")] public class Action : GLib.InitiallyUnowned { @@ -99,7 +98,7 @@ namespace Mx { [NoAccessorMethod] public bool y_fill { get; set; } } - [CCode (cheader_filename = "mx/mx.h", type_id = "MX_TYPE_BORDER_IMAGE")] + [CCode (cheader_filename = "mx/mx.h")] [Compact] public class BorderImage { public int bottom; @@ -797,7 +796,7 @@ namespace Mx { [HasEmitter] public signal void style_changed (Mx.StyleChangedFlags flags); } - [CCode (cheader_filename = "mx/mx.h", type_id = "MX_TYPE_PADDING")] + [CCode (cheader_filename = "mx/mx.h")] public struct Padding { public float top; public float right; diff --git a/vapi/pango.vapi b/vapi/pango.vapi index 0d147ac06..cae9f72c7 100644 --- a/vapi/pango.vapi +++ b/vapi/pango.vapi @@ -1,22 +1,21 @@ /* pango.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Pango", gir_namespace = "Pango", gir_version = "1.0", lower_case_cprefix = "pango_")] +[CCode (gir_namespace = "Pango", gir_version = "1.0")] namespace Pango { - [CCode (cprefix = "PangoScale", lower_case_cprefix = "pango_scale_")] namespace Scale { - [CCode (cheader_filename = "pango/pango.h")] + [CCode (cheader_filename = "pango/pango.h", cname = "PANGO_SCALE_LARGE")] public const double LARGE; - [CCode (cheader_filename = "pango/pango.h")] + [CCode (cheader_filename = "pango/pango.h", cname = "PANGO_SCALE_MEDIUM")] public const double MEDIUM; - [CCode (cheader_filename = "pango/pango.h")] + [CCode (cheader_filename = "pango/pango.h", cname = "PANGO_SCALE_SMALL")] public const double SMALL; - [CCode (cheader_filename = "pango/pango.h")] + [CCode (cheader_filename = "pango/pango.h", cname = "PANGO_SCALE_XX_LARGE")] public const double XX_LARGE; - [CCode (cheader_filename = "pango/pango.h")] + [CCode (cheader_filename = "pango/pango.h", cname = "PANGO_SCALE_XX_SMALL")] public const double XX_SMALL; - [CCode (cheader_filename = "pango/pango.h")] + [CCode (cheader_filename = "pango/pango.h", cname = "PANGO_SCALE_X_LARGE")] public const double X_LARGE; - [CCode (cheader_filename = "pango/pango.h")] + [CCode (cheader_filename = "pango/pango.h", cname = "PANGO_SCALE_X_SMALL")] public const double X_SMALL; } [CCode (cheader_filename = "pango/pango.h")] @@ -27,25 +26,21 @@ namespace Pango { public weak GLib.Callback equal; public Pango.AttrType type; } - [CCode (cheader_filename = "pango/pango.h")] - [Compact] + [CCode (cheader_filename = "pango/pango.h", free_function = "pango_attribute_destroy")] public class AttrColor : Pango.Attribute { public Pango.Color color; } - [CCode (cheader_filename = "pango/pango.h")] - [Compact] + [CCode (cheader_filename = "pango/pango.h", free_function = "pango_attribute_destroy")] public class AttrFloat : Pango.Attribute { public double value; } - [CCode (cheader_filename = "pango/pango.h")] - [Compact] + [CCode (cheader_filename = "pango/pango.h", free_function = "pango_attribute_destroy")] public class AttrFontDesc : Pango.Attribute { public weak Pango.FontDescription desc; [CCode (has_construct_function = false, type = "PangoAttribute*")] public AttrFontDesc (Pango.FontDescription desc); } - [CCode (cheader_filename = "pango/pango.h")] - [Compact] + [CCode (cheader_filename = "pango/pango.h", free_function = "pango_attribute_destroy")] public class AttrInt : Pango.Attribute { public int value; } @@ -59,14 +54,13 @@ namespace Pango { public bool next (); public void range (out int start, out int end); } - [CCode (cheader_filename = "pango/pango.h")] - [Compact] + [CCode (cheader_filename = "pango/pango.h", free_function = "pango_attribute_destroy")] public class AttrLanguage : Pango.Attribute { public weak Pango.Language value; [CCode (has_construct_function = false, type = "PangoAttribute*")] public AttrLanguage (Pango.Language language); } - [CCode (cheader_filename = "pango/pango.h", ref_function = "pango_attr_list_ref", type_id = "PANGO_TYPE_ATTR_LIST", unref_function = "pango_attr_list_unref")] + [CCode (cheader_filename = "pango/pango.h", ref_function = "pango_attr_list_ref", unref_function = "pango_attr_list_unref")] [Compact] public class AttrList { [CCode (has_construct_function = false)] @@ -79,8 +73,7 @@ namespace Pango { public void insert_before (owned Pango.Attribute attr); public void splice (Pango.AttrList other, int pos, int len); } - [CCode (cheader_filename = "pango/pango.h")] - [Compact] + [CCode (cheader_filename = "pango/pango.h", free_function = "pango_attribute_destroy")] public class AttrShape : Pango.Attribute { public weak Pango.Attribute attr; public weak Pango.AttrDataCopyFunc copy_func; @@ -93,16 +86,14 @@ namespace Pango { [CCode (has_construct_function = false, simple_generics = true, type = "PangoAttribute*")] public AttrShape.with_data (Pango.Rectangle ink_rect, Pango.Rectangle logical_rect, owned T data, Pango.AttrDataCopyFunc copy_func); } - [CCode (cheader_filename = "pango/pango.h")] - [Compact] + [CCode (cheader_filename = "pango/pango.h", free_function = "pango_attribute_destroy")] public class AttrSize : Pango.Attribute { public uint absolute; public int size; [CCode (has_construct_function = false, type = "PangoAttribute*")] public AttrSize (int size); } - [CCode (cheader_filename = "pango/pango.h")] - [Compact] + [CCode (cheader_filename = "pango/pango.h", free_function = "pango_attribute_destroy")] public class AttrString : Pango.Attribute { public weak string value; } @@ -177,7 +168,7 @@ namespace Pango { public void get_glyph_extents (Pango.Glyph glyph, out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect); public Pango.FontMetrics get_metrics (Pango.Language? language); } - [CCode (cheader_filename = "pango/pango.h", copy_function = "pango_font_description_copy", type_id = "PANGO_TYPE_FONT_DESCRIPTION")] + [CCode (cheader_filename = "pango/pango.h", copy_function = "pango_font_description_copy")] [Compact] [Immutable] public class FontDescription { @@ -238,7 +229,7 @@ namespace Pango { public unowned Pango.Font load_font (Pango.Context context, Pango.FontDescription desc); public unowned Pango.Fontset load_fontset (Pango.Context context, Pango.FontDescription desc, Pango.Language language); } - [CCode (cheader_filename = "pango/pango.h", ref_function = "pango_font_metrics_ref", type_id = "PANGO_TYPE_FONT_METRICS", unref_function = "pango_font_metrics_unref")] + [CCode (cheader_filename = "pango/pango.h", ref_function = "pango_font_metrics_ref", unref_function = "pango_font_metrics_unref")] [Compact] public class FontMetrics { public int get_approximate_char_width (); @@ -258,7 +249,7 @@ namespace Pango { public Pango.Font get_font (uint wc); public Pango.FontMetrics get_metrics (); } - [CCode (cheader_filename = "pango/pango.h", copy_function = "pango_glyph_item_copy", type_id = "PANGO_TYPE_GLYPH_ITEM")] + [CCode (cheader_filename = "pango/pango.h", copy_function = "pango_glyph_item_copy")] [Compact] public class GlyphItem { public weak Pango.GlyphString glyphs; @@ -269,7 +260,7 @@ namespace Pango { public void letter_space (string text, Pango.LogAttr[] log_attrs, int letter_spacing); public Pango.GlyphItem split (string text, int split_index); } - [CCode (cheader_filename = "pango/pango.h", copy_function = "pango_glyph_string_copy", type_id = "PANGO_TYPE_GLYPH_STRING")] + [CCode (cheader_filename = "pango/pango.h", copy_function = "pango_glyph_string_copy")] [Compact] public class GlyphString { [CCode (array_length_cname = "num_glyphs")] @@ -293,7 +284,7 @@ namespace Pango { [Compact] public class GlyphUnit { } - [CCode (cheader_filename = "pango/pango.h", copy_function = "pango_item_copy", type_id = "PANGO_TYPE_ITEM")] + [CCode (cheader_filename = "pango/pango.h", copy_function = "pango_item_copy")] [Compact] public class Item { public Pango.Analysis analysis; @@ -305,7 +296,7 @@ namespace Pango { public Pango.Item copy (); public Pango.Item split (int split_index, int split_offset); } - [CCode (cheader_filename = "pango/pango.h", type_id = "PANGO_TYPE_LANGUAGE")] + [CCode (cheader_filename = "pango/pango.h")] [Compact] public class Language { public static unowned Pango.Language? from_string (string language); @@ -378,7 +369,7 @@ namespace Pango { [Compact] public class LayoutClass { } - [CCode (cheader_filename = "pango/pango.h", copy_function = "pango_layout_iter_copy", type_id = "PANGO_TYPE_LAYOUT_ITER")] + [CCode (cheader_filename = "pango/pango.h", copy_function = "pango_layout_iter_copy")] [Compact] public class LayoutIter { public bool at_last_line (); @@ -401,7 +392,7 @@ namespace Pango { public bool next_line (); public bool next_run (); } - [CCode (cheader_filename = "pango/pango.h", ref_function = "pango_layout_line_ref", type_id = "PANGO_TYPE_LAYOUT_LINE", unref_function = "pango_layout_line_unref")] + [CCode (cheader_filename = "pango/pango.h", ref_function = "pango_layout_line_ref", unref_function = "pango_layout_line_unref")] [Compact] public class LayoutLine { public uint is_paragraph_start; @@ -462,7 +453,7 @@ namespace Pango { public void get_range (out unowned string start, out unowned string end, Pango.Script script); public bool next (); } - [CCode (cheader_filename = "pango/pango.h", copy_function = "pango_tab_array_copy", type_id = "PANGO_TYPE_TAB_ARRAY")] + [CCode (cheader_filename = "pango/pango.h", copy_function = "pango_tab_array_copy")] [Compact] public class TabArray { [CCode (has_construct_function = false)] @@ -477,7 +468,7 @@ namespace Pango { [CCode (has_construct_function = false)] public TabArray.with_positions (int size, bool positions_in_pixels, Pango.TabAlign first_alignment, ...); } - [CCode (cheader_filename = "pango/pango.h", type_id = "PANGO_TYPE_ANALYSIS")] + [CCode (cheader_filename = "pango/pango.h")] public struct Analysis { public weak Pango.EngineShape shape_engine; public weak Pango.EngineLang lang_engine; @@ -489,7 +480,7 @@ namespace Pango { public weak Pango.Language language; public weak GLib.SList extra_attrs; } - [CCode (cheader_filename = "pango/pango.h", type_id = "PANGO_TYPE_COLOR")] + [CCode (cheader_filename = "pango/pango.h")] public struct Color { public uint16 red; public uint16 green; @@ -500,23 +491,21 @@ namespace Pango { public unowned string to_string (); } [CCode (cheader_filename = "pango/pango.h")] - [IntegerType (rank = 0)] - [SimpleType] public struct Glyph : uint32 { } - [CCode (cheader_filename = "pango/pango.h", type_id = "PANGO_TYPE_GLYPH_GEOMETRY")] + [CCode (cheader_filename = "pango/pango.h")] public struct GlyphGeometry { public weak Pango.GlyphUnit width; public weak Pango.GlyphUnit x_offset; public weak Pango.GlyphUnit y_offset; } - [CCode (cheader_filename = "pango/pango.h", type_id = "PANGO_TYPE_GLYPH_INFO")] + [CCode (cheader_filename = "pango/pango.h")] public struct GlyphInfo { public Pango.Glyph glyph; public Pango.GlyphGeometry geometry; public Pango.GlyphVisAttr attr; } - [CCode (cheader_filename = "pango/pango.h", type_id = "PANGO_TYPE_GLYPH_ITEM_ITER")] + [CCode (cheader_filename = "pango/pango.h")] public struct GlyphItemIter { public weak Pango.GlyphItem glyph_item; public weak string text; @@ -533,11 +522,11 @@ namespace Pango { public bool next_cluster (); public bool prev_cluster (); } - [CCode (cheader_filename = "pango/pango.h", type_id = "PANGO_TYPE_GLYPH_VIS_ATTR")] + [CCode (cheader_filename = "pango/pango.h")] public struct GlyphVisAttr { public uint is_cluster_start; } - [CCode (cheader_filename = "pango/pango.h", type_id = "PANGO_TYPE_LOG_ATTR")] + [CCode (cheader_filename = "pango/pango.h")] public struct LogAttr { public uint is_line_break; public uint is_mandatory_break; @@ -553,7 +542,7 @@ namespace Pango { public uint is_expandable_space; public uint is_word_boundary; } - [CCode (cheader_filename = "pango/pango.h", type_id = "PANGO_TYPE_MATRIX")] + [CCode (cheader_filename = "pango/pango.h")] public struct Matrix { public double xx; public double xy; @@ -573,7 +562,7 @@ namespace Pango { public void transform_rectangle (ref Pango.Rectangle rect); public void translate (double tx, double ty); } - [CCode (cheader_filename = "pango/pango.h", type_id = "PANGO_TYPE_RECTANGLE")] + [CCode (cheader_filename = "pango/pango.h")] public struct Rectangle { public int x; public int y; diff --git a/vapi/pangocairo.vapi b/vapi/pangocairo.vapi index eb8598fb9..7e20ea12d 100644 --- a/vapi/pangocairo.vapi +++ b/vapi/pangocairo.vapi @@ -1,6 +1,6 @@ /* pangocairo.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Pango", gir_namespace = "PangoCairo", gir_version = "1.0", lower_case_cprefix = "pango_")] +[CCode (gir_namespace = "PangoCairo", gir_version = "1.0")] namespace Pango { [CCode (cheader_filename = "pango/pangocairo.h")] public interface CairoFont : Pango.Font { diff --git a/vapi/poppler-glib.vapi b/vapi/poppler-glib.vapi index cb6591125..0dfe0e3ac 100644 --- a/vapi/poppler-glib.vapi +++ b/vapi/poppler-glib.vapi @@ -1,8 +1,7 @@ /* poppler-glib.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Poppler", lower_case_cprefix = "poppler_")] namespace Poppler { - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_action_copy", type_id = "POPPLER_TYPE_ACTION")] + [CCode (cheader_filename = "poppler.h", copy_function = "poppler_action_copy")] [Compact] public class Action { public Poppler.ActionAny any; @@ -27,7 +26,7 @@ namespace Poppler { public unowned string get_name (); public void set_contents (string contents); } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_annot_callout_line_copy", type_id = "POPPLER_TYPE_ANNOT_CALLOUT_LINE")] + [CCode (cheader_filename = "poppler.h", copy_function = "poppler_annot_callout_line_copy")] [Compact] public class AnnotCalloutLine { public bool multiline; @@ -48,7 +47,7 @@ namespace Poppler { public unowned Poppler.AnnotCalloutLine get_callout_line (); public Poppler.AnnotFreeTextQuadding get_quadding (); } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_annot_mapping_copy", type_id = "POPPLER_TYPE_ANNOT_MAPPING")] + [CCode (cheader_filename = "poppler.h", copy_function = "poppler_annot_mapping_copy")] [Compact] public class AnnotMapping { public weak Poppler.Annot annot; @@ -92,7 +91,7 @@ namespace Poppler { public bool save (string filename) throws GLib.Error; public bool save_to_callback (Poppler.AttachmentSaveFunc save_func) throws GLib.Error; } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_color_copy", type_id = "POPPLER_TYPE_COLOR")] + [CCode (cheader_filename = "poppler.h", copy_function = "poppler_color_copy")] [Compact] public class Color { public uint16 blue; @@ -102,7 +101,7 @@ namespace Poppler { public Color (); public unowned Poppler.Color copy (); } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_dest_copy", type_id = "POPPLER_TYPE_DEST")] + [CCode (cheader_filename = "poppler.h", copy_function = "poppler_dest_copy")] [Compact] public class Dest { public double bottom; @@ -177,7 +176,7 @@ namespace Poppler { public void free (); public bool scan (int n_pages, out unowned Poppler.FontsIter iter); } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_fonts_iter_copy", type_id = "POPPLER_TYPE_FONTS_ITER")] + [CCode (cheader_filename = "poppler.h", copy_function = "poppler_fonts_iter_copy")] [Compact] public class FontsIter { public Poppler.FontsIter copy (); @@ -222,7 +221,7 @@ namespace Poppler { public bool text_is_rich_text (); public void text_set_text (string text); } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_form_field_mapping_copy", type_id = "POPPLER_TYPE_FORM_FIELD_MAPPING")] + [CCode (cheader_filename = "poppler.h", copy_function = "poppler_form_field_mapping_copy")] [Compact] public class FormFieldMapping { public Poppler.Rectangle area; @@ -231,7 +230,7 @@ namespace Poppler { public FormFieldMapping (); public Poppler.FormFieldMapping copy (); } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_image_mapping_copy", type_id = "POPPLER_TYPE_IMAGE_MAPPING")] + [CCode (cheader_filename = "poppler.h", copy_function = "poppler_image_mapping_copy")] [Compact] public class ImageMapping { public Poppler.Rectangle area; @@ -240,7 +239,7 @@ namespace Poppler { public ImageMapping (); public Poppler.ImageMapping copy (); } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_index_iter_copy", type_id = "POPPLER_TYPE_INDEX_ITER")] + [CCode (cheader_filename = "poppler.h", copy_function = "poppler_index_iter_copy")] [Compact] public class IndexIter { [CCode (has_construct_function = false)] @@ -262,7 +261,7 @@ namespace Poppler { public bool is_visible (); public void show (); } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_layers_iter_copy", type_id = "POPPLER_TYPE_LAYERS_ITER")] + [CCode (cheader_filename = "poppler.h", copy_function = "poppler_layers_iter_copy")] [Compact] public class LayersIter { [CCode (has_construct_function = false)] @@ -273,7 +272,7 @@ namespace Poppler { public unowned string get_title (); public bool next (); } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_link_mapping_copy", type_id = "POPPLER_TYPE_LINK_MAPPING")] + [CCode (cheader_filename = "poppler.h", copy_function = "poppler_link_mapping_copy")] [Compact] public class LinkMapping { public weak Poppler.Action action; @@ -325,7 +324,7 @@ namespace Poppler { [NoAccessorMethod] public string label { owned get; } } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_page_transition_copy", type_id = "POPPLER_TYPE_PAGE_TRANSITION")] + [CCode (cheader_filename = "poppler.h", copy_function = "poppler_page_transition_copy")] [Compact] public class PageTransition { public Poppler.PageTransitionAlignment alignment; @@ -381,7 +380,7 @@ namespace Poppler { public weak string title; public weak string uri; } - [CCode (cheader_filename = "poppler.h", type_id = "POPPLER_TYPE_RECTANGLE")] + [CCode (cheader_filename = "poppler.h")] public struct Rectangle { public double x1; public double y1; diff --git a/vapi/purple.vapi b/vapi/purple.vapi index edaf5c775..7a2bff5c6 100644 --- a/vapi/purple.vapi +++ b/vapi/purple.vapi @@ -1,6 +1,5 @@ /* purple.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Purple", lower_case_cprefix = "purple_")] namespace Purple { [CCode (cheader_filename = "purple.h", free_function = "purple_account_destroy")] [Compact] @@ -761,7 +760,7 @@ namespace Purple { public weak GLib.Callback is_enabled; public weak GLib.Callback print; } - [CCode (cheader_filename = "purple.h", copy_function = "purple_desktop_item_copy")] + [CCode (cheader_filename = "purple.h", copy_function = "purple_desktop_item_copy", unref_function = "purple_desktop_item_unref")] [Compact] public class DesktopItem { public unowned Purple.DesktopItem copy (); @@ -3878,17 +3877,17 @@ namespace Purple { [CCode (cheader_filename = "purple.h")] public static void signals_unregister_by_instance (void* instance); [CCode (cheader_filename = "purple.h")] - public static void smarshal_BOOLEAN__OBJECT_POINTER_STRING (GLib.Closure closure, Gst.Value return_value, uint n_param_values, Gst.Value param_values, void* invocation_hint, void* marshal_data); + public static void smarshal_BOOLEAN__OBJECT_POINTER_STRING (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data); [CCode (cheader_filename = "purple.h")] - public static void smarshal_VOID__ENUM_STRING_STRING (GLib.Closure closure, Gst.Value return_value, uint n_param_values, Gst.Value param_values, void* invocation_hint, void* marshal_data); + public static void smarshal_VOID__ENUM_STRING_STRING (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data); [CCode (cheader_filename = "purple.h")] - public static void smarshal_VOID__ENUM_STRING_STRING_BOOLEAN (GLib.Closure closure, Gst.Value return_value, uint n_param_values, Gst.Value param_values, void* invocation_hint, void* marshal_data); + public static void smarshal_VOID__ENUM_STRING_STRING_BOOLEAN (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data); [CCode (cheader_filename = "purple.h")] - public static void smarshal_VOID__POINTER_POINTER_OBJECT (GLib.Closure closure, Gst.Value return_value, uint n_param_values, Gst.Value param_values, void* invocation_hint, void* marshal_data); + public static void smarshal_VOID__POINTER_POINTER_OBJECT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data); [CCode (cheader_filename = "purple.h")] - public static void smarshal_VOID__STRING_STRING (GLib.Closure closure, Gst.Value return_value, uint n_param_values, Gst.Value param_values, void* invocation_hint, void* marshal_data); + public static void smarshal_VOID__STRING_STRING (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data); [CCode (cheader_filename = "purple.h")] - public static void smarshal_VOID__STRING_STRING_DOUBLE (GLib.Closure closure, Gst.Value return_value, uint n_param_values, Gst.Value param_values, void* invocation_hint, void* marshal_data); + public static void smarshal_VOID__STRING_STRING_DOUBLE (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data); [CCode (cheader_filename = "purple.h")] public static unowned Purple.Smiley smileys_find_by_checksum (string checksum); [CCode (cheader_filename = "purple.h")] diff --git a/vapi/rest-0.6.vapi b/vapi/rest-0.6.vapi index df8334782..71e99cd25 100644 --- a/vapi/rest-0.6.vapi +++ b/vapi/rest-0.6.vapi @@ -1,6 +1,5 @@ /* rest-0.6.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Rest", lower_case_cprefix = "rest_")] namespace Rest { [CCode (cheader_filename = "rest/oauth-proxy.h", cname = "OAuthProxy")] public class OAuthProxy : Rest.Proxy { @@ -97,7 +96,7 @@ namespace Rest { [NoAccessorMethod] public Rest.Proxy proxy { owned get; construct; } } - [CCode (cheader_filename = "rest/rest-xml-parser.h", ref_function = "rest_xml_node_ref", type_id = "REST_TYPE_XML_NODE", unref_function = "rest_xml_node_unref")] + [CCode (cheader_filename = "rest/rest-xml-parser.h", ref_function = "rest_xml_node_ref", unref_function = "rest_xml_node_unref")] [Compact] public class XmlNode { public weak GLib.HashTable attrs; diff --git a/vapi/rest-0.7.vapi b/vapi/rest-0.7.vapi index ca7e1bffe..d9a00d6ba 100644 --- a/vapi/rest-0.7.vapi +++ b/vapi/rest-0.7.vapi @@ -214,7 +214,7 @@ namespace Rest { HTTP_HTTP_VERSION_NOT_SUPPORTED; public static GLib.Quark quark (); } - [CCode (cheader_filename = "rest/oauth-proxy.h", instance_pos = 3.9)] + [CCode (cheader_filename = "rest/oauth-proxy.h", cname = "OAuthProxyAuthCallback", instance_pos = 3.9)] public delegate void OAuthProxyAuthCallback (Rest.OAuthProxy proxy, GLib.Error? error, GLib.Object? weak_object); [CCode (cheader_filename = "rest/rest-proxy-call.h", instance_pos = 3.9)] public delegate void ProxyCallAsyncCallback (Rest.ProxyCall call, GLib.Error? error, GLib.Object? weak_object); diff --git a/vapi/rest-extras-0.6.vapi b/vapi/rest-extras-0.6.vapi index 91e808028..307bd14b2 100644 --- a/vapi/rest-extras-0.6.vapi +++ b/vapi/rest-extras-0.6.vapi @@ -1,6 +1,5 @@ /* rest-extras-0.6.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Rest", lower_case_cprefix = "rest_")] namespace Rest { [CCode (cheader_filename = "rest-extras/facebook-proxy.h", cname = "FacebookProxy")] public class FacebookProxy : Rest.Proxy { diff --git a/vapi/tracker-indexer-module-1.0.vapi b/vapi/tracker-indexer-module-1.0.vapi index 1874611a9..f6f767023 100644 --- a/vapi/tracker-indexer-module-1.0.vapi +++ b/vapi/tracker-indexer-module-1.0.vapi @@ -1,8 +1,6 @@ /* tracker-indexer-module-1.0.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Tracker", lower_case_cprefix = "tracker_")] namespace Tracker { - [CCode (cprefix = "TrackerModule", lower_case_cprefix = "tracker_module_")] namespace Module { [CCode (cheader_filename = "tracker-1.0/libtracker-indexer/tracker-module.h")] public delegate void FileFreeDataFunc (); @@ -47,7 +45,6 @@ namespace Tracker { [CCode (cheader_filename = "tracker-1.0/libtracker-indexer/tracker-module.h")] public static void shutdown (); } - [CCode (cprefix = "TrackerModuleConfig", lower_case_cprefix = "tracker_module_config_")] namespace ModuleConfig { [CCode (cheader_filename = "tracker-1.0/libtracker-common/tracker-module-config.h")] public static unowned string get_description (string name); @@ -80,7 +77,6 @@ namespace Tracker { [CCode (cheader_filename = "tracker-1.0/libtracker-common/tracker-module-config.h")] public static void shutdown (); } - [CCode (cprefix = "TrackerOntology", lower_case_cprefix = "tracker_ontology_")] namespace Ontology { [CCode (cheader_filename = "tracker-1.0/libtracker-common/tracker-ontology.h")] public static void field_add (Tracker.Field field); diff --git a/vapi/twitter-glib-1.0.vapi b/vapi/twitter-glib-1.0.vapi index 0ae6f3770..593154aff 100644 --- a/vapi/twitter-glib-1.0.vapi +++ b/vapi/twitter-glib-1.0.vapi @@ -1,6 +1,5 @@ /* twitter-glib-1.0.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Twitter", lower_case_cprefix = "twitter_")] namespace Twitter { [CCode (cheader_filename = "twitter-glib/twitter-glib.h")] public class Client : GLib.Object { diff --git a/vapi/unique-1.0.vapi b/vapi/unique-1.0.vapi index 353267e0f..b003f4491 100644 --- a/vapi/unique-1.0.vapi +++ b/vapi/unique-1.0.vapi @@ -1,6 +1,5 @@ /* unique-1.0.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Unique", lower_case_cprefix = "unique_")] namespace Unique { [CCode (cheader_filename = "unique/unique.h")] public class App : GLib.Object { @@ -41,7 +40,7 @@ namespace Unique { public void set_screen (Gdk.Screen screen); public void set_startup_id (string startup_id); } - [CCode (cheader_filename = "unique/unique.h", copy_function = "unique_message_data_copy", type_id = "UNIQUE_TYPE_MESSAGE_DATA")] + [CCode (cheader_filename = "unique/unique.h", copy_function = "unique_message_data_copy")] [Compact] public class MessageData { [CCode (has_construct_function = false)] diff --git a/vapi/vte-2.90.vapi b/vapi/vte-2.90.vapi index bd62bb88b..449d02417 100644 --- a/vapi/vte-2.90.vapi +++ b/vapi/vte-2.90.vapi @@ -179,7 +179,7 @@ namespace Vte { public virtual signal void text_scrolled (int delta); public virtual signal void window_title_changed (); } - [CCode (cheader_filename = "vte/vte.h", cname = "_VteCharAttributes", type_id = "VTE_TYPE__CHARATTRIBUTES")] + [CCode (cheader_filename = "vte/vte.h", cname = "_VteCharAttributes")] public struct _CharAttributes { } [CCode (cheader_filename = "vte/vte.h", cprefix = "VTE_PTY_ERROR_")] diff --git a/vapi/vte.vapi b/vapi/vte.vapi index 60d6465b5..66f609034 100644 --- a/vapi/vte.vapi +++ b/vapi/vte.vapi @@ -1,6 +1,5 @@ /* vte.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "Vte", lower_case_cprefix = "vte_")] namespace Vte { [CCode (cheader_filename = "vte/vte.h")] [Compact] diff --git a/vapi/webkit-1.0.vapi b/vapi/webkit-1.0.vapi index e1308e34f..03aa1fc65 100644 --- a/vapi/webkit-1.0.vapi +++ b/vapi/webkit-1.0.vapi @@ -1,6 +1,6 @@ /* webkit-1.0.vapi generated by vapigen, do not modify. */ -[CCode (cprefix = "WebKit", lower_case_cprefix = "webkit_")] +[CCode (lower_case_cprefix = "webkit_")] namespace WebKit { [CCode (cheader_filename = "webkit/webkit.h")] public class Download : GLib.Object {