vala r1012 - in trunk: . vala vapi



Author: juergbi
Date: Fri Feb 15 12:29:20 2008
New Revision: 1012
URL: http://svn.gnome.org/viewvc/vala?rev=1012&view=rev

Log:
2008-02-15  Juerg Billeter  <j bitron ch>

	* vala/valainterfacewriter.vala: write cheader_filename for
	  namespace methods

	* vapi/: regenerated bindings, fixes bug 514350


Modified:
   trunk/ChangeLog
   trunk/vala/valainterfacewriter.vala
   trunk/vapi/atk.vapi
   trunk/vapi/gconf-2.0.vapi
   trunk/vapi/gdk-2.0.vapi
   trunk/vapi/gio-2.0.vapi
   trunk/vapi/gio-unix-2.0.vapi
   trunk/vapi/gnome-vfs-2.0.vapi
   trunk/vapi/gstreamer-0.10.vapi
   trunk/vapi/gstreamer-audio-0.10.vapi
   trunk/vapi/gstreamer-base-0.10.vapi
   trunk/vapi/gstreamer-check-0.10.vapi
   trunk/vapi/gstreamer-controller-0.10.vapi
   trunk/vapi/gstreamer-dataprotocol-0.10.vapi
   trunk/vapi/gstreamer-fft-0.10.vapi
   trunk/vapi/gstreamer-pbutils-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-tag-0.10.vapi
   trunk/vapi/gstreamer-video-0.10.vapi
   trunk/vapi/gtk+-2.0.vapi
   trunk/vapi/gtksourceview-2.0.vapi
   trunk/vapi/hildon-1.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/libwnck-1.0.vapi
   trunk/vapi/pango.vapi
   trunk/vapi/pangocairo.vapi
   trunk/vapi/poppler-glib.vapi

Modified: trunk/vala/valainterfacewriter.vala
==============================================================================
--- trunk/vala/valainterfacewriter.vala	(original)
+++ trunk/vala/valainterfacewriter.vala	Fri Feb 15 12:29:20 2008
@@ -95,16 +95,6 @@
 		
 		write_indent ();
 		
-		var first = true;
-		string cheaders;
-		foreach (string cheader in cl.get_cheader_filenames ()) {
-			if (first) {
-				cheaders = cheader;
-				first = false;
-			} else {
-				cheaders = "%s,%s".printf (cheaders, cheader);
-			}
-		}
 		write_string ("[CCode (");
 
 		if (cl.is_reference_counting ()) {
@@ -127,6 +117,16 @@
 			write_string ("cname = \"%s\", ".printf (cl.get_cname ()));
 		}
 
+		bool first = true;
+		string cheaders;
+		foreach (string cheader in cl.get_cheader_filenames ()) {
+			if (first) {
+				cheaders = cheader;
+				first = false;
+			} else {
+				cheaders = "%s,%s".printf (cheaders, cheader);
+			}
+		}
 		write_string ("cheader_filename = \"%s\")]".printf (cheaders));
 		write_newline ();
 		
@@ -576,6 +576,20 @@
 			ccode_params.append_printf ("%scname = \"%s\"", separator, m.get_cname ());
 			separator = ", ";
 		}
+		if (m.parent_symbol is Namespace) {
+			bool first = true;
+			string cheaders;
+			foreach (string cheader in m.get_cheader_filenames ()) {
+				if (first) {
+					cheaders = cheader;
+					first = false;
+				} else {
+					cheaders = "%s,%s".printf (cheaders, cheader);
+				}
+			}
+			ccode_params.append_printf ("%scheader_filename = \"%s\"", separator, cheaders);
+			separator = ", ";
+		}
 		if (!float_equal (m.cinstance_parameter_position, 0)) {
 			ccode_params.append_printf ("%sinstance_pos = %g", separator, m.cinstance_parameter_position);
 			separator = ", ";

Modified: trunk/vapi/atk.vapi
==============================================================================
--- trunk/vapi/atk.vapi	(original)
+++ trunk/vapi/atk.vapi	Fri Feb 15 12:29:20 2008
@@ -648,22 +648,40 @@
 	public static delegate bool Function (pointer data);
 	public static delegate int KeySnoopFunc (Atk.KeyEventStruct event, pointer func_data);
 	public static delegate void PropertyChangeHandler (Atk.Object p1, Atk.PropertyValues p2);
+	[CCode (cheader_filename = "atk/atk.h")]
 	public static uint add_focus_tracker (Atk.EventListener focus_tracker);
+	[CCode (cheader_filename = "atk/atk.h")]
 	public static uint add_global_event_listener (GLib.SignalEmissionHook listener, string event_type);
+	[CCode (cheader_filename = "atk/atk.h")]
 	public static uint add_key_event_listener (Atk.KeySnoopFunc listener, pointer data);
+	[CCode (cheader_filename = "atk/atk.h")]
 	public static void focus_tracker_init (Atk.EventListenerInit init);
+	[CCode (cheader_filename = "atk/atk.h")]
 	public static void focus_tracker_notify (Atk.Object object);
+	[CCode (cheader_filename = "atk/atk.h")]
 	public static weak Atk.Registry get_default_registry ();
+	[CCode (cheader_filename = "atk/atk.h")]
 	public static weak Atk.Object get_focus_object ();
+	[CCode (cheader_filename = "atk/atk.h")]
 	public static weak Atk.Object get_root ();
+	[CCode (cheader_filename = "atk/atk.h")]
 	public static weak string get_toolkit_name ();
+	[CCode (cheader_filename = "atk/atk.h")]
 	public static weak string get_toolkit_version ();
+	[CCode (cheader_filename = "atk/atk.h")]
 	public static weak string get_version ();
+	[CCode (cheader_filename = "atk/atk.h")]
 	public static void remove_focus_tracker (uint tracker_id);
+	[CCode (cheader_filename = "atk/atk.h")]
 	public static void remove_global_event_listener (uint listener_id);
+	[CCode (cheader_filename = "atk/atk.h")]
 	public static void remove_key_event_listener (uint listener_id);
+	[CCode (cheader_filename = "atk/atk.h")]
 	public static Atk.Role role_for_name (string name);
+	[CCode (cheader_filename = "atk/atk.h")]
 	public static weak string role_get_localized_name (Atk.Role role);
+	[CCode (cheader_filename = "atk/atk.h")]
 	public static weak string role_get_name (Atk.Role role);
+	[CCode (cheader_filename = "atk/atk.h")]
 	public static Atk.Role role_register (string name);
 }

Modified: trunk/vapi/gconf-2.0.vapi
==============================================================================
--- trunk/vapi/gconf-2.0.vapi	(original)
+++ trunk/vapi/gconf-2.0.vapi	Fri Feb 15 12:29:20 2008
@@ -284,16 +284,28 @@
 	public static delegate void ListenersForeach (string location, uint cnxn_id, pointer listener_data, pointer user_data);
 	public static delegate bool ListenersPredicate (string location, uint cnxn_id, pointer listener_data, pointer user_data);
 	public static delegate void NotifyFunc (GConf.Engine conf, uint cnxn_id, GConf.Entry entry, pointer user_data);
+	[CCode (cheader_filename = "gconf/gconf.h")]
 	public static weak string concat_dir_and_key (string dir, string key);
+	[CCode (cheader_filename = "gconf/gconf.h")]
 	public static int debug_shutdown ();
+	[CCode (cheader_filename = "gconf/gconf.h")]
 	public static weak string enum_to_string (GConf.EnumStringPair[] lookup_table, int enum_value);
+	[CCode (cheader_filename = "gconf/gconf.h")]
 	public static GLib.Quark error_quark ();
+	[CCode (cheader_filename = "gconf/gconf.h")]
 	public static weak string escape_key (string arbitrary_text, int len);
+	[CCode (cheader_filename = "gconf/gconf.h")]
 	public static bool init (int argc, out weak string argv) throws GLib.Error;
+	[CCode (cheader_filename = "gconf/gconf.h")]
 	public static bool is_initialized ();
+	[CCode (cheader_filename = "gconf/gconf.h")]
 	public static bool key_is_below (string above, string below);
+	[CCode (cheader_filename = "gconf/gconf.h")]
 	public static bool string_to_enum (GConf.EnumStringPair[] lookup_table, string str, int enum_value_retloc);
+	[CCode (cheader_filename = "gconf/gconf.h")]
 	public static weak string unescape_key (string escaped_key, int len);
+	[CCode (cheader_filename = "gconf/gconf.h")]
 	public static weak string unique_key ();
+	[CCode (cheader_filename = "gconf/gconf.h")]
 	public static bool valid_key (string key, string why_invalid);
 }

