vala r1486 - in trunk: . vala vapi



Author: juergbi
Date: Thu May 29 20:26:37 2008
New Revision: 1486
URL: http://svn.gnome.org/viewvc/vala?rev=1486&view=rev

Log:
2008-05-29  Juerg Billeter  <j bitron ch>

	* vala/valainterfacewriter.vala:

	Output cheader filenames for namespace fields and constants

	* vapi/gdk-2.0.vapi:
	* vapi/gdk-pixbuf-2.0.vapi:
	* vapi/gio-2.0.vapi:
	* vapi/gio-unix-2.0.vapi:
	* vapi/gnet-2.0.vapi:
	* vapi/gnome-desktop-2.0.vapi:
	* vapi/gnome-keyring-1.vapi:
	* vapi/gnome-vfs-2.0.vapi:
	* vapi/goocanvas.vapi:
	* vapi/gstreamer-0.10.vapi:
	* vapi/gstreamer-audio-0.10.vapi:
	* vapi/gstreamer-dataprotocol-0.10.vapi:
	* vapi/gstreamer-net-0.10.vapi:
	* vapi/gstreamer-riff-0.10.vapi:
	* vapi/gstreamer-rtp-0.10.vapi:
	* vapi/gstreamer-rtsp-0.10.vapi:
	* vapi/gstreamer-sdp-0.10.vapi:
	* vapi/gstreamer-tag-0.10.vapi:
	* vapi/gstreamer-video-0.10.vapi:
	* vapi/gtk+-2.0.vapi:
	* vapi/hildon-1.vapi:
	* vapi/json-glib-1.0.vapi:
	* vapi/libglade-2.0.vapi:
	* vapi/libgnome-2.0.vapi:
	* vapi/libgnomeui-2.0.vapi:
	* vapi/libnotify.vapi:
	* vapi/libsoup-2.2.vapi:
	* vapi/libsoup-2.4.vapi:
	* vapi/pango.vapi:
	* vapi/poppler-glib.vapi:

	Regenerated


Modified:
   trunk/ChangeLog
   trunk/vala/valainterfacewriter.vala
   trunk/vapi/gdk-2.0.vapi
   trunk/vapi/gdk-pixbuf-2.0.vapi
   trunk/vapi/gio-2.0.vapi
   trunk/vapi/gio-unix-2.0.vapi
   trunk/vapi/gnet-2.0.vapi
   trunk/vapi/gnome-desktop-2.0.vapi
   trunk/vapi/gnome-keyring-1.vapi
   trunk/vapi/gnome-vfs-2.0.vapi
   trunk/vapi/goocanvas.vapi
   trunk/vapi/gstreamer-0.10.vapi
   trunk/vapi/gstreamer-audio-0.10.vapi
   trunk/vapi/gstreamer-dataprotocol-0.10.vapi
   trunk/vapi/gstreamer-net-0.10.vapi
   trunk/vapi/gstreamer-riff-0.10.vapi
   trunk/vapi/gstreamer-rtp-0.10.vapi
   trunk/vapi/gstreamer-rtsp-0.10.vapi
   trunk/vapi/gstreamer-sdp-0.10.vapi
   trunk/vapi/gstreamer-tag-0.10.vapi
   trunk/vapi/gstreamer-video-0.10.vapi
   trunk/vapi/gtk+-2.0.vapi
   trunk/vapi/hildon-1.vapi
   trunk/vapi/json-glib-1.0.vapi
   trunk/vapi/libglade-2.0.vapi
   trunk/vapi/libgnome-2.0.vapi
   trunk/vapi/libgnomeui-2.0.vapi
   trunk/vapi/libnotify.vapi
   trunk/vapi/libsoup-2.2.vapi
   trunk/vapi/libsoup-2.4.vapi
   trunk/vapi/pango.vapi
   trunk/vapi/poppler-glib.vapi

Modified: trunk/vala/valainterfacewriter.vala
==============================================================================
--- trunk/vala/valainterfacewriter.vala	(original)
+++ trunk/vala/valainterfacewriter.vala	Thu May 29 20:26:37 2008
@@ -453,9 +453,35 @@
 			return;
 		}
 
-		if (c.get_cname () != c.get_default_cname ()) {
+		bool custom_cname = (c.get_cname () != c.get_default_cname ());
+		bool custom_cheaders = (c.parent_symbol is Namespace);
+		if (custom_cname || custom_cheaders) {
 			write_indent ();
-			write_string ("[CCode (cname = \"%s\")]".printf (c.get_cname ()));
+			write_string ("[CCode (");
+
+			if (custom_cname) {
+				write_string ("cname = \"%s\"".printf (c.get_cname ()));
+			}
+
+			if (custom_cheaders) {
+				if (custom_cname) {
+					write_string (", ");
+				}
+
+				bool first = true;
+				string cheaders;
+				foreach (string cheader in c.get_cheader_filenames ()) {
+					if (first) {
+						cheaders = cheader;
+						first = false;
+					} else {
+						cheaders = "%s,%s".printf (cheaders, cheader);
+					}
+				}
+				write_string ("cheader_filename = \"%s\"".printf (cheaders));
+			}
+
+			write_string (")]");
 		}
 
 		write_indent ();
@@ -479,9 +505,35 @@
 			return;
 		}
 
