[vala] Regenerate more bindings



commit 8ec934d773e4bb4e43463fe1455e037dcb26f49f
Author: Jürg Billeter <j bitron ch>
Date:   Tue Apr 14 19:11:11 2009 +0200

    Regenerate more bindings
---
 vapi/gconf-2.0.vapi         |    4 +-
 vapi/gnome-desktop-2.0.vapi |    2 +-
 vapi/gnome-vfs-2.0.vapi     |   86 +++++++++++++++++++++---------------------
 vapi/goocanvas.vapi         |    4 +-
 vapi/hildon-fm-2.vapi       |    4 +-
 vapi/json-glib-1.0.vapi     |    2 +-
 vapi/libglade-2.0.vapi      |   16 ++++----
 vapi/libgnome-2.0.vapi      |   22 +++++-----
 vapi/liboobs-1.vapi         |    2 +-
 vapi/libsoup-2.2.vapi       |    4 +-
 vapi/libsoup-2.4.vapi       |    4 +-
 vapi/poppler-glib.vapi      |   22 +++++-----
 12 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/vapi/gconf-2.0.vapi b/vapi/gconf-2.0.vapi
index de8f9f9..f20e6e3 100644
--- a/vapi/gconf-2.0.vapi
+++ b/vapi/gconf-2.0.vapi
@@ -295,8 +295,8 @@ namespace GConf {
 	}
 	[CCode (cheader_filename = "gconf/gconf.h")]
 	public delegate void ChangeSetForeachFunc (GConf.ChangeSet cs, string key, GConf.Value value);
-	[CCode (cheader_filename = "gconf/gconf.h")]
-	public static delegate void ClientErrorHandlerFunc (GConf.Client client, GLib.Error error);
+	[CCode (cheader_filename = "gconf/gconf.h", has_target = false)]
+	public delegate void ClientErrorHandlerFunc (GConf.Client client, GLib.Error error);
 	[CCode (cheader_filename = "gconf/gconf.h")]
 	public delegate void ClientNotifyFunc (GConf.Client client, uint cnxn_id, GConf.Entry entry);
 	[CCode (cheader_filename = "gconf/gconf.h")]
diff --git a/vapi/gnome-desktop-2.0.vapi b/vapi/gnome-desktop-2.0.vapi
index c60e656..cb4e5df 100644
--- a/vapi/gnome-desktop-2.0.vapi
+++ b/vapi/gnome-desktop-2.0.vapi
@@ -20,7 +20,7 @@ namespace Gnome {
 		public virtual signal void name_changed ();
 	}
 	[Compact]