Modified: trunk/vapi/gdk-2.0.vapi
==============================================================================
--- trunk/vapi/gdk-2.0.vapi	(original)
+++ trunk/vapi/gdk-2.0.vapi	Fri Feb 15 12:29:20 2008
@@ -1455,144 +1455,284 @@
 	public const int MAX_TIMECOORD_AXES;
 	public const int PARENT_RELATIVE;
 	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, pointer data);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void add_option_entries_libgtk_only (GLib.OptionGroup group);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void beep ();
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static Cairo.Context cairo_create (Gdk.Drawable drawable);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void cairo_rectangle (Cairo.Context cr, Gdk.Rectangle rectangle);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void cairo_region (Cairo.Context cr, Gdk.Region region);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void cairo_set_source_color (Cairo.Context cr, Gdk.Color color);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void cairo_set_source_pixbuf (Cairo.Context cr, Gdk.Pixbuf pixbuf, double pixbuf_x, double pixbuf_y);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void cairo_set_source_pixmap (Cairo.Context cr, Gdk.Pixmap pixmap, double pixmap_x, double pixmap_y);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static weak GLib.List devices_list ();
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void drag_abort (Gdk.DragContext context, uint time_);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static weak Gdk.DragContext drag_begin (Gdk.Window window, GLib.List targets);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void drag_drop (Gdk.DragContext context, uint time_);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool drag_drop_succeeded (Gdk.DragContext context);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void drag_find_window (Gdk.DragContext context, Gdk.Window drag_window, int x_root, int y_root, out weak Gdk.Window dest_window, Gdk.DragProtocol protocol);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void drag_find_window_for_screen (Gdk.DragContext context, Gdk.Window drag_window, Gdk.Screen screen, int x_root, int y_root, out weak Gdk.Window dest_window, Gdk.DragProtocol protocol);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static uint drag_get_protocol (uint xid, Gdk.DragProtocol protocol);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static uint drag_get_protocol_for_display (Gdk.Display display, uint xid, Gdk.DragProtocol protocol);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static Gdk.Atom drag_get_selection (Gdk.DragContext context);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool drag_motion (Gdk.DragContext context, Gdk.Window dest_window, Gdk.DragProtocol protocol, int x_root, int y_root, Gdk.DragAction suggested_action, Gdk.DragAction possible_actions, uint time_);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void drag_status (Gdk.DragContext context, Gdk.DragAction action, uint time_);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_arc (Gdk.Drawable drawable, Gdk.GC gc, bool filled, int x, int y, int width, int height, int angle1, int angle2);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_drawable (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Drawable src, int xsrc, int ysrc, int xdest, int ydest, int width, int height);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_glyphs (Gdk.Drawable drawable, Gdk.GC gc, Pango.Font font, int x, int y, Pango.GlyphString glyphs);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_glyphs_transformed (Gdk.Drawable drawable, Gdk.GC gc, Pango.Matrix matrix, Pango.Font font, int x, int y, Pango.GlyphString glyphs);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_gray_image (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, uchar[] buf, int rowstride);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_image (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Image image, int xsrc, int ysrc, int xdest, int ydest, int width, int height);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_indexed_image (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, uchar[] buf, int rowstride, Gdk.RgbCmap cmap);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_layout (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, Pango.Layout layout);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_layout_line (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, Pango.LayoutLine line);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_layout_line_with_colors (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, Pango.LayoutLine line, Gdk.Color foreground, Gdk.Color background);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_layout_with_colors (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, Pango.Layout layout, Gdk.Color foreground, Gdk.Color background);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_line (Gdk.Drawable drawable, Gdk.GC gc, int x1_, int y1_, int x2_, int y2_);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_lines (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Point points, int npoints);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_pixbuf (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Pixbuf pixbuf, int src_x, int src_y, int dest_x, int dest_y, int width, int height, Gdk.RgbDither dither, int x_dither, int y_dither);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_point (Gdk.Drawable drawable, Gdk.GC gc, int x, int y);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_points (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Point points, int npoints);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_polygon (Gdk.Drawable drawable, Gdk.GC gc, bool filled, Gdk.Point points, int npoints);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_rectangle (Gdk.Drawable drawable, Gdk.GC gc, bool filled, int x, int y, int width, int height);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_rgb_32_image (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, uchar[] buf, int rowstride);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_rgb_32_image_dithalign (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, uchar[] buf, int rowstride, int xdith, int ydith);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_rgb_image (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, uchar[] rgb_buf, int rowstride);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_rgb_image_dithalign (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, uchar[] rgb_buf, int rowstride, int xdith, int ydith);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_segments (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Segment segs, int nsegs);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void draw_trapezoids (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Trapezoid[] trapezoids);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void drop_finish (Gdk.DragContext context, bool success, uint time_);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void drop_reply (Gdk.DragContext context, bool ok, uint time_);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static int error_trap_pop ();
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void error_trap_push ();
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool events_pending ();
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void flush ();
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void free_compound_text (uchar[] ctext);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void free_text_list (string list);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static weak Gdk.Window get_default_root_window ();
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static weak string get_display ();
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static weak string get_display_arg_name ();
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static weak string get_program_class ();
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool get_show_events ();
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void init (int argc, string argv);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool init_check (int argc, string argv);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void input_set_extension_events (Gdk.Window window, int mask, Gdk.ExtensionMode mode);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static Gdk.GrabStatus keyboard_grab (Gdk.Window window, bool owner_events, uint time_);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool keyboard_grab_info_libgtk_only (Gdk.Display display, out weak Gdk.Window grab_window, bool owner_events);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void keyboard_ungrab (uint time_);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void keyval_convert_case (uint symbol, uint lower, uint upper);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static uint keyval_from_name (string keyval_name);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool keyval_is_lower (uint keyval);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool keyval_is_upper (uint keyval);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static weak string keyval_name (uint keyval);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static uint keyval_to_lower (uint keyval);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static uint keyval_to_unicode (uint keyval);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static uint keyval_to_upper (uint keyval);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static weak GLib.List list_visuals ();
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void notify_startup_complete ();
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void notify_startup_complete_with_id (string startup_id);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static weak Pango.Context pango_context_get ();
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static weak Pango.Context pango_context_get_for_screen (Gdk.Screen screen);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static weak Gdk.Region pango_layout_get_clip_region (Pango.Layout layout, int x_origin, int y_origin, int index_ranges, int n_ranges);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static weak Gdk.Region pango_layout_line_get_clip_region (Pango.LayoutLine line, int x_origin, int y_origin, int index_ranges, int n_ranges);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void parse_args (int argc, string argv);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static weak Gdk.Pixbuf pixbuf_get_from_drawable (Gdk.Pixbuf dest, Gdk.Drawable src, Gdk.Colormap cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static weak Gdk.Pixbuf pixbuf_get_from_image (Gdk.Pixbuf dest, Gdk.Image src, Gdk.Colormap cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void pixbuf_render_pixmap_and_mask (Gdk.Pixbuf pixbuf, out weak Gdk.Pixmap pixmap_return, out weak Gdk.Bitmap mask_return, int alpha_threshold);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void pixbuf_render_pixmap_and_mask_for_colormap (Gdk.Pixbuf pixbuf, Gdk.Colormap colormap, out weak Gdk.Pixmap pixmap_return, out weak Gdk.Bitmap mask_return, int alpha_threshold);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void pixbuf_render_threshold_alpha (Gdk.Pixbuf pixbuf, Gdk.Bitmap bitmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int alpha_threshold);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static Gdk.GrabStatus pointer_grab (Gdk.Window window, bool owner_events, Gdk.EventMask event_mask, Gdk.Window confine_to, Gdk.Cursor cursor, uint time_);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool pointer_grab_info_libgtk_only (Gdk.Display display, out weak Gdk.Window grab_window, bool owner_events);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool pointer_is_grabbed ();
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void pointer_ungrab (uint time_);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void pre_parse_libgtk_only ();
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void property_change (Gdk.Window window, Gdk.Atom property, Gdk.Atom type, int format, Gdk.PropMode mode, uchar[] data, int nelements);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void property_delete (Gdk.Window window, Gdk.Atom property);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool property_get (Gdk.Window window, Gdk.Atom property, Gdk.Atom type, ulong offset, ulong length, int pdelete, out Gdk.Atom actual_property_type, int actual_format, int actual_length, uchar[] data);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void query_depths (int depths, int count);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void query_visual_types (out Gdk.VisualType visual_types, int count);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool rgb_colormap_ditherable (Gdk.Colormap cmap);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool rgb_ditherable ();
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void rgb_find_color (Gdk.Colormap colormap, ref Gdk.Color color);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static weak Gdk.Colormap rgb_get_colormap ();
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static weak Gdk.Visual rgb_get_visual ();
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void rgb_set_install (bool install);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void rgb_set_min_colors (int min_colors);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void rgb_set_verbose (bool verbose);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void selection_convert (Gdk.Window requestor, Gdk.Atom selection, Gdk.Atom target, uint time_);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static weak Gdk.Window selection_owner_get (Gdk.Atom selection);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static weak Gdk.Window selection_owner_get_for_display (Gdk.Display display, Gdk.Atom selection);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool selection_owner_set (Gdk.Window owner, Gdk.Atom selection, uint time_, bool send_event);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool selection_owner_set_for_display (Gdk.Display display, Gdk.Window owner, Gdk.Atom selection, uint time_, bool send_event);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool selection_property_get (Gdk.Window requestor, uchar[] data, Gdk.Atom prop_type, int prop_format);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void selection_send_notify (uint requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint time_);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void selection_send_notify_for_display (Gdk.Display display, uint requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint time_);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void set_double_click_time (uint msec);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static weak string set_locale ();
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static weak Gdk.PointerHooks set_pointer_hooks (Gdk.PointerHooks new_hooks);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void set_program_class (string program_class);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void set_show_events (bool show_events);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void set_sm_client_id (string sm_client_id);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool setting_get (string name, GLib.Value value);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool spawn_command_line_on_screen (Gdk.Screen screen, string command_line) throws GLib.Error;
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool spawn_on_screen (Gdk.Screen screen, string working_directory, string argv, string envp, GLib.SpawnFlags flags, GLib.SpawnChildSetupFunc child_setup, pointer user_data, int child_pid) throws GLib.Error;
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool spawn_on_screen_with_pipes (Gdk.Screen screen, string working_directory, string argv, string envp, GLib.SpawnFlags flags, GLib.SpawnChildSetupFunc child_setup, pointer user_data, int child_pid, int standard_input, int standard_output, int standard_error) throws GLib.Error;
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static int string_to_compound_text (string str, Gdk.Atom encoding, int format, uchar[] ctext, int length);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static int string_to_compound_text_for_display (Gdk.Display display, string str, Gdk.Atom encoding, int format, uchar[] ctext, int length);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void synthesize_window_state (Gdk.Window window, Gdk.WindowState unset_flags, Gdk.WindowState set_flags);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static int text_property_to_text_list (Gdk.Atom encoding, int format, uchar[] text, int length, string list);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static int text_property_to_text_list_for_display (Gdk.Display display, Gdk.Atom encoding, int format, uchar[] text, int length, string list);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static int text_property_to_utf8_list (Gdk.Atom encoding, int format, uchar[] text, int length, string list);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static int text_property_to_utf8_list_for_display (Gdk.Display display, Gdk.Atom encoding, int format, uchar[] text, int length, string list);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static uint threads_add_idle (GLib.SourceFunc function, pointer data);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static uint threads_add_idle_full (int priority, GLib.SourceFunc function, pointer data, GLib.DestroyNotify notify);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static uint threads_add_timeout (uint interval, GLib.SourceFunc function, pointer data);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static uint threads_add_timeout_full (int priority, uint interval, GLib.SourceFunc function, pointer data, GLib.DestroyNotify notify);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void threads_enter ();
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void threads_init ();
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void threads_leave ();
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void threads_set_lock_functions (GLib.Callback enter_fn, GLib.Callback leave_fn);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static uint unicode_to_keyval (uint wc);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool utf8_to_compound_text (string str, Gdk.Atom encoding, int format, uchar[] ctext, int length);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool utf8_to_compound_text_for_display (Gdk.Display display, string str, Gdk.Atom encoding, int format, uchar[] ctext, int length);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static weak string utf8_to_string_target (string str);
 }

Modified: trunk/vapi/gio-2.0.vapi
==============================================================================
--- trunk/vapi/gio-2.0.vapi	(original)
+++ trunk/vapi/gio-2.0.vapi	Fri Feb 15 12:29:20 2008
@@ -876,36 +876,36 @@
 	public const string VOLUME_IDENTIFIER_KIND_UNIX_DEVICE;
 	public const string VOLUME_IDENTIFIER_KIND_UUID;
 	public const string VOLUME_MONITOR_EXTENSION_POINT_NAME;
-	[CCode (cname = "g_content_type_can_be_executable")]
+	[CCode (cname = "g_content_type_can_be_executable", cheader_filename = "gio/gio.h")]
 	public static bool g_content_type_can_be_executable (string type);
-	[CCode (cname = "g_content_type_equals")]
+	[CCode (cname = "g_content_type_equals", cheader_filename = "gio/gio.h")]
 	public static bool g_content_type_equals (string type1, string type2);
-	[CCode (cname = "g_content_type_get_description")]
+	[CCode (cname = "g_content_type_get_description", cheader_filename = "gio/gio.h")]
 	public static weak string g_content_type_get_description (string type);
-	[CCode (cname = "g_content_type_get_icon")]
+	[CCode (cname = "g_content_type_get_icon", cheader_filename = "gio/gio.h")]
 	public static weak GLib.Icon g_content_type_get_icon (string type);
-	[CCode (cname = "g_content_type_get_mime_type")]
+	[CCode (cname = "g_content_type_get_mime_type", cheader_filename = "gio/gio.h")]
 	public static weak string g_content_type_get_mime_type (string type);
-	[CCode (cname = "g_content_type_guess")]
+	[CCode (cname = "g_content_type_guess", cheader_filename = "gio/gio.h")]
 	public static weak string g_content_type_guess (string filename, uchar[] data, ulong data_size, bool result_uncertain);
-	[CCode (cname = "g_content_type_is_a")]
+	[CCode (cname = "g_content_type_is_a", cheader_filename = "gio/gio.h")]
 	public static bool g_content_type_is_a (string type, string supertype);
-	[CCode (cname = "g_content_type_is_unknown")]
+	[CCode (cname = "g_content_type_is_unknown", cheader_filename = "gio/gio.h")]
 	public static bool g_content_type_is_unknown (string type);
-	[CCode (cname = "g_content_types_get_registered")]
+	[CCode (cname = "g_content_types_get_registered", cheader_filename = "gio/gio.h")]
 	public static weak GLib.List g_content_types_get_registered ();
-	[CCode (cname = "g_io_error_from_errno")]
+	[CCode (cname = "g_io_error_from_errno", cheader_filename = "gio/gio.h")]
 	public static GLib.IOErrorEnum g_io_error_from_errno (int err_no);
-	[CCode (cname = "g_io_error_quark")]
+	[CCode (cname = "g_io_error_quark", cheader_filename = "gio/gio.h")]
 	public static GLib.Quark g_io_error_quark ();
-	[CCode (cname = "g_io_modules_load_all_in_directory")]
+	[CCode (cname = "g_io_modules_load_all_in_directory", cheader_filename = "gio/gio.h")]
 	public static weak GLib.List g_io_modules_load_all_in_directory (string dirname);
-	[CCode (cname = "g_io_scheduler_cancel_all_jobs")]
+	[CCode (cname = "g_io_scheduler_cancel_all_jobs", cheader_filename = "gio/gio.h")]
 	public static void g_io_scheduler_cancel_all_jobs ();
-	[CCode (cname = "g_io_scheduler_push_job")]
+	[CCode (cname = "g_io_scheduler_push_job", cheader_filename = "gio/gio.h")]
 	public static void g_io_scheduler_push_job (GLib.IOSchedulerJobFunc job_func, pointer user_data, GLib.DestroyNotify notify, int io_priority, GLib.Cancellable cancellable);
-	[CCode (cname = "g_simple_async_report_error_in_idle")]
+	[CCode (cname = "g_simple_async_report_error_in_idle", cheader_filename = "gio/gio.h")]
 	public static void g_simple_async_report_error_in_idle (GLib.Object object, GLib.AsyncReadyCallback callback, pointer user_data, GLib.Quark domain, int code, string format);
-	[CCode (cname = "g_simple_async_report_gerror_in_idle")]
+	[CCode (cname = "g_simple_async_report_gerror_in_idle", cheader_filename = "gio/gio.h")]
 	public static void g_simple_async_report_gerror_in_idle (GLib.Object object, GLib.AsyncReadyCallback callback, pointer user_data) throws GLib.Error;
 }

Modified: trunk/vapi/gio-unix-2.0.vapi
==============================================================================
--- trunk/vapi/gio-unix-2.0.vapi	(original)
+++ trunk/vapi/gio-unix-2.0.vapi	Fri Feb 15 12:29:20 2008
@@ -42,38 +42,38 @@
 	public class UnixOutputStream : GLib.OutputStream {
 		public UnixOutputStream (int fd, bool close_fd_at_close);
 	}
-	[CCode (cname = "g_unix_is_mount_path_system_internal")]
+	[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);
-	[CCode (cname = "g_unix_mount_at")]
+	[CCode (cname = "g_unix_mount_at", cheader_filename = "gio/gunixmounts.h")]
 	public static weak GLib.UnixMountEntry g_unix_mount_at (string mount_path, uint64 time_read);
-	[CCode (cname = "g_unix_mount_compare")]
+	[CCode (cname = "g_unix_mount_compare", cheader_filename = "gio/gunixmounts.h")]
 	public static int g_unix_mount_compare (GLib.UnixMountEntry mount1, GLib.UnixMountEntry mount2);
-	[CCode (cname = "g_unix_mount_free")]
+	[CCode (cname = "g_unix_mount_free", cheader_filename = "gio/gunixmounts.h")]
 	public static void g_unix_mount_free (GLib.UnixMountEntry mount_entry);
-	[CCode (cname = "g_unix_mount_get_device_path")]
+	[CCode (cname = "g_unix_mount_get_device_path", cheader_filename = "gio/gunixmounts.h")]
 	public static weak string g_unix_mount_get_device_path (GLib.UnixMountEntry mount_entry);
-	[CCode (cname = "g_unix_mount_get_fs_type")]
+	[CCode (cname = "g_unix_mount_get_fs_type", cheader_filename = "gio/gunixmounts.h")]
 	public static weak string g_unix_mount_get_fs_type (GLib.UnixMountEntry mount_entry);
-	[CCode (cname = "g_unix_mount_get_mount_path")]
+	[CCode (cname = "g_unix_mount_get_mount_path", cheader_filename = "gio/gunixmounts.h")]
 	public static weak string g_unix_mount_get_mount_path (GLib.UnixMountEntry mount_entry);
-	[CCode (cname = "g_unix_mount_guess_can_eject")]
+	[CCode (cname = "g_unix_mount_guess_can_eject", cheader_filename = "gio/gunixmounts.h")]
 	public static bool g_unix_mount_guess_can_eject (GLib.UnixMountEntry mount_entry);
-	[CCode (cname = "g_unix_mount_guess_icon")]
+	[CCode (cname = "g_unix_mount_guess_icon", cheader_filename = "gio/gunixmounts.h")]
 	public static weak GLib.Icon g_unix_mount_guess_icon (GLib.UnixMountEntry mount_entry);
-	[CCode (cname = "g_unix_mount_guess_name")]
+	[CCode (cname = "g_unix_mount_guess_name", cheader_filename = "gio/gunixmounts.h")]
 	public static weak string g_unix_mount_guess_name (GLib.UnixMountEntry mount_entry);
-	[CCode (cname = "g_unix_mount_guess_should_display")]
+	[CCode (cname = "g_unix_mount_guess_should_display", cheader_filename = "gio/gunixmounts.h")]
 	public static bool g_unix_mount_guess_should_display (GLib.UnixMountEntry mount_entry);
-	[CCode (cname = "g_unix_mount_is_readonly")]
+	[CCode (cname = "g_unix_mount_is_readonly", cheader_filename = "gio/gunixmounts.h")]
 	public static bool g_unix_mount_is_readonly (GLib.UnixMountEntry mount_entry);
-	[CCode (cname = "g_unix_mount_is_system_internal")]
+	[CCode (cname = "g_unix_mount_is_system_internal", cheader_filename = "gio/gunixmounts.h")]
 	public static bool g_unix_mount_is_system_internal (GLib.UnixMountEntry mount_entry);
-	[CCode (cname = "g_unix_mount_points_changed_since")]
+	[CCode (cname = "g_unix_mount_points_changed_since", cheader_filename = "gio/gunixmounts.h")]
 	public static bool g_unix_mount_points_changed_since (uint64 time);
-	[CCode (cname = "g_unix_mount_points_get")]
+	[CCode (cname = "g_unix_mount_points_get", cheader_filename = "gio/gunixmounts.h")]
 	public static weak GLib.List g_unix_mount_points_get (uint64 time_read);
-	[CCode (cname = "g_unix_mounts_changed_since")]
+	[CCode (cname = "g_unix_mounts_changed_since", cheader_filename = "gio/gunixmounts.h")]
 	public static bool g_unix_mounts_changed_since (uint64 time);
-	[CCode (cname = "g_unix_mounts_get")]
+	[CCode (cname = "g_unix_mounts_get", cheader_filename = "gio/gunixmounts.h")]
 	public static weak GLib.List g_unix_mounts_get (uint64 time_read);
 }