-		if (f.get_cname () != f.get_default_cname ()) {
+		bool custom_cname = (f.get_cname () != f.get_default_cname ());
+		bool custom_cheaders = (f.parent_symbol is Namespace);
+		if (custom_cname || custom_cheaders) {
 			write_indent ();
-			write_string ("[CCode (cname = \"%s\")]".printf (f.get_cname ()));
+			write_string ("[CCode (");
+
+			if (custom_cname) {
+				write_string ("cname = \"%s\"".printf (f.get_cname ()));
+			}
+
+			if (custom_cheaders) {
+				if (custom_cname) {
+					write_string (", ");
+				}
+
+				bool first = true;
+				string cheaders;
+				foreach (string cheader in f.get_cheader_filenames ()) {
+					if (first) {
+						cheaders = cheader;
+						first = false;
+					} else {
+						cheaders = "%s,%s".printf (cheaders, cheader);
+					}
+				}
+				write_string ("cheader_filename = \"%s\"".printf (cheaders));
+			}
+
+			write_string (")]");
 		}
 
 		if (f.no_array_length && f.field_type is ArrayType) {

Modified: trunk/vapi/gdk-2.0.vapi
==============================================================================
--- trunk/vapi/gdk-2.0.vapi	(original)
+++ trunk/vapi/gdk-2.0.vapi	Thu May 29 20:26:37 2008
@@ -1484,12 +1484,19 @@
 	public static delegate void InputFunction (void* data, int source, Gdk.InputCondition condition);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public delegate void SpanFunc (Gdk.Span span);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public const Gdk.Atom SELECTION_PRIMARY;
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public const Gdk.Atom SELECTION_SECONDARY;
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public const Gdk.Atom SELECTION_CLIPBOARD;
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public const int CURRENT_TIME;
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public const int MAX_TIMECOORD_AXES;
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public const int PARENT_RELATIVE;
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public const int PRIORITY_REDRAW;
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void add_client_message_filter (Gdk.Atom message_type, Gdk.FilterFunc func, void* data);

Modified: trunk/vapi/gdk-pixbuf-2.0.vapi
==============================================================================
--- trunk/vapi/gdk-pixbuf-2.0.vapi	(original)
+++ trunk/vapi/gdk-pixbuf-2.0.vapi	Thu May 29 20:26:37 2008
@@ -191,11 +191,18 @@
 	public delegate void PixbufDestroyNotify (uchar[] pixels);
 	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public delegate bool PixbufSaveFunc (string buf, ulong count, GLib.Error error);
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public const int PIXBUF_FEATURES_H;
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public const int PIXBUF_MAGIC_NUMBER;
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public const int PIXBUF_MAJOR;
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public const int PIXBUF_MICRO;
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public const int PIXBUF_MINOR;
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public const string PIXBUF_VERSION;
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public const int PIXDATA_HEADER_LENGTH;
 }

Modified: trunk/vapi/gio-2.0.vapi
==============================================================================
--- trunk/vapi/gio-2.0.vapi	(original)
+++ trunk/vapi/gio-2.0.vapi	Thu May 29 20:26:37 2008
@@ -849,77 +849,149 @@
 	public static delegate void* ReallocFunc (void* data, ulong size);
 	[CCode (cheader_filename = "gio/gio.h")]
 	public static delegate void SimpleAsyncThreadFunc (GLib.SimpleAsyncResult res, GLib.Object object, GLib.Cancellable cancellable);
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_ACCESS_CAN_DELETE;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_ACCESS_CAN_READ;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_ACCESS_CAN_RENAME;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_ACCESS_CAN_TRASH;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_ACCESS_CAN_WRITE;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_DOS_IS_ARCHIVE;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_DOS_IS_SYSTEM;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_ETAG_VALUE;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_FILESYSTEM_FREE;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_FILESYSTEM_READONLY;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_FILESYSTEM_SIZE;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_FILESYSTEM_TYPE;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_FILESYSTEM_USE_PREVIEW;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_GVFS_BACKEND;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_ID_FILE;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_ID_FILESYSTEM;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_MOUNTABLE_HAL_UDI;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_OWNER_GROUP;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_OWNER_USER;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_OWNER_USER_REAL;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_SELINUX_CONTEXT;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_STANDARD_COPY_NAME;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_STANDARD_DESCRIPTION;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_STANDARD_EDIT_NAME;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_STANDARD_ICON;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_STANDARD_IS_BACKUP;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_STANDARD_IS_HIDDEN;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_STANDARD_IS_SYMLINK;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_STANDARD_IS_VIRTUAL;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_STANDARD_NAME;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_STANDARD_SIZE;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_STANDARD_SORT_ORDER;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_STANDARD_TARGET_URI;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_STANDARD_TYPE;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_THUMBNAILING_FAILED;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_THUMBNAIL_PATH;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_TIME_ACCESS;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_TIME_ACCESS_USEC;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_TIME_CHANGED;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_TIME_CHANGED_USEC;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_TIME_CREATED;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_TIME_CREATED_USEC;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_TIME_MODIFIED;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_TIME_MODIFIED_USEC;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_TRASH_ITEM_COUNT;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_UNIX_BLOCKS;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_UNIX_BLOCK_SIZE;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_UNIX_DEVICE;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_UNIX_GID;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_UNIX_INODE;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_UNIX_MODE;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_UNIX_NLINK;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_UNIX_RDEV;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_UNIX_UID;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string NATIVE_VOLUME_MONITOR_EXTENSION_POINT_NAME;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string VFS_EXTENSION_POINT_NAME;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string VOLUME_IDENTIFIER_KIND_HAL_UDI;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string VOLUME_IDENTIFIER_KIND_LABEL;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string VOLUME_IDENTIFIER_KIND_NFS_MOUNT;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string VOLUME_IDENTIFIER_KIND_UNIX_DEVICE;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string VOLUME_IDENTIFIER_KIND_UUID;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string VOLUME_MONITOR_EXTENSION_POINT_NAME;
 	[CCode (cname = "g_content_type_can_be_executable", cheader_filename = "gio/gio.h")]
 	public static bool g_content_type_can_be_executable (string type);

Modified: trunk/vapi/gio-unix-2.0.vapi
==============================================================================
--- trunk/vapi/gio-unix-2.0.vapi	(original)
+++ trunk/vapi/gio-unix-2.0.vapi	Thu May 29 20:26:37 2008
@@ -49,6 +49,7 @@
 	public interface DesktopAppInfoLookup : GLib.Object {
 		public abstract weak GLib.AppInfo get_default_for_uri_scheme (string uri_scheme);
 	}
+	[CCode (cheader_filename = "gio/gunixmounts.h")]
 	public const string DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME;
 	[CCode (cname = "g_unix_is_mount_path_system_internal", cheader_filename = "gio/gunixmounts.h")]
 	public static bool g_unix_is_mount_path_system_internal (string mount_path);

Modified: trunk/vapi/gnet-2.0.vapi
==============================================================================
--- trunk/vapi/gnet-2.0.vapi	(original)
+++ trunk/vapi/gnet-2.0.vapi	Thu May 29 20:26:37 2008
@@ -249,10 +249,15 @@
 	public delegate void TcpSocketConnectAsyncFunc (GNet.TcpSocket socket, GNet.TcpSocketConnectAsyncStatus status);
 	[CCode (cheader_filename = "gnet.h")]
 	public delegate void TcpSocketNewAsyncFunc (GNet.TcpSocket socket);
+	[CCode (cheader_filename = "gnet.h")]
 	public const int INETADDR_MAX_LEN;
+	[CCode (cheader_filename = "gnet.h")]
 	public const int MD5_HASH_LENGTH;
+	[CCode (cheader_filename = "gnet.h")]
 	public const int SHA_HASH_LENGTH;
+	[CCode (cheader_filename = "gnet.h")]
 	public const int SOCKS_PORT;
+	[CCode (cheader_filename = "gnet.h")]
 	public const int SOCKS_VERSION;
 	[CCode (cheader_filename = "gnet.h")]
 	public static weak string base64_decode (string src, int srclen, int dstlenp);

Modified: trunk/vapi/gnome-desktop-2.0.vapi
==============================================================================
--- trunk/vapi/gnome-desktop-2.0.vapi	(original)
+++ trunk/vapi/gnome-desktop-2.0.vapi	Thu May 29 20:26:37 2008
@@ -110,36 +110,68 @@
 	public class Hint : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
 		public Hint (string hintfile, string title, string background_image, string logo_image, string startupkey);
 	}
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_ACTIONS;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_CATEGORIES;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_COMMENT;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_DEFAULT_APP;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_DEV;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_DOC_PATH;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_ENCODING;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_EXEC;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_FILE_PATTERN;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_FS_TYPE;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_GENERIC_NAME;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_HIDDEN;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_ICON;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_MIME_TYPE;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_MINI_ICON;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_MOUNT_POINT;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_NAME;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_NO_DISPLAY;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_ONLY_SHOW_IN;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_PATH;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_PATTERNS;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_READ_ONLY;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_SORT_ORDER;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_SWALLOW_EXEC;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_SWALLOW_TITLE;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_TERMINAL;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_TERMINAL_OPTIONS;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_TRY_EXEC;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_TYPE;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_UNMOUNT_ICON;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_URL;
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public const string DESKTOP_ITEM_VERSION;
 }

Modified: trunk/vapi/gnome-keyring-1.vapi
==============================================================================
--- trunk/vapi/gnome-keyring-1.vapi	(original)
+++ trunk/vapi/gnome-keyring-1.vapi	Thu May 29 20:26:37 2008
@@ -146,11 +146,17 @@
 	public delegate void OperationGetListCallback (GnomeKeyring.Result result, GLib.List list);
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public delegate void OperationGetStringCallback (GnomeKeyring.Result result, string str);
+	[CCode (cheader_filename = "gnome-keyring.h")]
 	public const string DEFAULT;
+	[CCode (cheader_filename = "gnome-keyring.h")]
 	public const GnomeKeyring.PasswordSchema NETWORK_PASSWORD;
+	[CCode (cheader_filename = "gnome-keyring.h")]
 	public const int GNOME_KEYRING_ITEM_APPLICATION_SECRET;
+	[CCode (cheader_filename = "gnome-keyring.h")]
 	public const int GNOME_KEYRING_ITEM_INFO_ALL;
+	[CCode (cheader_filename = "gnome-keyring.h")]
 	public const int GNOME_KEYRING_ITEM_TYPE_MASK;
+	[CCode (cheader_filename = "gnome-keyring.h")]
 	public const string GNOME_KEYRING_SESSION;
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public static weak GLib.List acl_copy (GLib.List list);

