[vala] Regenerate all bindings



commit bb5df67143fab06182097a0893a459aaa5f27ee5
Author: Evan Nemerson <evan coeus-group com>
Date:   Sun Mar 14 13:48:05 2010 -0700

    Regenerate all bindings

 vapi/gconf-2.0.vapi                   |   10 +-
 vapi/gdk-pixbuf-2.0.vapi              |    4 +-
 vapi/gdk-x11-2.0.vapi                 |    6 +-
 vapi/gio-2.0.vapi                     |    8 +-
 vapi/gnome-desktop-2.0.vapi           |   12 +-
 vapi/gnome-vfs-2.0.vapi               |   62 ++++++------
 vapi/gstreamer-0.10.vapi              |   50 +++++-----
 vapi/gstreamer-audio-0.10.vapi        |    2 +-
 vapi/gstreamer-base-0.10.vapi         |    2 +-
 vapi/gstreamer-controller-0.10.vapi   |    2 +-
 vapi/gstreamer-dataprotocol-0.10.vapi |    4 +-
 vapi/gstreamer-fft-0.10.vapi          |    2 +-
 vapi/gstreamer-interfaces-0.10.vapi   |   14 ++--
 vapi/gstreamer-netbuffer-0.10.vapi    |    7 +-
 vapi/gstreamer-rtp-0.10.vapi          |    8 +-
 vapi/gstreamer-rtsp-0.10.vapi         |   12 +-
 vapi/gstreamer-sdp-0.10.vapi          |    2 +-
 vapi/hildon-1.vapi                    |    8 +-
 vapi/hildon-fm-2.vapi                 |   12 +-
 vapi/libgda-4.0.vapi                  |    2 +-
 vapi/libgdata.vapi                    |    2 +-
 vapi/libgnome-2.0.vapi                |    8 +-
 vapi/libgnome-menu.vapi               |    4 +-
 vapi/libgnomeui-2.0.vapi              |    2 +
 vapi/libgsf-1.vapi                    |   12 +-
 vapi/libnotify.vapi                   |    2 +-
 vapi/liboobs-1.vapi                   |   14 ++--
 vapi/libsoup-2.2.vapi                 |   28 +++---
 vapi/libwnck-1.0.vapi                 |   18 ++--
 vapi/loudmouth-1.0.vapi               |   70 +++++++-------
 vapi/poppler-glib.vapi                |   36 ++++----
 vapi/purple.vapi                      |  177 +++++++++++---------------------
 vapi/rest.vapi                        |    4 +-
 vapi/vte.vapi                         |    4 +-
 34 files changed, 276 insertions(+), 334 deletions(-)
---
diff --git a/vapi/gconf-2.0.vapi b/vapi/gconf-2.0.vapi
index bd32b28..88f5073 100644
--- a/vapi/gconf-2.0.vapi
+++ b/vapi/gconf-2.0.vapi
@@ -245,19 +245,19 @@ namespace GConf {
 		public void set_string (string the_str);
 		public unowned string to_string ();
 	}
-	[CCode (cprefix = "GCONF_CLIENT_HANDLE_", has_type_id = "0", cheader_filename = "gconf/gconf.h")]
+	[CCode (cprefix = "GCONF_CLIENT_HANDLE_", has_type_id = false, cheader_filename = "gconf/gconf.h")]
 	public enum ClientErrorHandlingMode {
 		NONE,
 		UNRETURNED,
 		ALL
 	}
-	[CCode (cprefix = "GCONF_CLIENT_PRELOAD_", has_type_id = "0", cheader_filename = "gconf/gconf.h")]
+	[CCode (cprefix = "GCONF_CLIENT_PRELOAD_", has_type_id = false, cheader_filename = "gconf/gconf.h")]
 	public enum ClientPreloadType {
 		NONE,
 		ONELEVEL,
 		RECURSIVE
 	}