Modified: trunk/vapi/gnome-vfs-2.0.vapi
==============================================================================
--- trunk/vapi/gnome-vfs-2.0.vapi	(original)
+++ trunk/vapi/gnome-vfs-2.0.vapi	Fri Feb 15 12:29:20 2008
@@ -913,212 +913,420 @@
 	public const int S_IWOTH;
 	public const int S_IXGRP;
 	public const int S_IXOTH;
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static bool application_is_user_owned_application (GnomeVFS.MimeApplication application);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void application_registry_add_mime_type (string app_id, string mime_type);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void application_registry_clear_mime_types (string app_id);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static bool application_registry_exists (string app_id);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak GLib.List application_registry_get_applications (string mime_type);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static bool application_registry_get_bool_value (string app_id, string key, bool got_key);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak GLib.List application_registry_get_keys (string app_id);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak GnomeVFS.MimeApplication application_registry_get_mime_application (string app_id);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak GLib.List application_registry_get_mime_types (string app_id);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string application_registry_peek_value (string app_id, string key);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void application_registry_reload ();
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void application_registry_remove_application (string app_id);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void application_registry_remove_mime_type (string app_id, string mime_type);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void application_registry_save_mime_application (GnomeVFS.MimeApplication application);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void application_registry_set_bool_value (string app_id, string key, bool value);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void application_registry_set_value (string app_id, string key, string value);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void application_registry_shutdown ();
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static bool application_registry_supports_mime_type (string app_id, string mime_type);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static bool application_registry_supports_uri_scheme (string app_id, string uri_scheme);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result application_registry_sync ();
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void application_registry_unset_key (string app_id, string key);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void async_cancel (GnomeVFS.AsyncHandle handle);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void async_close (GnomeVFS.AsyncHandle handle, GnomeVFS.AsyncCloseCallback callback, pointer callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void async_create (out weak GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm, int priority, GnomeVFS.AsyncOpenCallback callback, pointer callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void async_create_as_channel (out weak GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm, int priority, GnomeVFS.AsyncCreateAsChannelCallback callback, pointer callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void async_create_symbolic_link (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, string uri_reference, int priority, GnomeVFS.AsyncOpenCallback callback, pointer callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void async_create_uri (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm, int priority, GnomeVFS.AsyncOpenCallback callback, pointer callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void async_create_uri_as_channel (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm, int priority, GnomeVFS.AsyncCreateAsChannelCallback callback, pointer callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void async_file_control (GnomeVFS.AsyncHandle handle, string operation, pointer operation_data, GLib.DestroyNotify operation_data_destroy_func, GnomeVFS.AsyncFileControlCallback callback, pointer callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void async_find_directory (out weak GnomeVFS.AsyncHandle handle_return, GLib.List near_uri_list, GnomeVFS.FindDirectoryKind kind, bool create_if_needed, bool find_if_needed, uint permissions, int priority, GnomeVFS.AsyncFindDirectoryCallback callback, pointer user_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void async_get_file_info (out weak GnomeVFS.AsyncHandle handle_return, GLib.List uri_list, GnomeVFS.FileInfoOptions options, int priority, GnomeVFS.AsyncGetFileInfoCallback callback, pointer callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static int async_get_job_limit ();
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void async_load_directory (out weak GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.FileInfoOptions options, uint items_per_notification, int priority, GnomeVFS.AsyncDirectoryLoadCallback callback, pointer callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void async_load_directory_uri (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.FileInfoOptions options, uint items_per_notification, int priority, GnomeVFS.AsyncDirectoryLoadCallback callback, pointer callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void async_module_callback_pop (string callback_name);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void async_module_callback_push (string callback_name, GnomeVFS.AsyncModuleCallback callback, pointer callback_data, GLib.DestroyNotify destroy_notify);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void async_module_callback_set_default (string callback_name, GnomeVFS.AsyncModuleCallback callback, pointer callback_data, GLib.DestroyNotify destroy_notify);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void async_open (out weak GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.OpenMode open_mode, int priority, GnomeVFS.AsyncOpenCallback callback, pointer callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void async_open_as_channel (out weak GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.OpenMode open_mode, uint advised_block_size, int priority, GnomeVFS.AsyncOpenAsChannelCallback callback, pointer callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void async_open_uri (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, int priority, GnomeVFS.AsyncOpenCallback callback, pointer callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void async_open_uri_as_channel (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, uint advised_block_size, int priority, GnomeVFS.AsyncOpenAsChannelCallback callback, pointer callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void async_read (GnomeVFS.AsyncHandle handle, pointer buffer, uint bytes, GnomeVFS.AsyncReadCallback callback, pointer callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void async_seek (GnomeVFS.AsyncHandle handle, GnomeVFS.SeekPosition whence, GnomeVFS.FileOffset offset, GnomeVFS.AsyncSeekCallback callback, pointer callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void async_set_file_info (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.FileInfo info, GnomeVFS.SetFileInfoMask mask, GnomeVFS.FileInfoOptions options, int priority, GnomeVFS.AsyncSetFileInfoCallback callback, pointer callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void async_set_job_limit (int limit);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void async_write (GnomeVFS.AsyncHandle handle, pointer buffer, uint bytes, GnomeVFS.AsyncWriteCallback callback, pointer callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result async_xfer (out weak GnomeVFS.AsyncHandle handle_return, GLib.List source_uri_list, GLib.List target_uri_list, GnomeVFS.XferOptions xfer_options, GnomeVFS.XferErrorMode error_mode, GnomeVFS.XferOverwriteMode overwrite_mode, int priority, GnomeVFS.AsyncXferProgressCallback progress_update_callback, pointer update_callback_data, GnomeVFS.XferProgressCallback progress_sync_callback, pointer sync_callback_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result check_same_fs (string source, string target, bool same_fs_return);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result check_same_fs_uris (GnomeVFS.URI source_uri, GnomeVFS.URI target_uri, bool same_fs_return);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result close (GnomeVFS.Handle handle);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void connect_to_server (string uri, string display_name, string icon);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result create (out weak GnomeVFS.Handle handle, string text_uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result create_symbolic_link (GnomeVFS.URI uri, string target_reference);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result create_uri (out weak GnomeVFS.Handle handle, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result directory_close (GnomeVFS.DirectoryHandle handle);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result directory_list_load (GLib.List list, string text_uri, GnomeVFS.FileInfoOptions options);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result directory_open (out weak GnomeVFS.DirectoryHandle handle, string text_uri, GnomeVFS.FileInfoOptions options);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result directory_open_from_uri (out weak GnomeVFS.DirectoryHandle handle, GnomeVFS.URI uri, GnomeVFS.FileInfoOptions options);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result directory_read_next (GnomeVFS.DirectoryHandle handle, GnomeVFS.FileInfo file_info);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result directory_visit (string text_uri, GnomeVFS.FileInfoOptions info_options, GnomeVFS.DirectoryVisitOptions visit_options, GnomeVFS.DirectoryVisitFunc callback, pointer data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result directory_visit_files (string text_uri, GLib.List file_list, GnomeVFS.FileInfoOptions info_options, GnomeVFS.DirectoryVisitOptions visit_options, GnomeVFS.DirectoryVisitFunc callback, pointer data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result directory_visit_files_at_uri (GnomeVFS.URI uri, GLib.List file_list, GnomeVFS.FileInfoOptions info_options, GnomeVFS.DirectoryVisitOptions visit_options, GnomeVFS.DirectoryVisitFunc callback, pointer data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result directory_visit_uri (GnomeVFS.URI uri, GnomeVFS.FileInfoOptions info_options, GnomeVFS.DirectoryVisitOptions visit_options, GnomeVFS.DirectoryVisitFunc callback, pointer data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result dns_sd_browse (out weak GnomeVFS.DNSSDBrowseHandle handle, string domain, string type, GnomeVFS.DNSSDBrowseCallback callback, pointer callback_data, GLib.DestroyNotify callback_data_destroy_func);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result dns_sd_browse_sync (string domain, string type, int timeout_msec, int n_services, out weak GnomeVFS.DNSSDService services);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result dns_sd_cancel_resolve (GnomeVFS.DNSSDResolveHandle handle);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result dns_sd_list_browse_domains_sync (string domain, int timeout_msec, GLib.List domains);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result dns_sd_resolve (out weak GnomeVFS.DNSSDResolveHandle handle, string name, string type, string domain, int timeout, GnomeVFS.DNSSDResolveCallback callback, pointer callback_data, GLib.DestroyNotify callback_data_destroy_func);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result dns_sd_resolve_sync (string name, string type, string domain, int timeout_msec, out weak string host, int port, GLib.HashTable text, int text_raw_len_out, out weak string text_raw_out);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result dns_sd_stop_browse (GnomeVFS.DNSSDBrowseHandle handle);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string escape_host_and_path_string (string path);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string escape_path_string (string path);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string escape_set (string string, string match_set);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string escape_slashes (string string);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string escape_string (string string);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string expand_initial_tilde (string path);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result file_control (GnomeVFS.Handle handle, string operation, pointer operation_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result find_directory (GnomeVFS.URI near_uri, GnomeVFS.FindDirectoryKind kind, out weak GnomeVFS.URI _result, bool create_if_needed, bool find_if_needed, uint permissions);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result forget_cache (GnomeVFS.Handle handle, GnomeVFS.FileOffset offset, GnomeVFS.FileSize size);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string format_file_size_for_display (GnomeVFS.FileSize size);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string format_uri_for_display (string uri);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak GLib.List get_default_browse_domains ();
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result get_file_info (string text_uri, GnomeVFS.FileInfo info, GnomeVFS.FileInfoOptions options);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result get_file_info_from_handle (GnomeVFS.Handle handle, GnomeVFS.FileInfo info, GnomeVFS.FileInfoOptions options);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result get_file_info_uri (GnomeVFS.URI uri, GnomeVFS.FileInfo info, GnomeVFS.FileInfoOptions options);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string get_file_mime_type (string path, pointer optional_stat_info, bool suffix_only);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string get_file_mime_type_fast (string path, pointer optional_stat_info);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string get_local_path_from_uri (string uri);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string get_mime_type (string text_uri);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string get_mime_type_common (GnomeVFS.URI uri);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string get_mime_type_for_data (pointer data, int data_size);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string get_mime_type_for_name (string filename);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string get_mime_type_for_name_and_data (string filename, pointer data, long data_size);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string get_mime_type_from_file_data (GnomeVFS.URI uri);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string get_mime_type_from_uri (GnomeVFS.URI uri);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string get_slow_mime_type (string text_uri);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string get_supertype_from_mime_type (string mime_type);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string get_uri_from_local_path (string local_full_path);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string get_uri_scheme (string uri);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result get_volume_free_space (GnomeVFS.URI vfs_uri, GnomeVFS.FileSize size);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak GnomeVFS.VolumeMonitor get_volume_monitor ();
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string icon_path_from_filename (string filename);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static bool init ();
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static bool initialized ();
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static bool is_executable_command_string (string command_string);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static bool is_primary_thread ();
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void list_deep_free (GLib.List list);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void loadinit (pointer app, pointer modinfo);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result make_directory (string text_uri, uint perm);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result make_directory_for_uri (GnomeVFS.URI uri, uint perm);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string make_path_name_canonical (string path);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string make_uri_canonical (string uri);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string make_uri_canonical_strip_fragment (string uri);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string make_uri_from_input (string location);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string make_uri_from_input_with_dirs (string location, GnomeVFS.MakeURIDirs dirs);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string make_uri_from_input_with_trailing_ws (string location);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string make_uri_from_shell_arg (string uri);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string make_uri_full_from_relative (string base_uri, string relative_uri);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result mime_add_application_to_short_list (string mime_type, string application_id);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result mime_add_component_to_short_list (string mime_type, string iid);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result mime_add_extension (string mime_type, string extension);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static bool mime_can_be_executable (string mime_type);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void mime_component_list_free (GLib.List list);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result mime_extend_all_applications (string mime_type, GLib.List application_ids);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak GLib.List mime_get_all_applications (string mime_type);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak GLib.List mime_get_all_applications_for_uri (string uri, string mime_type);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak GLib.List mime_get_all_components (string mime_type);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak GLib.List mime_get_all_desktop_entries (string mime_type);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak GnomeVFS.MimeAction mime_get_default_action (string mime_type);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.MimeActionType mime_get_default_action_type (string mime_type);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak GnomeVFS.MimeApplication mime_get_default_application (string mime_type);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak GnomeVFS.MimeApplication mime_get_default_application_for_uri (string uri, string mime_type);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static pointer mime_get_default_component (string mime_type);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string mime_get_default_desktop_entry (string mime_type);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string mime_get_description (string mime_type);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string mime_get_icon (string mime_type);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak GLib.List mime_get_short_list_applications (string mime_type);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak GLib.List mime_get_short_list_components (string mime_type);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static bool mime_id_in_application_list (string id, GLib.List applications);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static bool mime_id_in_component_list (string iid, GLib.List components);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak GLib.List mime_id_list_from_application_list (GLib.List applications);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak GLib.List mime_id_list_from_component_list (GLib.List components);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void mime_info_cache_reload (string dir);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void mime_reload ();
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak GLib.List mime_remove_application_from_list (GLib.List applications, string application_id, bool did_remove);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result mime_remove_application_from_short_list (string mime_type, string application_id);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak GLib.List mime_remove_component_from_list (GLib.List components, string iid, bool did_remove);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result mime_remove_component_from_short_list (string mime_type, string iid);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result mime_remove_extension (string mime_type, string extension);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result mime_remove_from_all_applications (string mime_type, GLib.List application_ids);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result mime_set_can_be_executable (string mime_type, bool new_value);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result mime_set_default_action_type (string mime_type, GnomeVFS.MimeActionType action_type);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result mime_set_default_application (string mime_type, string application_id);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result mime_set_default_component (string mime_type, string component_iid);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result mime_set_description (string mime_type, string description);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result mime_set_icon (string mime_type, string filename);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result mime_set_short_list_applications (string mime_type, GLib.List application_ids);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result mime_set_short_list_components (string mime_type, GLib.List component_iids);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void mime_shutdown ();
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string mime_type_from_name (string filename);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string mime_type_from_name_or_default (string filename, string defaultv);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.MimeEquivalence mime_type_get_equivalence (string mime_type, string base_mime_type);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static bool mime_type_is_equal (string a, string b);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static bool mime_type_is_supertype (string mime_type);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void module_callback_pop (string callback_name);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void module_callback_push (string callback_name, GnomeVFS.ModuleCallback callback, pointer callback_data, GLib.DestroyNotify destroy_notify);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void module_callback_set_default (string callback_name, GnomeVFS.ModuleCallback callback, pointer callback_data, GLib.DestroyNotify destroy_notify);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result monitor_add (out weak GnomeVFS.MonitorHandle handle, string text_uri, GnomeVFS.MonitorType monitor_type, GnomeVFS.MonitorCallback callback, pointer user_data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result monitor_cancel (GnomeVFS.MonitorHandle handle);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result move (string old_text_uri, string new_text_uri, bool force_replace);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result move_uri (GnomeVFS.URI old_uri, GnomeVFS.URI new_uri, bool force_replace);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result open (out weak GnomeVFS.Handle handle, string text_uri, GnomeVFS.OpenMode open_mode);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result open_fd (out weak GnomeVFS.Handle handle, int filedes);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result open_uri (out weak GnomeVFS.Handle handle, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void postinit (pointer app, pointer modinfo);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void preinit (pointer app, pointer modinfo);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result read (GnomeVFS.Handle handle, pointer buffer, GnomeVFS.FileSize bytes, GnomeVFS.FileSize bytes_read);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result read_entire_file (string uri, int file_size, out weak string file_contents);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result remove_directory (string text_uri);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result remove_directory_from_uri (GnomeVFS.URI uri);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result resolve (string hostname, out weak GnomeVFS.ResolveHandle handle);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void resolve_free (GnomeVFS.ResolveHandle handle);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static bool resolve_next_address (GnomeVFS.ResolveHandle handle, out weak GnomeVFS.Address address);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void resolve_reset_to_beginning (GnomeVFS.ResolveHandle handle);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result result_from_errno ();
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result result_from_errno_code (int errno_code);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result result_from_h_errno ();
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result result_from_h_errno_val (int h_errno_code);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string result_to_string (GnomeVFS.Result _result);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result seek (GnomeVFS.Handle handle, GnomeVFS.SeekPosition whence, GnomeVFS.FileOffset offset);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result set_file_info (string text_uri, GnomeVFS.FileInfo info, GnomeVFS.SetFileInfoMask mask);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result set_file_info_uri (GnomeVFS.URI uri, GnomeVFS.FileInfo info, GnomeVFS.SetFileInfoMask mask);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static void shutdown ();
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result tell (GnomeVFS.Handle handle, GnomeVFS.FileSize offset_return);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result truncate (string text_uri, GnomeVFS.FileSize length);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result truncate_handle (GnomeVFS.Handle handle, GnomeVFS.FileSize length);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result truncate_uri (GnomeVFS.URI uri, GnomeVFS.FileSize length);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string unescape_string (string escaped_string, string illegal_characters);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static weak string unescape_string_for_display (string escaped);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result unlink (string text_uri);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result unlink_from_uri (GnomeVFS.URI uri);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static bool uris_match (string uri_1, string uri_2);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result url_show (string url);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result url_show_with_env (string url, out weak string envp);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result write (GnomeVFS.Handle handle, pointer buffer, GnomeVFS.FileSize bytes, GnomeVFS.FileSize bytes_written);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result xfer_delete_list (GLib.List source_uri_list, GnomeVFS.XferErrorMode error_mode, GnomeVFS.XferOptions xfer_options, GnomeVFS.XferProgressCallback progress_callback, pointer data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result xfer_uri (GnomeVFS.URI source_uri, GnomeVFS.URI target_uri, GnomeVFS.XferOptions xfer_options, GnomeVFS.XferErrorMode error_mode, GnomeVFS.XferOverwriteMode overwrite_mode, GnomeVFS.XferProgressCallback progress_callback, pointer data);
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public static GnomeVFS.Result xfer_uri_list (GLib.List source_uri_list, GLib.List target_uri_list, GnomeVFS.XferOptions xfer_options, GnomeVFS.XferErrorMode error_mode, GnomeVFS.XferOverwriteMode overwrite_mode, GnomeVFS.XferProgressCallback progress_callback, pointer data);
 }

Modified: trunk/vapi/gstreamer-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-0.10.vapi	Fri Feb 15 12:29:20 2008
@@ -1834,157 +1834,310 @@
 	public const int VERSION_MICRO;
 	public const int VERSION_MINOR;
 	public const int VERSION_NANO;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void init ([CCode (array_length_pos = 0.9)] ref string[] args);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void atomic_int_set (int atomic_int, int value);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static uint class_signal_connect (pointer klass, string name, pointer func, pointer func_data);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void class_signal_emit_by_name (Gst.Object object, string name, pointer self);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static GLib.Quark core_error_quark ();
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void debug_add_log_function (Gst.LogFunction func, pointer data);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak string debug_construct_term_color (uint colorinfo);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak GLib.SList debug_get_all_categories ();
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static Gst.DebugLevel debug_get_default_threshold ();
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool debug_is_active ();
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool debug_is_colored ();
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak string debug_level_get_name (Gst.DebugLevel level);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void debug_log (Gst.DebugCategory category, Gst.DebugLevel level, string file, string function, int line, GLib.Object object, string format);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void debug_log_default (Gst.DebugCategory category, Gst.DebugLevel level, string file, string function, int line, GLib.Object object, Gst.DebugMessage message, pointer unused);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void debug_log_valist (Gst.DebugCategory category, Gst.DebugLevel level, string file, string function, int line, GLib.Object object, string format, pointer args);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void debug_print_stack_trace ();
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static uint debug_remove_log_function (Gst.LogFunction func);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static uint debug_remove_log_function_by_data (pointer data);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void debug_set_active (bool active);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void debug_set_colored (bool colored);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void debug_set_default_threshold (Gst.DebugLevel level);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void debug_set_threshold_for_name (string name, Gst.DebugLevel level);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void debug_unset_threshold_for_name (string name);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool default_registry_check_feature_version (string feature_name, uint min_major, uint min_minor, uint min_micro);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void deinit ();
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static GLib.Type double_range_get_type ();
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak string error_get_message (GLib.Quark domain, int code);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak GLib.List filter_run (GLib.List list, Gst.FilterFunc func, bool first, pointer user_data);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak string flow_get_name (Gst.FlowReturn ret);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static GLib.Quark flow_to_quark (Gst.FlowReturn ret);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static Gst.Format format_get_by_nick (string nick);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak Gst.FormatDefinition format_get_details (Gst.Format format);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak string format_get_name (Gst.Format format);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak Gst.Iterator format_iterate_definitions ();
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static Gst.Format format_register (string nick, string description);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static GLib.Quark format_to_quark (Gst.Format format);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool formats_contains (Gst.Format formats, Gst.Format format);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static GLib.Type fourcc_get_type ();
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static GLib.Type fraction_get_type ();
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static GLib.Type fraction_range_get_type ();
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool init_check (int argc, string argv) throws GLib.Error;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak GLib.OptionGroup init_get_option_group ();
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static GLib.Type int_range_get_type ();
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool is_tag_list (pointer p);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static GLib.Quark library_error_quark ();
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void marshal_BOOLEAN__POINTER (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void marshal_BOOLEAN__VOID (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void marshal_BOXED__BOXED (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void marshal_POINTER__POINTER (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void marshal_VOID__BOXED_OBJECT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void marshal_VOID__INT64 (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void marshal_VOID__INT_INT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void marshal_VOID__OBJECT_BOXED (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void marshal_VOID__OBJECT_BOXED_STRING (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void marshal_VOID__OBJECT_OBJECT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void marshal_VOID__OBJECT_OBJECT_STRING (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void marshal_VOID__OBJECT_PARAM (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void marshal_VOID__OBJECT_POINTER (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void marshal_VOID__OBJECT_STRING (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void marshal_VOID__POINTER_OBJECT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void marshal_VOID__UINT_BOXED (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, pointer invocation_hint, pointer marshal_data);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak GLib.ParamSpec param_spec_fraction (string name, string nick, string blurb, int min_num, int min_denom, int max_num, int max_denom, int default_num, int default_denom, GLib.ParamFlags flags);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak GLib.ParamSpec param_spec_mini_object (string name, string nick, string blurb, GLib.Type object_type, GLib.ParamFlags flags);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak Gst.Element parse_bin_from_description (string bin_description, bool ghost_unconnected_pads) throws GLib.Error;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static GLib.Quark parse_error_quark ();
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak Gst.Element parse_launch (string pipeline_description) throws GLib.Error;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak Gst.Element parse_launchv (string[] argv) throws GLib.Error;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void print_element_args (GLib.StringBuilder buf, int indent, Gst.Element element);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void print_pad_caps (GLib.StringBuilder buf, int indent, Gst.Pad pad);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static GLib.Quark resource_error_quark ();
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool segtrap_is_enabled ();
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void segtrap_set_enabled (bool enabled);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static GLib.Quark stream_error_quark ();
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool tag_exists (string tag);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak string tag_get_description (string tag);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static Gst.TagFlag tag_get_flag (string tag);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak string tag_get_nick (string tag);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static GLib.Type tag_get_type (string tag);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool tag_is_fixed (string tag);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void tag_merge_strings_with_comma (GLib.Value dest, GLib.Value src);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void tag_merge_use_first (GLib.Value dest, GLib.Value src);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void tag_register (string name, Gst.TagFlag flag, GLib.Type type, string nick, string blurb, Gst.TagMergeFunc func);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool update_registry ();
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak string uri_construct (string protocol, string location);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak string uri_get_location (string uri);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak string uri_get_protocol (string uri);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool uri_has_protocol (string uri, string protocol);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool uri_is_valid (string uri);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool uri_protocol_is_supported (Gst.URIType type, string protocol);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool uri_protocol_is_valid (string protocol);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void util_dump_mem (uchar[] mem, uint size);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static uint64 util_gdouble_to_guint64 (double value);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak Gst.ClockTime util_get_timestamp ();
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static double util_guint64_to_gdouble (uint64 value);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void util_set_object_arg (GLib.Object object, string name, string value);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void util_set_value_from_string (GLib.Value value, string value_str);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static uint64 util_uint64_scale (uint64 val, uint64 num, uint64 denom);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static uint64 util_uint64_scale_int (uint64 val, int num, int denom);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void value_array_append_value (GLib.Value value, GLib.Value append_value);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static uint value_array_get_size (GLib.Value value);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static GLib.Type value_array_get_type ();
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static GLib.Value value_array_get_value (GLib.Value value, uint index);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void value_array_prepend_value (GLib.Value value, GLib.Value prepend_value);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool value_can_compare (GLib.Value value1, GLib.Value value2);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool value_can_intersect (GLib.Value value1, GLib.Value value2);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool value_can_subtract (GLib.Value minuend, GLib.Value subtrahend);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool value_can_union (GLib.Value value1, GLib.Value value2);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static int value_compare (GLib.Value value1, GLib.Value value2);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool value_deserialize (GLib.Value dest, string src);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool value_fraction_multiply (GLib.Value product, GLib.Value factor1, GLib.Value factor2);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool value_fraction_subtract (GLib.Value dest, GLib.Value minuend, GLib.Value subtrahend);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak Gst.Caps value_get_caps (GLib.Value value);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak GLib.Date value_get_date (GLib.Value value);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static double value_get_double_range_max (GLib.Value value);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static double value_get_double_range_min (GLib.Value value);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static uint value_get_fourcc (GLib.Value value);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static int value_get_fraction_denominator (GLib.Value value);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static int value_get_fraction_numerator (GLib.Value value);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static GLib.Value value_get_fraction_range_max (GLib.Value value);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static GLib.Value value_get_fraction_range_min (GLib.Value value);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static int value_get_int_range_max (GLib.Value value);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static int value_get_int_range_min (GLib.Value value);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak Gst.MiniObject value_get_mini_object (GLib.Value value);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak Gst.Structure value_get_structure (GLib.Value value);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void value_init_and_copy (GLib.Value dest, GLib.Value src);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool value_intersect (GLib.Value dest, GLib.Value value1, GLib.Value value2);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool value_is_fixed (GLib.Value value);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void value_list_append_value (GLib.Value value, GLib.Value append_value);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void value_list_concat (GLib.Value dest, GLib.Value value1, GLib.Value value2);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static uint value_list_get_size (GLib.Value value);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static GLib.Type value_list_get_type ();
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static GLib.Value value_list_get_value (GLib.Value value, uint index);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void value_list_prepend_value (GLib.Value value, GLib.Value prepend_value);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void value_register (Gst.ValueTable table);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void value_register_intersect_func (GLib.Type type1, GLib.Type type2, Gst.ValueIntersectFunc func);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void value_register_subtract_func (GLib.Type minuend_type, GLib.Type subtrahend_type, Gst.ValueSubtractFunc func);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void value_register_union_func (GLib.Type type1, GLib.Type type2, Gst.ValueUnionFunc func);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak string value_serialize (GLib.Value value);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void value_set_caps (GLib.Value value, Gst.Caps caps);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void value_set_date (GLib.Value value, GLib.Date date);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void value_set_double_range (GLib.Value value, double start, double end);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void value_set_fourcc (GLib.Value value, uint fourcc);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void value_set_fraction (GLib.Value value, int numerator, int denominator);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void value_set_fraction_range (GLib.Value value, GLib.Value start, GLib.Value end);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void value_set_fraction_range_full (GLib.Value value, int numerator_start, int denominator_start, int numerator_end, int denominator_end);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void value_set_int_range (GLib.Value value, int start, int end);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void value_set_mini_object (GLib.Value value, Gst.MiniObject mini_object);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void value_set_structure (GLib.Value value, Gst.Structure structure);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool value_subtract (GLib.Value dest, GLib.Value minuend, GLib.Value subtrahend);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void value_take_mini_object (GLib.Value value, Gst.MiniObject mini_object);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool value_union (GLib.Value dest, GLib.Value value1, GLib.Value value2);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void version (uint major, uint minor, uint micro, uint nano);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static string version_string ();
 }

Modified: trunk/vapi/gstreamer-audio-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-audio-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-audio-0.10.vapi	Fri Feb 15 12:29:20 2008
@@ -252,16 +252,28 @@
 	public const string AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_CAPS;
 	public const string AUDIO_INT_PAD_TEMPLATE_CAPS;
 	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);
+	[CCode (cheader_filename = "gst/audio/audio.h")]
 	public static weak GLib.List audio_default_registry_mixer_filter (Gst.AudioMixerFilterFunc filter_func, bool first, pointer user_data);
+	[CCode (cheader_filename = "gst/audio/audio.h")]
 	public static weak Gst.ClockTime audio_duration_from_pad_buffer (Gst.Pad pad, Gst.Buffer buf);
+	[CCode (cheader_filename = "gst/audio/audio.h")]
 	public static Gst.AudioChannelPosition audio_fixate_channel_positions (Gst.Structure str);
+	[CCode (cheader_filename = "gst/audio/audio.h")]
 	public static int audio_frame_byte_size (Gst.Pad pad);
+	[CCode (cheader_filename = "gst/audio/audio.h")]
 	public static long audio_frame_length (Gst.Pad pad, Gst.Buffer buf);
+	[CCode (cheader_filename = "gst/audio/audio.h")]
 	public static Gst.AudioChannelPosition audio_get_channel_positions (Gst.Structure str);
+	[CCode (cheader_filename = "gst/audio/audio.h")]
 	public static bool audio_is_buffer_framed (Gst.Pad pad, Gst.Buffer buf);
+	[CCode (cheader_filename = "gst/audio/audio.h")]
 	public static void audio_set_caps_channel_positions_list (Gst.Caps caps, Gst.AudioChannelPosition pos, int num_positions);
+	[CCode (cheader_filename = "gst/audio/audio.h")]
 	public static void audio_set_channel_positions (Gst.Structure str, Gst.AudioChannelPosition pos);
+	[CCode (cheader_filename = "gst/audio/audio.h")]
 	public static void audio_set_structure_channel_positions_list (Gst.Structure str, Gst.AudioChannelPosition pos, int num_positions);
+	[CCode (cheader_filename = "gst/audio/audio.h")]
 	public static void audio_structure_set_int (Gst.Structure structure, Gst.AudioFieldFlag flag);
 }

Modified: trunk/vapi/gstreamer-base-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-base-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-base-0.10.vapi	Fri Feb 15 12:29:20 2008
@@ -318,7 +318,10 @@
 	public static delegate Gst.FlowReturn TypeFindHelperGetRangeFunction (Gst.Object obj, uint64 offset, uint length, out weak Gst.Buffer buffer);
 	public const string BASE_TRANSFORM_SINK_NAME;
 	public const string BASE_TRANSFORM_SRC_NAME;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak Gst.Caps type_find_helper (Gst.Pad src, uint64 size);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak Gst.Caps type_find_helper_for_buffer (Gst.Object obj, Gst.Buffer buf, Gst.TypeFindProbability prob);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak Gst.Caps type_find_helper_get_range (Gst.Object obj, Gst.TypeFindHelperGetRangeFunction func, uint64 size, Gst.TypeFindProbability prob);
 }

Modified: trunk/vapi/gstreamer-check-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-check-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-check-0.10.vapi	Fri Feb 15 12:29:20 2008
@@ -8,18 +8,32 @@
 		public int size;
 		public int abi_size;
 	}
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak Gst.Buffer buffer_straw_get_buffer (Gst.Element bin, Gst.Pad pad);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void buffer_straw_start_pipeline (Gst.Element bin, Gst.Pad pad);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void buffer_straw_stop_pipeline (Gst.Element bin, Gst.Pad pad);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void check_abi_list (Gst.CheckABIStruct[] list, bool have_abi_sizes);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static Gst.FlowReturn check_chain_func (Gst.Pad pad, Gst.Buffer buffer);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void check_init (int argc, string argv);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void check_message_error (Gst.Message message, Gst.MessageType type, GLib.Quark domain, int code);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static int check_run_suite (pointer suite, string name, string fname);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak Gst.Element check_setup_element (string factory);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak Gst.Pad check_setup_sink_pad (Gst.Element element, Gst.StaticPadTemplate template, Gst.Caps caps);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak Gst.Pad check_setup_src_pad (Gst.Element element, Gst.StaticPadTemplate template, Gst.Caps caps);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void check_teardown_element (Gst.Element element);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void check_teardown_sink_pad (Gst.Element element);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void check_teardown_src_pad (Gst.Element element);
 }

Modified: trunk/vapi/gstreamer-controller-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-controller-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-controller-0.10.vapi	Fri Feb 15 12:29:20 2008
@@ -99,16 +99,28 @@
 	public static delegate bool ControlSourceGetValue (Gst.ControlSource self, Gst.ClockTime timestamp, GLib.Value value);
 	public static delegate bool ControlSourceGetValueArray (Gst.ControlSource self, Gst.ClockTime timestamp, Gst.ValueArray value_array);
 	public const int PARAM_CONTROLLABLE;
+	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
 	public static weak Gst.Controller object_control_properties (GLib.Object object);
+	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
 	public static weak Gst.ClockTime object_get_control_rate (GLib.Object object);
+	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
 	public static weak Gst.ControlSource object_get_control_source (GLib.Object object, string property_name);
+	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
 	public static weak Gst.Controller object_get_controller (GLib.Object object);
+	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
 	public static bool object_get_value_array (GLib.Object object, Gst.ClockTime timestamp, Gst.ValueArray value_array);
+	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
 	public static bool object_get_value_arrays (GLib.Object object, Gst.ClockTime timestamp, GLib.SList value_arrays);
+	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
 	public static void object_set_control_rate (GLib.Object object, Gst.ClockTime control_rate);
+	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
 	public static bool object_set_control_source (GLib.Object object, string property_name, Gst.ControlSource csource);
+	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
 	public static bool object_set_controller (GLib.Object object, Gst.Controller controller);
+	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
 	public static weak Gst.ClockTime object_suggest_next_sync (GLib.Object object);
+	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
 	public static bool object_sync_values (GLib.Object object, Gst.ClockTime timestamp);
+	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
 	public static bool object_uncontrol_properties (GLib.Object object);
 }

Modified: trunk/vapi/gstreamer-dataprotocol-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-dataprotocol-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-dataprotocol-0.10.vapi	Fri Feb 15 12:29:20 2008
@@ -37,17 +37,30 @@
 	public const int DP_HEADER_LENGTH;
 	public const int DP_VERSION_MAJOR;
 	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);
+	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
 	public static weak Gst.Caps dp_caps_from_packet (uint header_length, uchar header, uchar payload);
+	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
 	public static ushort dp_crc (uchar buffer, uint length);
+	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
 	public static weak Gst.Event dp_event_from_packet (uint header_length, uchar header, uchar payload);
+	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
 	public static bool dp_header_from_buffer (Gst.Buffer buffer, Gst.DPHeaderFlag flags, uint length, uchar header);
+	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
 	public static uint dp_header_payload_length (uchar header);
+	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
 	public static Gst.DPPayloadType dp_header_payload_type (uchar header);
+	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
 	public static void dp_init ();
+	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
 	public static bool dp_packet_from_caps (Gst.Caps caps, Gst.DPHeaderFlag flags, uint length, uchar header, uchar payload);
+	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
 	public static bool dp_packet_from_event (Gst.Event event, Gst.DPHeaderFlag flags, uint length, uchar header, uchar payload);
+	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
 	public static bool dp_validate_header (uint header_length, uchar header);
+	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
 	public static bool dp_validate_packet (uint header_length, uchar header, uchar payload);
+	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
 	public static bool dp_validate_payload (uint header_length, uchar header, uchar payload);
 }

Modified: trunk/vapi/gstreamer-fft-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-fft-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-fft-0.10.vapi	Fri Feb 15 12:29:20 2008
@@ -78,5 +78,6 @@
 		public int r;
 		public int i;
 	}
+	[CCode (cheader_filename = "gst/fft/gstfft.h")]
 	public static int fft_next_fast_length (int n);
 }

Modified: trunk/vapi/gstreamer-pbutils-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-pbutils-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-pbutils-0.10.vapi	Fri Feb 15 12:29:20 2008
@@ -22,30 +22,56 @@
 		public void set_xid (uint xid);
 	}
 	public static delegate void InstallPluginsResultFunc (Gst.InstallPluginsReturn result, pointer user_data);
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static Gst.InstallPluginsReturn install_plugins_async (string details, Gst.InstallPluginsContext ctx, Gst.InstallPluginsResultFunc func, pointer user_data);
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static bool install_plugins_installation_in_progress ();
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static weak string install_plugins_return_get_name (Gst.InstallPluginsReturn ret);
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static bool install_plugins_supported ();
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static Gst.InstallPluginsReturn install_plugins_sync (string details, Gst.InstallPluginsContext ctx);
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static bool is_missing_plugin_message (Gst.Message msg);
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static weak string missing_decoder_installer_detail_new (Gst.Caps decode_caps);
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static weak Gst.Message missing_decoder_message_new (Gst.Element element, Gst.Caps decode_caps);
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static weak string missing_element_installer_detail_new (string factory_name);
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static weak Gst.Message missing_element_message_new (Gst.Element element, string factory_name);
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static weak string missing_encoder_installer_detail_new (Gst.Caps encode_caps);
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static weak Gst.Message missing_encoder_message_new (Gst.Element element, Gst.Caps encode_caps);
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static weak string missing_plugin_message_get_description (Gst.Message msg);
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static weak string missing_plugin_message_get_installer_detail (Gst.Message msg);
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static weak string missing_uri_sink_installer_detail_new (string protocol);
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static weak Gst.Message missing_uri_sink_message_new (Gst.Element element, string protocol);
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static weak string missing_uri_source_installer_detail_new (string protocol);
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static weak Gst.Message missing_uri_source_message_new (Gst.Element element, string protocol);
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static bool pb_utils_add_codec_description_to_tag_list (Gst.TagList taglist, string codec_tag, Gst.Caps caps);
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static weak string pb_utils_get_codec_description (Gst.Caps caps);
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static weak string pb_utils_get_decoder_description (Gst.Caps caps);
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static weak string pb_utils_get_element_description (string factory_name);
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static weak string pb_utils_get_encoder_description (Gst.Caps caps);
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static weak string pb_utils_get_sink_description (string protocol);
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static weak string pb_utils_get_source_description (string protocol);
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 	public static void pb_utils_init ();
 }

Modified: trunk/vapi/gstreamer-riff-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-riff-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-riff-0.10.vapi	Fri Feb 15 12:29:20 2008
@@ -210,19 +210,34 @@
 	public const int RIFF_WAVE_FORMAT_XEBEC;
 	public const int RIFF_WAVE_FORMAT_YAMAHA_ADPCM;
 	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);
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public static weak Gst.Caps riff_create_audio_template_caps ();
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public static weak Gst.Caps riff_create_iavs_caps (uint codec_fcc, Gst.gst_riff_strh strh, Gst.gst_riff_strf_iavs strf, Gst.Buffer strf_data, Gst.Buffer strd_data, out weak string codec_name);
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public static weak Gst.Caps riff_create_iavs_template_caps ();
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public static weak Gst.Caps riff_create_video_caps (uint codec_fcc, Gst.gst_riff_strh strh, Gst.gst_riff_strf_vids strf, Gst.Buffer strf_data, Gst.Buffer strd_data, out weak string codec_name);
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public static weak Gst.Caps riff_create_video_template_caps ();
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public static void riff_init ();
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public static bool riff_parse_chunk (Gst.Element element, Gst.Buffer buf, uint offset, uint fourcc, out weak Gst.Buffer chunk_data);
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public static bool riff_parse_file_header (Gst.Element element, Gst.Buffer buf, uint doctype);
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public static void riff_parse_info (Gst.Element element, Gst.Buffer buf, out weak Gst.TagList taglist);
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public static bool riff_parse_strf_auds (Gst.Element element, Gst.Buffer buf, out weak Gst.gst_riff_strf_auds strf, out weak Gst.Buffer data);
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public static bool riff_parse_strf_iavs (Gst.Element element, Gst.Buffer buf, out weak Gst.gst_riff_strf_iavs strf, out weak Gst.Buffer data);
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public static bool riff_parse_strf_vids (Gst.Element element, Gst.Buffer buf, out weak Gst.gst_riff_strf_vids strf, out weak Gst.Buffer data);
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public static bool riff_parse_strh (Gst.Element element, Gst.Buffer buf, out weak Gst.gst_riff_strh strh);
+	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
 	public static Gst.FlowReturn riff_read_chunk (Gst.Element element, Gst.Pad pad, uint64 offset, uint tag, out weak Gst.Buffer chunk_data);
 }

Modified: trunk/vapi/gstreamer-rtp-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-rtp-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-rtp-0.10.vapi	Fri Feb 15 12:29:20 2008
@@ -237,56 +237,108 @@
 	public const int RTP_PAYLOAD_TS48;
 	public const string RTP_PAYLOAD_TS48_STRING;
 	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);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void rtcp_buffer_end (Gst.Buffer buffer);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool rtcp_buffer_get_first_packet (Gst.Buffer buffer, Gst.RTCPPacket packet);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static uint rtcp_buffer_get_packet_count (Gst.Buffer buffer);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak Gst.Buffer rtcp_buffer_new (uint mtu);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak Gst.Buffer rtcp_buffer_new_copy_data (pointer data, uint len);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak Gst.Buffer rtcp_buffer_new_take_data (pointer data, uint len);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool rtcp_buffer_validate (Gst.Buffer buffer);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool rtcp_buffer_validate_data (uchar data, uint len);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static uint64 rtcp_ntp_to_unix (uint64 ntptime);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static uint64 rtcp_unix_to_ntp (uint64 unixtime);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void rtp_buffer_allocate_data (Gst.Buffer buffer, uint payload_len, uchar pad_len, uchar csrc_count);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static uint rtp_buffer_calc_header_len (uchar csrc_count);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static uint rtp_buffer_calc_packet_len (uint payload_len, uchar pad_len, uchar csrc_count);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static uint rtp_buffer_calc_payload_len (uint packet_len, uchar pad_len, uchar csrc_count);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static int rtp_buffer_compare_seqnum (ushort seqnum1, ushort seqnum2);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static uint rtp_buffer_default_clock_rate (uchar payload_type);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static uint64 rtp_buffer_ext_timestamp (uint64 exttimestamp, uint timestamp);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static uint rtp_buffer_get_csrc (Gst.Buffer buffer, uchar idx);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static uchar rtp_buffer_get_csrc_count (Gst.Buffer buffer);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool rtp_buffer_get_extension (Gst.Buffer buffer);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool rtp_buffer_get_extension_data (Gst.Buffer buffer, ushort bits, pointer data, uint wordlen);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static uint rtp_buffer_get_header_len (Gst.Buffer buffer);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool rtp_buffer_get_marker (Gst.Buffer buffer);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static uint rtp_buffer_get_packet_len (Gst.Buffer buffer);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool rtp_buffer_get_padding (Gst.Buffer buffer);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static pointer rtp_buffer_get_payload (Gst.Buffer buffer);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak Gst.Buffer rtp_buffer_get_payload_buffer (Gst.Buffer buffer);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static uint rtp_buffer_get_payload_len (Gst.Buffer buffer);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak Gst.Buffer rtp_buffer_get_payload_subbuffer (Gst.Buffer buffer, uint offset, uint len);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static uchar rtp_buffer_get_payload_type (Gst.Buffer buffer);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static ushort rtp_buffer_get_seq (Gst.Buffer buffer);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static uint rtp_buffer_get_ssrc (Gst.Buffer buffer);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static uint rtp_buffer_get_timestamp (Gst.Buffer buffer);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static uchar rtp_buffer_get_version (Gst.Buffer buffer);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak Gst.Buffer rtp_buffer_new_allocate (uint payload_len, uchar pad_len, uchar csrc_count);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak Gst.Buffer rtp_buffer_new_allocate_len (uint packet_len, uchar pad_len, uchar csrc_count);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak Gst.Buffer rtp_buffer_new_copy_data (pointer data, uint len);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak Gst.Buffer rtp_buffer_new_take_data (pointer data, uint len);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void rtp_buffer_pad_to (Gst.Buffer buffer, uint len);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void rtp_buffer_set_csrc (Gst.Buffer buffer, uchar idx, uint csrc);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void rtp_buffer_set_extension (Gst.Buffer buffer, bool extension);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void rtp_buffer_set_marker (Gst.Buffer buffer, bool marker);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void rtp_buffer_set_packet_len (Gst.Buffer buffer, uint len);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void rtp_buffer_set_padding (Gst.Buffer buffer, bool padding);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void rtp_buffer_set_payload_type (Gst.Buffer buffer, uchar payload_type);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void rtp_buffer_set_seq (Gst.Buffer buffer, ushort seq);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void rtp_buffer_set_ssrc (Gst.Buffer buffer, uint ssrc);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void rtp_buffer_set_timestamp (Gst.Buffer buffer, uint timestamp);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void rtp_buffer_set_version (Gst.Buffer buffer, uchar version);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool rtp_buffer_validate (Gst.Buffer buffer);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static bool rtp_buffer_validate_data (uchar data, uint len);
 }

Modified: trunk/vapi/gstreamer-rtsp-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-rtsp-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-rtsp-0.10.vapi	Fri Feb 15 12:29:20 2008
@@ -341,13 +341,22 @@
 		public signal Gst.RTSPResult send (pointer req, pointer resp);
 	}
 	public const int RTSP_DEFAULT_PORT;
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static void rtsp_base64_decode_ip (string data, ulong len);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak string rtsp_base64_encode (string data, ulong len);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static Gst.RTSPHeaderField rtsp_find_header_field (string header);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static Gst.RTSPMethod rtsp_find_method (string method);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak string rtsp_header_as_text (Gst.RTSPHeaderField field);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak string rtsp_method_as_text (Gst.RTSPMethod method);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak string rtsp_status_as_text (Gst.RTSPStatusCode code);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak string rtsp_strresult (Gst.RTSPResult _result);
+	[CCode (cheader_filename = "gst/gst.h")]
 	public static weak string rtsp_version_as_text (Gst.RTSPVersion version);
 }

Modified: trunk/vapi/gstreamer-tag-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-tag-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-tag-0.10.vapi	Fri Feb 15 12:29:20 2008
@@ -53,19 +53,34 @@
 	public const string TAG_MUSICBRAINZ_ARTISTID;
 	public const string TAG_MUSICBRAINZ_TRACKID;
 	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);
+	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public static weak string tag_from_id3_tag (string id3_tag);
+	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public static weak string tag_from_id3_user_tag (string type, string id3_user_tag);
+	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public static weak string tag_from_vorbis_tag (string vorbis_tag);
+	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public static uint tag_id3_genre_count ();
+	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public static weak string tag_id3_genre_get (uint id);
+	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public static weak Gst.TagList tag_list_from_vorbiscomment_buffer (Gst.Buffer buffer, uchar id_data, uint id_data_length, string vendor_string);
+	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public static weak Gst.TagList tag_list_new_from_id3v1 (uchar data);
+	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public static weak Gst.Buffer tag_list_to_vorbiscomment_buffer (Gst.TagList list, uchar id_data, uint id_data_length, string vendor_string);
+	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public static bool tag_parse_extended_comment (string ext_comment, string key, string lang, string value, bool fail_if_no_key);
+	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public static void tag_register_musicbrainz_tags ();
+	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public static weak string tag_to_id3_tag (string gst_tag);
+	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public static weak GLib.List tag_to_vorbis_comments (Gst.TagList list, string tag);
+	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public static weak string tag_to_vorbis_tag (string gst_tag);
+	[CCode (cheader_filename = "gst/tag/tag.h")]
 	public static void vorbis_tag_add (Gst.TagList list, string tag, string value);
 }

Modified: trunk/vapi/gstreamer-video-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-video-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-video-0.10.vapi	Fri Feb 15 12:29:20 2008
@@ -68,23 +68,42 @@
 	public const string VIDEO_RED_MASK_16;
 	public const int VIDEO_RED_MASK_16_INT;
 	public const string VIDEO_SIZE_RANGE;
+	[CCode (cheader_filename = "gst/video/video.h")]
 	public static bool video_calculate_display_ratio (uint dar_n, uint dar_d, uint video_width, uint video_height, uint video_par_n, uint video_par_d, uint display_par_n, uint display_par_d);
+	[CCode (cheader_filename = "gst/video/video.h")]
 	public static bool video_format_convert (Gst.VideoFormat format, int width, int height, int fps_n, int fps_d, Gst.Format src_format, int64 src_value, Gst.Format dest_format, int64 dest_value);
+	[CCode (cheader_filename = "gst/video/video.h")]
 	public static Gst.VideoFormat video_format_from_fourcc (uint fourcc);
+	[CCode (cheader_filename = "gst/video/video.h")]
 	public static int video_format_get_component_height (Gst.VideoFormat format, int component, int height);
+	[CCode (cheader_filename = "gst/video/video.h")]
 	public static int video_format_get_component_offset (Gst.VideoFormat format, int component, int width, int height);
+	[CCode (cheader_filename = "gst/video/video.h")]
 	public static int video_format_get_component_width (Gst.VideoFormat format, int component, int width);
+	[CCode (cheader_filename = "gst/video/video.h")]
 	public static int video_format_get_pixel_stride (Gst.VideoFormat format, int component);
+	[CCode (cheader_filename = "gst/video/video.h")]
 	public static int video_format_get_row_stride (Gst.VideoFormat format, int component, int width);
+	[CCode (cheader_filename = "gst/video/video.h")]
 	public static int video_format_get_size (Gst.VideoFormat format, int width, int height);
+	[CCode (cheader_filename = "gst/video/video.h")]
 	public static bool video_format_has_alpha (Gst.VideoFormat format);
+	[CCode (cheader_filename = "gst/video/video.h")]
 	public static bool video_format_is_rgb (Gst.VideoFormat format);
+	[CCode (cheader_filename = "gst/video/video.h")]
 	public static bool video_format_is_yuv (Gst.VideoFormat format);
+	[CCode (cheader_filename = "gst/video/video.h")]
 	public static weak Gst.Caps video_format_new_caps (Gst.VideoFormat format, int width, int height, int framerate_n, int framerate_d, int par_n, int par_d);
+	[CCode (cheader_filename = "gst/video/video.h")]
 	public static bool video_format_parse_caps (Gst.Caps caps, Gst.VideoFormat format, int width, int height);
+	[CCode (cheader_filename = "gst/video/video.h")]
 	public static uint video_format_to_fourcc (Gst.VideoFormat format);
+	[CCode (cheader_filename = "gst/video/video.h")]
 	public static GLib.Value video_frame_rate (Gst.Pad pad);
+	[CCode (cheader_filename = "gst/video/video.h")]
 	public static bool video_get_size (Gst.Pad pad, int width, int height);
+	[CCode (cheader_filename = "gst/video/video.h")]
 	public static bool video_parse_caps_framerate (Gst.Caps caps, int fps_n, int fps_d);
+	[CCode (cheader_filename = "gst/video/video.h")]
 	public static bool video_parse_caps_pixel_aspect_ratio (Gst.Caps caps, int par_n, int par_d);
 }

Modified: trunk/vapi/gtk+-2.0.vapi
==============================================================================
--- trunk/vapi/gtk+-2.0.vapi	(original)
+++ trunk/vapi/gtk+-2.0.vapi	Fri Feb 15 12:29:20 2008
@@ -6468,156 +6468,308 @@
 	public const string STOCK_ZOOM_OUT;
 	public const int TEXT_VIEW_PRIORITY_VALIDATE;
 	public const int TYPE_FUNDAMENTAL_LAST;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void init ([CCode (array_length_pos = 0.9)] ref string[] args);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool accel_groups_activate (GLib.Object object, uint accel_key, Gdk.ModifierType accel_mods);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static weak GLib.SList accel_groups_from_object (GLib.Object object);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static uint accelerator_get_default_mod_mask ();
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static weak string accelerator_get_label (uint accelerator_key, Gdk.ModifierType accelerator_mods);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static weak string accelerator_name (uint accelerator_key, Gdk.ModifierType accelerator_mods);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void accelerator_parse (string accelerator, out uint accelerator_key, out Gdk.ModifierType accelerator_mods);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void accelerator_set_default_mod_mask (Gdk.ModifierType default_mod_mask);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool accelerator_valid (uint keyval, Gdk.ModifierType modifiers);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool alternative_dialog_button_order (Gdk.Screen screen);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool bindings_activate (Gtk.Object object, uint keyval, Gdk.ModifierType modifiers);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool bindings_activate_event (Gtk.Object object, Gdk.EventKey event);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static weak string check_version (uint required_major, uint required_minor, uint required_micro);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void disable_setlocale ();
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static weak Gdk.DragContext drag_begin (Gtk.Widget widget, Gtk.TargetList targets, Gdk.DragAction actions, int button, Gdk.Event event);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool drag_check_threshold (Gtk.Widget widget, int start_x, int start_y, int current_x, int current_y);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_dest_add_image_targets (Gtk.Widget widget);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_dest_add_text_targets (Gtk.Widget widget);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_dest_add_uri_targets (Gtk.Widget widget);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static Gdk.Atom drag_dest_find_target (Gtk.Widget widget, Gdk.DragContext context, Gtk.TargetList target_list);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static weak Gtk.TargetList drag_dest_get_target_list (Gtk.Widget widget);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool drag_dest_get_track_motion (Gtk.Widget widget);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_dest_set (Gtk.Widget widget, Gtk.DestDefaults flags, Gtk.TargetEntry[] targets, Gdk.DragAction actions);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_dest_set_proxy (Gtk.Widget widget, Gdk.Window proxy_window, Gdk.DragProtocol protocol, bool use_coordinates);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_dest_set_target_list (Gtk.Widget widget, Gtk.TargetList target_list);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_dest_set_track_motion (Gtk.Widget widget, bool track_motion);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_dest_unset (Gtk.Widget widget);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_finish (Gdk.DragContext context, bool success, bool del, uint time_);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_get_data (Gtk.Widget widget, Gdk.DragContext context, Gdk.Atom target, uint time_);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static weak Gtk.Widget drag_get_source_widget (Gdk.DragContext context);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_highlight (Gtk.Widget widget);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_set_icon_default (Gdk.DragContext context);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_set_icon_name (Gdk.DragContext context, string icon_name, int hot_x, int hot_y);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_set_icon_pixbuf (Gdk.DragContext context, Gdk.Pixbuf pixbuf, int hot_x, int hot_y);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_set_icon_pixmap (Gdk.DragContext context, Gdk.Colormap colormap, Gdk.Pixmap pixmap, Gdk.Bitmap mask, int hot_x, int hot_y);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_set_icon_stock (Gdk.DragContext context, string stock_id, int hot_x, int hot_y);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_set_icon_widget (Gdk.DragContext context, Gtk.Widget widget, int hot_x, int hot_y);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_source_add_image_targets (Gtk.Widget widget);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_source_add_text_targets (Gtk.Widget widget);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_source_add_uri_targets (Gtk.Widget widget);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static weak Gtk.TargetList drag_source_get_target_list (Gtk.Widget widget);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_source_set (Gtk.Widget widget, Gdk.ModifierType start_button_mask, Gtk.TargetEntry[] targets, Gdk.DragAction actions);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_source_set_icon (Gtk.Widget widget, Gdk.Colormap colormap, Gdk.Pixmap pixmap, Gdk.Bitmap mask);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_source_set_icon_name (Gtk.Widget widget, string icon_name);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_source_set_icon_pixbuf (Gtk.Widget widget, Gdk.Pixbuf pixbuf);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_source_set_icon_stock (Gtk.Widget widget, string stock_id);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_source_set_target_list (Gtk.Widget widget, Gtk.TargetList target_list);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_source_unset (Gtk.Widget widget);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_unhighlight (Gtk.Widget widget);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void draw_insertion_cursor (Gtk.Widget widget, Gdk.Drawable drawable, Gdk.Rectangle area, Gdk.Rectangle location, bool is_primary, Gtk.TextDirection direction, bool draw_arrow);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool events_pending ();
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static weak Gdk.GC gc_get (int depth, Gdk.Colormap colormap, Gdk.GCValues values, Gdk.GCValuesMask values_mask);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void gc_release (Gdk.GC gc);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static weak Gdk.Event get_current_event ();
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool get_current_event_state (Gdk.ModifierType state);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static uint get_current_event_time ();
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static weak Pango.Language get_default_language ();
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static weak Gtk.Widget get_event_widget (Gdk.Event event);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static weak GLib.OptionGroup get_option_group (bool open_default_display);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void grab_add (Gtk.Widget widget);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static weak Gtk.Widget grab_get_current ();
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void grab_remove (Gtk.Widget widget);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static Gtk.IconSize icon_size_from_name (string name);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static weak string icon_size_get_name (Gtk.IconSize size);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool icon_size_lookup (Gtk.IconSize size, int width, int height);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool icon_size_lookup_for_settings (Gtk.Settings settings, Gtk.IconSize size, int width, int height);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static Gtk.IconSize icon_size_register (string name, int width, int height);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void icon_size_register_alias (string alias, Gtk.IconSize target);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static GLib.Type identifier_get_type ();
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void init_add (Gtk.Function function, pointer data);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool init_check (int argc, string[] argv);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool init_with_args (int argc, string[] argv, string parameter_string, GLib.OptionEntry[] entries, string translation_domain) throws GLib.Error;
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static uint key_snooper_install (Gtk.KeySnoopFunc snooper, pointer func_data);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void key_snooper_remove (uint snooper_handler_id);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void main ();
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void main_do_event (Gdk.Event event);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool main_iteration ();
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool main_iteration_do (bool blocking);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static uint main_level ();
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void main_quit ();
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void paint_arrow (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, Gtk.ArrowType arrow_type, bool fill, int x, int y, int width, int height);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void paint_box (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void paint_box_gap (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.PositionType gap_side, int gap_x, int gap_width);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void paint_check (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void paint_diamond (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void paint_expander (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, Gtk.ExpanderStyle expander_style);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void paint_extension (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.PositionType gap_side);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void paint_flat_box (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void paint_focus (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void paint_handle (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.Orientation orientation);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void paint_hline (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x1, int x2, int y);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void paint_layout (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, bool use_text, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, Pango.Layout layout);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void paint_option (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void paint_polygon (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, Gdk.Point points, int npoints, bool fill);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void paint_resize_grip (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, Gdk.WindowEdge edge, int x, int y, int width, int height);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void paint_shadow (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void paint_shadow_gap (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.PositionType gap_side, int gap_x, int gap_width);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void paint_slider (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.Orientation orientation);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void paint_tab (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void paint_vline (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int y1_, int y2_, int x);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool parse_args (int argc, string[] argv);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static GLib.Quark print_error_quark ();
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static weak Gtk.PageSetup print_run_page_setup_dialog (Gtk.Window parent, Gtk.PageSetup page_setup, Gtk.PrintSettings settings);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void print_run_page_setup_dialog_async (Gtk.Window parent, Gtk.PageSetup page_setup, Gtk.PrintSettings settings, Gtk.PageSetupDoneFunc done_cb, pointer data);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void propagate_event (Gtk.Widget widget, Gdk.Event event);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static uint quit_add (uint main_level, Gtk.Function function, pointer data);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void quit_add_destroy (uint main_level, Gtk.Object object);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void quit_remove (uint quit_handler_id);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void quit_remove_by_data (pointer data);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void rc_add_default_file (string filename);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static weak string rc_find_module_in_path (string module_file);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static weak string rc_find_pixmap_in_path (Gtk.Settings settings, GLib.Scanner scanner, string pixmap_file);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static weak string rc_get_default_files ();
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static weak string rc_get_im_module_file ();
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static weak string rc_get_im_module_path ();
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static weak string rc_get_module_dir ();
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static weak Gtk.Style rc_get_style (Gtk.Widget widget);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static weak Gtk.Style rc_get_style_by_paths (Gtk.Settings settings, string widget_path, string class_path, GLib.Type type);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static weak string rc_get_theme_dir ();
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void rc_parse (string filename);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static uint rc_parse_color (GLib.Scanner scanner, Gdk.Color color);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static uint rc_parse_color_full (GLib.Scanner scanner, Gtk.RcStyle style, Gdk.Color color);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static uint rc_parse_priority (GLib.Scanner scanner, Gtk.PathPriorityType priority);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static uint rc_parse_state (GLib.Scanner scanner, Gtk.StateType state);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void rc_parse_string (string rc_string);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool rc_reparse_all ();
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool rc_reparse_all_for_settings (Gtk.Settings settings, bool force_load);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void rc_reset_styles (Gtk.Settings settings);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static weak GLib.Scanner rc_scanner_new ();
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void rc_set_default_files (string filenames);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void selection_add_target (Gtk.Widget widget, Gdk.Atom selection, Gdk.Atom target, uint info);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void selection_add_targets (Gtk.Widget widget, Gdk.Atom selection, Gtk.TargetEntry[] targets, uint ntargets);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void selection_clear_targets (Gtk.Widget widget, Gdk.Atom selection);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool selection_convert (Gtk.Widget widget, Gdk.Atom selection, Gdk.Atom target, uint time_);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool selection_owner_set (Gtk.Widget widget, Gdk.Atom selection, uint time_);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool selection_owner_set_for_display (Gdk.Display display, Gtk.Widget widget, Gdk.Atom selection, uint time_);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void selection_remove_all (Gtk.Widget widget);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static weak string set_locale ();
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void show_about_dialog (Gtk.Window parent, ...);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void stock_add (Gtk.StockItem[] items);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void stock_add_static (Gtk.StockItem[] items);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static weak GLib.SList stock_list_ids ();
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool stock_lookup (string stock_id, Gtk.StockItem item);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void stock_set_translate_func (string domain, Gtk.TranslateFunc func, pointer data, Gtk.DestroyNotify notify);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void target_table_free (Gtk.TargetEntry[] targets);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static Gtk.TargetEntry target_table_new_from_list (Gtk.TargetList list, int n_targets);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool targets_include_image (Gdk.Atom[] targets, bool writable);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool targets_include_rich_text (Gdk.Atom[] targets, Gtk.TextBuffer buffer);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool targets_include_text (Gdk.Atom[] targets);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool targets_include_uri (Gdk.Atom[] targets);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool tree_get_row_drag_data (Gtk.SelectionData selection_data, out weak Gtk.TreeModel tree_model, out weak Gtk.TreePath path);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool tree_set_row_drag_data (Gtk.SelectionData selection_data, Gtk.TreeModel tree_model, Gtk.TreePath path);
 }

Modified: trunk/vapi/gtksourceview-2.0.vapi
==============================================================================
--- trunk/vapi/gtksourceview-2.0.vapi	(original)
+++ trunk/vapi/gtksourceview-2.0.vapi	Fri Feb 15 12:29:20 2008
@@ -245,6 +245,8 @@
 		public signal void redo ();
 		public signal void undo ();
 	}
+	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
 	public static bool source_iter_backward_search (Gtk.TextIter iter, string str, Gtk.SourceSearchFlags flags, Gtk.TextIter match_start, Gtk.TextIter match_end, Gtk.TextIter limit);
+	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
 	public static bool source_iter_forward_search (Gtk.TextIter iter, string str, Gtk.SourceSearchFlags flags, Gtk.TextIter match_start, Gtk.TextIter match_end, Gtk.TextIter limit);
 }

Modified: trunk/vapi/hildon-1.vapi
==============================================================================
--- trunk/vapi/hildon-1.vapi	(original)
+++ trunk/vapi/hildon-1.vapi	Fri Feb 15 12:29:20 2008
@@ -609,12 +609,20 @@
 	public const int MICRO_VERSION;
 	public const int MINOR_VERSION;
 	public const int WINDOW_LONG_PRESS_TIME;
+	[CCode (cheader_filename = "hildon/hildon.h")]
 	public static int get_icon_pixel_size (Gtk.IconSize size);
+	[CCode (cheader_filename = "hildon/hildon.h")]
 	public static bool helper_event_button_is_finger (Gdk.EventButton event);
+	[CCode (cheader_filename = "hildon/hildon.h")]
 	public static void helper_set_insensitive_message (Gtk.Widget widget, string message);
+	[CCode (cheader_filename = "hildon/hildon.h")]
 	public static void helper_set_insensitive_messagef (Gtk.Widget widget, string format);
+	[CCode (cheader_filename = "hildon/hildon.h")]
 	public static ulong helper_set_logical_color (Gtk.Widget widget, Gtk.RcFlags rcflags, Gtk.StateType state, string logicalcolorname);
+	[CCode (cheader_filename = "hildon/hildon.h")]
 	public static ulong helper_set_logical_font (Gtk.Widget widget, string logicalfontname);
+	[CCode (cheader_filename = "hildon/hildon.h")]
 	public static void helper_set_thumb_scrollbar (Gtk.ScrolledWindow win, bool thumb);
+	[CCode (cheader_filename = "hildon/hildon.h")]
 	public static void play_system_sound (string sample);
 }

Modified: trunk/vapi/libglade-2.0.vapi
==============================================================================
--- trunk/vapi/libglade-2.0.vapi	(original)
+++ trunk/vapi/libglade-2.0.vapi	Fri Feb 15 12:29:20 2008
@@ -100,20 +100,36 @@
 	public static delegate void XMLConnectFunc (string handler_name, GLib.Object object, string signal_name, string signal_data, GLib.Object connect_object, bool after, pointer user_data);
 	public static delegate weak Gtk.Widget XMLCustomWidgetHandler (Glade.XML xml, string func_name, string name, string string1, string string2, int int1, int int2, pointer user_data);
 	public const int MODULE_API_VERSION;
+	[CCode (cheader_filename = "glade/glade.h")]
 	public static int enum_from_string (GLib.Type type, string string);
+	[CCode (cheader_filename = "glade/glade.h")]
 	public static uint flags_from_string (GLib.Type type, string string);
+	[CCode (cheader_filename = "glade/glade.h")]
 	public static weak string get_widget_name (Gtk.Widget widget);
+	[CCode (cheader_filename = "glade/glade.h")]
 	public static weak Glade.XML get_widget_tree (Gtk.Widget widget);
+	[CCode (cheader_filename = "glade/glade.h")]
 	public static void init ();
+	[CCode (cheader_filename = "glade/glade.h")]
 	public static weak string module_check_version (int version);
+	[CCode (cheader_filename = "glade/glade.h")]
 	public static void module_register_widgets ();
+	[CCode (cheader_filename = "glade/glade.h")]
 	public static weak Glade.Interface parser_parse_buffer (string buffer, int len, string domain);
+	[CCode (cheader_filename = "glade/glade.h")]
 	public static weak Glade.Interface parser_parse_file (string file, string domain);
+	[CCode (cheader_filename = "glade/glade.h")]
 	public static void provide (string library);
+	[CCode (cheader_filename = "glade/glade.h")]
 	public static void register_custom_prop (GLib.Type type, string prop_name, Glade.ApplyCustomPropFunc apply_prop);
+	[CCode (cheader_filename = "glade/glade.h")]
 	public static void register_widget (GLib.Type type, Glade.NewFunc new_func, Glade.BuildChildrenFunc build_children, Glade.FindInternalChildFunc find_internal_child);
+	[CCode (cheader_filename = "glade/glade.h")]
 	public static void require (string library);
+	[CCode (cheader_filename = "glade/glade.h")]
 	public static void set_custom_handler (Glade.XMLCustomWidgetHandler handler, pointer user_data);
+	[CCode (cheader_filename = "glade/glade.h")]
 	public static void standard_build_children (Glade.XML self, Gtk.Widget parent, Glade.WidgetInfo info);
+	[CCode (cheader_filename = "glade/glade.h")]
 	public static weak Gtk.Widget standard_build_widget (Glade.XML xml, GLib.Type widget_type, Glade.WidgetInfo info);
 }

Modified: trunk/vapi/libgnome-2.0.vapi
==============================================================================
--- trunk/vapi/libgnome-2.0.vapi	(original)
+++ trunk/vapi/libgnome-2.0.vapi	Fri Feb 15 12:29:20 2008
@@ -143,47 +143,86 @@
 	public const string PARAM_POPT_CONTEXT;
 	public const string PARAM_POPT_FLAGS;
 	public const string PARAM_POPT_TABLE;
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static weak Gnome.ModuleInfo bonobo_module_info_get ();
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static void clearenv ();
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static int execute_async (string dir, int argc, string[] argv);
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static int execute_async_fds (string dir, int argc, string[] argv, bool close_fds);
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static int execute_async_with_env (string dir, int argc, string[] argv, int envc, string[] envv);
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static int execute_async_with_env_fds (string dir, int argc, string[] argv, int envc, string[] envv, bool close_fds);
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static int execute_shell (string dir, string commandline);
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static int execute_shell_fds (string dir, string commandline, bool close_fds);
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static int execute_terminal_shell (string dir, string commandline);
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static int execute_terminal_shell_fds (string dir, string commandline, bool close_fds);
-	[CCode (cname = "g_extension_pointer")]
+	[CCode (cname = "g_extension_pointer", cheader_filename = "libgnome/libgnome.h")]
 	public static weak string g_extension_pointer (string path);
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static weak string gconf_get_app_settings_relative (Gnome.Program program, string subkey);
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static weak string gconf_get_gnome_libs_settings_relative (string subkey);
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static bool help_display (string file_name, string link_id) throws GLib.Error;
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static bool help_display_desktop (Gnome.Program program, string doc_id, string file_name, string link_id) throws GLib.Error;
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static bool help_display_desktop_with_env (Gnome.Program program, string doc_id, string file_name, string link_id, out weak string envp) throws GLib.Error;
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static bool help_display_uri (string help_uri) throws GLib.Error;
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static bool help_display_uri_with_env (string help_uri, out weak string envp) throws GLib.Error;
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static bool help_display_with_doc_id (Gnome.Program program, string doc_id, string file_name, string link_id) throws GLib.Error;
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static bool help_display_with_doc_id_and_env (Gnome.Program program, string doc_id, string file_name, string link_id, out weak string envp) throws GLib.Error;
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static GLib.Quark help_error_quark ();
-	[CCode (cname = "libgnome_module_info_get")]
+	[CCode (cname = "libgnome_module_info_get", cheader_filename = "libgnome/libgnome.h")]
 	public static weak Gnome.ModuleInfo libgnome_module_info_get ();
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static void prepend_terminal_to_vector (int argc, out weak string argv);
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static int setenv (string name, string value, bool overwrite);
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static int sound_connection_get ();
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static void sound_init (string hostname);
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static void sound_play (string filename);
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static int sound_sample_load (string sample_name, string filename);
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static void sound_shutdown ();
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static void triggers_add_trigger (Gnome.Trigger nt);
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static void triggers_do (string msg, string level);
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static void triggers_vadd_trigger (Gnome.Trigger nt, string[] supinfo);
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static void triggers_vdo (string msg, string level, string[] supinfo);
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static void unsetenv (string name);
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static GLib.Quark url_error_quark ();
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static bool url_show (string url) throws GLib.Error;
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static bool url_show_with_env (string url, out weak string envp) throws GLib.Error;
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static weak string user_accels_dir_get ();
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static weak string user_dir_get ();
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static weak string user_private_dir_get ();
+	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static weak string util_user_shell ();
 }

Modified: trunk/vapi/libgnomeui-2.0.vapi
==============================================================================
--- trunk/vapi/libgnomeui-2.0.vapi	(original)
+++ trunk/vapi/libgnomeui-2.0.vapi	Fri Feb 15 12:29:20 2008
@@ -554,29 +554,52 @@
 	public const string LIBGNOMEUI_PARAM_DISPLAY;
 	[CCode (cname = "LIBGNOMEUI_MODULE")]
 	public Gnome.ModuleInfo libgnomeui_module;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static void accelerators_sync ();
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static bool authentication_manager_dialog_is_visible ();
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static void authentication_manager_init ();
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static weak Gdk.Pixbuf gdk_pixbuf_new_from_uri (string uri);
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static weak Gnome.GdkPixbufAsyncHandle gdk_pixbuf_new_from_uri_async (string uri, Gnome.GdkPixbufLoadCallback load_callback, Gnome.GdkPixbufDoneCallback done_callback, pointer callback_data);
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static weak Gdk.Pixbuf gdk_pixbuf_new_from_uri_at_scale (string uri, int width, int height, bool preserve_aspect_ratio);
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static void gdk_pixbuf_new_from_uri_cancel (Gnome.GdkPixbufAsyncHandle handle);
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static weak Gnome.ModuleInfo gtk_module_info_get ();
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static bool help_display_desktop_on_screen (Gnome.Program program, string doc_id, string file_name, string link_id, Gdk.Screen screen) throws GLib.Error;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static bool help_display_on_screen (string file_name, string link_id, Gdk.Screen screen) throws GLib.Error;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static bool help_display_uri_on_screen (string help_uri, Gdk.Screen screen) throws GLib.Error;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static bool help_display_with_doc_id_on_screen (Gnome.Program program, string doc_id, string file_name, string link_id, Gdk.Screen screen) throws GLib.Error;
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static void ice_init ();
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static weak string icon_lookup (Gtk.IconTheme icon_theme, Gnome.ThumbnailFactory thumbnail_factory, string file_uri, string custom_icon, GnomeVFS.FileInfo file_info, string mime_type, Gnome.IconLookupFlags flags, Gnome.IconLookupResultFlags _result);
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static weak string icon_lookup_sync (Gtk.IconTheme icon_theme, Gnome.ThumbnailFactory thumbnail_factory, string file_uri, string custom_icon, Gnome.IconLookupFlags flags, Gnome.IconLookupResultFlags _result);
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static void interaction_key_return (int key, bool cancel_shutdown);
-	[CCode (cname = "libgnomeui_module_info_get")]
+	[CCode (cname = "libgnomeui_module_info_get", cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static weak Gnome.ModuleInfo libgnomeui_module_info_get ();
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static weak Gnome.Client master_client ();
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static bool thumbnail_has_uri (Gdk.Pixbuf pixbuf, string uri);
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static bool thumbnail_is_valid (Gdk.Pixbuf pixbuf, string uri, ulong mtime);
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static weak string thumbnail_md5 (string uri);
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static weak string thumbnail_path_for_uri (string uri, Gnome.ThumbnailSize size);
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static weak Gdk.Pixbuf thumbnail_scale_down_pixbuf (Gdk.Pixbuf pixbuf, int dest_width, int dest_height);
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static bool url_show_on_screen (string url, Gdk.Screen screen) throws GLib.Error;
 }

Modified: trunk/vapi/libnotify.vapi
==============================================================================
--- trunk/vapi/libnotify.vapi	(original)
+++ trunk/vapi/libnotify.vapi	Fri Feb 15 12:29:20 2008
@@ -45,10 +45,16 @@
 	public static delegate void ActionCallback (Notify.Notification p1, string p2, pointer p3);
 	public const int EXPIRES_DEFAULT;
 	public const int EXPIRES_NEVER;
+	[CCode (cheader_filename = "libnotify/notify.h")]
 	public static weak string get_app_name ();
+	[CCode (cheader_filename = "libnotify/notify.h")]
 	public static weak GLib.List get_server_caps ();
+	[CCode (cheader_filename = "libnotify/notify.h")]
 	public static bool get_server_info (out weak string ret_name, out weak string ret_vendor, out weak string ret_version, out weak string ret_spec_version);
+	[CCode (cheader_filename = "libnotify/notify.h")]
 	public static bool init (string app_name);
+	[CCode (cheader_filename = "libnotify/notify.h")]
 	public static bool is_initted ();
+	[CCode (cheader_filename = "libnotify/notify.h")]
 	public static void uninit ();
 }

Modified: trunk/vapi/libsoup-2.2.vapi
==============================================================================
--- trunk/vapi/libsoup-2.2.vapi	(original)
+++ trunk/vapi/libsoup-2.2.vapi	Fri Feb 15 12:29:20 2008
@@ -599,27 +599,50 @@
 	public const int STATUS_H;
 	public const int TYPES_H;
 	public const int URI_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static weak GLib.Source add_idle (GLib.MainContext async_context, GLib.SourceFunc function, pointer data);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static weak GLib.Source add_timeout (GLib.MainContext async_context, uint interval, GLib.SourceFunc function, pointer data);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static weak string base64_decode (string text, int out_len);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static int base64_decode_step (uchar[] @in, int len, uchar[] @out, int state, uint save);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static weak string base64_encode (string text, int len);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static int base64_encode_close (uchar[] @in, int inlen, bool break_lines, uchar[] @out, int state, int save);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static int base64_encode_step (uchar[] @in, int len, bool break_lines, uchar[] @out, int state, int save);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static weak string date_generate (ulong when);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static ulong date_iso8601_parse (string timestamp);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static ulong date_parse (string timestamp);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static void gmtime (ulong when, pointer tm);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static weak string header_param_copy_token (GLib.HashTable tokens, string t);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static weak string header_param_decode_token (out weak string @in);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static void header_param_destroy_hash (GLib.HashTable table);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static weak GLib.HashTable header_param_parse_list (string header);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static bool headers_parse_request (string str, int len, GLib.HashTable dest, out weak string req_method, out weak string req_path, Soup.HttpVersion ver);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static bool headers_parse_response (string str, int len, GLib.HashTable dest, Soup.HttpVersion ver, uint status_code, out weak string reason_phrase);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static bool headers_parse_status_line (string status_line, Soup.HttpVersion ver, uint status_code, out weak string reason_phrase);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static Soup.MethodId method_get_id (string method);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static uint signal_connect_once (pointer instance, string detailed_signal, GLib.Callback c_handler, pointer data);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static weak string status_get_phrase (uint status_code);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static bool str_case_equal (pointer v1, pointer v2);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static uint str_case_hash (pointer key);
 }

Modified: trunk/vapi/libsoup-2.4.vapi
==============================================================================
--- trunk/vapi/libsoup-2.4.vapi	(original)
+++ trunk/vapi/libsoup-2.4.vapi	Fri Feb 15 12:29:20 2008
@@ -573,45 +573,86 @@
 	public const int URI_H;
 	public const int VALUE_UTILS_H;
 	public const int XMLRPC_H;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static weak GLib.Source add_idle (GLib.MainContext async_context, GLib.SourceFunc function, pointer data);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static weak GLib.Source add_timeout (GLib.MainContext async_context, uint interval, GLib.SourceFunc function, pointer data);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static weak GLib.HashTable form_decode_urlencoded (string encoded_form);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static weak string form_encode_urlencoded (GLib.HashTable form_data_set);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static weak string form_encode_urlencoded_list (out weak GLib.Data form_data_set);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static bool header_contains (string header, string token);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static void header_free_list (GLib.SList list);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static void header_free_param_list (GLib.HashTable param_list);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static weak GLib.SList header_parse_list (string header);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static weak GLib.HashTable header_parse_param_list (string header);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static weak GLib.SList header_parse_quality_list (string header, GLib.SList unacceptable);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static uint headers_parse_request (string str, int len, Soup.MessageHeaders req_headers, out weak string req_method, out weak string req_path, Soup.HTTPVersion ver);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static bool headers_parse_response (string str, int len, Soup.MessageHeaders headers, Soup.HTTPVersion ver, uint status_code, out weak string reason_phrase);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static bool headers_parse_status_line (string status_line, Soup.HTTPVersion ver, uint status_code, out weak string reason_phrase);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static GLib.Quark http_error_quark ();
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static uint signal_connect_once (pointer instance, string detailed_signal, GLib.Callback c_handler, pointer data);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static GLib.Quark ssl_error_quark ();
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static weak string status_get_phrase (uint status_code);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static bool str_case_equal (pointer v1, pointer v2);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static uint str_case_hash (pointer key);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static void value_array_append (GLib.ValueArray array, GLib.Type type);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static GLib.ValueArray value_array_from_args (pointer args);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static bool value_array_get_nth (GLib.ValueArray array, uint index_, GLib.Type type);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static void value_array_insert (GLib.ValueArray array, uint index_, GLib.Type type);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static bool value_array_to_args (GLib.ValueArray array, pointer args);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static void value_hash_insert (GLib.HashTable hash, string key, GLib.Type type);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static void value_hash_insert_value (GLib.HashTable hash, string key, GLib.Value value);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static bool value_hash_lookup (GLib.HashTable hash, string key, GLib.Type type);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static weak GLib.HashTable value_hash_new ();
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static weak string xmlrpc_build_fault (int fault_code, string fault_format);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static weak string xmlrpc_build_method_call (string method_name, GLib.Value[] params);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static weak string xmlrpc_build_method_response (GLib.Value value);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static GLib.Quark xmlrpc_error_quark ();
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static bool xmlrpc_extract_method_call (string method_call, int length, out weak string method_name);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static bool xmlrpc_extract_method_response (string method_response, int length, GLib.Type type) throws GLib.Error;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static GLib.Quark xmlrpc_fault_quark ();
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static bool xmlrpc_parse_method_call (string method_call, int length, out weak string method_name, out GLib.ValueArray params);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static bool xmlrpc_parse_method_response (string method_response, int length, GLib.Value value) throws GLib.Error;
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static weak Soup.Message xmlrpc_request_new (string uri, string method_name);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static void xmlrpc_set_fault (Soup.Message msg, int fault_code, string fault_format);
+	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static void xmlrpc_set_response (Soup.Message msg, GLib.Type type);
 }

Modified: trunk/vapi/libwnck-1.0.vapi
==============================================================================
--- trunk/vapi/libwnck-1.0.vapi	(original)
+++ trunk/vapi/libwnck-1.0.vapi	Fri Feb 15 12:29:20 2008
@@ -416,9 +416,14 @@
 		public signal void name_changed ();
 	}
 	public static delegate weak Gdk.Pixbuf LoadIconFunction (string icon_name, int size, uint flags, pointer data);
+	[CCode (cheader_filename = "libwnck/libwnck.h")]
 	public static weak Gtk.Widget create_window_action_menu (Wnck.Window window);
+	[CCode (cheader_filename = "libwnck/libwnck.h")]
 	public static void gtk_window_set_dock_type (Gtk.Window window);
+	[CCode (cheader_filename = "libwnck/libwnck.h")]
 	public static void pid_read_resource_usage (Gdk.Display gdk_display, ulong pid, Wnck.ResourceUsage usage);
+	[CCode (cheader_filename = "libwnck/libwnck.h")]
 	public static void set_client_type (Wnck.ClientType ewmh_sourceindication_client_type);
+	[CCode (cheader_filename = "libwnck/libwnck.h")]
 	public static void xid_read_resource_usage (Gdk.Display gdk_display, ulong xid, Wnck.ResourceUsage usage);
 }

Modified: trunk/vapi/pango.vapi
==============================================================================
--- trunk/vapi/pango.vapi	(original)
+++ trunk/vapi/pango.vapi	Fri Feb 15 12:29:20 2008
@@ -710,58 +710,112 @@
 	public const int VERSION_MICRO;
 	public const int VERSION_MINOR;
 	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);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static weak Pango.Attribute attr_fallback_new (bool enable_fallback);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static weak Pango.Attribute attr_family_new (string family);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static weak Pango.Attribute attr_foreground_new (ushort red, ushort green, ushort blue);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static weak Pango.Attribute attr_gravity_hint_new (Pango.GravityHint hint);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static weak Pango.Attribute attr_gravity_new (Pango.Gravity gravity);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static weak Pango.Attribute attr_letter_spacing_new (int letter_spacing);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static weak Pango.Attribute attr_rise_new (int rise);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static weak Pango.Attribute attr_scale_new (double scale_factor);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static weak Pango.Attribute attr_stretch_new (Pango.Stretch stretch);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static weak Pango.Attribute attr_strikethrough_color_new (ushort red, ushort green, ushort blue);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static weak Pango.Attribute attr_strikethrough_new (bool strikethrough);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static weak Pango.Attribute attr_style_new (Pango.Style style);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static Pango.AttrType attr_type_register (string name);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static weak Pango.Attribute attr_underline_color_new (ushort red, ushort green, ushort blue);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static weak Pango.Attribute attr_underline_new (Pango.Underline underline);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static weak Pango.Attribute attr_variant_new (Pango.Variant variant);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static weak Pango.Attribute attr_weight_new (Pango.Weight weight);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static void @break (string text, int length, Pango.Analysis analysis, Pango.LogAttr[] attrs, int attrs_len);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static void extents_to_pixels (ref Pango.Rectangle inclusive, ref Pango.Rectangle nearest);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static Pango.Direction find_base_dir (string text, int length);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static void find_paragraph_boundary (string text, int length, int paragraph_delimiter_index, int next_paragraph_start);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static void get_log_attrs (string text, int length, int level, Pango.Language language, Pango.LogAttr[] log_attrs, int attrs_len);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static Pango.Gravity gravity_get_for_matrix (Pango.Matrix matrix);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static Pango.Gravity gravity_get_for_script (Pango.Script script, Pango.Gravity base_gravity, Pango.GravityHint hint);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static double gravity_to_rotation (Pango.Gravity gravity);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static bool is_zero_width (unichar ch);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static weak GLib.List itemize (Pango.Context context, string text, int start_index, int length, Pango.AttrList attrs, Pango.AttrIterator cached_iter);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static weak GLib.List itemize_with_base_dir (Pango.Context context, Pango.Direction base_dir, string text, int start_index, int length, Pango.AttrList attrs, Pango.AttrIterator cached_iter);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static uchar log2vis_get_embedding_levels (string text, int length, Pango.Direction pbase_dir);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static bool parse_enum (GLib.Type type, string str, int value, bool warn, out weak string possible_values);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static bool parse_markup (string markup_text, int length, unichar accel_marker, out weak Pango.AttrList attr_list, out weak string text, unichar accel_char) throws GLib.Error;
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static bool parse_stretch (string str, Pango.Stretch stretch, bool warn);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static bool parse_style (string str, Pango.Style style, bool warn);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static bool parse_variant (string str, Pango.Variant variant, bool warn);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static bool parse_weight (string str, Pango.Weight weight, bool warn);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static void quantize_line_geometry (int thickness, int position);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static int read_line (GLib.FileStream stream, GLib.StringBuilder str);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static weak GLib.List reorder_items (GLib.List logical_items);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static bool scan_int (out weak string pos, int @out);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static bool scan_string (out weak string pos, GLib.StringBuilder @out);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static bool scan_word (out weak string pos, GLib.StringBuilder @out);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static Pango.Script script_for_unichar (unichar ch);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static weak Pango.Language script_get_sample_language (Pango.Script script);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static void shape (string text, int length, Pango.Analysis analysis, Pango.GlyphString glyphs);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static bool skip_space (out weak string pos);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static weak string split_file_list (string str);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static weak string trim_string (string str);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static Pango.Direction unichar_direction (unichar ch);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static int units_from_double (double d);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static double units_to_double (int i);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static int version ();
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static weak string version_check (int required_major, int required_minor, int required_micro);
+	[CCode (cheader_filename = "pango/pango.h")]
 	public static weak string version_string ();
 }

Modified: trunk/vapi/pangocairo.vapi
==============================================================================
--- trunk/vapi/pangocairo.vapi	(original)
+++ trunk/vapi/pangocairo.vapi	Fri Feb 15 12:29:20 2008
@@ -17,21 +17,38 @@
 		public void set_resolution (double dpi);
 	}
 	public static delegate void CairoShapeRendererFunc (Cairo.Context cr, Pango.AttrShape attr, bool do_path, pointer data);
+	[CCode (cheader_filename = "pango/pangocairo.h")]
 	public static weak Cairo.FontOptions cairo_context_get_font_options (Pango.Context context);
+	[CCode (cheader_filename = "pango/pangocairo.h")]
 	public static double cairo_context_get_resolution (Pango.Context context);
+	[CCode (cheader_filename = "pango/pangocairo.h")]
 	public static Pango.CairoShapeRendererFunc cairo_context_get_shape_renderer (Pango.Context context, pointer data);
+	[CCode (cheader_filename = "pango/pangocairo.h")]
 	public static void cairo_context_set_font_options (Pango.Context context, Cairo.FontOptions options);
+	[CCode (cheader_filename = "pango/pangocairo.h")]
 	public static void cairo_context_set_resolution (Pango.Context context, double dpi);
+	[CCode (cheader_filename = "pango/pangocairo.h")]
 	public static void cairo_context_set_shape_renderer (Pango.Context context, Pango.CairoShapeRendererFunc func, pointer data, GLib.DestroyNotify dnotify);
+	[CCode (cheader_filename = "pango/pangocairo.h")]
 	public static weak Pango.Layout cairo_create_layout (Cairo.Context cr);
+	[CCode (cheader_filename = "pango/pangocairo.h")]
 	public static void cairo_error_underline_path (Cairo.Context cr, double x, double y, double width, double height);
+	[CCode (cheader_filename = "pango/pangocairo.h")]
 	public static void cairo_glyph_string_path (Cairo.Context cr, Pango.Font font, Pango.GlyphString glyphs);
+	[CCode (cheader_filename = "pango/pangocairo.h")]
 	public static void cairo_layout_line_path (Cairo.Context cr, Pango.LayoutLine line);
+	[CCode (cheader_filename = "pango/pangocairo.h")]
 	public static void cairo_layout_path (Cairo.Context cr, Pango.Layout layout);
+	[CCode (cheader_filename = "pango/pangocairo.h")]
 	public static void cairo_show_error_underline (Cairo.Context cr, double x, double y, double width, double height);
+	[CCode (cheader_filename = "pango/pangocairo.h")]
 	public static void cairo_show_glyph_string (Cairo.Context cr, Pango.Font font, Pango.GlyphString glyphs);
+	[CCode (cheader_filename = "pango/pangocairo.h")]
 	public static void cairo_show_layout (Cairo.Context cr, Pango.Layout layout);
+	[CCode (cheader_filename = "pango/pangocairo.h")]
 	public static void cairo_show_layout_line (Cairo.Context cr, Pango.LayoutLine line);
+	[CCode (cheader_filename = "pango/pangocairo.h")]
 	public static void cairo_update_context (Cairo.Context cr, Pango.Context context);
+	[CCode (cheader_filename = "pango/pangocairo.h")]
 	public static void cairo_update_layout (Cairo.Context cr, Pango.Layout layout);
 }

Modified: trunk/vapi/poppler-glib.vapi
==============================================================================
--- trunk/vapi/poppler-glib.vapi	(original)
+++ trunk/vapi/poppler-glib.vapi	Fri Feb 15 12:29:20 2008
@@ -412,7 +412,10 @@
 	}
 	public static delegate bool AttachmentSaveFunc (string buf, ulong count, pointer data, GLib.Error error);
 	public const int HAS_CAIRO;
+	[CCode (cheader_filename = "poppler.h")]
 	public static GLib.Quark error_quark ();
+	[CCode (cheader_filename = "poppler.h")]
 	public static Poppler.Backend get_backend ();
+	[CCode (cheader_filename = "poppler.h")]
 	public static weak string get_version ();
 }



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