Modified: trunk/vapi/gnome-vfs-2.0.vapi
==============================================================================
--- trunk/vapi/gnome-vfs-2.0.vapi	(original)
+++ trunk/vapi/gnome-vfs-2.0.vapi	Thu May 29 20:26:37 2008
@@ -948,38 +948,71 @@
 	public delegate void VolumeOpCallback (bool succeeded, string error, string detailed_error);
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public delegate int XferProgressCallback (GnomeVFS.XferProgressInfo info);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const string DESKTOP_ENTRY_GROUP;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const string GNOME_VFS_APPLICATION_REGISTRY_CAN_OPEN_MULTIPLE_FILES;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const string GNOME_VFS_APPLICATION_REGISTRY_COMMAND;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const string GNOME_VFS_APPLICATION_REGISTRY_NAME;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const string GNOME_VFS_APPLICATION_REGISTRY_REQUIRES_TERMINAL;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const string GNOME_VFS_APPLICATION_REGISTRY_STARTUP_NOTIFY;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const string GNOME_VFS_APPLICATION_REGISTRY_USES_GNOMEVFS;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const int GNOME_VFS_MAJOR_VERSION;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const int GNOME_VFS_MICRO_VERSION;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const string GNOME_VFS_MIME_TYPE_UNKNOWN;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const int GNOME_VFS_MINOR_VERSION;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const string GNOME_VFS_MODULE_CALLBACK_AUTHENTICATION;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const string GNOME_VFS_MODULE_CALLBACK_FILL_AUTHENTICATION;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const string GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const string GNOME_VFS_MODULE_CALLBACK_HTTP_PROXY_AUTHENTICATION;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const string GNOME_VFS_MODULE_CALLBACK_HTTP_RECEIVED_HEADERS;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const string GNOME_VFS_MODULE_CALLBACK_HTTP_SEND_ADDITIONAL_HEADERS;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const string GNOME_VFS_MODULE_CALLBACK_QUESTION;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const string GNOME_VFS_MODULE_CALLBACK_SAVE_AUTHENTICATION;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const string GNOME_VFS_MODULE_CALLBACK_STATUS_MESSAGE;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const int GNOME_VFS_PRIORITY_DEFAULT;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const int GNOME_VFS_PRIORITY_MAX;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const int GNOME_VFS_PRIORITY_MIN;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const string GNOME_VFS_URI_MAGIC_STR;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const string GNOME_VFS_URI_PATH_STR;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const int S_IRGRP;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const int S_IROTH;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const int S_ISGID;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const int S_ISUID;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const int S_IWGRP;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const int S_IWOTH;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const int S_IXGRP;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public const int S_IXOTH;
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static bool application_is_user_owned_application (GnomeVFS.MimeApplication application);

Modified: trunk/vapi/goocanvas.vapi
==============================================================================
--- trunk/vapi/goocanvas.vapi	(original)
+++ trunk/vapi/goocanvas.vapi	Thu May 29 20:26:37 2008
@@ -869,5 +869,6 @@
 		public virtual signal void child_notify (GLib.ParamSpec pspec);
 		public virtual signal void child_removed (int child_num);
 	}
+	[CCode (cheader_filename = "goocanvas.h")]
 	public const int NUM_ARROW_POINTS;
 }

Modified: trunk/vapi/gstreamer-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-0.10.vapi	Thu May 29 20:26:37 2008
@@ -1926,81 +1926,157 @@
 	public static delegate bool ValueSubtractFunc (GLib.Value dest, GLib.Value minuend, GLib.Value subtrahend);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static delegate bool ValueUnionFunc (GLib.Value dest, GLib.Value value1, GLib.Value value2);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int BUFFER_COPY_ALL;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int BUFFER_OFFSET_NONE;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string BUFFER_TRACE_NAME;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string CLOCK_ENTRY_TRACE_NAME;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int CLOCK_TIME_NONE;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int DEBUG_BG_MASK;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int DEBUG_FG_MASK;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int DEBUG_FORMAT_MASK;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string EVENT_TRACE_NAME;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int EVENT_TYPE_BOTH;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int EVENT_TYPE_SHIFT;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string FOURCC_FORMAT;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int INDEX_ID_INVALID;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string LICENSE_UNKNOWN;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string MESSAGE_TRACE_NAME;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int MSECOND;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int NSECOND;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int PARAM_CONTROLLABLE;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int PARAM_USER_SHIFT;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int SECOND;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_ALBUM;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_ALBUM_GAIN;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_ALBUM_PEAK;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_ALBUM_SORTNAME;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_ALBUM_VOLUME_COUNT;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_ALBUM_VOLUME_NUMBER;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_ARTIST;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_ARTIST_SORTNAME;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_AUDIO_CODEC;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_BEATS_PER_MINUTE;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_BITRATE;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_CODEC;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_COMMENT;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_COMPOSER;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_CONTACT;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_COPYRIGHT;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_COPYRIGHT_URI;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_DATE;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_DESCRIPTION;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_DURATION;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_ENCODER;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_ENCODER_VERSION;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_EXTENDED_COMMENT;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_GENRE;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_IMAGE;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_ISRC;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_LANGUAGE_CODE;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_LICENSE;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_LICENSE_URI;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_LOCATION;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_MAXIMUM_BITRATE;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_MINIMUM_BITRATE;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_NOMINAL_BITRATE;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_ORGANIZATION;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_PERFORMER;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_PREVIEW_IMAGE;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_REFERENCE_LEVEL;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_SERIAL;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_TITLE;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_TITLE_SORTNAME;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_TRACK_COUNT;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_TRACK_GAIN;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_TRACK_NUMBER;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_TRACK_PEAK;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_VERSION;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TAG_VIDEO_CODEC;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string TIME_FORMAT;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int USECOND;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int VALUE_EQUAL;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int VALUE_GREATER_THAN;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int VALUE_LESS_THAN;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int VALUE_UNORDERED;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int VERSION_MAJOR;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int VERSION_MICRO;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int VERSION_MINOR;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int VERSION_NANO;
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static void init ([CCode (array_length_pos = 0.9)] ref weak string[] args);

Modified: trunk/vapi/gstreamer-audio-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-audio-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-audio-0.10.vapi	Thu May 29 20:26:37 2008
@@ -250,10 +250,15 @@
 	public delegate bool AudioMixerFilterFunc (Gst.Mixer mixer);
 	[CCode (cheader_filename = "gst/audio/gstringbuffer.h")]
 	public delegate void RingBufferCallback (Gst.RingBuffer rbuf, uchar data, uint len);
+	[CCode (cheader_filename = "gst/audio/audio.h")]
 	public const int AUDIO_DEF_RATE;
+	[CCode (cheader_filename = "gst/audio/audio.h")]
 	public const string AUDIO_FLOAT_PAD_TEMPLATE_CAPS;
+	[CCode (cheader_filename = "gst/audio/audio.h")]
 	public const string AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_CAPS;
+	[CCode (cheader_filename = "gst/audio/audio.h")]
 	public const string AUDIO_INT_PAD_TEMPLATE_CAPS;
+	[CCode (cheader_filename = "gst/audio/audio.h")]
 	public const string AUDIO_INT_STANDARD_PAD_TEMPLATE_CAPS;
 	[CCode (cheader_filename = "gst/audio/audio.h")]
 	public static weak Gst.Buffer audio_buffer_clip (Gst.Buffer buffer, Gst.Segment segment, int rate, int frame_size);

Modified: trunk/vapi/gstreamer-dataprotocol-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-dataprotocol-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-dataprotocol-0.10.vapi	Thu May 29 20:26:37 2008
@@ -36,8 +36,11 @@
 	public static delegate bool DPPacketFromCapsFunction (Gst.Caps caps, Gst.DPHeaderFlag flags, uint length, uchar header, uchar payload);
 	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
 	public static delegate bool DPPacketFromEventFunction (Gst.Event event, Gst.DPHeaderFlag flags, uint length, uchar header, uchar payload);
+	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
 	public const int DP_HEADER_LENGTH;
