Explicitly set type_id for boxed types converted to compact classes

Fixes bug 660576.

diff --git a/vapi/gconf-2.0.vapi b/vapi/gconf-2.0.vapi
index 63b7d5fcfca5074500c5d8b10fd99dd8b45c504d..3b87024453b57e990a54fc060ac776bf653edd6f 100644 (file)
--- a/vapi/gconf-2.0.vapi
+++ b/vapi/gconf-2.0.vapi
@@ -1,7 +1,7 @@
 /* gconf-2.0.vapi generated by vapigen, do not modify. */
 
 namespace GConf {
-       [CCode (cheader_filename = "gconf/gconf.h", ref_function = "gconf_change_set_ref", ref_function_void = true, unref_function = "gconf_change_set_unref")]
+       [CCode (cheader_filename = "gconf/gconf.h", ref_function = "gconf_change_set_ref", ref_function_void = true, type_id = "gconf_change_set_get_type ()", 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 267d33ed102d2678f56a49cf7db50a580aeac2e9..4419fc12f0e1221d6f0caa1cfde467ca6cf3e3b2 100644 (file)
--- a/vapi/gdk-2.0.vapi
+++ b/vapi/gdk-2.0.vapi
@@ -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", unref_function = "gdk_cursor_unref")]
+       [CCode (cheader_filename = "gdk/gdk.h", ref_function = "gdk_cursor_ref", type_id = "gdk_cursor_get_type ()", 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")]
+       [CCode (cheader_filename = "gdk/gdk.h", copy_function = "gdk_event_copy", type_id = "gdk_event_get_type ()")]
        [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", unref_function = "gdk_font_unref")]
+       [CCode (cheader_filename = "gdk/gdk.h", ref_function = "gdk_font_ref", type_id = "gdk_font_get_type ()", unref_function = "gdk_font_unref")]
        [Compact]
        public class Font {
                public int ascent;

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index c90152e275332b2bf3198ebdfb71a9792bdd382d..92dd62cebc7a84773e120af1ee93c15fbad55d01 100644 (file)
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -225,7 +225,7 @@ namespace GLib {
        [Compact]
        public class CredentialsClass {
        }
-       [CCode (cheader_filename = "gio/gio.h", ref_function = "g_dbus_annotation_info_ref", unref_function = "g_dbus_annotation_info_unref")]
+       [CCode (cheader_filename = "gio/gio.h", ref_function = "g_dbus_annotation_info_ref", type_id = "g_dbus_annotation_info_get_type ()", unref_function = "g_dbus_annotation_info_unref")]
        [Compact]
        public class DBusAnnotationInfo {
                [CCode (array_length = false, array_null_terminated = true)]
@@ -235,7 +235,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", unref_function = "g_dbus_arg_info_unref")]
+       [CCode (cheader_filename = "gio/gio.h", ref_function = "g_dbus_arg_info_ref", type_id = "g_dbus_arg_info_get_type ()", unref_function = "g_dbus_arg_info_unref")]
        [Compact]
        public class DBusArgInfo {
                [CCode (array_length = false, array_null_terminated = true)]
@@ -308,7 +308,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", unref_function = "g_dbus_interface_info_unref")]
+       [CCode (cheader_filename = "gio/gio.h", ref_function = "g_dbus_interface_info_ref", type_id = "g_dbus_interface_info_get_type ()", unref_function = "g_dbus_interface_info_unref")]
        [Compact]
        public class DBusInterfaceInfo {
                [CCode (array_length = false, array_null_terminated = true)]
@@ -415,7 +415,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", unref_function = "g_dbus_method_info_unref")]
+       [CCode (cheader_filename = "gio/gio.h", ref_function = "g_dbus_method_info_ref", type_id = "g_dbus_method_info_get_type ()", unref_function = "g_dbus_method_info_unref")]
        [Compact]
        public class DBusMethodInfo {
                [CCode (array_length = false, array_null_terminated = true)]
@@ -449,7 +449,7 @@ namespace GLib {
                public void return_value_with_unix_fd_list (GLib.Variant? parameters, GLib.UnixFDList? fd_list);
                public void take_error (GLib.Error error);
        }
-       [CCode (cheader_filename = "gio/gio.h", ref_function = "g_dbus_node_info_ref", unref_function = "g_dbus_node_info_unref")]
+       [CCode (cheader_filename = "gio/gio.h", ref_function = "g_dbus_node_info_ref", type_id = "g_dbus_node_info_get_type ()", unref_function = "g_dbus_node_info_unref")]
        [Compact]
        public class DBusNodeInfo {
                [CCode (array_length = false, array_null_terminated = true)]
@@ -534,7 +534,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", unref_function = "g_dbus_property_info_unref")]
+       [CCode (cheader_filename = "gio/gio.h", ref_function = "g_dbus_property_info_ref", type_id = "g_dbus_property_info_get_type ()", unref_function = "g_dbus_property_info_unref")]
        [Compact]
        public class DBusPropertyInfo {
                [CCode (array_length = false, array_null_terminated = true)]
@@ -614,7 +614,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", unref_function = "g_dbus_signal_info_unref")]
+       [CCode (cheader_filename = "gio/gio.h", ref_function = "g_dbus_signal_info_ref", type_id = "g_dbus_signal_info_get_type ()", unref_function = "g_dbus_signal_info_unref")]
        [Compact]
        public class DBusSignalInfo {
                [CCode (array_length = false, array_null_terminated = true)]
@@ -707,7 +707,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", unref_function = "g_file_attribute_info_list_unref")]
+       [CCode (cheader_filename = "gio/gio.h", ref_function = "g_file_attribute_info_list_ref", type_id = "g_file_attribute_info_list_get_type ()", unref_function = "g_file_attribute_info_list_unref")]
        [Compact]
        public class FileAttributeInfoList {
                public weak GLib.FileAttributeInfo infos;
@@ -718,7 +718,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", unref_function = "g_file_attribute_matcher_unref")]
+       [CCode (cheader_filename = "gio/gio.h", ref_function = "g_file_attribute_matcher_ref", type_id = "g_file_attribute_matcher_get_type ()", unref_function = "g_file_attribute_matcher_unref")]
        [Compact]
        public class FileAttributeMatcher {
                [CCode (has_construct_function = false)]
@@ -1537,7 +1537,7 @@ namespace GLib {
                [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")]
+       [CCode (cheader_filename = "gio/gio.h", copy_function = "g_srv_target_copy", type_id = "g_srv_target_get_type ()")]
        [Compact]
        public class SrvTarget {
                [CCode (has_construct_function = false)]

diff --git a/vapi/gnome-desktop-2.0.vapi b/vapi/gnome-desktop-2.0.vapi
index a3c29f7d343f1f82b7154fbfe701597beec1437a..aa036ede786d46718c76a22b4d4e679124f49d1d 100644 (file)
--- a/vapi/gnome-desktop-2.0.vapi
+++ b/vapi/gnome-desktop-2.0.vapi
@@ -18,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", unref_function = "gnome_desktop_item_unref")]
+       [CCode (cheader_filename = "libgnome/gnome-desktop-item.h", ref_function = "gnome_desktop_item_ref", type_id = "gnome_desktop_item_get_type ()", unref_function = "gnome_desktop_item_unref")]
        [Compact]
        public class DesktopItem {
                [CCode (has_construct_function = false)]

diff --git a/vapi/gnome-vfs-2.0.vapi b/vapi/gnome-vfs-2.0.vapi
index a81e21499cd64077376df67f56e9d7db758d3289..9d9ee5d7a4f561ece2f9534da945bfd844ca4476 100644 (file)
--- a/vapi/gnome-vfs-2.0.vapi
+++ b/vapi/gnome-vfs-2.0.vapi
@@ -55,7 +55,7 @@ namespace GnomeVFS {
        public class ACLPerm {
                public unowned string to_string ();
        }
-       [CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+       [CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", type_id = "gnome_vfs_address_get_type ()")]
        [Compact]
        public class Address {
                public unowned GnomeVFS.Address dup ();
@@ -142,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, 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, type_id = "gnome_vfs_file_info_get_type ()", unref_function = "gnome_vfs_file_info_unref")]
        [Compact]
        public class FileInfo {
                public weak GnomeVFS.ACL acl;
@@ -201,11 +201,11 @@ namespace GnomeVFS {
                public weak GnomeVFS.URI uri;
                public unowned GnomeVFS.GetFileInfoResult dup ();
        }
-       [CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+       [CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", type_id = "gnome_vfs_find_directory_result_get_type ()")]
        [Compact]
        public class GnomeVfsFindDirectoryResult {
        }
-       [CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+       [CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", type_id = "gnome_vfs_get_file_info_result_get_type ()")]
        [Compact]
        public class GnomeVfsGetFileInfoResult {
        }

diff --git a/vapi/goocanvas.vapi b/vapi/goocanvas.vapi
index c7cf06d797099cfa2ca2bcd47f06299ad3565a3c..b0930a0d155052ee6869b57207e93f9e937a30f9 100644 (file)
--- 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")]
+       [CCode (cheader_filename = "goocanvas.h", type_id = "goo_cairo_pattern_get_type ()")]
        [Compact]
        public class CairoPattern {
        }

diff --git a/vapi/gstreamer-0.10.vapi b/vapi/gstreamer-0.10.vapi
index d95bb43a181e86936cc7e140e6dcce64d3cd85a0..50fc769d7676f559210627c77693b1bb3df40440 100644 (file)
--- 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")]
+       [CCode (cheader_filename = "gst/gst.h", type_id = "gst_buffer_list_iterator_get_type ()")]
        [Compact]
        public class BufferListIterator {
                public void add (owned Gst.Buffer buffer);
@@ -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")]
+       [CCode (cheader_filename = "gst/gst.h", type_id = "gst_date_get_type ()")]
        [Compact]
        public class Date {
        }
-       [CCode (cheader_filename = "gst/gst.h", ref_function = "gst_date_time_ref", unref_function = "gst_date_time_unref")]
+       [CCode (cheader_filename = "gst/gst.h", ref_function = "gst_date_time_ref", type_id = "gst_date_time_get_type ()", unref_function = "gst_date_time_unref")]
        [Compact]
        public class DateTime {
                [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")]
+       [CCode (cheader_filename = "gst/gst.h", type_id = "gst_g_error_get_type ()")]
        [Compact]
        public class GError {
        }
@@ -1038,7 +1038,7 @@ namespace Gst {
        [CCode (cheader_filename = "gst/gst.h")]
        public class ParamSpecMiniObject : GLib.ParamSpec {
        }
-       [CCode (cheader_filename = "gst/gst.h")]
+       [CCode (cheader_filename = "gst/gst.h", type_id = "gst_parse_context_get_type ()")]
        [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")]
+       [CCode (cheader_filename = "gst/gst.h", copy_function = "gst_segment_copy", type_id = "gst_segment_get_type ()")]
        [Compact]
        public class Segment {
                public double abs_rate;

diff --git a/vapi/gstreamer-base-0.10.vapi b/vapi/gstreamer-base-0.10.vapi
index ab34a0241fa83c7e0e1090ba1be1160082394267..a83ec72de396615e8e3164bdc8483782c414c2a1 100644 (file)
--- 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")]
+       [CCode (cheader_filename = "gst/gst.h", type_id = "gst_base_parse_frame_get_type ()")]
        [Compact]
        public class BaseParseFrame {
                public weak Gst.Buffer buffer;

diff --git a/vapi/gstreamer-pbutils-0.10.vapi b/vapi/gstreamer-pbutils-0.10.vapi
index 59648b63ec1c16b50b8c9acbfa035181fff79fa0..21fd6ac536bfd81e2cd31762e4afd34daf9c3a89 100644 (file)
--- a/vapi/gstreamer-pbutils-0.10.vapi
+++ b/vapi/gstreamer-pbutils-0.10.vapi
@@ -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")]
+       [CCode (cheader_filename = "gst/pbutils/pbutils.h", type_id = "gst_install_plugins_context_get_type ()")]
        [Compact]
        public class InstallPluginsContext {
                [CCode (has_construct_function = false)]

diff --git a/vapi/gstreamer-rtsp-0.10.vapi b/vapi/gstreamer-rtsp-0.10.vapi
index af3ffa94fbb337f946d7771e6b5737ae59a78379..b4ae4eee0d6514977eff3d8e1c05c55ef8fc57ea 100644 (file)
--- a/vapi/gstreamer-rtsp-0.10.vapi
+++ b/vapi/gstreamer-rtsp-0.10.vapi
@@ -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")]
+       [CCode (cheader_filename = "gst/rtsp/gstrtspconnection.h", copy_function = "gst_rtsp_url_copy", type_id = "gst_rtsp_url_get_type ()")]
        [Compact]
        public class RTSPUrl {
                public string abspath;

diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index 658fdc90bde2b55183618e5deaa08b0dfcf77fa2..183103d21e3b5ef0f38deae1586a0ab3f6427853 100644 (file)
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -622,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")]
+       [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_border_copy", type_id = "gtk_border_get_type ()")]
        [Compact]
        public class Border {
                public int bottom;
@@ -2023,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")]
+       [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_icon_info_copy", type_id = "gtk_icon_info_get_type ()")]
        [Compact]
        public class IconInfo {
                public Gtk.IconInfo copy ();
@@ -2038,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", unref_function = "gtk_icon_set_unref")]
+       [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_icon_set_ref", type_id = "gtk_icon_set_get_type ()", unref_function = "gtk_icon_set_unref")]
        [Compact]
        public class IconSet {
                [CCode (has_construct_function = false)]
@@ -2050,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")]
+       [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_icon_source_copy", type_id = "gtk_icon_source_get_type ()")]
        [Compact]
        public class IconSource {
                [CCode (has_construct_function = false)]
@@ -2988,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")]
+       [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_paper_size_copy", type_id = "gtk_paper_size_get_type ()")]
        [Compact]
        public class PaperSize {
                [CCode (has_construct_function = false)]
@@ -3504,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", unref_function = "gtk_recent_info_unref")]
+       [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_recent_info_ref", type_id = "gtk_recent_info_get_type ()", unref_function = "gtk_recent_info_unref")]
        [Compact]
        public class RecentInfo {
                public bool exists ();
@@ -3676,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")]
+       [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_selection_data_copy", type_id = "gtk_selection_data_get_type ()")]
        [Compact]
        public class SelectionData {
                [CCode (array_length = false)]
@@ -4240,7 +4240,7 @@ namespace Gtk {
                public uint shrink;
                public uint16 spacing;
        }
-       [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_target_list_ref", unref_function = "gtk_target_list_unref")]
+       [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_target_list_ref", type_id = "gtk_target_list_get_type ()", unref_function = "gtk_target_list_unref")]
        [Compact]
        public class TargetList {
                public weak GLib.List<Gtk.TargetPair> list;
@@ -4288,7 +4288,7 @@ namespace Gtk {
                public uint strikethrough;
                public uint underline;
        }
-       [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_text_attributes_ref", unref_function = "gtk_text_attributes_unref")]
+       [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_text_attributes_ref", type_id = "gtk_text_attributes_get_type ()", unref_function = "gtk_text_attributes_unref")]
        [Compact]
        public class TextAttributes {
                public weak Gtk.TextAppearance appearance;
@@ -5022,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")]
+       [CCode (cheader_filename = "gtk/gtk.h", const_cname = "GtkTreePath", copy_function = "gtk_tree_path_copy", type_id = "gtk_tree_path_get_type ()")]
        [Compact]
        [Immutable]
        public class TreePath {
@@ -5049,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")]
+       [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_tree_row_reference_copy", type_id = "gtk_tree_row_reference_get_type ()")]
        [Compact]
        [Immutable]
        public class TreeRowReference {

diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 52ec43c9187940bf6480c8a67a76c7ddf4901178..af751458b1f1a1020be825a6058a03ebf65f7b98 100644 (file)
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -1527,7 +1527,7 @@ namespace Gtk {
                public unowned string to_string ();
                public virtual signal void parsing_error (Gtk.CssSection section, GLib.Error error);
        }
-       [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_css_section_ref", unref_function = "gtk_css_section_unref")]
+       [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_css_section_ref", type_id = "gtk_css_section_get_type ()", unref_function = "gtk_css_section_unref")]
        [Compact]
        public class CssSection {
                public uint get_end_line ();
@@ -2005,7 +2005,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", unref_function = "gtk_gradient_unref")]
+       [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_gradient_ref", type_id = "gtk_gradient_get_type ()", unref_function = "gtk_gradient_unref")]
        [Compact]
        public class Gradient {
                public void add_color_stop (double offset, Gtk.SymbolicColor color);
@@ -2149,7 +2149,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")]
+       [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_icon_info_copy", type_id = "gtk_icon_info_get_type ()")]
        [Compact]
        public class IconInfo {
                public Gtk.IconInfo copy ();
@@ -2167,7 +2167,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", unref_function = "gtk_icon_set_unref")]
+       [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_icon_set_ref", type_id = "gtk_icon_set_get_type ()", unref_function = "gtk_icon_set_unref")]
        [Compact]
        public class IconSet {
                [CCode (has_construct_function = false)]
@@ -2180,7 +2180,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")]
+       [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_icon_source_copy", type_id = "gtk_icon_source_get_type ()")]
        [Compact]
        public class IconSource {
                [CCode (has_construct_function = false)]
@@ -2963,7 +2963,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")]
+       [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_paper_size_copy", type_id = "gtk_paper_size_get_type ()")]
        [Compact]
        public class PaperSize {
                [CCode (has_construct_function = false)]
@@ -3433,7 +3433,7 @@ namespace Gtk {
                public weak string mime_type;
                public weak string uri;
        }
-       [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_recent_info_ref", unref_function = "gtk_recent_info_unref")]
+       [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_recent_info_ref", type_id = "gtk_recent_info_get_type ()", unref_function = "gtk_recent_info_unref")]
        [Compact]
        public class RecentInfo {
                public unowned GLib.AppInfo create_app_info (string app_name) throws GLib.Error;
@@ -3576,7 +3576,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")]
+       [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_selection_data_copy", type_id = "gtk_selection_data_get_type ()")]
        [Compact]
        public class SelectionData {
                public Gtk.SelectionData copy ();
@@ -4119,7 +4119,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", unref_function = "gtk_symbolic_color_unref")]
+       [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_symbolic_color_ref", type_id = "gtk_symbolic_color_get_type ()", unref_function = "gtk_symbolic_color_unref")]
        [Compact]
        public class SymbolicColor {
                [CCode (has_construct_function = false)]
@@ -4192,7 +4192,7 @@ namespace Gtk {
                public uint shrink;
                public uint16 spacing;
        }
-       [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_target_list_ref", unref_function = "gtk_target_list_unref")]
+       [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_target_list_ref", type_id = "gtk_target_list_get_type ()", unref_function = "gtk_target_list_unref")]
        [Compact]
        public class TargetList {
                [CCode (has_construct_function = false)]
@@ -4225,7 +4225,7 @@ namespace Gtk {
                public uint strikethrough;
                public uint underline;
        }
-       [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_text_attributes_ref", unref_function = "gtk_text_attributes_unref")]
+       [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_text_attributes_ref", type_id = "gtk_text_attributes_get_type ()", unref_function = "gtk_text_attributes_unref")]
        [Compact]
        public class TextAttributes {
                public weak Gtk.TextAppearance appearance;
@@ -4938,7 +4938,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")]
+       [CCode (cheader_filename = "gtk/gtk.h", const_cname = "GtkTreePath", copy_function = "gtk_tree_path_copy", type_id = "gtk_tree_path_get_type ()")]
        [Compact]
        [Immutable]
        public class TreePath {
@@ -4965,7 +4965,7 @@ namespace Gtk {
                public unowned string to_string ();
                public bool up ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_tree_row_reference_copy")]
+       [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_tree_row_reference_copy", type_id = "gtk_tree_row_reference_get_type ()")]
        [Compact]
        [Immutable]
        public class TreeRowReference {
@@ -5671,7 +5671,7 @@ namespace Gtk {
                public uint valign;
                public int width;
        }
-       [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_widget_path_ref", unref_function = "gtk_widget_path_unref")]
+       [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_widget_path_ref", type_id = "gtk_widget_path_get_type ()", unref_function = "gtk_widget_path_unref")]
        [Compact]
        public class WidgetPath {
                [CCode (has_construct_function = false)]

diff --git a/vapi/libepc-1.0.vapi b/vapi/libepc-1.0.vapi
index b00950aa4790d8a947986b68acbbc6db69040f9c..0ac3c682ff086319f4cb6512dc93d41bd35758aa 100644 (file)
--- a/vapi/libepc-1.0.vapi
+++ b/vapi/libepc-1.0.vapi
@@ -127,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", unref_function = "epc_service_info_unref")]
+       [CCode (cheader_filename = "libepc/service-info.h", ref_function = "epc_service_info_ref", type_id = "epc_service_info_get_type ()", 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 9b8ae46c4c24847b756f941bbfbde6796fb4bf3e..b763288eb185d6b6b775d68d67ac73adb1bd7c50 100644 (file)
--- a/vapi/libgda-4.0.vapi
+++ b/vapi/libgda-4.0.vapi
@@ -26,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")]
+       [CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_binary_copy", type_id = "gda_binary_get_type ()")]
        [Compact]
        public class Binary {
                public long binary_length;
@@ -35,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")]
+       [CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_blob_copy", type_id = "gda_blob_get_type ()")]
        [Compact]
        public class Blob {
                public weak Gda.Binary data;
@@ -422,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")]
+       [CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_geometricpoint_copy", free_function = "gda_geometricpoint_free", type_id = "gda_geometricpoint_get_type ()")]
        [Compact]
        public class GeometricPoint {
                public double x;
@@ -680,7 +680,7 @@ namespace Gda {
                public bool trylock ();
                public void unlock ();
        }
-       [CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_numeric_copy")]
+       [CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_numeric_copy", type_id = "gda_numeric_get_type ()")]
        [Compact]
        public class Numeric {
                public weak string number;
@@ -712,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")]
+       [CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_quark_list_copy", type_id = "gda_quark_list_get_type ()")]
        [Compact]
        public class QuarkList {
                [CCode (has_construct_function = false)]
@@ -1057,7 +1057,7 @@ namespace Gda {
        [Compact]
        public class SqlErrorType {
        }
-       [CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_sql_expr_copy")]
+       [CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_sql_expr_copy", type_id = "gda_sql_expr_get_type ()")]
        [Compact]
        public class SqlExpr {
                public weak Gda.SqlAnyPart any;
@@ -1274,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")]
+       [CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_sql_statement_copy", type_id = "gda_sql_statement_get_type ()")]
        [Compact]
        public class SqlStatement {
                public void* contents;
@@ -1455,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")]
+       [CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_time_copy", type_id = "gda_time_get_type ()")]
        [Compact]
        public class Time {
                public ulong fraction;
@@ -1466,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")]
+       [CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_timestamp_copy", type_id = "gda_timestamp_get_type ()")]
        [Compact]
        public class Timestamp {
                public ushort day;

diff --git a/vapi/libgnome-2.0.vapi b/vapi/libgnome-2.0.vapi
index 0766e850ea53983d781d00d07fb2e6b3f725df36..685ae8d13c45d93136f3198c525110a0ebe23963 100644 (file)
--- a/vapi/libgnome-2.0.vapi
+++ b/vapi/libgnome-2.0.vapi
@@ -1,7 +1,7 @@
 /* libgnome-2.0.vapi generated by vapigen, do not modify. */
 
 namespace Gnome {
-       [CCode (cheader_filename = "libgnome/libgnome.h")]
+       [CCode (cheader_filename = "libgnome/libgnome.h", type_id = "gnome_module_info_get_type ()")]
        [Compact]
        public class ModuleInfo {
                public weak Gnome.ModuleClassInitHook class_init;

diff --git a/vapi/libgsf-1.vapi b/vapi/libgsf-1.vapi
index 32b70f69eec1d6182625fcc89642f69a247eb2cd..7799dd516439fae85db845ee1ca4973ac6404093 100644 (file)
--- a/vapi/libgsf-1.vapi
+++ b/vapi/libgsf-1.vapi
@@ -396,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")]
+       [CCode (cheader_filename = "gsf/gsf-timestamp.h", copy_function = "gsf_timestamp_copy", type_id = "gsf_timestamp_get_type ()")]
        [Compact]
        public class Timestamp {
                public GLib.Date date;

diff --git a/vapi/liboobs-1.vapi b/vapi/liboobs-1.vapi
index 80f561b8d4f3cdfbc06bfadcdfa3c52347e9f7b1..99e576cbfb023b09285f2998c8402c981f2ae931 100644 (file)
--- a/vapi/liboobs-1.vapi
+++ b/vapi/liboobs-1.vapi
@@ -203,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")]
+       [CCode (cheader_filename = "oobs/oobs.h", copy_function = "oobs_list_iter_copy", type_id = "oobs_list_iter_get_type ()")]
        [Compact]
        public class ListIter {
                public void* data;

diff --git a/vapi/pango.vapi b/vapi/pango.vapi
index b94703075ff4f4a5263d30cf90f6a92e740921d4..807afcba83a8edeb0f4e02d6c1acbcf79071b7a7 100644 (file)
--- a/vapi/pango.vapi
+++ b/vapi/pango.vapi
@@ -60,7 +60,7 @@ namespace Pango {
                [CCode (has_construct_function = false, type = "PangoAttribute*")]
                public AttrLanguage (Pango.Language language);
        }
-       [CCode (cheader_filename = "pango/pango.h", ref_function = "pango_attr_list_ref", unref_function = "pango_attr_list_unref")]
+       [CCode (cheader_filename = "pango/pango.h", ref_function = "pango_attr_list_ref", type_id = "pango_attr_list_get_type ()", unref_function = "pango_attr_list_unref")]
        [Compact]
        public class AttrList {
                [CCode (has_construct_function = false)]
@@ -168,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")]
+       [CCode (cheader_filename = "pango/pango.h", copy_function = "pango_font_description_copy", type_id = "pango_font_description_get_type ()")]
        [Compact]
        [Immutable]
        public class FontDescription {
@@ -229,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", unref_function = "pango_font_metrics_unref")]
+       [CCode (cheader_filename = "pango/pango.h", ref_function = "pango_font_metrics_ref", type_id = "pango_font_metrics_get_type ()", unref_function = "pango_font_metrics_unref")]
        [Compact]
        public class FontMetrics {
                public int get_approximate_char_width ();
@@ -249,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")]
+       [CCode (cheader_filename = "pango/pango.h", copy_function = "pango_glyph_item_copy", type_id = "pango_glyph_item_get_type ()")]
        [Compact]
        public class GlyphItem {
                public weak Pango.GlyphString glyphs;
@@ -260,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")]
+       [CCode (cheader_filename = "pango/pango.h", copy_function = "pango_glyph_string_copy", type_id = "pango_glyph_string_get_type ()")]
        [Compact]
        public class GlyphString {
                [CCode (array_length_cname = "num_glyphs")]
@@ -284,7 +284,7 @@ namespace Pango {
        [Compact]
        public class GlyphUnit {
        }
-       [CCode (cheader_filename = "pango/pango.h", copy_function = "pango_item_copy")]
+       [CCode (cheader_filename = "pango/pango.h", copy_function = "pango_item_copy", type_id = "pango_item_get_type ()")]
        [Compact]
        public class Item {
                public Pango.Analysis analysis;
@@ -296,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")]
+       [CCode (cheader_filename = "pango/pango.h", type_id = "pango_language_get_type ()")]
        [Compact]
        public class Language {
                public static unowned Pango.Language? from_string (string language);
@@ -369,7 +369,7 @@ namespace Pango {
        [Compact]
        public class LayoutClass {
        }
-       [CCode (cheader_filename = "pango/pango.h", copy_function = "pango_layout_iter_copy")]
+       [CCode (cheader_filename = "pango/pango.h", copy_function = "pango_layout_iter_copy", type_id = "pango_layout_iter_get_type ()")]
        [Compact]
        public class LayoutIter {
                public bool at_last_line ();
@@ -392,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", unref_function = "pango_layout_line_unref")]
+       [CCode (cheader_filename = "pango/pango.h", ref_function = "pango_layout_line_ref", type_id = "pango_layout_line_get_type ()", unref_function = "pango_layout_line_unref")]
        [Compact]
        public class LayoutLine {
                public uint is_paragraph_start;
@@ -453,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")]
+       [CCode (cheader_filename = "pango/pango.h", copy_function = "pango_tab_array_copy", type_id = "pango_tab_array_get_type ()")]
        [Compact]
        public class TabArray {
                [CCode (has_construct_function = false)]

diff --git a/vapi/poppler-glib.vapi b/vapi/poppler-glib.vapi
index 0dfe0e3acf8516033c0b66342603667d321714e1..5759cc1bcc699bf9d259e00cfe0cd89b8850dff5 100644 (file)
--- a/vapi/poppler-glib.vapi
+++ b/vapi/poppler-glib.vapi
@@ -1,7 +1,7 @@
 /* poppler-glib.vapi generated by vapigen, do not modify. */
 
 namespace Poppler {
-       [CCode (cheader_filename = "poppler.h", copy_function = "poppler_action_copy")]
+       [CCode (cheader_filename = "poppler.h", copy_function = "poppler_action_copy", type_id = "poppler_action_get_type ()")]
        [Compact]
        public class Action {
                public Poppler.ActionAny any;
@@ -26,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")]
+       [CCode (cheader_filename = "poppler.h", copy_function = "poppler_annot_callout_line_copy", type_id = "poppler_annot_callout_line_get_type ()")]
        [Compact]
        public class AnnotCalloutLine {
                public bool multiline;
@@ -47,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")]
+       [CCode (cheader_filename = "poppler.h", copy_function = "poppler_annot_mapping_copy", type_id = "poppler_annot_mapping_get_type ()")]
        [Compact]
        public class AnnotMapping {
                public weak Poppler.Annot annot;
@@ -91,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")]
+       [CCode (cheader_filename = "poppler.h", copy_function = "poppler_color_copy", type_id = "poppler_color_get_type ()")]
        [Compact]
        public class Color {
                public uint16 blue;
@@ -101,7 +101,7 @@ namespace Poppler {
                public Color ();
                public unowned Poppler.Color copy ();
        }
-       [CCode (cheader_filename = "poppler.h", copy_function = "poppler_dest_copy")]
+       [CCode (cheader_filename = "poppler.h", copy_function = "poppler_dest_copy", type_id = "poppler_dest_get_type ()")]
        [Compact]
        public class Dest {
                public double bottom;
@@ -176,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")]
+       [CCode (cheader_filename = "poppler.h", copy_function = "poppler_fonts_iter_copy", type_id = "poppler_fonts_iter_get_type ()")]
        [Compact]
        public class FontsIter {
                public Poppler.FontsIter copy ();
@@ -221,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")]
+       [CCode (cheader_filename = "poppler.h", copy_function = "poppler_form_field_mapping_copy", type_id = "poppler_form_field_mapping_get_type ()")]
        [Compact]
        public class FormFieldMapping {
                public Poppler.Rectangle area;
@@ -230,7 +230,7 @@ namespace Poppler {
                public FormFieldMapping ();
                public Poppler.FormFieldMapping copy ();
        }
-       [CCode (cheader_filename = "poppler.h", copy_function = "poppler_image_mapping_copy")]
+       [CCode (cheader_filename = "poppler.h", copy_function = "poppler_image_mapping_copy", type_id = "poppler_image_mapping_get_type ()")]
        [Compact]
        public class ImageMapping {
                public Poppler.Rectangle area;
@@ -239,7 +239,7 @@ namespace Poppler {
                public ImageMapping ();
                public Poppler.ImageMapping copy ();
        }
-       [CCode (cheader_filename = "poppler.h", copy_function = "poppler_index_iter_copy")]
+       [CCode (cheader_filename = "poppler.h", copy_function = "poppler_index_iter_copy", type_id = "poppler_index_iter_get_type ()")]
        [Compact]
        public class IndexIter {
                [CCode (has_construct_function = false)]
@@ -261,7 +261,7 @@ namespace Poppler {
                public bool is_visible ();
                public void show ();
        }
-       [CCode (cheader_filename = "poppler.h", copy_function = "poppler_layers_iter_copy")]
+       [CCode (cheader_filename = "poppler.h", copy_function = "poppler_layers_iter_copy", type_id = "poppler_layers_iter_get_type ()")]
        [Compact]
        public class LayersIter {
                [CCode (has_construct_function = false)]
@@ -272,7 +272,7 @@ namespace Poppler {
                public unowned string get_title ();
                public bool next ();
        }
-       [CCode (cheader_filename = "poppler.h", copy_function = "poppler_link_mapping_copy")]
+       [CCode (cheader_filename = "poppler.h", copy_function = "poppler_link_mapping_copy", type_id = "poppler_link_mapping_get_type ()")]
        [Compact]
        public class LinkMapping {
                public weak Poppler.Action action;
@@ -324,7 +324,7 @@ namespace Poppler {
                [NoAccessorMethod]
                public string label { owned get; }
        }
-       [CCode (cheader_filename = "poppler.h", copy_function = "poppler_page_transition_copy")]
+       [CCode (cheader_filename = "poppler.h", copy_function = "poppler_page_transition_copy", type_id = "poppler_page_transition_get_type ()")]
        [Compact]
        public class PageTransition {
                public Poppler.PageTransitionAlignment alignment;

diff --git a/vapi/rest-0.6.vapi b/vapi/rest-0.6.vapi
index 71e99cd250d82ccd3254f8563af9e73890ca1896..961e9507be27d17cd599b31f66be8bb8ddc24e1f 100644 (file)
--- a/vapi/rest-0.6.vapi
+++ b/vapi/rest-0.6.vapi
@@ -96,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", unref_function = "rest_xml_node_unref")]
+       [CCode (cheader_filename = "rest/rest-xml-parser.h", ref_function = "rest_xml_node_ref", type_id = "rest_xml_node_get_type ()", unref_function = "rest_xml_node_unref")]
        [Compact]
        public class XmlNode {
                public weak GLib.HashTable attrs;

diff --git a/vapi/unique-1.0.vapi b/vapi/unique-1.0.vapi
index b003f449183acd43690d0edf3a34c1debd64a931..532d4aa780dfae26456710e83ec7b13b89f4a722 100644 (file)
--- a/vapi/unique-1.0.vapi
+++ b/vapi/unique-1.0.vapi
@@ -40,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")]
+       [CCode (cheader_filename = "unique/unique.h", copy_function = "unique_message_data_copy", type_id = "unique_message_data_get_type ()")]
        [Compact]
        public class MessageData {
                [CCode (has_construct_function = false)]

diff --git a/vapigen/valagidlparser.vala b/vapigen/valagidlparser.vala
index d3525b1527563025d130e6e275ebb9b97db96a5c..621fa5464b70d772973c4ac063d3099b0f9169f4 100644 (file)
--- a/vapigen/valagidlparser.vala
+++ b/vapigen/valagidlparser.vala
@@ -1209,6 +1209,9 @@ public class Vala.GIdlParser : CodeVisitor {
                                cl = new Class (name, current_source_reference);
                                cl.access = SymbolAccessibility.PUBLIC;
                                cl.is_compact = true;
+                               if (boxed_node.gtype_init != null) {
+                                       cl.set_attribute_string ("CCode", "type_id", "%s ()".printf (boxed_node.gtype_init));
+                               }
 
                                var cl_attributes = get_attributes (node.name);
                                if (cl_attributes != null) {