-	[CCode (cprefix = "GCONF_ERROR_", has_type_id = "0", cheader_filename = "gconf/gconf.h")]
+	[CCode (cprefix = "GCONF_ERROR_", has_type_id = false, cheader_filename = "gconf/gconf.h")]
 	public enum Error {
 		SUCCESS,
 		FAILED,
@@ -277,12 +277,12 @@ namespace GConf {
 		NO_WRITABLE_DATABASE,
 		IN_SHUTDOWN
 	}
-	[CCode (cprefix = "GCONF_UNSET_INCLUDING_SCHEMA_", has_type_id = "0", cheader_filename = "gconf/gconf.h")]
+	[CCode (cprefix = "GCONF_UNSET_INCLUDING_SCHEMA_", has_type_id = false, cheader_filename = "gconf/gconf.h")]
 	[Flags]
 	public enum UnsetFlags {
 		NAMES
 	}
-	[CCode (cprefix = "GCONF_VALUE_", has_type_id = "0", cheader_filename = "gconf/gconf.h")]
+	[CCode (cprefix = "GCONF_VALUE_", has_type_id = false, cheader_filename = "gconf/gconf.h")]
 	public enum ValueType {
 		INVALID,
 		STRING,
diff --git a/vapi/gdk-pixbuf-2.0.vapi b/vapi/gdk-pixbuf-2.0.vapi
index 62bd209..15f6212 100644
--- a/vapi/gdk-pixbuf-2.0.vapi
+++ b/vapi/gdk-pixbuf-2.0.vapi
@@ -176,7 +176,7 @@ namespace Gdk {
 		UPSIDEDOWN,
 		CLOCKWISE
 	}
-	[CCode (cprefix = "GDK_PIXDATA_DUMP_", has_type_id = "0", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+	[CCode (cprefix = "GDK_PIXDATA_DUMP_", has_type_id = false, cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public enum PixdataDumpType {
 		PIXDATA_STREAM,
 		PIXDATA_STRUCT,
@@ -187,7 +187,7 @@ namespace Gdk {
 		CONST,
 		RLE_DECODER
 	}
-	[CCode (cprefix = "GDK_PIXDATA_", has_type_id = "0", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+	[CCode (cprefix = "GDK_PIXDATA_", has_type_id = false, cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public enum PixdataType {
 		COLOR_TYPE_RGB,
 		COLOR_TYPE_RGBA,
diff --git a/vapi/gdk-x11-2.0.vapi b/vapi/gdk-x11-2.0.vapi
index 9fb951f..4827ea5 100644
--- a/vapi/gdk-x11-2.0.vapi
+++ b/vapi/gdk-x11-2.0.vapi
@@ -33,7 +33,7 @@ namespace Gdk {
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static unowned X.Display x11_drawable_get_xdisplay (Gdk.Drawable drawable);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
-	public static uint32 x11_drawable_get_xid (Gdk.Drawable drawable);
+	public static X.ID x11_drawable_get_xid (Gdk.Drawable drawable);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static unowned X.Display x11_gc_get_xdisplay (Gdk.GC gc);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
@@ -91,7 +91,7 @@ namespace Gdk {
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static Gdk.Atom x11_xatom_to_atom_for_display (Gdk.Display display, X.Atom xatom);
 	[CCode (cname = "gdk_xid_table_lookup", cheader_filename = "gdk/gdkx.h")]
-	public static void* x11_xid_table_lookup (uint32 xid);
+	public static void* x11_xid_table_lookup (X.ID xid);
 	[CCode (cname = "gdk_xid_table_lookup_for_display", cheader_filename = "gdk/gdkx.h")]
-	public static void* x11_xid_table_lookup_for_display (Gdk.Display display, uint32 xid);
+	public static void* x11_xid_table_lookup_for_display (Gdk.Display display, X.ID xid);
 }
diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index e62d517..06e5722 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -1416,19 +1416,19 @@ namespace GLib {
 		NOT_INITIALIZED,
 		ADDRESS_IN_USE,
 	}
-	[CCode (cheader_filename = "gio/gio.h", instance_pos = -2)]
+	[CCode (cheader_filename = "gio/gio.h")]
 	public delegate void AsyncReadyCallback (GLib.Object? source_object, GLib.AsyncResult res);
-	[CCode (cheader_filename = "gio/gio.h", instance_pos = -2)]
+	[CCode (cheader_filename = "gio/gio.h")]
 	public delegate void FileProgressCallback (int64 current_num_bytes, int64 total_num_bytes);
 	[CCode (cheader_filename = "gio/gio.h", has_target = false)]
 	public delegate bool FileReadMoreCallback (string file_contents, int64 file_size, void* callback_data);
-	[CCode (cheader_filename = "gio/gio.h", instance_pos = -2)]
+	[CCode (cheader_filename = "gio/gio.h")]
 	public delegate bool IOSchedulerJobFunc (GLib.IOSchedulerJob job, GLib.Cancellable cancellable);
 	[CCode (cheader_filename = "gio/gio.h", has_target = false)]
 	public delegate void* ReallocFunc (void* data, size_t size);
 	[CCode (cheader_filename = "gio/gio.h", has_target = false)]
 	public delegate void SimpleAsyncThreadFunc (GLib.SimpleAsyncResult res, GLib.Object object, GLib.Cancellable cancellable);
-	[CCode (cheader_filename = "gio/gio.h", instance_pos = -2)]
+	[CCode (cheader_filename = "gio/gio.h")]
 	public delegate bool SocketSourceFunc (GLib.Socket socket, GLib.IOCondition condition);
 	[CCode (cheader_filename = "gio/gio.h")]
 	public static GLib.EqualFunc file_equal;
diff --git a/vapi/gnome-desktop-2.0.vapi b/vapi/gnome-desktop-2.0.vapi
index 970638c..3563cd1 100644
--- a/vapi/gnome-desktop-2.0.vapi
+++ b/vapi/gnome-desktop-2.0.vapi
@@ -72,7 +72,7 @@ namespace Gnome {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Hint (string hintfile, string title, string background_image, string logo_image, string startupkey);
 	}
-	[CCode (cprefix = "GNOME_DESKTOP_ITEM_ERROR_", has_type_id = "0", cheader_filename = "libgnome/gnome-desktop-item.h")]
+	[CCode (cprefix = "GNOME_DESKTOP_ITEM_ERROR_", has_type_id = false, cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public enum DesktopItemError {
 		NO_FILENAME,
 		UNKNOWN_ENCODING,
@@ -83,11 +83,11 @@ namespace Gnome {
 		NOT_LAUNCHABLE,
 		INVALID_TYPE
 	}
-	[CCode (cprefix = "GNOME_DESKTOP_ITEM_ICON_NO_", has_type_id = "0", cheader_filename = "libgnome/gnome-desktop-item.h")]
+	[CCode (cprefix = "GNOME_DESKTOP_ITEM_ICON_NO_", has_type_id = false, cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public enum DesktopItemIconFlags {
 		KDE
 	}
-	[CCode (cprefix = "GNOME_DESKTOP_ITEM_LAUNCH_", has_type_id = "0", cheader_filename = "libgnome/gnome-desktop-item.h")]
+	[CCode (cprefix = "GNOME_DESKTOP_ITEM_LAUNCH_", has_type_id = false, cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public enum DesktopItemLaunchFlags {
 		ONLY_ONE,
 		USE_CURRENT_DIR,
@@ -95,18 +95,18 @@ namespace Gnome {
 		APPEND_PATHS,
 		DO_NOT_REAP_CHILD
 	}
-	[CCode (cprefix = "GNOME_DESKTOP_ITEM_LOAD_", has_type_id = "0", cheader_filename = "libgnome/gnome-desktop-item.h")]
+	[CCode (cprefix = "GNOME_DESKTOP_ITEM_LOAD_", has_type_id = false, cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public enum DesktopItemLoadFlags {
 		ONLY_IF_EXISTS,
 		NO_TRANSLATIONS
 	}
-	[CCode (cprefix = "GNOME_DESKTOP_ITEM_", has_type_id = "0", cheader_filename = "libgnome/gnome-desktop-item.h")]
+	[CCode (cprefix = "GNOME_DESKTOP_ITEM_", has_type_id = false, cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public enum DesktopItemStatus {
 		UNCHANGED,
 		CHANGED,
 		DISAPPEARED
 	}
-	[CCode (cprefix = "GNOME_DESKTOP_ITEM_TYPE_", has_type_id = "0", cheader_filename = "libgnome/gnome-desktop-item.h")]
+	[CCode (cprefix = "GNOME_DESKTOP_ITEM_TYPE_", has_type_id = false, cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public enum DesktopItemType {
 		NULL,
 		OTHER,
diff --git a/vapi/gnome-vfs-2.0.vapi b/vapi/gnome-vfs-2.0.vapi
index 170f3cf..ffa60ce 100644
--- a/vapi/gnome-vfs-2.0.vapi
+++ b/vapi/gnome-vfs-2.0.vapi
@@ -565,12 +565,12 @@ namespace GnomeVFS {
 	[IntegerType (rank = 0)]
 	public struct FileSize : uint64 {
 	}
-	[CCode (cprefix = "GNOME_VFS_DNS_SD_SERVICE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_DNS_SD_SERVICE_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum DNSSDServiceStatus {
 		ADDED,
 		REMOVED
 	}
-	[CCode (cprefix = "GNOME_VFS_DEVICE_TYPE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_DEVICE_TYPE_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum DeviceType {
 		UNKNOWN,
 		AUDIO_CD,
@@ -591,7 +591,7 @@ namespace GnomeVFS {
 		LOOPBACK,
 		NETWORK
 	}
-	[CCode (cprefix = "GNOME_VFS_DIRECTORY_VISIT_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_DIRECTORY_VISIT_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	[Flags]
 	public enum DirectoryVisitOptions {
 		DEFAULT,
@@ -599,14 +599,14 @@ namespace GnomeVFS {
 		LOOPCHECK,
 		IGNORE_RECURSE_ERROR
 	}
-	[CCode (cprefix = "GNOME_VFS_FILE_FLAGS_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_FILE_FLAGS_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	[Flags]
 	public enum FileFlags {
 		NONE,
 		SYMLINK,
 		LOCAL
 	}
-	[CCode (cprefix = "GNOME_VFS_FILE_INFO_FIELDS_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_FILE_INFO_FIELDS_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	[Flags]
 	public enum FileInfoFields {
 		NONE,
@@ -629,7 +629,7 @@ namespace GnomeVFS {
 		ACL,
 		SELINUX_CONTEXT
 	}
-	[CCode (cprefix = "GNOME_VFS_FILE_INFO_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_FILE_INFO_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	[Flags]
 	public enum FileInfoOptions {
 		DEFAULT,
@@ -642,7 +642,7 @@ namespace GnomeVFS {
 		GET_ACL,
 		GET_SELINUX_CONTEXT
 	}
-	[CCode (cprefix = "GNOME_VFS_PERM_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_PERM_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	[Flags]
 	public enum FilePermissions {
 		SUID,
@@ -664,7 +664,7 @@ namespace GnomeVFS {
 		ACCESS_WRITABLE,
 		ACCESS_EXECUTABLE
 	}
-	[CCode (cprefix = "GNOME_VFS_FILE_TYPE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_FILE_TYPE_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum FileType {
 		UNKNOWN,
 		REGULAR,
@@ -675,42 +675,42 @@ namespace GnomeVFS {
 		BLOCK_DEVICE,
 		SYMBOLIC_LINK
 	}
-	[CCode (cprefix = "GNOME_VFS_DIRECTORY_KIND_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_DIRECTORY_KIND_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum FindDirectoryKind {
 		DESKTOP,
 		TRASH
 	}
-	[CCode (cprefix = "GNOME_VFS_MAKE_URI_DIR_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_MAKE_URI_DIR_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	[Flags]
 	public enum MakeURIDirs {
 		NONE,
 		HOMEDIR,
 		CURRENT
 	}
-	[CCode (cprefix = "GNOME_VFS_MIME_ACTION_TYPE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_MIME_ACTION_TYPE_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum MimeActionType {
 		NONE,
 		APPLICATION,
 		COMPONENT
 	}
-	[CCode (cprefix = "GNOME_VFS_MIME_APPLICATION_ARGUMENT_TYPE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_MIME_APPLICATION_ARGUMENT_TYPE_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum MimeApplicationArgumentType {
 		URIS,
 		PATHS,
 		URIS_FOR_NON_FILES
 	}
-	[CCode (cprefix = "GNOME_VFS_MIME_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_MIME_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum MimeEquivalence {
 		UNRELATED,
 		IDENTICAL,
 		PARENT
 	}
-	[CCode (cprefix = "", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum ModuleCallbackAuthenticationAuthType {
 		AuthTypeBasic,
 		AuthTypeDigest
 	}
-	[CCode (cprefix = "GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	[Flags]
 	public enum ModuleCallbackFullAuthenticationFlags {
 		PREVIOUS_ATTEMPT_FAILED,
@@ -720,12 +720,12 @@ namespace GnomeVFS {
 		SAVING_SUPPORTED,
 		ANON_SUPPORTED
 	}
-	[CCode (cprefix = "GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_OUT_ANON_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_OUT_ANON_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	[Flags]
 	public enum ModuleCallbackFullAuthenticationOutFlags {
 		SELECTED
 	}
-	[CCode (cprefix = "GNOME_VFS_MONITOR_EVENT_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_MONITOR_EVENT_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum MonitorEventType {
 		CHANGED,
 		DELETED,
@@ -734,12 +734,12 @@ namespace GnomeVFS {
 		CREATED,
 		METADATA_CHANGED
 	}
-	[CCode (cprefix = "GNOME_VFS_MONITOR_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_MONITOR_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum MonitorType {
 		FILE,
 		DIRECTORY
 	}
-	[CCode (cprefix = "GNOME_VFS_OPEN_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_OPEN_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	[Flags]
 	public enum OpenMode {
 		NONE,
@@ -748,7 +748,7 @@ namespace GnomeVFS {
 		RANDOM,
 		TRUNCATE
 	}
-	[CCode (cprefix = "GNOME_VFS_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum Result {
 		OK,
 		ERROR_NOT_FOUND,
@@ -804,13 +804,13 @@ namespace GnomeVFS {
 		ERROR_NOT_A_SYMBOLIC_LINK,
 		NUM_ERRORS
 	}
-	[CCode (cprefix = "GNOME_VFS_SEEK_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_SEEK_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum SeekPosition {
 		START,
 		CURRENT,
 		END
 	}
-	[CCode (cprefix = "GNOME_VFS_SET_FILE_INFO_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_SET_FILE_INFO_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	[Flags]
 	public enum SetFileInfoMask {
 		NONE,
@@ -822,7 +822,7 @@ namespace GnomeVFS {
 		SELINUX_CONTEXT,
 		SYMLINK_NAME
 	}
-	[CCode (cprefix = "GNOME_VFS_URI_HIDE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_URI_HIDE_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	[Flags]
 	public enum URIHideOptions {
 		NONE,
@@ -833,24 +833,24 @@ namespace GnomeVFS {
 		TOPLEVEL_METHOD,
 		FRAGMENT_IDENTIFIER
 	}
-	[CCode (cprefix = "GNOME_VFS_VOLUME_TYPE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_VOLUME_TYPE_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum VolumeType {
 		MOUNTPOINT,
 		VFS_MOUNT,
 		CONNECTED_SERVER
 	}
-	[CCode (cprefix = "GNOME_VFS_XFER_ERROR_ACTION_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_XFER_ERROR_ACTION_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum XferErrorAction {
 		ABORT,
 		RETRY,
 		SKIP
 	}
-	[CCode (cprefix = "GNOME_VFS_XFER_ERROR_MODE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_XFER_ERROR_MODE_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum XferErrorMode {
 		ABORT,
 		QUERY
 	}
-	[CCode (cprefix = "GNOME_VFS_XFER_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_XFER_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	[Flags]
 	public enum XferOptions {
 		DEFAULT,
@@ -868,7 +868,7 @@ namespace GnomeVFS {
 		FOLLOW_LINKS_RECURSIVE,
 		TARGET_DEFAULT_PERMS
 	}
-	[CCode (cprefix = "GNOME_VFS_XFER_OVERWRITE_ACTION_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_XFER_OVERWRITE_ACTION_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum XferOverwriteAction {
 		ABORT,
 		REPLACE,
@@ -876,14 +876,14 @@ namespace GnomeVFS {
 		SKIP,
 		SKIP_ALL
 	}
-	[CCode (cprefix = "GNOME_VFS_XFER_OVERWRITE_MODE_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_XFER_OVERWRITE_MODE_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum XferOverwriteMode {
 		ABORT,
 		QUERY,
 		REPLACE,
 		SKIP
 	}
-	[CCode (cprefix = "GNOME_VFS_XFER_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_XFER_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum XferPhase {
 		PHASE_INITIAL,
 		CHECKING_DESTINATION,
@@ -904,7 +904,7 @@ namespace GnomeVFS {
 		PHASE_COMPLETED,
 		NUM_PHASES
 	}
-	[CCode (cprefix = "GNOME_VFS_XFER_PROGRESS_STATUS_", has_type_id = "0", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cprefix = "GNOME_VFS_XFER_PROGRESS_STATUS_", has_type_id = false, cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public enum XferProgressStatus {
 		OK,
 		VFSERROR,
diff --git a/vapi/gstreamer-0.10.vapi b/vapi/gstreamer-0.10.vapi
index 8852414..21e6436 100644
--- a/vapi/gstreamer-0.10.vapi
+++ b/vapi/gstreamer-0.10.vapi
@@ -64,7 +64,7 @@ namespace Gst {
 	[CCode (ref_function = "gst_buffer_ref", unref_function = "gst_buffer_unref", cheader_filename = "gst/gst.h")]
 	public class Buffer : Gst.MiniObject {
 		public weak Gst.Caps caps;
-		[CCode (array_length_cname = "size")]
+		[CCode (array_length_cname = "size", array_length_type = "guint")]
 		public weak uint8[] data;
 		public Gst.ClockTime duration;
 		public weak GLib.FreeFunc free_func;
@@ -2188,35 +2188,35 @@ namespace Gst {
 		DISABLED,
 		NUM_ERRORS,
 	}
-	[CCode (cheader_filename = "gst/gst.h", instance_pos = -2)]
+	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate unowned Gst.Buffer BufferListDoFunction (Gst.Buffer buffer);
-	[CCode (cheader_filename = "gst/gst.h", instance_pos = -2)]
+	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate Gst.BufferListItem BufferListFunc (out unowned Gst.Buffer buffer, uint group, uint idx);
-	[CCode (cheader_filename = "gst/gst.h", instance_pos = -2)]
+	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate bool BufferProbeCallback (Gst.Pad pad, Gst.Buffer buffer);
-	[CCode (cheader_filename = "gst/gst.h", instance_pos = -2)]
+	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate bool BusFunc (Gst.Bus bus, Gst.Message message);
-	[CCode (cheader_filename = "gst/gst.h", instance_pos = -2)]
+	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate Gst.BusSyncReply BusSyncHandler (Gst.Bus bus, Gst.Message message);
-	[CCode (cheader_filename = "gst/gst.h", instance_pos = -2)]
+	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate bool ClockCallback (Gst.Clock clock, Gst.ClockTime time, Gst.ClockID id);
 	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
 	public delegate void* CopyFunction (void* object);
-	[CCode (cheader_filename = "gst/gst.h", instance_pos = -2)]
+	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate bool DataProbeCallback (Gst.Pad pad, Gst.MiniObject data);
 	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
 	public delegate void DebugFuncPtr ();
-	[CCode (cheader_filename = "gst/gst.h", instance_pos = -2)]
+	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate bool EventProbeCallback (Gst.Pad pad, Gst.Event event);
-	[CCode (cheader_filename = "gst/gst.h", instance_pos = -2)]
+	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate bool FilterFunc (void* obj);
-	[CCode (cheader_filename = "gst/gst.h", instance_pos = -2)]
+	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate bool IndexFilter (Gst.Index index, Gst.IndexEntry entry);
-	[CCode (cheader_filename = "gst/gst.h", instance_pos = -2)]
+	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate bool IndexResolver (Gst.Index index, Gst.Object writer, string writer_string);
 	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
 	public delegate void IteratorDisposeFunction (void* owner);
-	[CCode (cheader_filename = "gst/gst.h", instance_pos = -2)]
+	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate bool IteratorFoldFunction (void* item, Gst.Value ret);
 	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
 	public delegate void IteratorFreeFunction (Gst.Iterator it);
@@ -2226,7 +2226,7 @@ namespace Gst {
 	public delegate Gst.IteratorResult IteratorNextFunction (Gst.Iterator it, void* result);
 	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
 	public delegate void IteratorResyncFunction (Gst.Iterator it);
-	[CCode (cheader_filename = "gst/gst.h", instance_pos = -2)]
+	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate void LogFunction (Gst.DebugCategory category, Gst.DebugLevel level, string file, string function, int line, GLib.Object object, Gst.DebugMessage message);
 	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
 	public delegate unowned Gst.MiniObject MiniObjectCopyFunction (Gst.MiniObject obj);
@@ -2238,7 +2238,7 @@ namespace Gst {
 	public delegate bool PadActivateFunction (Gst.Pad pad);
 	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
 	public delegate bool PadActivateModeFunction (Gst.Pad pad, bool active);
-	[CCode (cheader_filename = "gst/gst.h", instance_pos = -2)]
+	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate void PadBlockCallback (Gst.Pad pad, bool blocked);
 	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
 	public delegate Gst.FlowReturn PadBufferAllocFunction (Gst.Pad pad, uint64 offset, uint size, Gst.Caps caps, out Gst.Buffer buf);
@@ -2248,7 +2248,7 @@ namespace Gst {
 	public delegate Gst.FlowReturn PadChainListFunction (Gst.Pad pad, Gst.BufferList list);
 	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
 	public delegate bool PadCheckGetRangeFunction (Gst.Pad pad);
-	[CCode (cheader_filename = "gst/gst.h", instance_pos = -2)]
+	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate bool PadDispatcherFunction (Gst.Pad pad);
 	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
 	public delegate bool PadEventFunction (Gst.Pad pad, owned Gst.Event event);
@@ -2272,27 +2272,27 @@ namespace Gst {
 	public delegate bool PadSetCapsFunction (Gst.Pad pad, Gst.Caps caps);
 	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
 	public delegate void PadUnlinkFunction (Gst.Pad pad);
-	[CCode (cheader_filename = "gst/gst.h", instance_pos = -2)]
+	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate bool PluginFeatureFilter (Gst.PluginFeature feature);
-	[CCode (cheader_filename = "gst/gst.h", instance_pos = -2)]
+	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate bool PluginFilter (Gst.Plugin plugin);
-	[CCode (cheader_filename = "gst/gst.h", instance_pos = -2)]
+	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate bool PluginInitFullFunc (Gst.Plugin plugin);
 	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
 	public delegate bool PluginInitFunc (Gst.Plugin plugin);
-	[CCode (cheader_filename = "gst/gst.h", instance_pos = -2)]
+	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate bool StructureForeachFunc (GLib.Quark field_id, Gst.Value value);
-	[CCode (cheader_filename = "gst/gst.h", instance_pos = -2)]
+	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate bool StructureMapFunc (GLib.Quark field_id, Gst.Value value);
-	[CCode (cheader_filename = "gst/gst.h", instance_pos = -2)]
+	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate void TagForeachFunc (Gst.TagList list, string tag);
 	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
 	public delegate void TagMergeFunc (Gst.Value dest, Gst.Value src);
-	[CCode (cheader_filename = "gst/gst.h", instance_pos = -2)]
+	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate void TaskFunction ();
-	[CCode (cheader_filename = "gst/gst.h", instance_pos = -2)]
+	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate void TaskPoolFunction ();
-	[CCode (cheader_filename = "gst/gst.h", instance_pos = -2)]
+	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate void TypeFindFunction (Gst.TypeFind find);
 	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
 	public delegate int ValueCompareFunc (Gst.Value value1, Gst.Value value2);
diff --git a/vapi/gstreamer-audio-0.10.vapi b/vapi/gstreamer-audio-0.10.vapi
index 2688d43..adb99fa 100644
--- a/vapi/gstreamer-audio-0.10.vapi
+++ b/vapi/gstreamer-audio-0.10.vapi
@@ -185,7 +185,7 @@ namespace Gst {
 		NONE,
 		NUM
 	}
-	[CCode (cprefix = "GST_AUDIO_FIELD_", has_type_id = "0", cheader_filename = "gst/audio/audio.h")]
+	[CCode (cprefix = "GST_AUDIO_FIELD_", has_type_id = false, cheader_filename = "gst/audio/audio.h")]
 	public enum AudioFieldFlag {
 		RATE,
 		CHANNELS,
diff --git a/vapi/gstreamer-base-0.10.vapi b/vapi/gstreamer-base-0.10.vapi
index 660a570..af7497f 100644
--- a/vapi/gstreamer-base-0.10.vapi
+++ b/vapi/gstreamer-base-0.10.vapi
@@ -424,7 +424,7 @@ namespace Gst {
 		[NoWrapper]
 		public virtual Gst.FlowReturn create (out unowned Gst.Buffer buf);
 	}
-	[CCode (cprefix = "GST_BASE_SRC_", has_type_id = "0", cheader_filename = "gst/gst.h")]
+	[CCode (cprefix = "GST_BASE_SRC_", has_type_id = false, cheader_filename = "gst/gst.h")]
 	public enum BaseSrcFlags {
 		STARTED,
 		FLAG_LAST
diff --git a/vapi/gstreamer-controller-0.10.vapi b/vapi/gstreamer-controller-0.10.vapi
index 83db848..3c0f70b 100644
--- a/vapi/gstreamer-controller-0.10.vapi
+++ b/vapi/gstreamer-controller-0.10.vapi
@@ -85,7 +85,7 @@ namespace Gst {
 		public Gst.ClockTime sample_interval;
 		public void* values;
 	}
-	[CCode (cprefix = "GST_INTERPOLATE_", has_type_id = "0", cheader_filename = "gst/controller/gstcontroller.h")]
+	[CCode (cprefix = "GST_INTERPOLATE_", has_type_id = false, cheader_filename = "gst/controller/gstcontroller.h")]
 	public enum InterpolateMode {
 		NONE,
 		TRIGGER,
diff --git a/vapi/gstreamer-dataprotocol-0.10.vapi b/vapi/gstreamer-dataprotocol-0.10.vapi
index 1bdd19d..f62b5b8 100644
--- a/vapi/gstreamer-dataprotocol-0.10.vapi
+++ b/vapi/gstreamer-dataprotocol-0.10.vapi
@@ -12,14 +12,14 @@ namespace Gst {
 		[CCode (has_construct_function = false)]
 		public DPPacketizer (Gst.DPVersion version);
 	}
-	[CCode (cprefix = "GST_DP_HEADER_FLAG_", has_type_id = "0", cheader_filename = "gst/dataprotocol/dataprotocol.h")]
+	[CCode (cprefix = "GST_DP_HEADER_FLAG_", has_type_id = false, cheader_filename = "gst/dataprotocol/dataprotocol.h")]
 	public enum DPHeaderFlag {
 		NONE,
 		CRC_HEADER,
 		CRC_PAYLOAD,
 		CRC
 	}
-	[CCode (cprefix = "GST_DP_PAYLOAD_", has_type_id = "0", cheader_filename = "gst/dataprotocol/dataprotocol.h")]
+	[CCode (cprefix = "GST_DP_PAYLOAD_", has_type_id = false, cheader_filename = "gst/dataprotocol/dataprotocol.h")]
 	public enum DPPayloadType {
 		NONE,
 		BUFFER,
diff --git a/vapi/gstreamer-fft-0.10.vapi b/vapi/gstreamer-fft-0.10.vapi
index 39a1530..e97fbb9 100644
--- a/vapi/gstreamer-fft-0.10.vapi
+++ b/vapi/gstreamer-fft-0.10.vapi
@@ -74,7 +74,7 @@ namespace Gst {
 		public int32 i;
 		public int32 r;
 	}
-	[CCode (cprefix = "GST_FFT_WINDOW_", has_type_id = "0", cheader_filename = "gst/fft/gstfft.h")]
+	[CCode (cprefix = "GST_FFT_WINDOW_", has_type_id = false, cheader_filename = "gst/fft/gstfft.h")]
 	public enum FFTWindow {
 		RECTANGULAR,
 		HAMMING,
diff --git a/vapi/gstreamer-interfaces-0.10.vapi b/vapi/gstreamer-interfaces-0.10.vapi
index c8c97a5..6ccfc23 100644
--- a/vapi/gstreamer-interfaces-0.10.vapi
+++ b/vapi/gstreamer-interfaces-0.10.vapi
@@ -211,7 +211,7 @@ namespace Gst {
 		HARDWARE,
 		SOFTWARE
 	}
-	[CCode (cprefix = "GST_PHOTOGRAPHY_COLOUR_TONE_MODE_", has_type_id = "0", cheader_filename = "gst/gst.h")]
+	[CCode (cprefix = "GST_PHOTOGRAPHY_COLOUR_TONE_MODE_", has_type_id = false, cheader_filename = "gst/gst.h")]
 	public enum ColourToneMode {
 		NORMAL,
 		SEPIA,
@@ -223,7 +223,7 @@ namespace Gst {
 		SOLARIZE,
 		OUT_OF_FOCUS
 	}
-	[CCode (cprefix = "GST_PHOTOGRAPHY_FLASH_MODE_", has_type_id = "0", cheader_filename = "gst/gst.h")]
+	[CCode (cprefix = "GST_PHOTOGRAPHY_FLASH_MODE_", has_type_id = false, cheader_filename = "gst/gst.h")]
 	public enum FlashMode {
 		AUTO,
 		OFF,
@@ -231,7 +231,7 @@ namespace Gst {
 		FILL_IN,
 		RED_EYE
 	}
-	[CCode (cprefix = "GST_PHOTOGRAPHY_FOCUS_STATUS_", has_type_id = "0", cheader_filename = "gst/gst.h")]
+	[CCode (cprefix = "GST_PHOTOGRAPHY_FOCUS_STATUS_", has_type_id = false, cheader_filename = "gst/gst.h")]
 	public enum FocusStatus {
 		NONE,
 		RUNNING,
@@ -315,7 +315,7 @@ namespace Gst {
 		COMMANDS,
 		ANGLES
 	}
-	[CCode (cprefix = "GST_PHOTOGRAPHY_CAPS_", has_type_id = "0", cheader_filename = "gst/gst.h")]
+	[CCode (cprefix = "GST_PHOTOGRAPHY_CAPS_", has_type_id = false, cheader_filename = "gst/gst.h")]
 	public enum PhotoCaps {
 		NONE,
 		EV_COMP,
@@ -330,13 +330,13 @@ namespace Gst {
 		EXPOSURE,
 		SHAKE
 	}
-	[CCode (cprefix = "GST_PHOTOGRAPHY_SHAKE_RISK_", has_type_id = "0", cheader_filename = "gst/gst.h")]
+	[CCode (cprefix = "GST_PHOTOGRAPHY_SHAKE_RISK_", has_type_id = false, cheader_filename = "gst/gst.h")]
 	public enum PhotoShakeRisk {
 		LOW,
 		MEDIUM,
 		HIGH
 	}
-	[CCode (cprefix = "GST_PHOTOGRAPHY_SCENE_MODE_", has_type_id = "0", cheader_filename = "gst/gst.h")]
+	[CCode (cprefix = "GST_PHOTOGRAPHY_SCENE_MODE_", has_type_id = false, cheader_filename = "gst/gst.h")]
 	public enum SceneMode {
 		MANUAL,
 		CLOSEUP,
@@ -354,7 +354,7 @@ namespace Gst {
 		FREQUENCY,
 		AUDIO
 	}
-	[CCode (cprefix = "GST_PHOTOGRAPHY_WB_MODE_", has_type_id = "0", cheader_filename = "gst/gst.h")]
+	[CCode (cprefix = "GST_PHOTOGRAPHY_WB_MODE_", has_type_id = false, cheader_filename = "gst/gst.h")]
 	public enum WhiteBalanceMode {
 		AUTO,
 		DAYLIGHT,
diff --git a/vapi/gstreamer-netbuffer-0.10.vapi b/vapi/gstreamer-netbuffer-0.10.vapi
index ad5269b..468f14f 100644
--- a/vapi/gstreamer-netbuffer-0.10.vapi
+++ b/vapi/gstreamer-netbuffer-0.10.vapi
@@ -10,11 +10,6 @@ namespace Gst {
 		[CCode (cname = "gst_netbuffer_new", has_construct_function = false)]
 		public NetBuffer ();
 	}
-	[Compact]
-	[CCode (cheader_filename = "gst/netbuffer/gstnetbuffer.h")]
-	public class NetBufferClass {
-		public weak Gst.BufferClass buffer_class;
-	}
 	[CCode (type_id = "GST_TYPE_NET_ADDRESS", cheader_filename = "gst/netbuffer/gstnetbuffer.h")]
 	public struct NetAddress {
 		public Gst.NetType type;
@@ -39,7 +34,7 @@ namespace Gst {
 		[CCode (cname = "gst_netaddress_to_string")]
 		public int to_string (string dest, ulong len);
 	}
-	[CCode (cprefix = "GST_NET_TYPE_", has_type_id = "0", cheader_filename = "gst/netbuffer/gstnetbuffer.h")]
+	[CCode (cprefix = "GST_NET_TYPE_", has_type_id = false, cheader_filename = "gst/netbuffer/gstnetbuffer.h")]
 	public enum NetType {
 		UNKNOWN,
 		IP4,
diff --git a/vapi/gstreamer-rtp-0.10.vapi b/vapi/gstreamer-rtp-0.10.vapi
index 160ab03..d024a8e 100644
--- a/vapi/gstreamer-rtp-0.10.vapi
+++ b/vapi/gstreamer-rtp-0.10.vapi
@@ -155,7 +155,7 @@ namespace Gst {
 		public void sr_get_sender_info (uint32 ssrc, uint64 ntptime, uint32 rtptime, uint32 packet_count, uint32 octet_count);
 		public void sr_set_sender_info (uint32 ssrc, uint64 ntptime, uint32 rtptime, uint32 packet_count, uint32 octet_count);
 	}
-	[CCode (cprefix = "GST_RTCP_", has_type_id = "0", cheader_filename = "gst/gst.h")]
+	[CCode (cprefix = "GST_RTCP_", has_type_id = false, cheader_filename = "gst/gst.h")]
 	public enum RTCPFBType {
 		FB_TYPE_INVALID,
 		RTPFB_TYPE_NACK,
@@ -164,7 +164,7 @@ namespace Gst {
 		PSFB_TYPE_RPSI,
 		PSFB_TYPE_AFB
 	}
-	[CCode (cprefix = "GST_RTCP_SDES_", has_type_id = "0", cheader_filename = "gst/rtp/gstrtcpbuffer.h")]
+	[CCode (cprefix = "GST_RTCP_SDES_", has_type_id = false, cheader_filename = "gst/rtp/gstrtcpbuffer.h")]
 	public enum RTCPSDESType {
 		INVALID,
 		END,
@@ -177,7 +177,7 @@ namespace Gst {
 		NOTE,
 		PRIV
 	}
-	[CCode (cprefix = "GST_RTCP_TYPE_", has_type_id = "0", cheader_filename = "gst/rtp/gstrtcpbuffer.h")]
+	[CCode (cprefix = "GST_RTCP_TYPE_", has_type_id = false, cheader_filename = "gst/rtp/gstrtcpbuffer.h")]
 	public enum RTCPType {
 		INVALID,
 		SR,
@@ -188,7 +188,7 @@ namespace Gst {
 		RTPFB,
 		PSFB
 	}
-	[CCode (cprefix = "GST_RTP_PAYLOAD_", has_type_id = "0", cheader_filename = "gst/rtp/gstbasertpaudiopayload.h")]
+	[CCode (cprefix = "GST_RTP_PAYLOAD_", has_type_id = false, cheader_filename = "gst/rtp/gstbasertpaudiopayload.h")]
 	public enum RTPPayload {
 		PCMU,
 		@1016,
diff --git a/vapi/gstreamer-rtsp-0.10.vapi b/vapi/gstreamer-rtsp-0.10.vapi
index 9553c20..bf000af 100644
--- a/vapi/gstreamer-rtsp-0.10.vapi
+++ b/vapi/gstreamer-rtsp-0.10.vapi
@@ -257,7 +257,7 @@ namespace Gst {
 		X_STARTUPPROFILE,
 		TIMESTAMP
 	}
-	[CCode (cprefix = "GST_RTSP_LOWER_TRANS_", has_type_id = "0", cheader_filename = "gst/rtsp/gstrtspextension.h")]
+	[CCode (cprefix = "GST_RTSP_LOWER_TRANS_", has_type_id = false, cheader_filename = "gst/rtsp/gstrtspextension.h")]
 	public enum RTSPLowerTrans {
 		UNKNOWN,
 		UDP,
@@ -281,20 +281,20 @@ namespace Gst {
 		SET_PARAMETER,
 		TEARDOWN
 	}
-	[CCode (cprefix = "GST_RTSP_MESSAGE_", has_type_id = "0", cheader_filename = "gst/rtsp/gstrtspmessage.h")]
+	[CCode (cprefix = "GST_RTSP_MESSAGE_", has_type_id = false, cheader_filename = "gst/rtsp/gstrtspmessage.h")]
 	public enum RTSPMsgType {
 		INVALID,
 		REQUEST,
 		RESPONSE,
 		DATA
 	}
-	[CCode (cprefix = "GST_RTSP_PROFILE_", has_type_id = "0", cheader_filename = "gst/rtsp/gstrtsptransport.h")]
+	[CCode (cprefix = "GST_RTSP_PROFILE_", has_type_id = false, cheader_filename = "gst/rtsp/gstrtsptransport.h")]
 	public enum RTSPProfile {
 		UNKNOWN,
 		AVP,
 		SAVP
 	}
-	[CCode (cprefix = "GST_RTSP_RANGE_", has_type_id = "0", cheader_filename = "gst/rtsp/gstrtsprange.h")]
+	[CCode (cprefix = "GST_RTSP_RANGE_", has_type_id = false, cheader_filename = "gst/rtsp/gstrtsprange.h")]
 	public enum RTSPRangeUnit {
 		SMPTE,
 		SMPTE_30_DROP,
@@ -380,13 +380,13 @@ namespace Gst {
 		RTSP_VERSION_NOT_SUPPORTED,
 		OPTION_NOT_SUPPORTED
 	}
-	[CCode (cprefix = "GST_RTSP_TIME_", has_type_id = "0", cheader_filename = "gst/rtsp/gstrtsprange.h")]
+	[CCode (cprefix = "GST_RTSP_TIME_", has_type_id = false, cheader_filename = "gst/rtsp/gstrtsprange.h")]
 	public enum RTSPTimeType {
 		SECONDS,
 		NOW,
 		END
 	}
-	[CCode (cprefix = "GST_RTSP_TRANS_", has_type_id = "0", cheader_filename = "gst/rtsp/gstrtsptransport.h")]
+	[CCode (cprefix = "GST_RTSP_TRANS_", has_type_id = false, cheader_filename = "gst/rtsp/gstrtsptransport.h")]
 	public enum RTSPTransMode {
 		UNKNOWN,
 		RTP,
diff --git a/vapi/gstreamer-sdp-0.10.vapi b/vapi/gstreamer-sdp-0.10.vapi
index 48f92ea..c6fc57f 100644
--- a/vapi/gstreamer-sdp-0.10.vapi
+++ b/vapi/gstreamer-sdp-0.10.vapi
@@ -158,7 +158,7 @@ namespace Gst {
 		public weak string time;
 		public weak string typed_time;
 	}
-	[CCode (cprefix = "GST_SDP_", has_type_id = "0", cheader_filename = "gst/sdp/gstsdp.h")]
+	[CCode (cprefix = "GST_SDP_", has_type_id = false, cheader_filename = "gst/sdp/gstsdp.h")]
 	public enum SDPResult {
 		OK,
 		EINVAL
diff --git a/vapi/hildon-1.vapi b/vapi/hildon-1.vapi
index a3a616a..a39a070 100644
--- a/vapi/hildon-1.vapi
+++ b/vapi/hildon-1.vapi
@@ -994,7 +994,7 @@ namespace Hildon {
 		INVALID_DATE,
 		INVALID_TIME
 	}
-	[CCode (cprefix = "HILDON_GTK_INPUT_MODE_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "HILDON_GTK_INPUT_MODE_", has_type_id = false, cheader_filename = "gtk/gtk.h")]
 	public enum GtkInputMode {
 		ALPHA,
 		NUMERIC,
@@ -1007,7 +1007,7 @@ namespace Hildon {
 		AUTOCAP,
 		DICTIONARY
 	}
-	[CCode (cprefix = "HILDON_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "HILDON_", has_type_id = false, cheader_filename = "gtk/gtk.h")]
 	public enum Mode {
 		DIABLO,
 		FREMANTLE
@@ -1057,7 +1057,7 @@ namespace Hildon {
 		MINIMUM,
 		CHILDREN
 	}
-	[CCode (cprefix = "HILDON_SIZE_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "HILDON_SIZE_", has_type_id = false, cheader_filename = "gtk/gtk.h")]
 	public enum SizeType {
 		AUTO_WIDTH,
 		HALFSCREEN_WIDTH,
@@ -1078,7 +1078,7 @@ namespace Hildon {
 		SINGLE,
 		MULTIPLE
 	}
-	[CCode (cprefix = "HILDON_UI_MODE_", has_type_id = "0", cheader_filename = "gtk/gtk.h")]
+	[CCode (cprefix = "HILDON_UI_MODE_", has_type_id = false, cheader_filename = "gtk/gtk.h")]
 	public enum UIMode {
 		NORMAL,
 		EDIT
diff --git a/vapi/hildon-fm-2.vapi b/vapi/hildon-fm-2.vapi
index bb7fdf4..8b135ac 100644
--- a/vapi/hildon-fm-2.vapi
+++ b/vapi/hildon-fm-2.vapi
@@ -169,31 +169,31 @@ namespace Hildon {
 		public FileSystemStorageDialog (Gtk.Window parent, string uri_str);
 		public static void set_uri (Gtk.Widget widget, string uri_str);
 	}
-	[CCode (cprefix = "HILDON_FILE_SELECTION_MODE_", has_type_id = "0", cheader_filename = "hildon/hildon-file-selection.h")]
+	[CCode (cprefix = "HILDON_FILE_SELECTION_MODE_", has_type_id = false, cheader_filename = "hildon/hildon-file-selection.h")]
 	public enum FileSelectionMode {
 		LIST,
 		THUMBNAILS
 	}
-	[CCode (cprefix = "HILDON_FILE_SELECTION_PANE_", has_type_id = "0", cheader_filename = "hildon/hildon-file-selection.h")]
+	[CCode (cprefix = "HILDON_FILE_SELECTION_PANE_", has_type_id = false, cheader_filename = "hildon/hildon-file-selection.h")]
 	public enum FileSelectionPane {
 		NAVIGATION,
 		CONTENT
 	}
-	[CCode (cprefix = "HILDON_FILE_SELECTION_SORT_", has_type_id = "0", cheader_filename = "hildon/hildon-file-selection.h")]
+	[CCode (cprefix = "HILDON_FILE_SELECTION_SORT_", has_type_id = false, cheader_filename = "hildon/hildon-file-selection.h")]
 	public enum FileSelectionSortKey {
 		NAME,
 		TYPE,
 		MODIFIED,
 		SIZE
 	}
-	[CCode (cprefix = "HILDON_FILE_SELECTION_SHOW_", has_type_id = "0", cheader_filename = "hildon/hildon-file-selection.h")]
+	[CCode (cprefix = "HILDON_FILE_SELECTION_SHOW_", has_type_id = false, cheader_filename = "hildon/hildon-file-selection.h")]
 	public enum FileSelectionVisibleColumns {
 		NAME,
 		MODIFIED,
 		SIZE,
 		ALL
 	}
-	[CCode (cprefix = "HILDON_FILE_SYSTEM_MODEL_", has_type_id = "0", cheader_filename = "hildon/hildon-file-system-model.h")]
+	[CCode (cprefix = "HILDON_FILE_SYSTEM_MODEL_", has_type_id = false, cheader_filename = "hildon/hildon-file-system-model.h")]
 	public enum FileSystemModelColumns {
 		COLUMN_GTK_PATH_INTERNAL,
 		COLUMN_LOCAL_PATH,
@@ -224,7 +224,7 @@ namespace Hildon {
 		COLUMN_IS_DRIVE,
 		NUM_COLUMNS
 	}
-	[CCode (cprefix = "HILDON_FILE_SYSTEM_MODEL_", has_type_id = "0", cheader_filename = "hildon/hildon-file-system-model.h")]
+	[CCode (cprefix = "HILDON_FILE_SYSTEM_MODEL_", has_type_id = false, cheader_filename = "hildon/hildon-file-system-model.h")]
 	public enum FileSystemModelItemType {
 		UNKNOWN,
 		FILE,
diff --git a/vapi/libgda-4.0.vapi b/vapi/libgda-4.0.vapi
index 242a6e6..501e3c1 100644
--- a/vapi/libgda-4.0.vapi
+++ b/vapi/libgda-4.0.vapi
@@ -1817,7 +1817,7 @@ namespace Gda {
 		VIEW_DEPENDENCIES,
 		ALL
 	}
-	[CCode (cprefix = "GDA_", has_type_id = "0", cheader_filename = "libgda/libgda.h")]
+	[CCode (cprefix = "GDA_", has_type_id = false, cheader_filename = "libgda/libgda.h")]
 	public enum PrefixDir {
 		NO_DIR,
 		BIN_DIR,
diff --git a/vapi/libgdata.vapi b/vapi/libgdata.vapi
index 879d19b..07e6afa 100644
--- a/vapi/libgdata.vapi
+++ b/vapi/libgdata.vapi
@@ -1541,7 +1541,7 @@ namespace GData {
 		ALL,
 		PARTNER
 	}
-	[CCode (cheader_filename = "gdata/gdata.h", instance_pos = -2)]
+	[CCode (cheader_filename = "gdata/gdata.h")]
 	public delegate void QueryProgressCallback (GData.Entry entry, uint entry_key, uint entry_count);
 	[CCode (cheader_filename = "gdata/gdata.h")]
 	public const string GD_ADDRESS_USAGE_GENERAL;
diff --git a/vapi/libgnome-2.0.vapi b/vapi/libgnome-2.0.vapi
index 2c7a7ab..9359f25 100644
--- a/vapi/libgnome-2.0.vapi
+++ b/vapi/libgnome-2.0.vapi
@@ -78,7 +78,7 @@ namespace Gnome {
 		public Gnome.TriggerType type;
 		public void* u;
 	}
-	[CCode (cprefix = "GNOME_FILE_DOMAIN_", has_type_id = "0", cheader_filename = "libgnome/libgnome.h")]
+	[CCode (cprefix = "GNOME_FILE_DOMAIN_", has_type_id = false, cheader_filename = "libgnome/libgnome.h")]
 	public enum FileDomain {
 		UNKNOWN,
 		LIBDIR,
@@ -94,19 +94,19 @@ namespace Gnome {
 		APP_CONFIG,
 		APP_HELP
 	}
-	[CCode (cprefix = "GNOME_HELP_ERROR_", has_type_id = "0", cheader_filename = "libgnome/libgnome.h")]
+	[CCode (cprefix = "GNOME_HELP_ERROR_", has_type_id = false, cheader_filename = "libgnome/libgnome.h")]
 	public enum HelpError {
 		INTERNAL,
 		NOT_FOUND
 	}
-	[CCode (cprefix = "GTRIG_", has_type_id = "0", cheader_filename = "libgnome/libgnome.h")]
+	[CCode (cprefix = "GTRIG_", has_type_id = false, cheader_filename = "libgnome/libgnome.h")]
 	public enum TriggerType {
 		NONE,
 		FUNCTION,
 		COMMAND,
 		MEDIAPLAY
 	}
-	[CCode (cprefix = "GNOME_URL_ERROR_", has_type_id = "0", cheader_filename = "libgnome/libgnome.h")]
+	[CCode (cprefix = "GNOME_URL_ERROR_", has_type_id = false, cheader_filename = "libgnome/libgnome.h")]
 	public enum URLError {
 		PARSE,
 		LAUNCH,
diff --git a/vapi/libgnome-menu.vapi b/vapi/libgnome-menu.vapi
index 8a00fc5..a762535 100644
--- a/vapi/libgnome-menu.vapi
+++ b/vapi/libgnome-menu.vapi
@@ -63,7 +63,7 @@ namespace GMenu {
 	[CCode (cheader_filename = "gnome-menus/gmenu-tree.h")]
 	public class TreeSeparator : GMenu.TreeItem {
 	}
-	[CCode (cprefix = "GMENU_TREE_FLAGS_", has_type_id = "0", cheader_filename = "gnome-menus/gmenu-tree.h")]
+	[CCode (cprefix = "GMENU_TREE_FLAGS_", has_type_id = false, cheader_filename = "gnome-menus/gmenu-tree.h")]
 	public enum TreeFlags {
 		NONE,
 		INCLUDE_EXCLUDED,
@@ -71,7 +71,7 @@ namespace GMenu {
 		INCLUDE_NODISPLAY,
 		MASK
 	}
-	[CCode (cprefix = "GMENU_TREE_ITEM_", has_type_id = "0", cheader_filename = "gnome-menus/gmenu-tree.h")]
+	[CCode (cprefix = "GMENU_TREE_ITEM_", has_type_id = false, cheader_filename = "gnome-menus/gmenu-tree.h")]
 	public enum TreeItemType {
 		INVALID,
 		DIRECTORY,
diff --git a/vapi/libgnomeui-2.0.vapi b/vapi/libgnomeui-2.0.vapi
index ea8c1c5..b524c0a 100644
--- a/vapi/libgnomeui-2.0.vapi
+++ b/vapi/libgnomeui-2.0.vapi
@@ -508,6 +508,8 @@ namespace Gnome {
 	public delegate void StringCallback (string str);
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h", has_target = false)]
 	public delegate void UISignalConnectFunc (Gnome.UIInfo uiinfo, string signal_name, Gnome.UIBuilderData uibdata);
+	[CCode (cname = "LIBGNOMEUI_MODULE", cheader_filename = "libgnomeui/libgnomeui.h")]
+	public static Gnome.ModuleInfo libgnomeui_module;
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string APP_MENUBAR_NAME;
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
diff --git a/vapi/libgsf-1.vapi b/vapi/libgsf-1.vapi
index 8d4e104..9f9ab8a 100644
--- a/vapi/libgsf-1.vapi
+++ b/vapi/libgsf-1.vapi
@@ -472,12 +472,12 @@ namespace Gsf {
 		[NoAccessorMethod]
 		public bool pretty_print { get; set; }
 	}
-	[CCode (cheader_filename = "gsf/gsf.h")]
+	[CCode (cname = "gint64", cheader_filename = "glib.h")]
 	[SimpleType]
-	[IntegerType (rank = 0)]
+	[IntegerType (rank = 10)]
 	public struct off_t : int64 {
 	}
-	[CCode (cprefix = "GSF_CLIP_FORMAT_", has_type_id = "0", cheader_filename = "gsf/gsf-clip-data.h")]
+	[CCode (cprefix = "GSF_CLIP_FORMAT_", has_type_id = false, cheader_filename = "gsf/gsf-clip-data.h")]
 	public enum ClipFormat {
 		WINDOWS_CLIPBOARD,
 		MACINTOSH_CLIPBOARD,
@@ -486,7 +486,7 @@ namespace Gsf {
 		CLIPBOARD_FORMAT_NAME,
 		UNKNOWN
 	}
-	[CCode (cprefix = "GSF_CLIP_FORMAT_WINDOWS_", has_type_id = "0", cheader_filename = "gsf/gsf-clip-data.h")]
+	[CCode (cprefix = "GSF_CLIP_FORMAT_WINDOWS_", has_type_id = false, cheader_filename = "gsf/gsf-clip-data.h")]
 	public enum ClipFormatWindows {
 		ERROR,
 		UNKNOWN,
@@ -500,13 +500,13 @@ namespace Gsf {
 		AUTO,
 		ALWAYS
 	}
-	[CCode (cprefix = "GSF_XML_", has_type_id = "0", cheader_filename = "gsf/gsf-libxml.h")]
+	[CCode (cprefix = "GSF_XML_", has_type_id = false, cheader_filename = "gsf/gsf-libxml.h")]
 	public enum XMLContent {
 		NO_CONTENT,
 		CONTENT,
 		SHARED_CONTENT
 	}
-	[CCode (cprefix = "GSF_ZIP_", has_type_id = "0", cheader_filename = "gsf/gsf-outfile-zip.h")]
+	[CCode (cprefix = "GSF_ZIP_", has_type_id = false, cheader_filename = "gsf/gsf-outfile-zip.h")]
 	public enum ZipCompressionMethod {
 		STORED,
 		SHRUNK,
diff --git a/vapi/libnotify.vapi b/vapi/libnotify.vapi
index d5605ec..9d5aade 100644
--- a/vapi/libnotify.vapi
+++ b/vapi/libnotify.vapi
@@ -38,7 +38,7 @@ namespace Notify {
 		public string summary { owned get; set construct; }
 		public virtual signal void closed ();
 	}
-	[CCode (cprefix = "NOTIFY_URGENCY_", has_type_id = "0", cheader_filename = "libnotify/notify.h")]
+	[CCode (cprefix = "NOTIFY_URGENCY_", has_type_id = false, cheader_filename = "libnotify/notify.h")]
 	public enum Urgency {
 		LOW,
 		NORMAL,
diff --git a/vapi/liboobs-1.vapi b/vapi/liboobs-1.vapi
index 5ee0988..4da6cb0 100644
--- a/vapi/liboobs-1.vapi
+++ b/vapi/liboobs-1.vapi
@@ -410,12 +410,12 @@ namespace Oobs {
 		[NoAccessorMethod]
 		public bool use_md5 { get; }
 	}
-	[CCode (cprefix = "OOBS_DIAL_TYPE_", has_type_id = "0", cheader_filename = "oobs/oobs.h")]
+	[CCode (cprefix = "OOBS_DIAL_TYPE_", has_type_id = false, cheader_filename = "oobs/oobs.h")]
 	public enum DialType {
 		TONES,
 		PULSES
 	}
-	[CCode (cprefix = "OOBS_IFACE_TYPE_", has_type_id = "0", cheader_filename = "oobs/oobs.h")]
+	[CCode (cprefix = "OOBS_IFACE_TYPE_", has_type_id = false, cheader_filename = "oobs/oobs.h")]
 	public enum IfaceType {
 		ETHERNET,
 		WIRELESS,
@@ -423,14 +423,14 @@ namespace Oobs {
 		PLIP,
 		PPP
 	}
-	[CCode (cprefix = "OOBS_MODEM_VOLUME_", has_type_id = "0", cheader_filename = "oobs/oobs.h")]
+	[CCode (cprefix = "OOBS_MODEM_VOLUME_", has_type_id = false, cheader_filename = "oobs/oobs.h")]
 	public enum ModemVolume {
 		SILENT,
 		LOW,
 		MEDIUM,
 		LOUD
 	}
-	[CCode (cprefix = "OOBS_RESULT_", has_type_id = "0", cheader_filename = "oobs/oobs.h")]
+	[CCode (cprefix = "OOBS_RESULT_", has_type_id = false, cheader_filename = "oobs/oobs.h")]
 	public enum Result {
 		OK,
 		ACCESS_DENIED,
@@ -438,20 +438,20 @@ namespace Oobs {
 		MALFORMED_DATA,
 		ERROR
 	}
-	[CCode (cprefix = "OOBS_RUNLEVEL_", has_type_id = "0", cheader_filename = "oobs/oobs.h")]
+	[CCode (cprefix = "OOBS_RUNLEVEL_", has_type_id = false, cheader_filename = "oobs/oobs.h")]
 	public enum RunlevelRole {
 		HALT,
 		REBOOT,
 		MONOUSER,
 		MULTIUSER
 	}
-	[CCode (cprefix = "OOBS_SERVICE_", has_type_id = "0", cheader_filename = "oobs/oobs.h")]
+	[CCode (cprefix = "OOBS_SERVICE_", has_type_id = false, cheader_filename = "oobs/oobs.h")]
 	public enum ServiceStatus {
 		START,
 		STOP,
 		IGNORE
 	}
-	[CCode (cprefix = "OOBS_SHARE_SMB_", has_type_id = "0", cheader_filename = "oobs/oobs.h")]
+	[CCode (cprefix = "OOBS_SHARE_SMB_", has_type_id = false, cheader_filename = "oobs/oobs.h")]
 	[Flags]
 	public enum ShareSMBFlags {
 		ENABLED,
diff --git a/vapi/libsoup-2.2.vapi b/vapi/libsoup-2.2.vapi
index 7856d13..8e9b0a1 100644
--- a/vapi/libsoup-2.2.vapi
+++ b/vapi/libsoup-2.2.vapi
@@ -386,34 +386,34 @@ namespace Soup {
 		public string body;
 		public uint length;
 	}
-	[CCode (cprefix = "SOUP_ADDRESS_FAMILY_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	[CCode (cprefix = "SOUP_ADDRESS_FAMILY_", has_type_id = false, cheader_filename = "libsoup/soup.h")]
 	public enum AddressFamily {
 		IPV4,
 		IPV6
 	}
-	[CCode (cprefix = "SOUP_AUTH_TYPE_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	[CCode (cprefix = "SOUP_AUTH_TYPE_", has_type_id = false, cheader_filename = "libsoup/soup.h")]
 	public enum AuthType {
 		BASIC,
 		DIGEST
 	}
-	[CCode (cprefix = "SOUP_ALGORITHM_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	[CCode (cprefix = "SOUP_ALGORITHM_", has_type_id = false, cheader_filename = "libsoup/soup.h")]
 	public enum DigestAlgorithm {
 		MD5,
 		MD5_SESS
 	}
-	[CCode (cprefix = "SOUP_HANDLER_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	[CCode (cprefix = "SOUP_HANDLER_", has_type_id = false, cheader_filename = "libsoup/soup.h")]
 	public enum HandlerPhase {
 		POST_REQUEST,
 		PRE_BODY,
 		BODY_CHUNK,
 		POST_BODY
 	}
-	[CCode (cprefix = "SOUP_HTTP_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	[CCode (cprefix = "SOUP_HTTP_", has_type_id = false, cheader_filename = "libsoup/soup.h")]
 	public enum HttpVersion {
 		@1_0,
 		@1_1
 	}
-	[CCode (cprefix = "SOUP_STATUS_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	[CCode (cprefix = "SOUP_STATUS_", has_type_id = false, cheader_filename = "libsoup/soup.h")]
 	public enum KnownStatusCode {
 		NONE,
 		CANCELLED,
@@ -477,13 +477,13 @@ namespace Soup {
 		INSUFFICIENT_STORAGE,
 		NOT_EXTENDED
 	}
-	[CCode (cprefix = "SOUP_MESSAGE_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	[CCode (cprefix = "SOUP_MESSAGE_", has_type_id = false, cheader_filename = "libsoup/soup.h")]
 	public enum MessageFlags {
 		NO_REDIRECT,
 		OVERWRITE_CHUNKS,
 		EXPECT_CONTINUE
 	}
-	[CCode (cprefix = "SOUP_MESSAGE_STATUS_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	[CCode (cprefix = "SOUP_MESSAGE_STATUS_", has_type_id = false, cheader_filename = "libsoup/soup.h")]
 	public enum MessageStatus {
 		IDLE,
 		QUEUED,
@@ -491,7 +491,7 @@ namespace Soup {
 		RUNNING,
 		FINISHED
 	}
-	[CCode (cprefix = "SOUP_METHOD_ID_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	[CCode (cprefix = "SOUP_METHOD_ID_", has_type_id = false, cheader_filename = "libsoup/soup.h")]
 	public enum MethodId {
 		UNKNOWN,
 		POST,
@@ -511,20 +511,20 @@ namespace Soup {
 		LOCK,
 		UNLOCK
 	}
-	[CCode (cprefix = "SOUP_BUFFER_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	[CCode (cprefix = "SOUP_BUFFER_", has_type_id = false, cheader_filename = "libsoup/soup.h")]
 	public enum Ownership {
 		SYSTEM_OWNED,
 		USER_OWNED,
 		STATIC
 	}
-	[CCode (cprefix = "SOUP_SOCKET_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	[CCode (cprefix = "SOUP_SOCKET_", has_type_id = false, cheader_filename = "libsoup/soup.h")]
 	public enum SocketIOStatus {
 		OK,
 		WOULD_BLOCK,
 		EOF,
 		ERROR
 	}
-	[CCode (cprefix = "SOUP_STATUS_CLASS_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	[CCode (cprefix = "SOUP_STATUS_CLASS_", has_type_id = false, cheader_filename = "libsoup/soup.h")]
 	public enum StatusClass {
 		TRANSPORT_ERROR,
 		INFORMATIONAL,
@@ -533,7 +533,7 @@ namespace Soup {
 		CLIENT_ERROR,
 		SERVER_ERROR
 	}
-	[CCode (cprefix = "SOUP_TRANSFER_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	[CCode (cprefix = "SOUP_TRANSFER_", has_type_id = false, cheader_filename = "libsoup/soup.h")]
 	public enum TransferEncoding {
 		UNKNOWN,
 		CHUNKED,
@@ -542,7 +542,7 @@ namespace Soup {
 		NONE,
 		EOF
 	}
-	[CCode (cprefix = "SOUP_XMLRPC_VALUE_TYPE_", has_type_id = "0", cheader_filename = "libsoup/soup.h")]
+	[CCode (cprefix = "SOUP_XMLRPC_VALUE_TYPE_", has_type_id = false, cheader_filename = "libsoup/soup.h")]
 	public enum XmlrpcValueType {
 		BAD,
 		INT,
diff --git a/vapi/libwnck-1.0.vapi b/vapi/libwnck-1.0.vapi
index ada687a..42fc377 100644
--- a/vapi/libwnck-1.0.vapi
+++ b/vapi/libwnck-1.0.vapi
@@ -325,30 +325,30 @@ namespace Wnck {
 		public int grid_area;
 		public int rows;
 	}
-	[CCode (cprefix = "WNCK_CLIENT_TYPE_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
+	[CCode (cprefix = "WNCK_CLIENT_TYPE_", has_type_id = false, cheader_filename = "libwnck/libwnck.h")]
 	public enum ClientType {
 		APPLICATION,
 		PAGER
 	}
-	[CCode (cprefix = "WNCK_MOTION_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
+	[CCode (cprefix = "WNCK_MOTION_", has_type_id = false, cheader_filename = "libwnck/libwnck.h")]
 	public enum MotionDirection {
 		UP,
 		DOWN,
 		LEFT,
 		RIGHT
 	}
-	[CCode (cprefix = "WNCK_PAGER_DISPLAY_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
+	[CCode (cprefix = "WNCK_PAGER_DISPLAY_", has_type_id = false, cheader_filename = "libwnck/libwnck.h")]
 	public enum PagerDisplayMode {
 		NAME,
 		CONTENT
 	}
-	[CCode (cprefix = "WNCK_TASKLIST_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
+	[CCode (cprefix = "WNCK_TASKLIST_", has_type_id = false, cheader_filename = "libwnck/libwnck.h")]
 	public enum TasklistGroupingType {
 		NEVER_GROUP,
 		AUTO_GROUP,
 		ALWAYS_GROUP
 	}
-	[CCode (cprefix = "WNCK_WINDOW_ACTION_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
+	[CCode (cprefix = "WNCK_WINDOW_ACTION_", has_type_id = false, cheader_filename = "libwnck/libwnck.h")]
 	[Flags]
 	public enum WindowActions {
 		MOVE,
@@ -371,7 +371,7 @@ namespace Wnck {
 		ABOVE,
 		BELOW
 	}
-	[CCode (cprefix = "WNCK_WINDOW_GRAVITY_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
+	[CCode (cprefix = "WNCK_WINDOW_GRAVITY_", has_type_id = false, cheader_filename = "libwnck/libwnck.h")]
 	public enum WindowGravity {
 		CURRENT,
 		NORTHWEST,
@@ -385,7 +385,7 @@ namespace Wnck {
 		SOUTHEAST,
 		STATIC
 	}
-	[CCode (cprefix = "WNCK_WINDOW_CHANGE_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
+	[CCode (cprefix = "WNCK_WINDOW_CHANGE_", has_type_id = false, cheader_filename = "libwnck/libwnck.h")]
 	[Flags]
 	public enum WindowMoveResizeMask {
 		X,
@@ -393,7 +393,7 @@ namespace Wnck {
 		WIDTH,
 		HEIGHT
 	}
-	[CCode (cprefix = "WNCK_WINDOW_STATE_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
+	[CCode (cprefix = "WNCK_WINDOW_STATE_", has_type_id = false, cheader_filename = "libwnck/libwnck.h")]
 	[Flags]
 	public enum WindowState {
 		MINIMIZED,
@@ -410,7 +410,7 @@ namespace Wnck {
 		ABOVE,
 		BELOW
 	}
-	[CCode (cprefix = "WNCK_WINDOW_", has_type_id = "0", cheader_filename = "libwnck/libwnck.h")]
+	[CCode (cprefix = "WNCK_WINDOW_", has_type_id = false, cheader_filename = "libwnck/libwnck.h")]
 	public enum WindowType {
 		NORMAL,
 		DESKTOP,
diff --git a/vapi/loudmouth-1.0.vapi b/vapi/loudmouth-1.0.vapi
index 99de9c8..8b32640 100644
--- a/vapi/loudmouth-1.0.vapi
+++ b/vapi/loudmouth-1.0.vapi
@@ -7,23 +7,23 @@ namespace Lm {
 	public class Connection {
 		public const int DEFAULT_PORT;
 		public const int DEFAULT_PORT_SSL;
+		[CCode (has_construct_function = false)]
+		public Connection (string server);
 		public bool authenticate (string username, string password, string resource, Lm.ResultFunction function, GLib.DestroyNotify? notify) throws GLib.Error;
 		public bool authenticate_and_block (string username, string password, string resource) throws GLib.Error;
 		public void cancel_open ();
 		public bool close () throws GLib.Error;
-		public weak string get_full_jid ();
-		public weak string get_jid ();
+		public unowned string get_full_jid ();
+		public unowned string get_jid ();
 		public uint get_keep_alive_rate ();
 		public string get_local_host ();
 		public uint get_port ();
-		public weak Lm.Proxy get_proxy ();
-		public weak string get_server ();
-		public weak Lm.SSL get_ssl ();
+		public unowned Lm.Proxy get_proxy ();
+		public unowned string get_server ();
+		public unowned Lm.SSL get_ssl ();
 		public Lm.ConnectionState get_state ();
 		public bool is_authenticated ();
 		public bool is_open ();
-		[CCode (has_construct_function = false)]
-		public Connection (string server);
 		public bool open (Lm.ResultFunction function, GLib.DestroyNotify? notify) throws GLib.Error;
 		public bool open_and_block () throws GLib.Error;
 		public void register_message_handler (Lm.MessageHandler handler, Lm.MessageType type, Lm.HandlerPriority priority);
@@ -46,21 +46,21 @@ namespace Lm {
 	[CCode (ref_function = "lm_message_ref", unref_function = "lm_message_unref", cheader_filename = "loudmouth/loudmouth.h")]
 	public class Message {
 		public Lm.MessageNode node;
-		public weak Lm.MessageNode get_node ();
-		public Lm.MessageSubType get_sub_type ();
-		public Lm.MessageType get_type ();
 		[CCode (has_construct_function = false)]
 		public Message (string? to, Lm.MessageType type);
+		public unowned Lm.MessageNode get_node ();
+		public Lm.MessageSubType get_sub_type ();
+		public Lm.MessageType get_type ();
 		[CCode (has_construct_function = false)]
 		public Message.with_sub_type (string? to, Lm.MessageType type, Lm.MessageSubType sub_type);
 	}
 	[Compact]
 	[CCode (ref_function = "lm_message_handler_ref", unref_function = "lm_message_handler_unref", cheader_filename = "loudmouth/loudmouth.h")]
 	public class MessageHandler {
-		public void invalidate ();
-		public bool is_valid ();
 		[CCode (has_construct_function = false)]
 		public MessageHandler (Lm.HandleMessageFunction function, GLib.DestroyNotify? notify);
+		public void invalidate ();
+		public bool is_valid ();
 	}
 	[Compact]
 	[CCode (ref_function = "lm_message_node_ref", unref_function = "lm_message_node_unref", cheader_filename = "loudmouth/loudmouth.h")]
@@ -72,12 +72,12 @@ namespace Lm {
 		public weak Lm.MessageNode prev;
 		public bool raw_mode;
 		public string value;
-		public weak Lm.MessageNode add_child (string name, string? value);
-		public weak Lm.MessageNode? find_child (string child_name);
-		public weak string get_attribute (string name);
-		public weak Lm.MessageNode? get_child (string child_name);
+		public unowned Lm.MessageNode add_child (string name, string? value);
+		public unowned Lm.MessageNode? find_child (string child_name);
+		public unowned string get_attribute (string name);
+		public unowned Lm.MessageNode? get_child (string child_name);
 		public bool get_raw_mode ();
-		public weak string get_value ();
+		public unowned string get_value ();
 		public void set_attribute (string name, string value);
 		public void set_attributes (string name, ...);
 		public void set_raw_mode (bool raw_mode);
@@ -87,12 +87,12 @@ namespace Lm {
 	[Compact]
 	[CCode (ref_function = "lm_proxy_ref", unref_function = "lm_proxy_unref", cheader_filename = "loudmouth/loudmouth.h")]
 	public class Proxy {
-		public weak string get_password ();
-		public uint get_port ();
-		public weak string get_server ();
-		public weak string get_username ();
 		[CCode (has_construct_function = false)]
 		public Proxy (Lm.ProxyType type);
+		public unowned string get_password ();
+		public uint get_port ();
+		public unowned string get_server ();
+		public unowned string get_username ();
 		public void set_password (string password);
 		public void set_port (uint port);
 		public void set_server (string server);
@@ -104,21 +104,21 @@ namespace Lm {
 	[Compact]
 	[CCode (ref_function = "lm_ssl_ref", unref_function = "lm_ssl_unref", cheader_filename = "loudmouth/loudmouth.h")]
 	public class SSL {
-		public weak string get_fingerprint ();
+		[CCode (has_construct_function = false)]
+		public SSL (string expected_fingerprint, Lm.SSLFunction ssl_function, GLib.DestroyNotify? notify);
+		public unowned string get_fingerprint ();
 		public bool get_require_starttls ();
 		public bool get_use_starttls ();
 		public static bool is_supported ();
-		[CCode (has_construct_function = false)]
-		public SSL (string expected_fingerprint, Lm.SSLFunction ssl_function, GLib.DestroyNotify? notify);
 		public void use_starttls (bool use_starttls, bool require);
 	}
-	[CCode (cprefix = "LM_CERT_", has_type_id = "0", cheader_filename = "loudmouth/loudmouth.h")]
+	[CCode (cprefix = "LM_CERT_", has_type_id = false, cheader_filename = "loudmouth/loudmouth.h")]
 	public enum CertificateStatus {
 		INVALID,
 		ISSUER_NOT_FOUND,
 		REVOKED
 	}
-	[CCode (cprefix = "LM_CONNECTION_STATE_", has_type_id = "0", cheader_filename = "loudmouth/loudmouth.h")]
+	[CCode (cprefix = "LM_CONNECTION_STATE_", has_type_id = false, cheader_filename = "loudmouth/loudmouth.h")]
 	public enum ConnectionState {
 		CLOSED,
 		OPENING,
@@ -126,7 +126,7 @@ namespace Lm {
 		AUTHENTICATING,
 		AUTHENTICATED
 	}
-	[CCode (cprefix = "LM_DISCONNECT_REASON_", has_type_id = "0", cheader_filename = "loudmouth/loudmouth.h")]
+	[CCode (cprefix = "LM_DISCONNECT_REASON_", has_type_id = false, cheader_filename = "loudmouth/loudmouth.h")]
 	public enum DisconnectReason {
 		OK,
 		PING_TIME_OUT,
@@ -136,25 +136,25 @@ namespace Lm {
 		INVALID_XML,
 		UNKNOWN
 	}
-	[CCode (cprefix = "LM_ERROR_", has_type_id = "0", cheader_filename = "loudmouth/loudmouth.h")]
+	[CCode (cprefix = "LM_ERROR_", has_type_id = false, cheader_filename = "loudmouth/loudmouth.h")]
 	public enum Error {
 		CONNECTION_NOT_OPEN,
 		CONNECTION_OPEN,
 		AUTH_FAILED,
 		CONNECTION_FAILED
 	}
-	[CCode (cprefix = "LM_HANDLER_PRIORITY_", has_type_id = "0", cheader_filename = "loudmouth/loudmouth.h")]
+	[CCode (cprefix = "LM_HANDLER_PRIORITY_", has_type_id = false, cheader_filename = "loudmouth/loudmouth.h")]
 	public enum HandlerPriority {
 		LAST,
 		NORMAL,
 		FIRST
 	}
-	[CCode (cprefix = "LM_HANDLER_RESULT_", has_type_id = "0", cheader_filename = "loudmouth/loudmouth.h")]
+	[CCode (cprefix = "LM_HANDLER_RESULT_", has_type_id = false, cheader_filename = "loudmouth/loudmouth.h")]
 	public enum HandlerResult {
 		REMOVE_MESSAGE,
 		ALLOW_MORE_HANDLERS
 	}
-	[CCode (cprefix = "LM_MESSAGE_SUB_TYPE_", has_type_id = "0", cheader_filename = "loudmouth/loudmouth.h")]
+	[CCode (cprefix = "LM_MESSAGE_SUB_TYPE_", has_type_id = false, cheader_filename = "loudmouth/loudmouth.h")]
 	public enum MessageSubType {
 		NOT_SET,
 		AVAILABLE,
@@ -173,7 +173,7 @@ namespace Lm {
 		RESULT,
 		ERROR
 	}
-	[CCode (cprefix = "LM_MESSAGE_TYPE_", has_type_id = "0", cheader_filename = "loudmouth/loudmouth.h")]
+	[CCode (cprefix = "LM_MESSAGE_TYPE_", has_type_id = false, cheader_filename = "loudmouth/loudmouth.h")]
 	public enum MessageType {
 		MESSAGE,
 		PRESENCE,
@@ -190,17 +190,17 @@ namespace Lm {
 		STARTTLS,
 		UNKNOWN
 	}
-	[CCode (cprefix = "LM_PROXY_TYPE_", has_type_id = "0", cheader_filename = "loudmouth/loudmouth.h")]
+	[CCode (cprefix = "LM_PROXY_TYPE_", has_type_id = false, cheader_filename = "loudmouth/loudmouth.h")]
 	public enum ProxyType {
 		NONE,
 		HTTP
 	}
-	[CCode (cprefix = "LM_SSL_RESPONSE_", has_type_id = "0", cheader_filename = "loudmouth/loudmouth.h")]
+	[CCode (cprefix = "LM_SSL_RESPONSE_", has_type_id = false, cheader_filename = "loudmouth/loudmouth.h")]
 	public enum SSLResponse {
 		CONTINUE,
 		STOP
 	}
-	[CCode (cprefix = "LM_SSL_STATUS_", has_type_id = "0", cheader_filename = "loudmouth/loudmouth.h")]
+	[CCode (cprefix = "LM_SSL_STATUS_", has_type_id = false, cheader_filename = "loudmouth/loudmouth.h")]
 	public enum SSLStatus {
 		NO_CERT_FOUND,
 		UNTRUSTED_CERT,
diff --git a/vapi/poppler-glib.vapi b/vapi/poppler-glib.vapi
index 2922d27..83155bc 100644
--- a/vapi/poppler-glib.vapi
+++ b/vapi/poppler-glib.vapi
@@ -279,7 +279,7 @@ namespace Poppler {
 		public double x2;
 		public double y2;
 	}
-	[CCode (cprefix = "POPPLER_ACTION_", has_type_id = "0", cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_ACTION_", has_type_id = false, cheader_filename = "poppler.h")]
 	public enum ActionType {
 		UNKNOWN,
 		GOTO_DEST,
@@ -289,13 +289,13 @@ namespace Poppler {
 		NAMED,
 		MOVIE
 	}
-	[CCode (cprefix = "POPPLER_BACKEND_", has_type_id = "0", cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_BACKEND_", has_type_id = false, cheader_filename = "poppler.h")]
 	public enum Backend {
 		UNKNOWN,
 		SPLASH,
 		CAIRO
 	}
-	[CCode (cprefix = "POPPLER_DEST_", has_type_id = "0", cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_DEST_", has_type_id = false, cheader_filename = "poppler.h")]
 	public enum DestType {
 		UNKNOWN,
 		XYZ,
@@ -308,12 +308,12 @@ namespace Poppler {
 		FITBV,
 		NAMED
 	}
-	[CCode (cprefix = "POPPLER_ERROR_", has_type_id = "0", cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_ERROR_", has_type_id = false, cheader_filename = "poppler.h")]
 	public enum Error {
 		INVALID,
 		ENCRYPTED
 	}
-	[CCode (cprefix = "POPPLER_FONT_TYPE_", has_type_id = "0", cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_FONT_TYPE_", has_type_id = false, cheader_filename = "poppler.h")]
 	public enum FontType {
 		UNKNOWN,
 		TYPE1,
@@ -328,18 +328,18 @@ namespace Poppler {
 		CID_TYPE2,
 		CID_TYPE2OT
 	}
-	[CCode (cprefix = "POPPLER_FORM_BUTTON_", has_type_id = "0", cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_FORM_BUTTON_", has_type_id = false, cheader_filename = "poppler.h")]
 	public enum FormButtonType {
 		PUSH,
 		CHECK,
 		RADIO
 	}
-	[CCode (cprefix = "POPPLER_FORM_CHOICE_", has_type_id = "0", cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_FORM_CHOICE_", has_type_id = false, cheader_filename = "poppler.h")]
 	public enum FormChoiceType {
 		COMBO,
 		LIST
 	}
-	[CCode (cprefix = "POPPLER_FORM_FIELD_", has_type_id = "0", cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_FORM_FIELD_", has_type_id = false, cheader_filename = "poppler.h")]
 	public enum FormFieldType {
 		UNKNOWN,
 		BUTTON,
@@ -347,20 +347,20 @@ namespace Poppler {
 		CHOICE,
 		SIGNATURE
 	}
-	[CCode (cprefix = "POPPLER_FORM_TEXT_", has_type_id = "0", cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_FORM_TEXT_", has_type_id = false, cheader_filename = "poppler.h")]
 	public enum FormTextType {
 		NORMAL,
 		MULTILINE,
 		FILE_SELECT
 	}
-	[CCode (cprefix = "POPPLER_ORIENTATION_", has_type_id = "0", cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_ORIENTATION_", has_type_id = false, cheader_filename = "poppler.h")]
 	public enum Orientation {
 		PORTRAIT,
 		LANDSCAPE,
 		UPSIDEDOWN,
 		SEASCAPE
 	}
-	[CCode (cprefix = "POPPLER_PAGE_LAYOUT_", has_type_id = "0", cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_PAGE_LAYOUT_", has_type_id = false, cheader_filename = "poppler.h")]
 	public enum PageLayout {
 		UNSET,
 		SINGLE_PAGE,
@@ -370,7 +370,7 @@ namespace Poppler {
 		TWO_PAGE_LEFT,
 		TWO_PAGE_RIGHT
 	}
-	[CCode (cprefix = "POPPLER_PAGE_MODE_", has_type_id = "0", cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_PAGE_MODE_", has_type_id = false, cheader_filename = "poppler.h")]
 	public enum PageMode {
 		UNSET,
 		NONE,
@@ -380,17 +380,17 @@ namespace Poppler {
 		USE_OC,
 		USE_ATTACHMENTS
 	}
-	[CCode (cprefix = "POPPLER_PAGE_TRANSITION_", has_type_id = "0", cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_PAGE_TRANSITION_", has_type_id = false, cheader_filename = "poppler.h")]
 	public enum PageTransitionAlignment {
 		HORIZONTAL,
 		VERTICAL
 	}
-	[CCode (cprefix = "POPPLER_PAGE_TRANSITION_", has_type_id = "0", cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_PAGE_TRANSITION_", has_type_id = false, cheader_filename = "poppler.h")]
 	public enum PageTransitionDirection {
 		INWARD,
 		OUTWARD
 	}
-	[CCode (cprefix = "POPPLER_PAGE_TRANSITION_", has_type_id = "0", cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_PAGE_TRANSITION_", has_type_id = false, cheader_filename = "poppler.h")]
 	public enum PageTransitionType {
 		REPLACE,
 		SPLIT,
@@ -405,7 +405,7 @@ namespace Poppler {
 		UNCOVER,
 		FADE
 	}
-	[CCode (cprefix = "POPPLER_PERMISSIONS_", has_type_id = "0", cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_PERMISSIONS_", has_type_id = false, cheader_filename = "poppler.h")]
 	[Flags]
 	public enum Permissions {
 		OK_TO_PRINT,
@@ -414,13 +414,13 @@ namespace Poppler {
 		OK_TO_ADD_NOTES,
 		FULL
 	}
-	[CCode (cprefix = "POPPLER_SELECTION_", has_type_id = "0", cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_SELECTION_", has_type_id = false, cheader_filename = "poppler.h")]
 	public enum SelectionStyle {
 		GLYPH,
 		WORD,
 		LINE
 	}
-	[CCode (cprefix = "POPPLER_VIEWER_PREFERENCES_", has_type_id = "0", cheader_filename = "poppler.h")]
+	[CCode (cprefix = "POPPLER_VIEWER_PREFERENCES_", has_type_id = false, cheader_filename = "poppler.h")]
 	[Flags]
 	public enum ViewerPreferences {
 		UNSET,
diff --git a/vapi/purple.vapi b/vapi/purple.vapi
index 4ed5523..a627d45 100644
--- a/vapi/purple.vapi
+++ b/vapi/purple.vapi
@@ -752,13 +752,6 @@ namespace Purple {
 	}
 	[Compact]
 	[CCode (cheader_filename = "purple.h")]
-	public class DBusBinding {
-		public weak GLib.Callback handler;
-		public weak string name;
-		public weak string parameters;
-	}
-	[Compact]
-	[CCode (cheader_filename = "purple.h")]
 	public class DBusType {
 		public weak Purple.DBusType parent;
 	}
@@ -1129,11 +1122,6 @@ namespace Purple {
 		public void set_value (string value);
 	}
 	[Compact]
-	[CCode (cheader_filename = "purple.h")]
-	public class OrigFn {
-		public uint nraddr;
-	}
-	[Compact]
 	[CCode (free_function = "purple_plugin_destroy", cheader_filename = "purple.h")]
 	public class Plugin {
 		public weak GLib.List dependent_plugins;
@@ -2191,15 +2179,15 @@ namespace Purple {
 		[CCode (cname = "xmlnode_to_str")]
 		public static unowned string to_str (Purple.xmlnode node, int len);
 	}
-	[CCode (cprefix = "PURPLE_ACCOUNT_REQUEST_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_ACCOUNT_REQUEST_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum AccountRequestType {
 		AUTHORIZATION
 	}
-	[CCode (cprefix = "PURPLE_BLIST_NODE_FLAG_NO_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_BLIST_NODE_FLAG_NO_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum BlistNodeFlags {
 		SAVE
 	}
-	[CCode (cprefix = "PURPLE_BLIST_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_BLIST_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum BlistNodeType {
 		GROUP_NODE,
 		CONTACT_NODE,
@@ -2207,17 +2195,17 @@ namespace Purple {
 		CHAT_NODE,
 		OTHER_NODE
 	}
-	[CCode (cprefix = "PURPLE_CERTIFICATE_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_CERTIFICATE_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum CertificateVerificationStatus {
 		INVALID,
 		VALID
 	}
-	[CCode (cprefix = "PURPLE_CIPHER_BATCH_MODE_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_CIPHER_BATCH_MODE_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum CipherBatchMode {
 		ECB,
 		CBC
 	}
-	[CCode (cprefix = "PURPLE_CIPHER_CAPS_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_CIPHER_CAPS_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum CipherCaps {
 		SET_OPT,
 		GET_OPT,
@@ -2239,14 +2227,14 @@ namespace Purple {
 		SET_KEY_WITH_LEN,
 		UNKNOWN
 	}
-	[CCode (cprefix = "PURPLE_CMD_FLAG_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_CMD_FLAG_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum CmdFlag {
 		IM,
 		CHAT,
 		PRPL_ONLY,
 		ALLOW_WRONG_ARGS
 	}
-	[CCode (cprefix = "PURPLE_CMD_P_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_CMD_P_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum CmdPriority {
 		VERY_LOW,
 		LOW,
@@ -2257,13 +2245,13 @@ namespace Purple {
 		HIGH,
 		VERY_HIGH
 	}
-	[CCode (cprefix = "PURPLE_CMD_RET_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_CMD_RET_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum CmdRet {
 		OK,
 		FAILED,
 		CONTINUE
 	}
-	[CCode (cprefix = "PURPLE_CMD_STATUS_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_CMD_STATUS_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum CmdStatus {
 		OK,
 		FAILED,
@@ -2272,7 +2260,7 @@ namespace Purple {
 		WRONG_PRPL,
 		WRONG_TYPE
 	}
-	[CCode (cprefix = "PURPLE_CONNECTION_ERROR_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_CONNECTION_ERROR_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum ConnectionError {
 		NETWORK_ERROR,
 		INVALID_USERNAME,
@@ -2292,7 +2280,7 @@ namespace Purple {
 		CERT_OTHER_ERROR,
 		OTHER_ERROR
 	}
-	[CCode (cprefix = "PURPLE_CONNECTION_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_CONNECTION_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum ConnectionFlags {
 		HTML,
 		NO_BGCOLOR,
@@ -2304,13 +2292,13 @@ namespace Purple {
 		NO_IMAGES,
 		ALLOW_CUSTOM_SMILEY
 	}
-	[CCode (cprefix = "PURPLE_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum ConnectionState {
 		DISCONNECTED,
 		CONNECTED,
 		CONNECTING
 	}
-	[CCode (cprefix = "PURPLE_CBFLAGS_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_CBFLAGS_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum ConvChatBuddyFlags {
 		NONE,
 		VOICE,
@@ -2319,7 +2307,7 @@ namespace Purple {
 		FOUNDER,
 		TYPING
 	}
-	[CCode (cprefix = "PURPLE_CONV_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_CONV_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum ConvUpdateType {
 		UPDATE_ADD,
 		UPDATE_REMOVE,
@@ -2336,7 +2324,7 @@ namespace Purple {
 		UPDATE_CHATLEFT,
 		UPDATE_FEATURES
 	}
-	[CCode (cprefix = "PURPLE_CONV_TYPE_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_CONV_TYPE_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum ConversationType {
 		UNKNOWN,
 		IM,
@@ -2344,7 +2332,7 @@ namespace Purple {
 		MISC,
 		ANY
 	}
-	[CCode (cprefix = "PURPLE_DEBUG_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_DEBUG_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum DebugLevel {
 		ALL,
 		MISC,
@@ -2353,7 +2341,7 @@ namespace Purple {
 		ERROR,
 		FATAL
 	}
-	[CCode (cprefix = "PURPLE_DESKTOP_ITEM_TYPE_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_DESKTOP_ITEM_TYPE_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum DesktopItemType {
 		NULL,
 		OTHER,
@@ -2365,27 +2353,27 @@ namespace Purple {
 		SERVICE,
 		SERVICE_TYPE
 	}
-	[CCode (cprefix = "PURPLE_ICON_SCALE_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_ICON_SCALE_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum IconScaleRules {
 		DISPLAY,
 		SEND
 	}
-	[CCode (cprefix = "PURPLE_INPUT_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_INPUT_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum InputCondition {
 		READ,
 		WRITE
 	}
-	[CCode (cprefix = "PURPLE_LOG_READ_NO_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_LOG_READ_NO_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum LogReadFlags {
 		NEWLINE
 	}
-	[CCode (cprefix = "PURPLE_LOG_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_LOG_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum LogType {
 		IM,
 		CHAT,
 		SYSTEM
 	}
-	[CCode (cprefix = "PURPLE_MEDIA_CANDIDATE_TYPE_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_MEDIA_CANDIDATE_TYPE_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum MediaCandidateType {
 		HOST,
 		SRFLX,
@@ -2393,7 +2381,7 @@ namespace Purple {
 		RELAY,
 		MULTICAST
 	}
-	[CCode (cprefix = "PURPLE_MEDIA_CAPS_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_MEDIA_CAPS_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum MediaCaps {
 		NONE,
 		AUDIO,
@@ -2404,13 +2392,13 @@ namespace Purple {
 		MODIFY_SESSION,
 		CHANGE_DIRECTION
 	}
-	[CCode (cprefix = "PURPLE_MEDIA_COMPONENT_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_MEDIA_COMPONENT_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum MediaComponentType {
 		NONE,
 		RTP,
 		RTCP
 	}
-	[CCode (cprefix = "PURPLE_MEDIA_ELEMENT_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_MEDIA_ELEMENT_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum MediaElementType {
 		NONE,
 		AUDIO,
@@ -2428,7 +2416,7 @@ namespace Purple {
 		SRC,
 		SINK
 	}
-	[CCode (cprefix = "PURPLE_MEDIA_INFO_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_MEDIA_INFO_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum MediaInfoType {
 		HANGUP,
 		ACCEPT,
@@ -2440,12 +2428,12 @@ namespace Purple {
 		HOLD,
 		UNHOLD
 	}
-	[CCode (cprefix = "PURPLE_MEDIA_NETWORK_PROTOCOL_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_MEDIA_NETWORK_PROTOCOL_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum MediaNetworkProtocol {
 		UDP,
 		TCP
 	}
-	[CCode (cprefix = "PURPLE_MEDIA_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_MEDIA_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum MediaSessionType {
 		NONE,
 		RECV_AUDIO,
@@ -2455,13 +2443,13 @@ namespace Purple {
 		AUDIO,
 		VIDEO
 	}
-	[CCode (cprefix = "PURPLE_MEDIA_STATE_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_MEDIA_STATE_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum MediaState {
 		NEW,
 		CONNECTED,
 		END
 	}
-	[CCode (cprefix = "PURPLE_MESSAGE_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_MESSAGE_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum MessageFlags {
 		SEND,
 		RECV,
@@ -2479,13 +2467,13 @@ namespace Purple {
 		NO_LINKIFY,
 		INVISIBLE
 	}
-	[CCode (cprefix = "PURPLE_NOTIFY_MSG_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_NOTIFY_MSG_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum NotifyMsgType {
 		ERROR,
 		WARNING,
 		INFO
 	}
-	[CCode (cprefix = "PURPLE_NOTIFY_BUTTON_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_NOTIFY_BUTTON_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum NotifySearchButtonType {
 		LABELED,
 		CONTINUE,
@@ -2495,7 +2483,7 @@ namespace Purple {
 		JOIN,
 		INVITE
 	}
-	[CCode (cprefix = "PURPLE_NOTIFY_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_NOTIFY_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum NotifyType {
 		MESSAGE,
 		EMAIL,
@@ -2505,32 +2493,32 @@ namespace Purple {
 		USERINFO,
 		URI
 	}
-	[CCode (cprefix = "PURPLE_NOTIFY_USER_INFO_ENTRY_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_NOTIFY_USER_INFO_ENTRY_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum NotifyUserInfoEntryType {
 		PAIR,
 		SECTION_BREAK,
 		SECTION_HEADER
 	}
-	[CCode (cprefix = "PURPLE_PLUGIN_PREF_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_PLUGIN_PREF_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum PluginPrefType {
 		NONE,
 		CHOICE,
 		INFO,
 		STRING_FORMAT
 	}
-	[CCode (cprefix = "PURPLE_PLUGIN_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_PLUGIN_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum PluginType {
 		UNKNOWN,
 		STANDARD,
 		LOADER,
 		PROTOCOL
 	}
-	[CCode (cprefix = "PURPLE_PMP_TYPE_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_PMP_TYPE_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum PmpType {
 		UDP,
 		TCP
 	}
-	[CCode (cprefix = "PURPLE_POUNCE_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_POUNCE_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum PounceEvent {
 		NONE,
 		SIGNON,
@@ -2544,12 +2532,12 @@ namespace Purple {
 		TYPING_STOPPED,
 		MESSAGE_RECEIVED
 	}
-	[CCode (cprefix = "PURPLE_POUNCE_OPTION_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_POUNCE_OPTION_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum PounceOption {
 		NONE,
 		AWAY
 	}
-	[CCode (cprefix = "PURPLE_PREF_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_PREF_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum PrefType {
 		NONE,
 		BOOLEAN,
@@ -2559,14 +2547,14 @@ namespace Purple {
 		PATH,
 		PATH_LIST
 	}
-	[CCode (cprefix = "PURPLE_PRESENCE_CONTEXT_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_PRESENCE_CONTEXT_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum PresenceContext {
 		UNSET,
 		ACCOUNT,
 		CONV,
 		BUDDY
 	}
-	[CCode (cprefix = "PURPLE_PRIVACY_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_PRIVACY_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum PrivacyType {
 		ALLOW_ALL,
 		DENY_ALL,
@@ -2574,7 +2562,7 @@ namespace Purple {
 		DENY_USERS,
 		ALLOW_BUDDYLIST
 	}
-	[CCode (cprefix = "OPT_PROTO_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "OPT_PROTO_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum ProtocolOptions {
 		UNIQUE_CHATNAME,
 		CHAT_TOPIC,
@@ -2586,7 +2574,7 @@ namespace Purple {
 		REGISTER_NOSCREENNAME,
 		SLASH_COMMANDS_NATIVE
 	}
-	[CCode (cprefix = "PURPLE_PROXY_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_PROXY_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum ProxyType {
 		USE_GLOBAL,
 		NONE,
@@ -2595,7 +2583,7 @@ namespace Purple {
 		SOCKS5,
 		USE_ENVVAR
 	}
-	[CCode (cprefix = "PURPLE_REQUEST_FIELD_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_REQUEST_FIELD_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum RequestFieldType {
 		NONE,
 		STRING,
@@ -2607,7 +2595,7 @@ namespace Purple {
 		IMAGE,
 		ACCOUNT
 	}
-	[CCode (cprefix = "PURPLE_REQUEST_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_REQUEST_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum RequestType {
 		INPUT,
 		CHOICE,
@@ -2616,18 +2604,18 @@ namespace Purple {
 		FILE,
 		FOLDER
 	}
-	[CCode (cprefix = "PURPLE_ROOMLIST_FIELD_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_ROOMLIST_FIELD_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum RoomlistFieldType {
 		BOOL,
 		INT,
 		STRING
 	}
-	[CCode (cprefix = "PURPLE_ROOMLIST_ROOMTYPE_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_ROOMLIST_ROOMTYPE_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum RoomlistRoomType {
 		CATEGORY,
 		ROOM
 	}
-	[CCode (cprefix = "PURPLE_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum SoundEventID {
 		SOUND_BUDDY_ARRIVE,
 		SOUND_BUDDY_LEAVE,
@@ -2642,13 +2630,13 @@ namespace Purple {
 		SOUND_CHAT_NICK,
 		NUM_SOUNDS
 	}
-	[CCode (cprefix = "PURPLE_SSL_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_SSL_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum SslErrorType {
 		HANDSHAKE_FAILED,
 		CONNECT_FAILED,
 		CERTIFICATE_INVALID
 	}
-	[CCode (cprefix = "PURPLE_STATUS_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_STATUS_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum StatusPrimitive {
 		UNSET,
 		OFFLINE,
@@ -2661,13 +2649,13 @@ namespace Purple {
 		TUNE,
 		NUM_PRIMITIVES
 	}
-	[CCode (cprefix = "PURPLE_STRING_FORMAT_TYPE_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_STRING_FORMAT_TYPE_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum StringFormatType {
 		NONE,
 		MULTILINE,
 		HTML
 	}
-	[CCode (cprefix = "PURPLE_STUN_NAT_TYPE_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_STUN_NAT_TYPE_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum StunNatType {
 		PUBLIC_IP,
 		UNKNOWN_NAT,
@@ -2676,14 +2664,14 @@ namespace Purple {
 		PORT_RESTRICTED_CONE,
 		SYMMETRIC
 	}
-	[CCode (cprefix = "PURPLE_STUN_STATUS_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_STUN_STATUS_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum StunStatus {
 		UNDISCOVERED,
 		UNKNOWN,
 		DISCOVERING,
 		DISCOVERED
 	}
-	[CCode (cprefix = "PURPLE_SUBTYPE_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_SUBTYPE_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum SubType {
 		UNKNOWN,
 		ACCOUNT,
@@ -2706,7 +2694,7 @@ namespace Purple {
 		STORED_IMAGE,
 		CERTIFICATEPOOL
 	}
-	[CCode (cprefix = "PURPLE_TYPE_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_TYPE_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum Type {
 		UNKNOWN,
 		SUBTYPE,
@@ -2727,44 +2715,19 @@ namespace Purple {
 		ENUM,
 		BOXED
 	}
-	[CCode (cprefix = "PURPLE_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum TypingState {
 		NOT_TYPING,
 		TYPING,
 		TYPED
 	}
-	[CCode (cprefix = "VG_USERREQ__", has_type_id = "0", cheader_filename = "purple.h")]
-	public enum Vg_ClientRequest {
-		RUNNING_ON_VALGRIND,
-		DISCARD_TRANSLATIONS,
-		CLIENT_CALL0,
-		CLIENT_CALL1,
-		CLIENT_CALL2,
-		CLIENT_CALL3,
-		COUNT_ERRORS,
-		MALLOCLIKE_BLOCK,
-		FREELIKE_BLOCK,
-		CREATE_MEMPOOL,
-		DESTROY_MEMPOOL,
-		MEMPOOL_ALLOC,
-		MEMPOOL_FREE,
-		MEMPOOL_TRIM,
-		MOVE_MEMPOOL,
-		MEMPOOL_CHANGE,
-		MEMPOOL_EXISTS,
-		PRINTF,
-		PRINTF_BACKTRACE,
-		STACK_REGISTER,
-		STACK_DEREGISTER,
-		STACK_CHANGE
-	}
-	[CCode (cprefix = "XMLNODE_TYPE_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "XMLNODE_TYPE_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum XMLNodeType {
 		TAG,
 		ATTRIB,
 		DATA
 	}
-	[CCode (cprefix = "PURPLE_XFER_STATUS_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_XFER_STATUS_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum XferStatusType {
 		UNKNOWN,
 		NOT_STARTED,
@@ -2774,7 +2737,7 @@ namespace Purple {
 		CANCEL_LOCAL,
 		CANCEL_REMOTE
 	}
-	[CCode (cprefix = "PURPLE_XFER_", has_type_id = "0", cheader_filename = "purple.h")]
+	[CCode (cprefix = "PURPLE_XFER_", has_type_id = false, cheader_filename = "purple.h")]
 	public enum XferType {
 		UNKNOWN,
 		SEND,
@@ -2985,20 +2948,6 @@ namespace Purple {
 	[CCode (cheader_filename = "purple.h")]
 	public const int NO_TZ_OFF;
 	[CCode (cheader_filename = "purple.h")]
-	public const int NVALGRIND;
-	[CCode (cheader_filename = "purple.h")]
-	public const int PLAT_amd64_linux;
-	[CCode (cheader_filename = "purple.h")]
-	public const int PLAT_ppc32_aix5;
-	[CCode (cheader_filename = "purple.h")]
-	public const int PLAT_ppc32_linux;
-	[CCode (cheader_filename = "purple.h")]
-	public const int PLAT_ppc64_aix5;
-	[CCode (cheader_filename = "purple.h")]
-	public const int PLAT_ppc64_linux;
-	[CCode (cheader_filename = "purple.h")]
-	public const int PLAT_x86_linux;
-	[CCode (cheader_filename = "purple.h")]
 	public const int PLUGINS;
 	[CCode (cheader_filename = "purple.h")]
 	public const int PLUGIN_FLAG_INVISIBLE;
@@ -3284,8 +3233,6 @@ namespace Purple {
 	public static void dnsquery_uninit ();
 	[CCode (cheader_filename = "purple.h")]
 	public static bool email_is_valid (string address);
-	[CCode (cname = "empty_to_null", cheader_filename = "purple.h")]
-	public static unowned string empty_to_null (string str);
 	[CCode (cheader_filename = "purple.h")]
 	public static unowned string escape_filename (string str);
 	[CCode (cheader_filename = "purple.h")]
@@ -3568,8 +3515,6 @@ namespace Purple {
 	public static unowned string ntlm_gen_type3 (string username, string passw, string hostname, string domain, uchar nonce, uint32 flags);
 	[CCode (cheader_filename = "purple.h")]
 	public static uchar ntlm_parse_type2 (string type2, uint32 flags);
-	[CCode (cname = "null_to_empty", cheader_filename = "purple.h")]
-	public static unowned string null_to_empty (string s);
 	[CCode (cheader_filename = "purple.h")]
 	public static void plugins_add_search_path (string path);
 	[CCode (cheader_filename = "purple.h")]
diff --git a/vapi/rest.vapi b/vapi/rest.vapi
index 7d81c32..3d84ecb 100644
--- a/vapi/rest.vapi
+++ b/vapi/rest.vapi
@@ -203,8 +203,8 @@ namespace Rest {
 		HTTP_GATEWAY_TIMEOUT,
 		HTTP_HTTP_VERSION_NOT_SUPPORTED,
 	}
-	[CCode (cheader_filename = "rest/oauth-proxy.h", instance_pos = -2)]
+	[CCode (cheader_filename = "rest/oauth-proxy.h")]
 	public delegate void OAuthProxyAuthCallback (Rest.OAuthProxy proxy, GLib.Error? error, GLib.Object? weak_object);
-	[CCode (cheader_filename = "rest/rest-proxy-call.h", instance_pos = -2)]
+	[CCode (cheader_filename = "rest/rest-proxy-call.h")]
 	public delegate void ProxyCallAsyncCallback (Rest.ProxyCall call, GLib.Error? error, GLib.Object? weak_object);
 }
diff --git a/vapi/vte.vapi b/vapi/vte.vapi
index 3100202..8583497 100644
--- a/vapi/vte.vapi
+++ b/vapi/vte.vapi
@@ -161,13 +161,13 @@ namespace Vte {
 		[CCode (type = "AtkObjectFactory*", has_construct_function = false)]
 		public TerminalAccessibleFactory ();
 	}
-	[CCode (cprefix = "VTE_ANTI_ALIAS_", has_type_id = "0", cheader_filename = "vte/vte.h")]
+	[CCode (cprefix = "VTE_ANTI_ALIAS_", has_type_id = false, cheader_filename = "vte/vte.h")]
 	public enum TerminalAntiAlias {
 		USE_DEFAULT,
 		FORCE_ENABLE,
 		FORCE_DISABLE
 	}
-	[CCode (cprefix = "VTE_ERASE_", has_type_id = "0", cheader_filename = "vte/vte.h")]
+	[CCode (cprefix = "VTE_ERASE_", has_type_id = false, cheader_filename = "vte/vte.h")]
 	public enum TerminalEraseBinding {
 		AUTO,
 		ASCII_BACKSPACE,



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