+	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
 	public const int DP_VERSION_MAJOR;
+	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
 	public const int DP_VERSION_MINOR;
 	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
 	public static weak Gst.Buffer dp_buffer_from_header (uint header_length, uchar header);

Modified: trunk/vapi/gstreamer-net-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-net-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-net-0.10.vapi	Thu May 29 20:26:37 2008
@@ -42,5 +42,6 @@
 		[NoAccessorMethod]
 		public int port { get; set; }
 	}
+	[CCode (cheader_filename = "gst/net/gstnet.h")]
 	public const int NET_TIME_PACKET_SIZE;
 }

Modified: trunk/vapi/gstreamer-riff-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-riff-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-riff-0.10.vapi	Thu May 29 20:26:37 2008
@@ -68,153 +68,301 @@
 		public uint quality;
 		public uint samplesize;
 	}
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_IBM_FORMAT_ADPCM;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_IBM_FORMAT_ALAW;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_IBM_FORMAT_MULAW;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_IF_COMPUSE;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_IF_KEYFRAME;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_IF_LIST;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_IF_NO_TIME;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_STRH_DISABLED;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_STRH_VIDEOPALCHANGES;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_A52;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_AAC;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_ADPCM;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_ALAW;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_APTX;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_AUDIOFILE_AF10;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_AUDIOFILE_AF36;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_BTV_DIGITAL;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_CANOPUS_ATRAC;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_CIRRUS;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_CONTROL_RES_CR10;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_CONTROL_RES_VQLPC;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_CREATIVE_ADPCM;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_CREATIVE_FASTSPEECH10;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_CREATIVE_FASTSPEECH8;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_CS2;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_CS_IMAADPCM;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_CU_CODEC;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_DF_G726;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_DF_GSM610;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_DIALOGIC_OKI_ADPCM;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_DIGIADPCM;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_DIGIFIX;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_DIGIREAL;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_DIGISTD;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_DIGITAL_G723;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_DOLBY_AC2;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_DOLBY_AC3_SPDIF;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_DSAT_DISPLAY;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_DSP_TRUESPEECH;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_DTS;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_DVI_ADPCM;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_ECHOSC1;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_ECHOSC3;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_ESPCM;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_EXTENSIBLE;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_FM_TOWNS_SND;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_G722_ADPCM;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_G723_ADPCM;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_G726ADPCM;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_G726_ADPCM;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_G728_CELP;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_G729A;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_GSM610;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_GSM_AMR_CBR;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_GSM_AMR_VBR;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_IBM_CVSD;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_IEEE_FLOAT;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_ILINK_VC;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_IPI_HSX;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_IPI_RPELP;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_ISIAUDIO;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_ITU_G721_ADPCM;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_LH_CODEC;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_LRC;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_LUCENT_G723;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_MALDEN_PHONYTALK;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_MEDIASONIC_G723;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_MEDIASPACE_ADPCM;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_MEDIAVISION_ADPCM;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_MPEGL12;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_MPEGL3;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_MSG723;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_MSN;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_MSRT24;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_MULAW;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_MVI_MVI2;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_NMS_VBXADPCM;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_NORRIS;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_OKI_ADPCM;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_OLIADPCM;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_OLICELP;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_OLIGSM;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_OLIOPR;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_OLISBC;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_ONLIVE;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_PAC;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_PACKED;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_PCM;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_PHILIPS_LPCBB;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_PROSODY_1612;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_PROSODY_8KBPS;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_QDESIGN_MUSIC;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_QUALCOMM_HALFRATE;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_QUALCOMM_PUREVOICE;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_QUARTERDECK;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_RAW_SPORT;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_RHETOREX_ADPCM;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_ROCKWELL_ADPCM;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_ROCKWELL_DIGITALK;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_RT24;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_SANYO_LD_ADPCM;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_SBC24;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_SIERRA_ADPCM;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_SIPROLAB_ACELP4800;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_SIPROLAB_ACELP8V3;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_SIPROLAB_ACEPLNET;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_SIPROLAB_G729;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_SIPROLAB_G729A;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_SIPROLAB_KELVIN;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_SOFTSOUND;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_SONARC;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_SONY_ATRAC3;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_SOUNDSPACE_MUSICOMPRESS;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_TPC;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_TUBGSM;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_UHER_ADPCM;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_UNKNOWN;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_VIVO_G723;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_VIVO_SIREN;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_VME_VMPCM;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_VORBIS1;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_VORBIS1PLUS;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_VORBIS2;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_VORBIS2PLUS;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_VORBIS3;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_VORBIS3PLUS;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_VOXWARE;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_VOXWARE_AC10;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_VOXWARE_AC16;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_VOXWARE_AC20;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_VOXWARE_AC8;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_VOXWARE_BYTE_ALIGNED;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_VOXWARE_METASOUND;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_VOXWARE_METAVOICE;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_VOXWARE_RT29HW;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_VOXWARE_TQ40;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_VOXWARE_TQ60;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_VOXWARE_VR12;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_VOXWARE_VR18;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_VSELP;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_WMAV1;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_WMAV2;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_WMAV3;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_WMAV3_L;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_WMS;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_XEBEC;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_YAMAHA_ADPCM;
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public const int RIFF_WAVE_FORMAT_ZYXEL_ADPCM;
 	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public static weak Gst.Caps riff_create_audio_caps (ushort codec_id, Gst.gst_riff_strh strh, Gst.gst_riff_strf_auds strf, Gst.Buffer strf_data, Gst.Buffer strd_data, out weak string codec_name);

Modified: trunk/vapi/gstreamer-rtp-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-rtp-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-rtp-0.10.vapi	Thu May 29 20:26:37 2008
@@ -196,48 +196,91 @@
 		[NoAccessorMethod]
 		public uint timestamp_offset { get; set; }
 	}
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int RTCP_MAX_BYE_SSRC_COUNT;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int RTCP_MAX_RB_COUNT;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int RTCP_MAX_SDES;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int RTCP_MAX_SDES_ITEM_COUNT;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int RTCP_VALID_MASK;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int RTCP_VALID_VALUE;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int RTCP_VERSION;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_1016_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_CELLB_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_CN_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_DVI4_11025_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_DVI4_16000_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_DVI4_22050_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_DVI4_8000_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_DYNAMIC_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_G721_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_G722_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int RTP_PAYLOAD_G723_53;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_G723_53_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int RTP_PAYLOAD_G723_63;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_G723_63_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_G723_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_G728_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_G729_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_GSM_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_H261_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_H263_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_JPEG_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_L16_MONO_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_L16_STEREO_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_LPC_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_MP2T_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_MPA_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_MPV_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_NV_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_PCMA_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_PCMU_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_QCELP_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int RTP_PAYLOAD_TS41;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_TS41_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int RTP_PAYLOAD_TS48;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const string RTP_PAYLOAD_TS48_STRING;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int RTP_VERSION;
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool rtcp_buffer_add_packet (Gst.Buffer buffer, Gst.RTCPType type, Gst.RTCPPacket packet);

Modified: trunk/vapi/gstreamer-rtsp-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-rtsp-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-rtsp-0.10.vapi	Thu May 29 20:26:37 2008
@@ -347,6 +347,7 @@
 		[HasEmitter]
 		public virtual signal Gst.RTSPResult send (void* req, void* resp);
 	}
+	[CCode (cheader_filename = "gst/gst.h")]
 	public const int RTSP_DEFAULT_PORT;
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static void rtsp_base64_decode_ip (string data, ulong len);

Modified: trunk/vapi/gstreamer-sdp-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-sdp-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-sdp-0.10.vapi	Thu May 29 20:26:37 2008
@@ -161,9 +161,14 @@
 		public weak string time;
 		public weak string typed_time;
 	}
+	[CCode (cheader_filename = "gst/sdp/gstsdpmessage.h")]
 	public const string SDP_BWTYPE_AS;
+	[CCode (cheader_filename = "gst/sdp/gstsdpmessage.h")]
 	public const string SDP_BWTYPE_CT;
