GNOME.org
 

[vala] girparser: Add has_type_id=false for structs without registered GType

commit 0d07fb8c74d9b6add98aaefc3bbb667391147756
Author: Luca Bruno <lucabru src gnome org>
Date:   Sun Oct 9 11:04:54 2011 +0200

    girparser: Add has_type_id=false for structs without registered GType
    
    Fixes regressions introduced by the switch to gir.
    
    Fixes bug 661291.

 vala/valagirparser.vala        |    6 ++++
 vapi/atk.vapi                  |   10 ++++----
 vapi/clutter-1.0.vapi          |   26 ++++++++++----------
 vapi/gdk-3.0.vapi              |   52 ++++++++++++++++++++--------------------
 vapi/gdk-pixbuf-2.0.vapi       |    8 +++---
 vapi/libgdata.vapi             |    2 +-
 vapi/libsoup-2.4.vapi          |    4 +-
 vapi/metadata/Gdk-3.0.metadata |    2 +
 vapi/mx-1.0.vapi               |    4 +-
 vapi/vte-2.90.vapi             |    2 +-
 10 files changed, 62 insertions(+), 54 deletions(-)
---
diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index be3d241..3597b26 100644
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -2306,6 +2306,12 @@ public class Vala.GirParser : CodeVisitor {
 		if (current.new_symbol) {
 			st = new Struct (element_get_name (), current.source_reference);
 			current.symbol = st;
+			var type_id = reader.get_attribute ("glib:get-type");
+			if (type_id == null) {
+				st.set_attribute_bool ("CCode", "has_type_id", false);
+			} else {
+				st.set_attribute_string ("CCode", "type_id", "%s ()".printf (type_id));
+			}
 		} else {
 			st = (Struct) current.symbol;
 		}
diff --git a/vapi/atk.vapi b/vapi/atk.vapi
index 801ef46..4509c49 100644
--- a/vapi/atk.vapi
+++ b/vapi/atk.vapi
@@ -447,7 +447,7 @@ namespace Atk {
 		public string name;
 		public string value;
 	}
-	[CCode (cheader_filename = "atk/atk.h")]
+	[CCode (cheader_filename = "atk/atk.h", has_type_id = false)]
 	public struct KeyEventStruct {
 		public int type;
 		public uint state;
@@ -457,14 +457,14 @@ namespace Atk {
 		public uint16 keycode;
 		public uint32 timestamp;
 	}
-	[CCode (cheader_filename = "atk/atk.h", cname = "_AtkPropertyValues")]
+	[CCode (cheader_filename = "atk/atk.h", cname = "_AtkPropertyValues", has_type_id = false)]
 	[GIR (name = "_PropertyValues")]
 	public struct PropertyValues {
 		public weak string property_name;
 		public GLib.Value old_value;
 		public GLib.Value new_value;
 	}
-	[CCode (cheader_filename = "atk/atk.h")]
+	[CCode (cheader_filename = "atk/atk.h", type_id = "atk_rectangle_get_type ()")]
 	public struct Rectangle {
 		public int x;
 		public int y;
@@ -481,7 +481,7 @@ namespace Atk {
 		[Deprecated (replacement = "StateType.register", since = "vala-0.16")]
 		public static Atk.StateType type_register (string name);
 	}
-	[CCode (cheader_filename = "atk/atk.h")]
+	[CCode (cheader_filename = "atk/atk.h", has_type_id = false)]
 	public struct TextRectangle {
 		public int x;
 		public int y;
@@ -766,7 +766,7 @@ namespace Atk {
 	[CCode (cheader_filename = "atk/atk.h", has_target = false)]
 	public delegate void EventListenerInit ();
 	[CCode (cheader_filename = "atk/atk.h", has_target = false)]
-	public delegate void FocusHandler (Atk.Object arg0, bool arg1);
+	public delegate void FocusHandler (Atk.Object obj, bool focus_in);
 	[CCode (cheader_filename = "atk/atk.h")]
 	public delegate bool Function ();
 	[CCode (cheader_filename = "atk/atk.h")]
diff --git a/vapi/clutter-1.0.vapi b/vapi/clutter-1.0.vapi
index 0ca8f1a..cbe69af 100644
--- a/vapi/clutter-1.0.vapi
+++ b/vapi/clutter-1.0.vapi
@@ -1965,7 +1965,7 @@ namespace Clutter {
 		public void set_size (float width, float height);
 		public Clutter.ActorBox union (Clutter.ActorBox b);
 	}
-	[CCode (cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
 	public struct AnyEvent {
 		public Clutter.EventType type;
 		public uint32 time;
@@ -1973,7 +1973,7 @@ namespace Clutter {
 		public weak Clutter.Stage stage;
 		public weak Clutter.Actor source;
 	}
-	[CCode (cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
 	public struct ButtonEvent {
 		public Clutter.EventType type;
 		public uint32 time;
@@ -2017,7 +2017,7 @@ namespace Clutter {
 		public uint32 to_pixel ();
 		public string to_string ();
 	}
-	[CCode (cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
 	public struct CrossingEvent {
 		public Clutter.EventType type;
 		public uint32 time;
@@ -2029,12 +2029,12 @@ namespace Clutter {
 		public weak Clutter.InputDevice device;
 		public weak Clutter.Actor related;
 	}
-	[CCode (cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_fog_get_type ()")]
 	public struct Fog {
 		public float z_near;
 		public float z_far;
 	}
-	[CCode (cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_geometry_get_type ()")]
 	public struct Geometry {
 		public int x;
 		public int y;
@@ -2043,7 +2043,7 @@ namespace Clutter {
 		public bool intersects (Clutter.Geometry geometry1);
 		public Clutter.Geometry union (Clutter.Geometry geometry_b);
 	}
-	[CCode (cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
 	public struct KeyEvent {
 		public Clutter.EventType type;
 		public uint32 time;
@@ -2056,7 +2056,7 @@ namespace Clutter {
 		public unichar unicode_value;
 		public weak Clutter.InputDevice device;
 	}
-	[CCode (cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_knot_get_type ()")]
 	public struct Knot {
 		public int x;
 		public int y;
@@ -2064,7 +2064,7 @@ namespace Clutter {
 		public bool equal (Clutter.Knot knot_b);
 		public void free ();
 	}
-	[CCode (cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
 	public struct MotionEvent {
 		public Clutter.EventType type;
 		public uint32 time;
@@ -2077,7 +2077,7 @@ namespace Clutter {
 		public double axes;
 		public weak Clutter.InputDevice device;
 	}
-	[CCode (cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_path_node_get_type ()")]
 	public struct PathNode {
 		public Clutter.PathNodeType type;
 		[CCode (array_length = false, array_null_terminated = true)]
@@ -2086,14 +2086,14 @@ namespace Clutter {
 		public bool equal (Clutter.PathNode node_b);
 		public void free ();
 	}
-	[CCode (cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_perspective_get_type ()")]
 	public struct Perspective {
 		public float fovy;
 		public float aspect;
 		public float z_near;
 		public float z_far;
 	}
-	[CCode (cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
 	public struct ScrollEvent {
 		public Clutter.EventType type;
 		public uint32 time;
@@ -2107,7 +2107,7 @@ namespace Clutter {
 		public double axes;
 		public weak Clutter.InputDevice device;
 	}
-	[CCode (cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
 	public struct StageStateEvent {
 		public Clutter.EventType type;
 		public uint32 time;
@@ -2138,7 +2138,7 @@ namespace Clutter {
 		public float to_pixels ();
 		public string to_string ();
 	}
-	[CCode (cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_vertex_get_type ()")]
 	public struct Vertex {
 		public float x;
 		public float y;
diff --git a/vapi/gdk-3.0.vapi b/vapi/gdk-3.0.vapi
index f415b79..5c0d04f 100644
--- a/vapi/gdk-3.0.vapi
+++ b/vapi/gdk-3.0.vapi
@@ -4575,7 +4575,7 @@ namespace Gdk {
 	public abstract class Device : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected Device ();
-		public static void free_history ([CCode (array_length_cname = "n_events", array_length_pos = 1.1, type = "GdkTimeCoord**")] Gdk.TimeCoord[] events);
+		public static void free_history ([CCode (array_length_cname = "n_events", array_length_pos = 1.1)] Gdk.TimeCoord[] events);
 		public unowned Gdk.Device? get_associated_device ();
 		public bool get_axis ([CCode (array_length = false)] double[] axes, Gdk.AxisUse use, out double value);
 		public Gdk.AxisUse get_axis_use (uint index_);
@@ -4591,7 +4591,7 @@ namespace Gdk {
 		public unowned string get_name ();
 		public void get_position (out unowned Gdk.Screen screen, out int x, out int y);
 		public Gdk.InputSource get_source ();
-		public void get_state (Gdk.Window window, [CCode (array_length = false, type = "gdouble*")] double[] axes, out Gdk.ModifierType mask);
+		public void get_state (Gdk.Window window, [CCode (array_length = false)] double[] axes, out Gdk.ModifierType mask);
 		public unowned Gdk.Window get_window_at_position (out int win_x, out int win_y);
 		public Gdk.GrabStatus grab (Gdk.Window window, Gdk.GrabOwnership grab_ownership, bool owner_events, Gdk.EventMask event_mask, Gdk.Cursor? cursor, uint32 time_);
 		public GLib.List<weak Gdk.Atom> list_axes ();
@@ -4999,7 +4999,7 @@ namespace Gdk {
 		public static Gdk.Atom intern_static_string (string atom_name);
 		public string name ();
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "gdk_color_get_type ()")]
 	public struct Color {
 		public uint32 pixel;
 		public uint16 red;
@@ -5012,13 +5012,13 @@ namespace Gdk {
 		public static bool parse (string spec, out Gdk.Color color);
 		public string to_string ();
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventAny {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
 		public int8 send_event;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventButton {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -5033,7 +5033,7 @@ namespace Gdk {
 		public double x_root;
 		public double y_root;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventConfigure {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -5043,7 +5043,7 @@ namespace Gdk {
 		public int width;
 		public int height;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventCrossing {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -5059,7 +5059,7 @@ namespace Gdk {
 		public bool focus;
 		public Gdk.ModifierType state;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventDND {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -5069,7 +5069,7 @@ namespace Gdk {
 		public short x_root;
 		public short y_root;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventExpose {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -5078,14 +5078,14 @@ namespace Gdk {
 		public weak Cairo.Region region;
 		public int count;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventFocus {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
 		public int8 send_event;
 		public int16 @in;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventGrabBroken {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -5109,7 +5109,7 @@ namespace Gdk {
 		public uint8 group;
 		public uint is_modifier;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventMotion {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -5125,7 +5125,7 @@ namespace Gdk {
 		public double x_root;
 		public double y_root;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventOwnerChange {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -5136,7 +5136,7 @@ namespace Gdk {
 		public uint32 time;
 		public uint32 selection_time;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventProperty {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -5145,7 +5145,7 @@ namespace Gdk {
 		public uint32 time;
 		public uint state;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventProximity {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -5153,7 +5153,7 @@ namespace Gdk {
 		public uint32 time;
 		public weak Gdk.Device device;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventScroll {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -5167,7 +5167,7 @@ namespace Gdk {
 		public double x_root;
 		public double y_root;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventSelection {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -5178,7 +5178,7 @@ namespace Gdk {
 		public uint32 time;
 		public weak Gdk.Window requestor;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventSetting {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -5186,14 +5186,14 @@ namespace Gdk {
 		public Gdk.SettingAction action;
 		public weak string name;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventVisibility {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
 		public int8 send_event;
 		public Gdk.VisibilityState state;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventWindowState {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -5201,7 +5201,7 @@ namespace Gdk {
 		public Gdk.WindowState changed_mask;
 		public Gdk.WindowState new_window_state;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct Geometry {
 		public int min_width;
 		public int min_height;
@@ -5215,18 +5215,18 @@ namespace Gdk {
 		public double max_aspect;
 		public Gdk.Gravity win_gravity;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct KeymapKey {
 		public uint keycode;
 		public int group;
 		public int level;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct Point {
 		public int x;
 		public int y;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "gdk_rgba_get_type ()")]
 	public struct RGBA {
 		public double red;
 		public double green;
@@ -5244,13 +5244,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")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct TimeCoord {
 		public uint32 time;
 		[CCode (array_length = false, array_null_terminated = true)]
 		public weak double[] axes;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct WindowAttr {
 		public weak string title;
 		public int event_mask;
diff --git a/vapi/gdk-pixbuf-2.0.vapi b/vapi/gdk-pixbuf-2.0.vapi
index 1fa0e87..ca81e1a 100644
--- a/vapi/gdk-pixbuf-2.0.vapi
+++ b/vapi/gdk-pixbuf-2.0.vapi
@@ -24,7 +24,7 @@ namespace Gdk {
 		[CCode (has_construct_function = false)]
 		public Pixbuf.from_file_at_size (string filename, int width, int height) throws GLib.Error;
 		[CCode (has_construct_function = false)]
-		public Pixbuf.from_inline ([CCode (array_length_cname = "data_length", array_length_pos = 0.5, type = "guint8*")] uint8[] data, bool copy_pixels = true) throws GLib.Error;
+		public Pixbuf.from_inline ([CCode (array_length_cname = "data_length", array_length_pos = 0.5)] uint8[] data, bool copy_pixels = true) throws GLib.Error;
 		[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 		public static Gdk.Pixbuf from_pixdata (Gdk.Pixdata pixdata, bool copy_pixels = true) throws GLib.Error;
 		[CCode (has_construct_function = false)]
@@ -53,7 +53,7 @@ namespace Gdk {
 		public void saturate_and_pixelate (Gdk.Pixbuf dest, float saturation, bool pixelate);
 		public bool save (string filename, string type, ...) throws GLib.Error;
 		public bool save_to_buffer ([CCode (array_length_type = "gsize", type = "gchar**")] out uint8[] buffer, string type, ...) throws GLib.Error;
-		public bool save_to_bufferv ([CCode (array_length_cname = "buffer_size", array_length_pos = 1.5, array_length_type = "gsize", type = "gchar**")] out uint8[] buffer, string type, [CCode (array_length = false, array_null_terminated = true)] string[] option_keys, [CCode (array_length = false, array_null_terminated = true)] string[] option_values) throws GLib.Error;
+		public bool save_to_bufferv ([CCode (array_length_cname = "buffer_size", array_length_pos = 1.5, array_length_type = "gsize")] out uint8[] buffer, string type, [CCode (array_length = false, array_null_terminated = true)] string[] option_keys, [CCode (array_length = false, array_null_terminated = true)] string[] option_values) throws GLib.Error;
 		public bool save_to_callback (Gdk.PixbufSaveFunc save_func, string type, ...) throws GLib.Error;
 		public bool save_to_callbackv ([CCode (delegate_target_pos = 1.5)] Gdk.PixbufSaveFunc save_func, string type, [CCode (array_length = false, array_null_terminated = true)] string[] option_keys, [CCode (array_length = false, array_null_terminated = true)] string[] option_values) throws GLib.Error;
 		public bool save_to_stream (GLib.OutputStream stream, string type, GLib.Cancellable? cancellable = null) throws GLib.Error;
@@ -144,7 +144,7 @@ namespace Gdk {
 		[CCode (has_construct_function = false)]
 		protected PixbufSimpleAnimIter ();
 	}
-	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h", has_type_id = false)]
 	public struct Pixdata {
 		public uint32 magic;
 		public int32 length;
@@ -154,7 +154,7 @@ namespace Gdk {
 		public uint32 height;
 		[CCode (array_length = false, array_null_terminated = true)]
 		public weak uint8[] pixel_data;
-		public bool deserialize ([CCode (array_length_cname = "stream_length", array_length_pos = 0.5, array_length_type = "guint", type = "guint8*")] uint8[] stream) throws GLib.Error;
+		public bool deserialize ([CCode (array_length_cname = "stream_length", array_length_pos = 0.5, array_length_type = "guint")] uint8[] stream) throws GLib.Error;
 		[CCode (array_length_pos = 0.1, array_length_type = "guint")]
 		public uint8[] serialize ();
 		public GLib.StringBuilder to_csource (string name, Gdk.PixdataDumpType dump_type);
diff --git a/vapi/libgdata.vapi b/vapi/libgdata.vapi
index 6eee125..c9066de 100644
--- a/vapi/libgdata.vapi
+++ b/vapi/libgdata.vapi
@@ -1537,7 +1537,7 @@ namespace GData {
 		[NoWrapper]
 		public abstract int compare_with (GData.Comparable other);
 	}
-	[CCode (cheader_filename = "gdata/gdata.h")]
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_color_get_type ()")]
 	public struct Color {
 		public uint16 red;
 		public uint16 green;
diff --git a/vapi/libsoup-2.4.vapi b/vapi/libsoup-2.4.vapi
index cfcf119..6ae2581 100644
--- a/vapi/libsoup-2.4.vapi
+++ b/vapi/libsoup-2.4.vapi
@@ -671,14 +671,14 @@ namespace Soup {
 		[NoWrapper]
 		public abstract void request_unqueued (Soup.Session session, Soup.Message msg);
 	}
-	[CCode (cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", has_type_id = false)]
 	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")]
+	[CCode (cheader_filename = "libsoup/soup.h", has_type_id = false)]
 	public struct Range {
 		public int64 start;
 		public int64 end;
diff --git a/vapi/metadata/Gdk-3.0.metadata b/vapi/metadata/Gdk-3.0.metadata
index f310ef2..0deca7f 100644
--- a/vapi/metadata/Gdk-3.0.metadata
+++ b/vapi/metadata/Gdk-3.0.metadata
@@ -39,12 +39,14 @@ Screen.get_monitor_geometry skip
 Window.get_frame_extents skip
 
 // Should send upstream
+add_option_entries_libgtk_only skip=false
 Device
         .free_history.events array array_length_idx=1
         .get_axis_value.value out
         .get_state.axes array
         .get_state.mask out
         .grab_info_libgtk_only skip
+Display.open_default_libgtk_only skip=false
 Window
         .destroy_notify skip
 synthesize_window_state skip
diff --git a/vapi/mx-1.0.vapi b/vapi/mx-1.0.vapi
index 9565d1d..8454451 100644
--- a/vapi/mx-1.0.vapi
+++ b/vapi/mx-1.0.vapi
@@ -1165,14 +1165,14 @@ namespace Mx {
 		[HasEmitter]
 		public virtual signal void style_changed (Mx.StyleChangedFlags flags);
 	}
-	[CCode (cheader_filename = "mx/mx.h")]
+	[CCode (cheader_filename = "mx/mx.h", type_id = "mx_padding_get_type ()")]
 	public struct Padding {
 		public float top;
 		public float right;
 		public float bottom;
 		public float left;
 	}
-	[CCode (cheader_filename = "mx/mx.h")]
+	[CCode (cheader_filename = "mx/mx.h", has_type_id = false)]
 	public struct SettingsProviderIface {
 	}
 	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_ACTOR_MANAGER_")]
diff --git a/vapi/vte-2.90.vapi b/vapi/vte-2.90.vapi
index 449d024..14816e2 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")]
+	[CCode (cheader_filename = "vte/vte.h", cname = "_VteCharAttributes", has_type_id = false)]
 	public struct _CharAttributes {
 	}
 	[CCode (cheader_filename = "vte/vte.h", cprefix = "VTE_PTY_ERROR_")]
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]