-	[CCode (ref_function = "gnome_desktop_item_ref", unref_function = "gnome_desktop_item_unref", cheader_filename = "libgnome/gnome-desktop-item.h")]
+	[CCode (ref_function = "gnome_desktop_item_ref", unref_function = "gnome_desktop_item_unref", type_id = "GNOME_TYPE_DESKTOP_ITEM", cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public class DesktopItem {
 		public bool attr_exists (string attr);
 		public void clear_localestring (string attr);
diff --git a/vapi/gnome-vfs-2.0.vapi b/vapi/gnome-vfs-2.0.vapi
index 6801631..457ed04 100644
--- a/vapi/gnome-vfs-2.0.vapi
+++ b/vapi/gnome-vfs-2.0.vapi
@@ -1,4 +1,4 @@
-/* gnome-vfs-2.0.vapi generated by lt-vapigen, do not modify. */
+/* gnome-vfs-2.0.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "GnomeVFS", lower_case_cprefix = "gnome_vfs_")]
 namespace GnomeVFS {
@@ -57,7 +57,7 @@ namespace GnomeVFS {
 		public unowned string to_string ();
 	}
 	[Compact]
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (type_id = "GNOME_VFS_TYPE_ADDRESS", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public class Address {
 		public unowned GnomeVFS.Address dup ();
 		public bool equal (GnomeVFS.Address b);
@@ -142,7 +142,7 @@ namespace GnomeVFS {
 		public virtual signal void volume_unmounted (GnomeVFS.Volume volume);
 	}
 	[Compact]
-	[CCode (ref_function = "gnome_vfs_file_info_ref", unref_function = "gnome_vfs_file_info_unref", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (ref_function = "gnome_vfs_file_info_ref", ref_function_void = true, unref_function = "gnome_vfs_file_info_unref", type_id = "GNOME_VFS_TYPE_FILE_INFO", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public class FileInfo {
 		public weak GnomeVFS.ACL acl;
 		public ulong atime;
@@ -205,11 +205,11 @@ namespace GnomeVFS {
 		public unowned GnomeVFS.GetFileInfoResult dup ();
 	}
 	[Compact]
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (type_id = "GNOME_VFS_TYPE_GNOME_VFS_FIND_DIRECTORY_RESULT", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public class GnomeVfsFindDirectoryResult {
 	}
 	[Compact]
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (type_id = "GNOME_VFS_TYPE_GNOME_VFS_GET_FILE_INFO_RESULT", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public class GnomeVfsGetFileInfoResult {
 	}
 	[Compact]
@@ -910,48 +910,48 @@ namespace GnomeVFS {
 		OVERWRITE,
 		DUPLICATE
 	}
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public static delegate void AsyncCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, void* callback_data);
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public static delegate void AsyncCloseCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, void* callback_data);
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public static delegate void AsyncCreateAsChannelCallback (GnomeVFS.AsyncHandle handle, GLib.IOChannel channel, GnomeVFS.Result result, void* callback_data);
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public static delegate void AsyncCreateCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, void* callback_data);
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public static delegate void AsyncDirectoryLoadCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, GLib.List list, uint entries_read, void* callback_data);
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public static delegate void AsyncFileControlCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, void* operation_data, void* callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", has_target = false)]
+	public delegate void AsyncCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, void* callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", has_target = false)]
+	public delegate void AsyncCloseCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, void* callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", has_target = false)]
+	public delegate void AsyncCreateAsChannelCallback (GnomeVFS.AsyncHandle handle, GLib.IOChannel channel, GnomeVFS.Result result, void* callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", has_target = false)]
+	public delegate void AsyncCreateCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, void* callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", has_target = false)]
+	public delegate void AsyncDirectoryLoadCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, GLib.List list, uint entries_read, void* callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", has_target = false)]
+	public delegate void AsyncFileControlCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, void* operation_data, void* callback_data);
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public delegate void AsyncFindDirectoryCallback (GnomeVFS.AsyncHandle handle, GLib.List results);
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public static delegate void AsyncGetFileInfoCallback (GnomeVFS.AsyncHandle handle, GLib.List results, void* callback_data);
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public static delegate void AsyncModuleCallback (void* @in, size_t in_size, void* @out, size_t out_size, void* callback_data, GnomeVFS.ModuleCallbackResponse response, void* response_data);
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public static delegate void AsyncOpenAsChannelCallback (GnomeVFS.AsyncHandle handle, GLib.IOChannel channel, GnomeVFS.Result result, void* callback_data);
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public static delegate void AsyncOpenCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, void* callback_data);
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public static delegate void AsyncReadCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, void* buffer, GnomeVFS.FileSize bytes_requested, GnomeVFS.FileSize bytes_read, void* callback_data);
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public static delegate void AsyncSeekCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, void* callback_data);
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public static delegate void AsyncSetFileInfoCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, GnomeVFS.FileInfo file_info, void* callback_data);
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public static delegate void AsyncWriteCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, void* buffer, GnomeVFS.FileSize bytes_requested, GnomeVFS.FileSize bytes_written, void* callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", has_target = false)]
+	public delegate void AsyncGetFileInfoCallback (GnomeVFS.AsyncHandle handle, GLib.List results, void* callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", has_target = false)]
+	public delegate void AsyncModuleCallback (void* @in, size_t in_size, void* @out, size_t out_size, void* callback_data, GnomeVFS.ModuleCallbackResponse response, void* response_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", has_target = false)]
+	public delegate void AsyncOpenAsChannelCallback (GnomeVFS.AsyncHandle handle, GLib.IOChannel channel, GnomeVFS.Result result, void* callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", has_target = false)]
+	public delegate void AsyncOpenCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, void* callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", has_target = false)]
+	public delegate void AsyncReadCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, void* buffer, GnomeVFS.FileSize bytes_requested, GnomeVFS.FileSize bytes_read, void* callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", has_target = false)]
+	public delegate void AsyncSeekCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, void* callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", has_target = false)]
+	public delegate void AsyncSetFileInfoCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, GnomeVFS.FileInfo file_info, void* callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", has_target = false)]
+	public delegate void AsyncWriteCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.Result result, void* buffer, GnomeVFS.FileSize bytes_requested, GnomeVFS.FileSize bytes_written, void* callback_data);
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public delegate int AsyncXferProgressCallback (GnomeVFS.AsyncHandle handle, GnomeVFS.XferProgressInfo info);
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public static delegate void DNSSDBrowseCallback (GnomeVFS.DNSSDBrowseHandle handle, GnomeVFS.DNSSDServiceStatus status, GnomeVFS.DNSSDService service, void* callback_data);
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public static delegate void DNSSDResolveCallback (GnomeVFS.DNSSDResolveHandle handle, GnomeVFS.Result result, GnomeVFS.DNSSDService service, string host, int port, GLib.HashTable text, int text_raw_len, string text_raw, void* callback_data);
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public static delegate bool DirectoryVisitFunc (string rel_path, GnomeVFS.FileInfo info, bool recursing_will_loop, void* user_data, bool recurse);
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public static delegate void ModuleCallback (void* @in, size_t in_size, void* @out, size_t out_size, void* callback_data);
-	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	public static delegate void ModuleCallbackResponse (void* response_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", has_target = false)]
+	public delegate void DNSSDBrowseCallback (GnomeVFS.DNSSDBrowseHandle handle, GnomeVFS.DNSSDServiceStatus status, GnomeVFS.DNSSDService service, void* callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", has_target = false)]
+	public delegate void DNSSDResolveCallback (GnomeVFS.DNSSDResolveHandle handle, GnomeVFS.Result result, GnomeVFS.DNSSDService service, string host, int port, GLib.HashTable text, int text_raw_len, string text_raw, void* callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", has_target = false)]
+	public delegate bool DirectoryVisitFunc (string rel_path, GnomeVFS.FileInfo info, bool recursing_will_loop, void* user_data, bool recurse);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", has_target = false)]
+	public delegate void ModuleCallback (void* @in, size_t in_size, void* @out, size_t out_size, void* callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", has_target = false)]
+	public delegate void ModuleCallbackResponse (void* response_data);
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public delegate void MonitorCallback (GnomeVFS.MonitorHandle handle, string monitor_uri, string info_uri, GnomeVFS.MonitorEventType event_type);
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
diff --git a/vapi/goocanvas.vapi b/vapi/goocanvas.vapi
index 97408a3..52bc2d3 100644
--- a/vapi/goocanvas.vapi
+++ b/vapi/goocanvas.vapi
@@ -3,7 +3,7 @@
 [CCode (cprefix = "Goo", lower_case_cprefix = "goo_")]
 namespace Goo {
 	[Compact]
-	[CCode (copy_function = "goo_cairo_matrix_copy", cheader_filename = "goocanvas.h")]
+	[CCode (copy_function = "goo_cairo_matrix_copy", type_id = "GOO_TYPE_CAIRO_MATRIX", cheader_filename = "goocanvas.h")]
 	public class CairoMatrix {
 		public static Cairo.Matrix copy (Cairo.Matrix matrix);
 	}
@@ -331,7 +331,7 @@ namespace Goo {
 		public string data { set; }
 	}
 	[Compact]
-	[CCode (ref_function = "goo_canvas_points_ref", unref_function = "goo_canvas_points_unref", cheader_filename = "goocanvas.h")]
+	[CCode (ref_function = "goo_canvas_points_ref", unref_function = "goo_canvas_points_unref", type_id = "GOO_TYPE_CANVAS_POINTS", cheader_filename = "goocanvas.h")]
 	public class CanvasPoints {
 		public double coords;
 		public int num_points;
diff --git a/vapi/hildon-fm-2.vapi b/vapi/hildon-fm-2.vapi
index 898f8e8..ab6adbd 100644
--- a/vapi/hildon-fm-2.vapi
+++ b/vapi/hildon-fm-2.vapi
@@ -240,6 +240,6 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon-file-system-info.h")]
 	public delegate void FileSystemInfoCallback (Hildon.FileSystemInfoHandle handle, Hildon.FileSystemInfo info, GLib.Error error);
-	[CCode (cheader_filename = "hildon/hildon-file-system-model.h")]
-	public static delegate bool FileSystemModelThumbnailCallback (string uri, string path, string thumbnail_file);
+	[CCode (cheader_filename = "hildon/hildon-file-system-model.h", has_target = false)]
+	public delegate bool FileSystemModelThumbnailCallback (string uri, string path, string thumbnail_file);
 }
diff --git a/vapi/json-glib-1.0.vapi b/vapi/json-glib-1.0.vapi
index 870f04d..c61ff0c 100644
--- a/vapi/json-glib-1.0.vapi
+++ b/vapi/json-glib-1.0.vapi
@@ -29,7 +29,7 @@ namespace Json {
 		public Json.Node root { owned get; set; }
 	}
 	[Compact]
-	[CCode (copy_function = "json_node_copy", cheader_filename = "json-glib/json-glib.h")]
+	[CCode (copy_function = "json_node_copy", type_id = "JSON_TYPE_NODE", cheader_filename = "json-glib/json-glib.h")]
 	public class Node {
 		public void* data;
 		public weak Json.Node parent;
diff --git a/vapi/libglade-2.0.vapi b/vapi/libglade-2.0.vapi
index 6238fb1..7b6eff2 100644
--- a/vapi/libglade-2.0.vapi
+++ b/vapi/libglade-2.0.vapi
@@ -103,14 +103,14 @@ namespace Glade {
 		public void signal_connect_data (string handlername, GLib.Callback func);
 		public void signal_connect_full (string handler_name, Glade.XMLConnectFunc func);
 	}
-	[CCode (cheader_filename = "glade/glade.h")]
-	public static delegate void ApplyCustomPropFunc (Glade.XML xml, Gtk.Widget widget, string propname, string value);
-	[CCode (cheader_filename = "glade/glade.h")]
-	public static delegate void BuildChildrenFunc (Glade.XML xml, Gtk.Widget parent, Glade.WidgetInfo info);
-	[CCode (cheader_filename = "glade/glade.h")]
-	public static delegate unowned Gtk.Widget FindInternalChildFunc (Glade.XML xml, Gtk.Widget parent, string childname);
-	[CCode (cheader_filename = "glade/glade.h")]
-	public static delegate Gtk.Widget NewFunc (Glade.XML xml, GLib.Type widget_type, Glade.WidgetInfo info);
+	[CCode (cheader_filename = "glade/glade.h", has_target = false)]
+	public delegate void ApplyCustomPropFunc (Glade.XML xml, Gtk.Widget widget, string propname, string value);
+	[CCode (cheader_filename = "glade/glade.h", has_target = false)]
+	public delegate void BuildChildrenFunc (Glade.XML xml, Gtk.Widget parent, Glade.WidgetInfo info);
+	[CCode (cheader_filename = "glade/glade.h", has_target = false)]
+	public delegate unowned Gtk.Widget FindInternalChildFunc (Glade.XML xml, Gtk.Widget parent, string childname);
+	[CCode (cheader_filename = "glade/glade.h", has_target = false)]
+	public delegate Gtk.Widget NewFunc (Glade.XML xml, GLib.Type widget_type, Glade.WidgetInfo info);
 	[CCode (cheader_filename = "glade/glade.h")]
 	public delegate void XMLConnectFunc (string handler_name, GLib.Object object, string signal_name, string signal_data, GLib.Object connect_object, bool after);
 	[CCode (cheader_filename = "glade/glade.h")]
diff --git a/vapi/libgnome-2.0.vapi b/vapi/libgnome-2.0.vapi
index 65c2268..462fef9 100644
--- a/vapi/libgnome-2.0.vapi
+++ b/vapi/libgnome-2.0.vapi
@@ -3,7 +3,7 @@
 [CCode (cprefix = "Gnome", lower_case_cprefix = "gnome_")]
 namespace Gnome {
 	[Compact]
-	[CCode (cheader_filename = "libgnome/libgnome.h")]
+	[CCode (type_id = "GNOME_TYPE_MODULE_INFO", cheader_filename = "libgnome/libgnome.h")]
 	public class ModuleInfo {
 		public weak Gnome.ModuleClassInitHook class_init;
 		public weak string description;
@@ -116,16 +116,16 @@ namespace Gnome {
 		VFS,
 		CANCELLED
 	}
-	[CCode (cheader_filename = "libgnome/libgnome.h")]
-	public static delegate void ModuleClassInitHook (void* klass, Gnome.ModuleInfo mod_info);
-	[CCode (cheader_filename = "libgnome/libgnome.h")]
-	public static delegate unowned GLib.OptionGroup ModuleGetGOptionGroupFunc ();
-	[CCode (cheader_filename = "libgnome/libgnome.h")]
-	public static delegate void ModuleHook (Gnome.Program program, Gnome.ModuleInfo mod_info);
-	[CCode (cheader_filename = "libgnome/libgnome.h")]
-	public static delegate void ModuleInitHook (Gnome.ModuleInfo mod_info);
-	[CCode (cheader_filename = "libgnome/libgnome.h")]
-	public static delegate void TriggerActionFunction (string msg, string level, string[] supinfo);
+	[CCode (cheader_filename = "libgnome/libgnome.h", has_target = false)]
+	public delegate void ModuleClassInitHook (void* klass, Gnome.ModuleInfo mod_info);
+	[CCode (cheader_filename = "libgnome/libgnome.h", has_target = false)]
+	public delegate unowned GLib.OptionGroup ModuleGetGOptionGroupFunc ();
+	[CCode (cheader_filename = "libgnome/libgnome.h", has_target = false)]
+	public delegate void ModuleHook (Gnome.Program program, Gnome.ModuleInfo mod_info);
+	[CCode (cheader_filename = "libgnome/libgnome.h", has_target = false)]
+	public delegate void ModuleInitHook (Gnome.ModuleInfo mod_info);
+	[CCode (cheader_filename = "libgnome/libgnome.h", has_target = false)]
+	public delegate void TriggerActionFunction (string msg, string level, string[] supinfo);
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public const string DOT_GNOME;
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
diff --git a/vapi/liboobs-1.vapi b/vapi/liboobs-1.vapi
index a2c4b2b..b7788c0 100644
--- a/vapi/liboobs-1.vapi
+++ b/vapi/liboobs-1.vapi
@@ -179,7 +179,7 @@ namespace Oobs {
 		public void* contained_type { construct; }
 	}
 	[Compact]
-	[CCode (copy_function = "oobs_list_iter_copy", cheader_filename = "oobs/oobs.h")]
+	[CCode (copy_function = "oobs_list_iter_copy", type_id = "OOBS_TYPE_LIST_ITER", cheader_filename = "oobs/oobs.h")]
 	public class ListIter {
 		public void* data;
 		public uint stamp;
diff --git a/vapi/libsoup-2.2.vapi b/vapi/libsoup-2.2.vapi
index 0aa953b..3bd57d3 100644
--- a/vapi/libsoup-2.2.vapi
+++ b/vapi/libsoup-2.2.vapi
@@ -410,8 +410,8 @@ namespace Soup {
 	}
 	[CCode (cprefix = "SOUP_HTTP_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
 	public enum HttpVersion {
-		1_0,
-		1_1
+		@1_0,
+		@1_1
 	}
 	[CCode (cprefix = "SOUP_STATUS_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
 	public enum KnownStatusCode {
diff --git a/vapi/libsoup-2.4.vapi b/vapi/libsoup-2.4.vapi
index b55de24..0c37b95 100644
--- a/vapi/libsoup-2.4.vapi
+++ b/vapi/libsoup-2.4.vapi
@@ -679,8 +679,8 @@ namespace Soup {
 	public delegate void LoggerPrinter (Soup.Logger logger, Soup.LoggerLogLevel level, string direction, string data);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public delegate void MessageHeadersForeachFunc (string name, string value);
-	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static delegate void ProxyResolverCallback (Soup.ProxyResolver p1, Soup.Message p2, uint p3, Soup.Address p4, void* p5);
+	[CCode (cheader_filename = "libsoup/soup.h", has_target = false)]
+	public delegate void ProxyResolverCallback (Soup.ProxyResolver p1, Soup.Message p2, uint p3, Soup.Address p4, void* p5);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public delegate void ServerCallback (Soup.Server server, Soup.Message msg, string path, GLib.HashTable query, Soup.ClientContext client);
 	[CCode (cheader_filename = "libsoup/soup.h")]
diff --git a/vapi/poppler-glib.vapi b/vapi/poppler-glib.vapi
index 3fc2e45..2edf7d8 100644
--- a/vapi/poppler-glib.vapi
+++ b/vapi/poppler-glib.vapi
@@ -3,7 +3,7 @@
 [CCode (cprefix = "Poppler", lower_case_cprefix = "poppler_")]
 namespace Poppler {
 	[Compact]
-	[CCode (copy_function = "poppler_action_copy", cheader_filename = "poppler.h")]
+	[CCode (copy_function = "poppler_action_copy", type_id = "POPPLER_TYPE_ACTION", cheader_filename = "poppler.h")]
 	public class Action {
 		public weak Poppler.ActionAny any;
 		public weak Poppler.ActionGotoDest goto_dest;
@@ -76,7 +76,7 @@ namespace Poppler {
 		public bool save_to_callback (Poppler.AttachmentSaveFunc save_func) throws GLib.Error;
 	}
 	[Compact]
-	[CCode (copy_function = "poppler_dest_copy", cheader_filename = "poppler.h")]
+	[CCode (copy_function = "poppler_dest_copy", type_id = "POPPLER_TYPE_DEST", cheader_filename = "poppler.h")]
 	public class Dest {
 		public double bottom;
 		public uint change_left;
@@ -144,7 +144,7 @@ namespace Poppler {
 		public bool scan (int n_pages, out unowned Poppler.FontsIter iter);
 	}
 	[Compact]
-	[CCode (copy_function = "poppler_fonts_iter_copy", cheader_filename = "poppler.h")]
+	[CCode (copy_function = "poppler_fonts_iter_copy", type_id = "POPPLER_TYPE_FONTS_ITER", cheader_filename = "poppler.h")]
 	public class FontsIter {
 		public unowned Poppler.FontsIter copy ();
 		public unowned string get_file_name ();
@@ -187,7 +187,7 @@ namespace Poppler {
 		public void text_set_text (string text);
 	}
 	[Compact]
-	[CCode (copy_function = "poppler_form_field_mapping_copy", cheader_filename = "poppler.h")]
+	[CCode (copy_function = "poppler_form_field_mapping_copy", type_id = "POPPLER_TYPE_FORM_FIELD_MAPPING", cheader_filename = "poppler.h")]
 	public class FormFieldMapping {
 		public weak Poppler.Rectangle area;
 		public weak Poppler.FormField field;
@@ -196,7 +196,7 @@ namespace Poppler {
 		public FormFieldMapping ();
 	}
 	[Compact]
-	[CCode (copy_function = "poppler_image_mapping_copy", cheader_filename = "poppler.h")]
+	[CCode (copy_function = "poppler_image_mapping_copy", type_id = "POPPLER_TYPE_IMAGE_MAPPING", cheader_filename = "poppler.h")]
 	public class ImageMapping {
 		public weak Poppler.Rectangle area;
 		public weak Gdk.Pixbuf image;
@@ -205,7 +205,7 @@ namespace Poppler {
 		public ImageMapping ();
 	}
 	[Compact]
-	[CCode (copy_function = "poppler_index_iter_copy", cheader_filename = "poppler.h")]
+	[CCode (copy_function = "poppler_index_iter_copy", type_id = "POPPLER_TYPE_INDEX_ITER", cheader_filename = "poppler.h")]
 	public class IndexIter {
 		public unowned Poppler.IndexIter copy ();
 		public unowned Poppler.Action get_action ();
@@ -216,7 +216,7 @@ namespace Poppler {
 		public bool next ();
 	}
 	[Compact]
-	[CCode (copy_function = "poppler_link_mapping_copy", cheader_filename = "poppler.h")]
+	[CCode (copy_function = "poppler_link_mapping_copy", type_id = "POPPLER_TYPE_LINK_MAPPING", cheader_filename = "poppler.h")]
 	public class LinkMapping {
 		public weak Poppler.Action action;
 		public weak Poppler.Rectangle area;
@@ -259,7 +259,7 @@ namespace Poppler {
 		public string label { owned get; }
 	}
 	[Compact]
-	[CCode (copy_function = "poppler_page_transition_copy", cheader_filename = "poppler.h")]
+	[CCode (copy_function = "poppler_page_transition_copy", type_id = "POPPLER_TYPE_PAGE_TRANSITION", cheader_filename = "poppler.h")]
 	public class PageTransition {
 		public Poppler.PageTransitionAlignment alignment;
 		public int angle;
@@ -273,7 +273,7 @@ namespace Poppler {
 		public PageTransition ();
 	}
 	[Compact]
-	[CCode (copy_function = "poppler_rectangle_copy", cheader_filename = "poppler.h")]
+	[CCode (copy_function = "poppler_rectangle_copy", type_id = "POPPLER_TYPE_RECTANGLE", cheader_filename = "poppler.h")]
 	public class Rectangle {
 		public double x1;
 		public double x2;
@@ -436,8 +436,8 @@ namespace Poppler {
 		DISPLAY_DOC_TITLE,
 		DIRECTION_RTL
 	}
-	[CCode (cheader_filename = "poppler.h")]
-	public static delegate bool AttachmentSaveFunc (string buf, size_t count, void* data, GLib.Error error);
+	[CCode (cheader_filename = "poppler.h", has_target = false)]
+	public delegate bool AttachmentSaveFunc (string buf, size_t count, void* data, GLib.Error error);
 	[CCode (cheader_filename = "poppler.h")]
 	public const int HAS_CAIRO;
 	[CCode (cheader_filename = "poppler.h")]



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]