+	[CCode (cheader_filename = "gst/sdp/gstsdpmessage.h")]
 	public const string SDP_BWTYPE_EXT_PREFIX;
+	[CCode (cheader_filename = "gst/sdp/gstsdpmessage.h")]
 	public const string SDP_BWTYPE_RR;
+	[CCode (cheader_filename = "gst/sdp/gstsdpmessage.h")]
 	public const string SDP_BWTYPE_RS;
 }

Modified: trunk/vapi/gstreamer-tag-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-tag-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-tag-0.10.vapi	Thu May 29 20:26:37 2008
@@ -40,17 +40,29 @@
 		[NoWrapper]
 		public virtual Gst.TagDemuxResult parse_tag (Gst.Buffer buffer, bool start_tag, uint tag_size, out weak Gst.TagList tags);
 	}
+	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public const string TAG_CDDA_CDDB_DISCID;
+	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public const string TAG_CDDA_CDDB_DISCID_FULL;
+	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public const string TAG_CDDA_MUSICBRAINZ_DISCID;
+	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public const string TAG_CDDA_MUSICBRAINZ_DISCID_FULL;
+	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public const string TAG_CMML_CLIP;
+	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public const string TAG_CMML_HEAD;
+	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public const string TAG_CMML_STREAM;
+	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public const string TAG_MUSICBRAINZ_ALBUMARTISTID;
+	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public const string TAG_MUSICBRAINZ_ALBUMID;
+	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public const string TAG_MUSICBRAINZ_ARTISTID;
+	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public const string TAG_MUSICBRAINZ_TRACKID;
+	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public const string TAG_MUSICBRAINZ_TRMID;
 	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public static weak string tag_freeform_string_to_utf8 (string data, int size, string env_vars);

Modified: trunk/vapi/gstreamer-video-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-video-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-video-0.10.vapi	Thu May 29 20:26:37 2008
@@ -4,90 +4,104 @@
 namespace Gst {
 	[CCode (cprefix = "GstVideoMask32", lower_case_cprefix = "gst_video_mask32_")]
 	namespace VideoMask32 {
-		[CCode (cname = "GST_VIDEO_BYTE1_MASK_32")]
+		[CCode (cname = "GST_VIDEO_BYTE1_MASK_32", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const string BYTE1;
-		[CCode (cname = "GST_VIDEO_BYTE2_MASK_32")]
+		[CCode (cname = "GST_VIDEO_BYTE2_MASK_32", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const string BYTE2;
-		[CCode (cname = "GST_VIDEO_BYTE3_MASK_32")]
+		[CCode (cname = "GST_VIDEO_BYTE3_MASK_32", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const string BYTE3;
-		[CCode (cname = "GST_VIDEO_BYTE4_MASK_32")]
+		[CCode (cname = "GST_VIDEO_BYTE4_MASK_32", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const string BYTE4;
-		[CCode (cname = "GST_VIDEO_BYTE1_MASK_32_INT")]
+		[CCode (cname = "GST_VIDEO_BYTE1_MASK_32_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const int BYTE1_INT;
-		[CCode (cname = "GST_VIDEO_BYTE2_MASK_32_INT")]
+		[CCode (cname = "GST_VIDEO_BYTE2_MASK_32_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const int BYTE2_INT;
-		[CCode (cname = "GST_VIDEO_BYTE3_MASK_32_INT")]
+		[CCode (cname = "GST_VIDEO_BYTE3_MASK_32_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const int BYTE3_INT;
-		[CCode (cname = "GST_VIDEO_BYTE4_MASK_32_INT")]
+		[CCode (cname = "GST_VIDEO_BYTE4_MASK_32_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const int BYTE4_INT;
 	}
 	[CCode (cprefix = "GstVideoMask24", lower_case_cprefix = "gst_video_mask24_")]
 	namespace VideoMask24 {
-		[CCode (cname = "GST_VIDEO_BYTE1_MASK_24")]
+		[CCode (cname = "GST_VIDEO_BYTE1_MASK_24", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const string BYTE1;
-		[CCode (cname = "GST_VIDEO_BYTE2_MASK_24")]
+		[CCode (cname = "GST_VIDEO_BYTE2_MASK_24", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const string BYTE2;
-		[CCode (cname = "GST_VIDEO_BYTE3_MASK_24")]
+		[CCode (cname = "GST_VIDEO_BYTE3_MASK_24", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const string BYTE3;
-		[CCode (cname = "GST_VIDEO_BYTE1_MASK_24_INT")]
+		[CCode (cname = "GST_VIDEO_BYTE1_MASK_24_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const int BYTE1_INT;
-		[CCode (cname = "GST_VIDEO_BYTE2_MASK_24_INT")]
+		[CCode (cname = "GST_VIDEO_BYTE2_MASK_24_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const int BYTE2_INT;
-		[CCode (cname = "GST_VIDEO_BYTE3_MASK_24_INT")]
+		[CCode (cname = "GST_VIDEO_BYTE3_MASK_24_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const int BYTE3_INT;
 	}
 	[CCode (cprefix = "GstVideoMask16", lower_case_cprefix = "gst_video_mask16_")]
 	namespace VideoMask16 {
-		[CCode (cname = "GST_VIDEO_RED_MASK_16")]
+		[CCode (cname = "GST_VIDEO_RED_MASK_16", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const string RED;
-		[CCode (cname = "GST_VIDEO_GREEN_MASK_16")]
+		[CCode (cname = "GST_VIDEO_GREEN_MASK_16", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const string GREEN;
-		[CCode (cname = "GST_VIDEO_BLUE_MASK_16")]
+		[CCode (cname = "GST_VIDEO_BLUE_MASK_16", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const string BLUE;
-		[CCode (cname = "GST_VIDEO_RED_MASK_16_INT")]
+		[CCode (cname = "GST_VIDEO_RED_MASK_16_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const int RED_INT;
-		[CCode (cname = "GST_VIDEO_GREEN_MASK_16_INT")]
+		[CCode (cname = "GST_VIDEO_GREEN_MASK_16_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const int GREEN_INT;
-		[CCode (cname = "GST_VIDEO_BLUE_MASK_16_INT")]
+		[CCode (cname = "GST_VIDEO_BLUE_MASK_16_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const int BLUE_INT;
 	}
 	[CCode (cprefix = "GstVideoMask15", lower_case_cprefix = "gst_video_mask15_")]
 	namespace VideoMask15 {
-		[CCode (cname = "GST_VIDEO_RED_MASK_15")]
+		[CCode (cname = "GST_VIDEO_RED_MASK_15", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const string RED;
-		[CCode (cname = "GST_VIDEO_GREEN_MASK_15")]
+		[CCode (cname = "GST_VIDEO_GREEN_MASK_15", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const string GREEN;
-		[CCode (cname = "GST_VIDEO_BLUE_MASK_15")]
+		[CCode (cname = "GST_VIDEO_BLUE_MASK_15", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const string BLUE;
-		[CCode (cname = "GST_VIDEO_RED_MASK_15_INT")]
+		[CCode (cname = "GST_VIDEO_RED_MASK_15_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const int RED_INT;
-		[CCode (cname = "GST_VIDEO_GREEN_MASK_15_INT")]
+		[CCode (cname = "GST_VIDEO_GREEN_MASK_15_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const int GREEN_INT;
-		[CCode (cname = "GST_VIDEO_BLUE_MASK_15_INT")]
+		[CCode (cname = "GST_VIDEO_BLUE_MASK_15_INT", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const int BLUE_INT;
 	}
 	[CCode (cprefix = "GstVideoRange", lower_case_cprefix = "gst_video_range_")]
 	namespace VideoRange {
-		[CCode (cname = "GST_VIDEO_SIZE_RANGE")]
+		[CCode (cname = "GST_VIDEO_SIZE_RANGE", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const string SIZE;
-		[CCode (cname = "GST_VIDEO_FPS_RANGE")]
+		[CCode (cname = "GST_VIDEO_FPS_RANGE", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const string FPS;
 	}
 	[CCode (cprefix = "GST_VIDEO_CAPS_", lower_case_cprefix = "gst_video_caps_")]
 	namespace VideoCaps {
+		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const string RGB;
+		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const string BGR;
+		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const string RGBx;
+		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const string xRGB;
+		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const string BGRx;
+		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const string xBGR;
+		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const string RGBA;
+		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const string ARGB;
+		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const string BGRA;
+		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const string ABGR;
+		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const string xRGB_HOST_ENDIAN;
+		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const string BGRx_HOST_ENDIAN;
+		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const string RGB_16;
+		[CCode (cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public const string RGB_15;
 		[CCode (cname = "GST_VIDEO_CAPS_YUV", cheader_filename = "gst/video/video.h,gst/video/video.h,gst/video/video.h,gst/video/video.h")]
 		public static string YUV (string fourcc);

Modified: trunk/vapi/gtk+-2.0.vapi
==============================================================================
--- trunk/vapi/gtk+-2.0.vapi	(original)
+++ trunk/vapi/gtk+-2.0.vapi	Thu May 29 20:26:37 2008
@@ -6430,154 +6430,303 @@
 	public delegate void TreeViewSearchPositionFunc (Gtk.TreeView tree_view, Gtk.Widget search_dialog);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void WindowKeysForeachFunc (Gtk.Window window, uint keyval, Gdk.ModifierType modifiers, bool is_mnemonic);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const int ARG_READWRITE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const int BINARY_AGE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const int BUTTONBOX_DEFAULT;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const int INPUT_ERROR;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const int INTERFACE_AGE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const int MAJOR_VERSION;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const int MAX_COMPOSE_LEN;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const int MICRO_VERSION;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const int MINOR_VERSION;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PAPER_NAME_A3;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PAPER_NAME_A4;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PAPER_NAME_A5;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PAPER_NAME_B5;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PAPER_NAME_EXECUTIVE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PAPER_NAME_LEGAL;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PAPER_NAME_LETTER;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const int PARAM_READABLE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const int PARAM_READWRITE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const int PARAM_WRITABLE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const int PATH_PRIO_MASK;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PRINT_SETTINGS_COLLATE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PRINT_SETTINGS_DEFAULT_SOURCE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PRINT_SETTINGS_DITHER;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PRINT_SETTINGS_DUPLEX;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PRINT_SETTINGS_FINISHINGS;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PRINT_SETTINGS_MEDIA_TYPE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PRINT_SETTINGS_NUMBER_UP;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PRINT_SETTINGS_N_COPIES;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PRINT_SETTINGS_ORIENTATION;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PRINT_SETTINGS_OUTPUT_BIN;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PRINT_SETTINGS_OUTPUT_FILE_FORMAT;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PRINT_SETTINGS_OUTPUT_URI;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PRINT_SETTINGS_PAGE_RANGES;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PRINT_SETTINGS_PAGE_SET;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PRINT_SETTINGS_PAPER_FORMAT;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PRINT_SETTINGS_PAPER_HEIGHT;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PRINT_SETTINGS_PAPER_WIDTH;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PRINT_SETTINGS_PRINTER;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PRINT_SETTINGS_PRINT_PAGES;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PRINT_SETTINGS_QUALITY;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PRINT_SETTINGS_RESOLUTION;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PRINT_SETTINGS_REVERSE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PRINT_SETTINGS_SCALE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PRINT_SETTINGS_USE_COLOR;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PRINT_SETTINGS_WIN32_DRIVER_EXTRA;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string PRINT_SETTINGS_WIN32_DRIVER_VERSION;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const int PRIORITY_REDRAW;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const int PRIORITY_RESIZE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_ABOUT;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_ADD;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_APPLY;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_BOLD;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_CANCEL;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_CDROM;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_CLEAR;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_CLOSE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_COLOR_PICKER;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_CONNECT;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_CONVERT;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_COPY;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_CUT;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_DELETE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_DIALOG_AUTHENTICATION;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_DIALOG_ERROR;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_DIALOG_INFO;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_DIALOG_QUESTION;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_DIALOG_WARNING;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_DIRECTORY;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_DISCARD;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_DISCONNECT;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_DND;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_DND_MULTIPLE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_EDIT;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_EXECUTE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_FILE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_FIND;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_FIND_AND_REPLACE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_FLOPPY;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_FULLSCREEN;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_GOTO_BOTTOM;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_GOTO_FIRST;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_GOTO_LAST;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_GOTO_TOP;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_GO_BACK;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_GO_DOWN;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_GO_FORWARD;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_GO_UP;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_HARDDISK;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_HELP;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_HOME;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_INDENT;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_INDEX;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_INFO;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_ITALIC;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_JUMP_TO;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_JUSTIFY_CENTER;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_JUSTIFY_FILL;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_JUSTIFY_LEFT;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_JUSTIFY_RIGHT;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_LEAVE_FULLSCREEN;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_MEDIA_FORWARD;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_MEDIA_NEXT;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_MEDIA_PAUSE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_MEDIA_PLAY;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_MEDIA_PREVIOUS;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_MEDIA_RECORD;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_MEDIA_REWIND;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_MEDIA_STOP;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_MISSING_IMAGE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_NETWORK;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_NEW;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_NO;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_OK;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_OPEN;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_ORIENTATION_LANDSCAPE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_ORIENTATION_PORTRAIT;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_ORIENTATION_REVERSE_LANDSCAPE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_ORIENTATION_REVERSE_PORTRAIT;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_PASTE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_PREFERENCES;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_PRINT;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_PRINT_PREVIEW;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_PROPERTIES;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_QUIT;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_REDO;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_REFRESH;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_REMOVE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_REVERT_TO_SAVED;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_SAVE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_SAVE_AS;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_SELECT_ALL;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_SELECT_COLOR;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_SELECT_FONT;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_SORT_ASCENDING;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_SORT_DESCENDING;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_SPELL_CHECK;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_STOP;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_STRIKETHROUGH;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_UNDELETE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_UNDERLINE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_UNDO;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_UNINDENT;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_YES;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_ZOOM_100;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_ZOOM_FIT;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_ZOOM_IN;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_ZOOM_OUT;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const int TEXT_VIEW_PRIORITY_VALIDATE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const int TYPE_FUNDAMENTAL_LAST;
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool accel_groups_activate (GLib.Object object, uint accel_key, Gdk.ModifierType accel_mods);

Modified: trunk/vapi/hildon-1.vapi
==============================================================================
--- trunk/vapi/hildon-1.vapi	(original)
+++ trunk/vapi/hildon-1.vapi	Thu May 29 20:26:37 2008
@@ -601,13 +601,21 @@
 		public abstract void get_natural_size (int width, int height);
 		public virtual signal void crumb_activated ();
 	}
+	[CCode (cheader_filename = "hildon/hildon.h")]
 	public const int MAJOR_VERSION;
+	[CCode (cheader_filename = "hildon/hildon.h")]
 	public const int MARGIN_DEFAULT;
+	[CCode (cheader_filename = "hildon/hildon.h")]
 	public const int MARGIN_DOUBLE;
+	[CCode (cheader_filename = "hildon/hildon.h")]
 	public const int MARGIN_HALF;
+	[CCode (cheader_filename = "hildon/hildon.h")]
 	public const int MARGIN_TRIPLE;
+	[CCode (cheader_filename = "hildon/hildon.h")]
 	public const int MICRO_VERSION;
+	[CCode (cheader_filename = "hildon/hildon.h")]
 	public const int MINOR_VERSION;
+	[CCode (cheader_filename = "hildon/hildon.h")]
 	public const int WINDOW_LONG_PRESS_TIME;
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public static int get_icon_pixel_size (Gtk.IconSize size);

Modified: trunk/vapi/json-glib-1.0.vapi
==============================================================================
--- trunk/vapi/json-glib-1.0.vapi	(original)
+++ trunk/vapi/json-glib-1.0.vapi	Thu May 29 20:26:37 2008
@@ -115,10 +115,15 @@
 		public abstract bool deserialize_property (string property_name, GLib.Value value, GLib.ParamSpec pspec, Json.Node property_node);
 		public abstract Json.Node serialize_property (string property_name, GLib.Value value, GLib.ParamSpec pspec);
 	}
+	[CCode (cheader_filename = "json-glib/json-glib.h")]
 	public const int MAJOR_VERSION;
+	[CCode (cheader_filename = "json-glib/json-glib.h")]
 	public const int MICRO_VERSION;
+	[CCode (cheader_filename = "json-glib/json-glib.h")]
 	public const int MINOR_VERSION;
+	[CCode (cheader_filename = "json-glib/json-glib.h")]
 	public const int VERSION_HEX;
+	[CCode (cheader_filename = "json-glib/json-glib.h")]
 	public const string VERSION_S;
 	[CCode (cheader_filename = "json-glib/json-glib.h")]
 	public static GLib.Object construct_gobject (GLib.Type gtype, string data, ulong length) throws GLib.Error;

Modified: trunk/vapi/libglade-2.0.vapi
==============================================================================
--- trunk/vapi/libglade-2.0.vapi	(original)
+++ trunk/vapi/libglade-2.0.vapi	Thu May 29 20:26:37 2008
@@ -113,6 +113,7 @@
 	public delegate void XMLConnectFunc (string handler_name, GLib.Object object, string signal_name, string signal_data, GLib.Object connect_object, bool after);
 	[CCode (cheader_filename = "glade/glade.h")]
 	public delegate weak Gtk.Widget XMLCustomWidgetHandler (Glade.XML xml, string func_name, string name, string string1, string string2, int int1, int int2);
+	[CCode (cheader_filename = "glade/glade.h")]
 	public const int MODULE_API_VERSION;
 	[CCode (cheader_filename = "glade/glade.h")]
 	public static int enum_from_string (GLib.Type type, string str);

Modified: trunk/vapi/libgnome-2.0.vapi
==============================================================================
--- trunk/vapi/libgnome-2.0.vapi	(original)
+++ trunk/vapi/libgnome-2.0.vapi	Thu May 29 20:26:37 2008
@@ -129,26 +129,47 @@
 	public static delegate void ModuleInitHook (Gnome.ModuleInfo mod_info);
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static delegate void TriggerActionFunction (string msg, string level, string[] supinfo);
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public const string DOT_GNOME;
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public const string DOT_GNOME_PRIVATE;
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public const string PARAM_APP_DATADIR;
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public const string PARAM_APP_ID;
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public const string PARAM_APP_LIBDIR;
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public const string PARAM_APP_PREFIX;
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public const string PARAM_APP_SYSCONFDIR;
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public const string PARAM_APP_VERSION;
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public const string PARAM_CREATE_DIRECTORIES;
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public const string PARAM_ENABLE_SOUND;
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public const string PARAM_ESPEAKER;
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public const string PARAM_GNOME_DATADIR;
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public const string PARAM_GNOME_LIBDIR;
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public const string PARAM_GNOME_PATH;
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public const string PARAM_GNOME_PREFIX;
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public const string PARAM_GNOME_SYSCONFDIR;
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public const string PARAM_GOPTION_CONTEXT;
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public const string PARAM_HUMAN_READABLE_NAME;
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public const string PARAM_POPT_CONTEXT;
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public const string PARAM_POPT_FLAGS;
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public const string PARAM_POPT_TABLE;
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static weak Gnome.ModuleInfo bonobo_module_info_get ();

Modified: trunk/vapi/libgnomeui-2.0.vapi
==============================================================================
--- trunk/vapi/libgnomeui-2.0.vapi	(original)
+++ trunk/vapi/libgnomeui-2.0.vapi	Thu May 29 20:26:37 2008
@@ -499,72 +499,137 @@
 	public delegate void StringCallback (string str);
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static delegate void UISignalConnectFunc (Gnome.UIInfo uiinfo, string signal_name, Gnome.UIBuilderData uibdata);
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string GNOMEUIINFO_KEY_UIBDATA;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string GNOMEUIINFO_KEY_UIDATA;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string APP_MENUBAR_NAME;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string APP_TOOLBAR_NAME;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const int CANCEL;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string CLIENT_PARAM_SM_CONNECT;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const int KEY_MOD_CLEAR;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const int KEY_MOD_CLOSE_WINDOW;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const int KEY_MOD_NEW_WINDOW;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const int KEY_MOD_PAUSE_GAME;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const int KEY_MOD_PRINT_SETUP;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const int KEY_MOD_REDO;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const int KEY_MOD_REDO_MOVE;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const int KEY_MOD_SAVE_AS;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const int KEY_NAME_CLEAR;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const int KEY_NAME_CLOSE_WINDOW;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const int KEY_NAME_NEW_WINDOW;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const int KEY_NAME_PRINT_SETUP;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string MESSAGE_BOX_ERROR;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string MESSAGE_BOX_GENERIC;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string MESSAGE_BOX_INFO;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string MESSAGE_BOX_QUESTION;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string MESSAGE_BOX_WARNING;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const int NO;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const int OK;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const int PAD;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const int PAD_BIG;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const int PAD_SMALL;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string PROPERTY_BOX_DIRTY;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_ABOUT;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_ATTACH;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_AUTHENTICATION;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_BLANK;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_BOOK_BLUE;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_BOOK_GREEN;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_BOOK_OPEN;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_BOOK_RED;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_BOOK_YELLOW;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_LINE_IN;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_MAIL;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_MAIL_FWD;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_MAIL_NEW;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_MAIL_RCV;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_MAIL_RPL;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_MAIL_SND;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_MIC;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_MIDI;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_MULTIPLE_FILE;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_NOT;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_SCORES;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_TABLE_BORDERS;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_TABLE_FILL;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_TEXT_BULLETED_LIST;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_TEXT_INDENT;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_TEXT_NUMBERED_LIST;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_TEXT_UNINDENT;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_TIMER;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_TIMER_STOP;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_TRASH;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_TRASH_FULL;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string STOCK_VOLUME;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const int YES;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string LIBGNOMEUI_PARAM_CRASH_DIALOG;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string LIBGNOMEUI_PARAM_DEFAULT_ICON;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string LIBGNOMEUI_PARAM_DISPLAY;
-	[CCode (cname = "LIBGNOMEUI_MODULE")]
+	[CCode (cname = "LIBGNOMEUI_MODULE", cheader_filename = "libgnomeui/libgnomeui.h")]
 	public Gnome.ModuleInfo libgnomeui_module;
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static void accelerators_sync ();

Modified: trunk/vapi/libnotify.vapi
==============================================================================
--- trunk/vapi/libnotify.vapi	(original)
+++ trunk/vapi/libnotify.vapi	Thu May 29 20:26:37 2008
@@ -44,7 +44,9 @@
 	}
 	[CCode (cheader_filename = "libnotify/notify.h")]
 	public static delegate void ActionCallback (Notify.Notification p1, string p2, void* p3);
+	[CCode (cheader_filename = "libnotify/notify.h")]
 	public const int EXPIRES_DEFAULT;
+	[CCode (cheader_filename = "libnotify/notify.h")]
 	public const int EXPIRES_NEVER;
 	[CCode (cheader_filename = "libnotify/notify.h")]
 	public static weak string get_app_name ();

Modified: trunk/vapi/libsoup-2.2.vapi
==============================================================================
--- trunk/vapi/libsoup-2.2.vapi	(original)
+++ trunk/vapi/libsoup-2.2.vapi	Thu May 29 20:26:37 2008
@@ -557,68 +557,131 @@
 	public delegate void SocketCallback (Soup.Socket sock, uint status);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public delegate void SocketListenerCallback (Soup.Socket listener, Soup.Socket sock);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int ADDRESS_ANY_PORT;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string CONNECTION_ASYNC_CONTEXT;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int CONNECTION_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string CONNECTION_MESSAGE_FILTER;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string CONNECTION_ORIGIN_URI;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string CONNECTION_PROXY_URI;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string CONNECTION_SSL_CREDENTIALS;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string CONNECTION_TIMEOUT;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int DATE_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int HEADERS_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int MESSAGE_FILTER_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int MESSAGE_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int MESSAGE_QUEUE_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string METHOD_CONNECT;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string METHOD_COPY;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string METHOD_DELETE;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string METHOD_GET;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int METHOD_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string METHOD_HEAD;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string METHOD_LOCK;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string METHOD_MKCOL;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string METHOD_MOVE;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string METHOD_OPTIONS;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string METHOD_PATCH;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string METHOD_POST;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string METHOD_PROPFIND;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string METHOD_PROPPATCH;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string METHOD_PUT;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string METHOD_TRACE;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string METHOD_UNLOCK;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int MISC_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SERVER_ASYNC_CONTEXT;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int SERVER_AUTH_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int SERVER_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SERVER_INTERFACE;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int SERVER_MESSAGE_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SERVER_PORT;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SERVER_SSL_CERT_FILE;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SERVER_SSL_KEY_FILE;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SESSION_ASYNC_CONTEXT;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int SESSION_ASYNC_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int SESSION_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SESSION_MAX_CONNS;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SESSION_MAX_CONNS_PER_HOST;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SESSION_PROXY_URI;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SESSION_SSL_CA_FILE;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int SESSION_SYNC_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SESSION_TIMEOUT;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SESSION_USE_NTLM;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int SOAP_MESSAGE_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SOCKET_ASYNC_CONTEXT;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SOCKET_FLAG_CLOEXEC;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SOCKET_FLAG_NODELAY;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SOCKET_FLAG_NONBLOCKING;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SOCKET_FLAG_REUSEADDR;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int SOCKET_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SOCKET_IS_SERVER;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SOCKET_SSL_CREDENTIALS;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SOCKET_TIMEOUT;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int STATUS_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int TYPES_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int URI_H;
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static weak GLib.TimeoutSource add_idle (GLib.MainContext async_context, GLib.SourceFunc function, void* data);

Modified: trunk/vapi/libsoup-2.4.vapi
==============================================================================
--- trunk/vapi/libsoup-2.4.vapi	(original)
+++ trunk/vapi/libsoup-2.4.vapi	Thu May 29 20:26:37 2008
@@ -550,81 +550,157 @@
 	public delegate void SessionCallback (Soup.Session session, Soup.Message msg);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public delegate void SocketCallback (Soup.Socket sock, uint status);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int AF_INET6;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int ADDRESS_ANY_PORT;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string ADDRESS_FAMILY;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string ADDRESS_NAME;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string ADDRESS_PHYSICAL;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string ADDRESS_PORT;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string ADDRESS_SOCKADDR;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string AUTH_DOMAIN_ADD_PATH;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string AUTH_DOMAIN_BASIC_AUTH_CALLBACK;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string AUTH_DOMAIN_BASIC_AUTH_DATA;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int AUTH_DOMAIN_BASIC_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string AUTH_DOMAIN_DIGEST_AUTH_CALLBACK;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string AUTH_DOMAIN_DIGEST_AUTH_DATA;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int AUTH_DOMAIN_DIGEST_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string AUTH_DOMAIN_FILTER;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string AUTH_DOMAIN_FILTER_DATA;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string AUTH_DOMAIN_GENERIC_AUTH_CALLBACK;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string AUTH_DOMAIN_GENERIC_AUTH_DATA;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int AUTH_DOMAIN_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string AUTH_DOMAIN_PROXY;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string AUTH_DOMAIN_REALM;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string AUTH_DOMAIN_REMOVE_PATH;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int AUTH_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string AUTH_HOST;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string AUTH_IS_AUTHENTICATED;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string AUTH_IS_FOR_PROXY;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string AUTH_REALM;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string AUTH_SCHEME_NAME;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int DATE_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int FORM_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int HEADERS_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int LOGGER_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int MESSAGE_BODY_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string MESSAGE_FLAGS;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int MESSAGE_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int MESSAGE_HEADERS_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string MESSAGE_HTTP_VERSION;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string MESSAGE_METHOD;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string MESSAGE_REASON_PHRASE;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string MESSAGE_STATUS_CODE;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string MESSAGE_URI;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int METHOD_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int MISC_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SERVER_ASYNC_CONTEXT;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int SERVER_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SERVER_INTERFACE;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SERVER_PORT;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SERVER_RAW_PATHS;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SERVER_SERVER_HEADER;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SERVER_SSL_CERT_FILE;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SERVER_SSL_KEY_FILE;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SESSION_ASYNC_CONTEXT;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int SESSION_ASYNC_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int SESSION_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SESSION_MAX_CONNS;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SESSION_MAX_CONNS_PER_HOST;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SESSION_PROXY_URI;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SESSION_SSL_CA_FILE;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int SESSION_SYNC_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SESSION_TIMEOUT;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SESSION_USER_AGENT;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SESSION_USE_NTLM;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SOCKET_ASYNC_CONTEXT;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SOCKET_FLAG_NONBLOCKING;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int SOCKET_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SOCKET_IS_SERVER;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SOCKET_LOCAL_ADDRESS;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SOCKET_REMOTE_ADDRESS;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SOCKET_SSL_CREDENTIALS;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const string SOCKET_TIMEOUT;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int STATUS_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int TYPES_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int URI_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int VALUE_UTILS_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public const int XMLRPC_H;
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static weak GLib.TimeoutSource add_idle (GLib.MainContext async_context, GLib.SourceFunc function, void* data);

Modified: trunk/vapi/pango.vapi
==============================================================================
--- trunk/vapi/pango.vapi	(original)
+++ trunk/vapi/pango.vapi	Thu May 29 20:26:37 2008
@@ -736,16 +736,27 @@
 	public delegate bool AttrFilterFunc (Pango.Attribute attribute);
 	[CCode (cheader_filename = "pango/pango.h")]
 	public delegate bool FontsetForeachFunc (Pango.Fontset fontset, Pango.Font font);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public const int ANALYSIS_FLAG_CENTERED_BASELINE;
+	[CCode (cheader_filename = "pango/pango.h")]
 	public const string ENGINE_TYPE_LANG;
+	[CCode (cheader_filename = "pango/pango.h")]
 	public const string ENGINE_TYPE_SHAPE;
+	[CCode (cheader_filename = "pango/pango.h")]
 	public const string RENDER_TYPE_NONE;
+	[CCode (cheader_filename = "pango/pango.h")]
 	public const int SCALE;
+	[CCode (cheader_filename = "pango/pango.h")]
 	public const int UNKNOWN_GLYPH_HEIGHT;
+	[CCode (cheader_filename = "pango/pango.h")]
 	public const int UNKNOWN_GLYPH_WIDTH;
+	[CCode (cheader_filename = "pango/pango.h")]
 	public const int VERSION_MAJOR;
+	[CCode (cheader_filename = "pango/pango.h")]
 	public const int VERSION_MICRO;
+	[CCode (cheader_filename = "pango/pango.h")]
 	public const int VERSION_MINOR;
+	[CCode (cheader_filename = "pango/pango.h")]
 	public const string VERSION_STRING;
 	[CCode (cheader_filename = "pango/pango.h")]
 	public static weak Pango.Attribute attr_background_new (ushort red, ushort green, ushort blue);

Modified: trunk/vapi/poppler-glib.vapi
==============================================================================
--- trunk/vapi/poppler-glib.vapi	(original)
+++ trunk/vapi/poppler-glib.vapi	Thu May 29 20:26:37 2008
@@ -428,6 +428,7 @@
 	}
 	[CCode (cheader_filename = "poppler.h")]
 	public static delegate bool AttachmentSaveFunc (string buf, ulong count, void* data, GLib.Error error);
+	[CCode (cheader_filename = "poppler.h")]
 	public const int HAS_CAIRO;
 	[CCode (cheader_filename = "poppler.h")]
 	public static GLib.Quark error_quark ();



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