Update bindings to not use static modifier for delegates

9 files changed, 176 insertions, 154 deletions

diff --git a/vapi/atk.vapi b/vapi/atk.vapi
index c84e0ca1e..1bf6ee9cc 100644
--- a/vapi/atk.vapi
+++ b/vapi/atk.vapi
@@ -656,18 +656,18 @@ namespace Atk {
 		MAX,
 		BOTH
 	}
-	[CCode (cheader_filename = "atk/atk.h")]
-	public static delegate void EventListener (Atk.Object obj);
-	[CCode (cheader_filename = "atk/atk.h")]
-	public static delegate void EventListenerInit ();
-	[CCode (cheader_filename = "atk/atk.h")]
-	public static delegate void FocusHandler (Atk.Object p1, bool p2);
+	[CCode (cheader_filename = "atk/atk.h", has_target = false)]
+	public delegate void EventListener (Atk.Object obj);
+	[CCode (cheader_filename = "atk/atk.h", has_target = false)]
+	public delegate void EventListenerInit ();
+	[CCode (cheader_filename = "atk/atk.h", has_target = false)]
+	public delegate void FocusHandler (Atk.Object p1, bool p2);
 	[CCode (cheader_filename = "atk/atk.h")]
 	public delegate bool Function ();
-	[CCode (cheader_filename = "atk/atk.h")]
-	public static delegate int KeySnoopFunc (Atk.KeyEventStruct event, void* func_data);
-	[CCode (cheader_filename = "atk/atk.h")]
-	public static delegate void PropertyChangeHandler (Atk.Object p1, Atk.PropertyValues p2);
+	[CCode (cheader_filename = "atk/atk.h", has_target = false)]
+	public delegate int KeySnoopFunc (Atk.KeyEventStruct event, void* func_data);
+	[CCode (cheader_filename = "atk/atk.h", has_target = false)]
+	public 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")]
diff --git a/vapi/gdk-2.0.vapi b/vapi/gdk-2.0.vapi
index f9b47fa93..e409f7586 100644
--- a/vapi/gdk-2.0.vapi
+++ b/vapi/gdk-2.0.vapi
@@ -1508,8 +1508,8 @@ namespace Gdk {
 	public delegate void EventFunc (Gdk.Event event);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public delegate Gdk.FilterReturn FilterFunc (Gdk.XEvent xevent, Gdk.Event event);
-	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static delegate void InputFunction (void* data, int source, Gdk.InputCondition condition);
+	[CCode (cheader_filename = "gdk/gdk.h", has_target = false)]
+	public delegate void InputFunction (void* data, int source, Gdk.InputCondition condition);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public delegate void SpanFunc (Gdk.Span span);
 	[CCode (cheader_filename = "gdk/gdk.h")]
diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 6f4d7356d..1b9cb9230 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -314,6 +314,7 @@ namespace GLib {
 	public class IOExtension {
 		public unowned string get_name ();
 		public int get_priority ();
+		public GLib.Type get_type ();
 		public unowned GLib.TypeClass ref_class ();
 	}
 	[Compact]
@@ -1064,14 +1065,14 @@ namespace GLib {
 	public delegate void AsyncReadyCallback (GLib.Object source_object, GLib.AsyncResult res);
 	[CCode (cheader_filename = "gio/gio.h")]
 	public delegate void FileProgressCallback (int64 current_num_bytes, int64 total_num_bytes);
-	[CCode (cheader_filename = "gio/gio.h")]
-	public static delegate bool FileReadMoreCallback (string file_contents, int64 file_size, void* callback_data);
+	[CCode (cheader_filename = "gio/gio.h", has_target = false)]
+	public delegate bool FileReadMoreCallback (string file_contents, int64 file_size, void* callback_data);
 	[CCode (cheader_filename = "gio/gio.h")]
 	public delegate bool IOSchedulerJobFunc (GLib.IOSchedulerJob job, GLib.Cancellable cancellable);
-	[CCode (cheader_filename = "gio/gio.h")]
-	public static delegate void* ReallocFunc (void* data, size_t size);
-	[CCode (cheader_filename = "gio/gio.h")]
-	public static delegate void SimpleAsyncThreadFunc (GLib.SimpleAsyncResult res, GLib.Object object, GLib.Cancellable cancellable);
+	[CCode (cheader_filename = "gio/gio.h", has_target = false)]
+	public delegate void* ReallocFunc (void* data, size_t size);
+	[CCode (cheader_filename = "gio/gio.h", has_target = false)]
+	public delegate void SimpleAsyncThreadFunc (GLib.SimpleAsyncResult res, GLib.Object object, GLib.Cancellable cancellable);
 	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_ACCESS_CAN_DELETE;
 	[CCode (cheader_filename = "gio/gio.h")]
diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index ca866ab45..c0669518d 100644
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -1199,7 +1199,8 @@ namespace GLib {
 		public static weak Source current_source ();
 	}
 	
-	public static delegate int PollFunc (PollFD[] ufds, uint nfsd, int timeout_);
+	[CCode (has_target = false)]
+	public delegate int PollFunc (PollFD[] ufds, uint nfsd, int timeout_);
 
 	[CCode (cname = "GSource")]
 	public class TimeoutSource : Source {
@@ -1269,14 +1270,19 @@ namespace GLib {
 		public static bool remove_by_funcs_user_data (void* user_data);
 		public static bool remove_by_user_data (void* user_data);
 	}
-	
-	public static delegate void SourceDummyMarshal ();
-	
-	public static delegate bool SourcePrepareFunc (Source source, out int timeout_);
-	public static delegate bool SourceCheckFunc (Source source);
-	public static delegate bool SourceDispatchFunc (Source source, SourceFunc _callback);
-	public static delegate void SourceFinalizeFunc (Source source);
-	
+
+	[CCode (has_target = false)]
+	public delegate void SourceDummyMarshal ();
+
+	[CCode (has_target = false)]
+	public delegate bool SourcePrepareFunc (Source source, out int timeout_);
+	[CCode (has_target = false)]
+	public delegate bool SourceCheckFunc (Source source);
+	[CCode (has_target = false)]
+	public delegate bool SourceDispatchFunc (Source source, SourceFunc _callback);
+	[CCode (has_target = false)]
+	public delegate void SourceFinalizeFunc (Source source);
+
 	[Compact]
 	public class SourceFuncs {
 		public SourcePrepareFunc prepare;
@@ -1284,11 +1290,14 @@ namespace GLib {
 		public SourceDispatchFunc dispatch;
 		public SourceFinalizeFunc finalize;
 	}
-	
-	public static delegate void SourceCallbackRefFunc (void* cb_data);
-	public static delegate void SourceCallbackUnrefFunc (void* cb_data);
-	public static delegate void SourceCallbackGetFunc (void* cb_data, Source source, SourceFunc func);
-	
+
+	[CCode (has_target = false)]
+	public delegate void SourceCallbackRefFunc (void* cb_data);
+	[CCode (has_target = false)]
+	public delegate void SourceCallbackUnrefFunc (void* cb_data);
+	[CCode (has_target = false)]
+	public delegate void SourceCallbackGetFunc (void* cb_data, Source source, SourceFunc func);
+
 	[Compact]
 	public class SourceCallbackFuncs {
 		public SourceCallbackRefFunc @ref;
@@ -1581,7 +1590,8 @@ namespace GLib {
 	[PrintfFormat]
 	public static void print (string format, ...);
 	public static void set_print_handler (PrintFunc func);
-	public static delegate void PrintFunc (string text);
+	[CCode (has_target = false)]
+	public delegate void PrintFunc (string text);
 	[PrintfFormat]
 	public static void printerr (string format, ...);
 	public static void set_printerr_handler (PrintFunc func);
@@ -2027,8 +2037,10 @@ namespace GLib {
 		public static uint closest (uint num);
 	}
 
-	public static delegate void FreeFunc (void* data);
-	public static delegate void VoidFunc ();
+	[CCode (has_target = false)]
+	public delegate void FreeFunc (void* data);
+	[CCode (has_target = false)]
+	public delegate void VoidFunc ();
 
 	public string format_size_for_display (int64 size);
 
@@ -2192,8 +2204,10 @@ namespace GLib {
 		public weak List<void*> complete_utf8 (string prefix, out string? new_prefix = null);
 	}
 
-	public static delegate string CompletionFunc (void* item);
-	public static delegate int CompletionStrncmpFunc (string s1, string s2, size_t n);
+	[CCode (has_target = false)]
+	public delegate string CompletionFunc (void* item);
+	[CCode (has_target = false)]
+	public delegate int CompletionStrncmpFunc (string s1, string s2, size_t n);
 
 	/* Timers */
 
@@ -2561,8 +2575,10 @@ namespace GLib {
 		public void set_translation_domain (string domain);
 	}
 
-	public static delegate bool OptionParseFunc (OptionContext context, OptionGroup group, void* data) throws OptionError;
-	public static delegate void OptionErrorFunc (OptionContext context, OptionGroup group, void* data, ref Error error);
+	[CCode (has_target = false)]
+	public delegate bool OptionParseFunc (OptionContext context, OptionGroup group, void* data) throws OptionError;
+	[CCode (has_target = false)]
+	public delegate void OptionErrorFunc (OptionContext context, OptionGroup group, void* data, ref Error error);
 
 	/* Perl-compatible regular expressions */
 
@@ -2630,7 +2646,8 @@ namespace GLib {
 		public static bool check_replacement (out bool has_references = null) throws RegexError;
 	}
 
-	public static delegate bool RegexEvalCallback (MatchInfo match_info, StringBuilder result, void* user_data);
+	[CCode (has_target = false)]
+	public delegate bool RegexEvalCallback (MatchInfo match_info, StringBuilder result, void* user_data);
 
 	[Compact]
 	[CCode (free_function = "g_match_info_free")]
@@ -3001,8 +3018,9 @@ namespace GLib {
 		public G data;
 		public SList<G> next;
 	}
-	
-	public static delegate int CompareFunc (void* a, void* b);
+
+	[CCode (has_target = false)]
+	public delegate int CompareFunc (void* a, void* b);
 
 	public delegate int CompareDataFunc (void* a, void* b);
 	
@@ -3116,13 +3134,16 @@ namespace GLib {
 		public bool steal (K key);
 		public void steal_all ();
 	}
-	
+
+	[CCode (has_target = false)]
 	public static delegate uint HashFunc (void* key);
+	[CCode (has_target = false)]
 	public static delegate bool EqualFunc (void* a, void* b);
 	public delegate void HFunc (void* key, void* value);
 
+	[CCode (has_target = false)]
 	public static delegate void DestroyNotify (void* data);
-	
+
 	[CCode (cname = "g_direct_hash")]
 	public static GLib.HashFunc direct_hash;
 	[CCode (cname = "g_direct_equal")]
diff --git a/vapi/gstreamer-0.10.vapi b/vapi/gstreamer-0.10.vapi
index 87f861b88..b01b85cb8 100644
--- a/vapi/gstreamer-0.10.vapi
+++ b/vapi/gstreamer-0.10.vapi
@@ -1977,8 +1977,8 @@ namespace Gst {
 	public delegate bool ClockCallback (Gst.Clock clock, Gst.ClockTime time, Gst.ClockID id);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate bool DataProbeCallback (Gst.Pad pad, Gst.MiniObject data);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate void DebugFuncPtr ();
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate void DebugFuncPtr ();
 	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate bool EventProbeCallback (Gst.Pad pad, Gst.Event event);
 	[CCode (cheader_filename = "gst/gst.h")]
@@ -1987,90 +1987,90 @@ namespace Gst {
 	public delegate bool IndexFilter (Gst.Index index, Gst.IndexEntry entry);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate bool IndexResolver (Gst.Index index, Gst.Object writer, string writer_string);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate void IteratorDisposeFunction (void* owner);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate void IteratorDisposeFunction (void* owner);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate bool IteratorFoldFunction (void* item, Gst.Value ret);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate void IteratorFreeFunction (Gst.Iterator it);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate Gst.IteratorItem IteratorItemFunction (Gst.Iterator it, void* item);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate Gst.IteratorResult IteratorNextFunction (Gst.Iterator it, void* result);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate void IteratorResyncFunction (Gst.Iterator it);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate void IteratorFreeFunction (Gst.Iterator it);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate Gst.IteratorItem IteratorItemFunction (Gst.Iterator it, void* item);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate Gst.IteratorResult IteratorNextFunction (Gst.Iterator it, void* result);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate void IteratorResyncFunction (Gst.Iterator it);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate void LogFunction (Gst.DebugCategory category, Gst.DebugLevel level, string file, string function, int line, GLib.Object object, Gst.DebugMessage message);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate unowned Gst.MiniObject MiniObjectCopyFunction (Gst.MiniObject obj);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate void MiniObjectFinalizeFunction (Gst.MiniObject obj);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate bool PadAcceptCapsFunction (Gst.Pad pad, Gst.Caps caps);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate bool PadActivateFunction (Gst.Pad pad);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate bool PadActivateModeFunction (Gst.Pad pad, bool active);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate unowned Gst.MiniObject MiniObjectCopyFunction (Gst.MiniObject obj);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate void MiniObjectFinalizeFunction (Gst.MiniObject obj);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate bool PadAcceptCapsFunction (Gst.Pad pad, Gst.Caps caps);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate bool PadActivateFunction (Gst.Pad pad);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate bool PadActivateModeFunction (Gst.Pad pad, bool active);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate void PadBlockCallback (Gst.Pad pad, bool blocked);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate Gst.FlowReturn PadBufferAllocFunction (Gst.Pad pad, uint64 offset, uint size, Gst.Caps caps, out Gst.Buffer buf);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate Gst.FlowReturn PadChainFunction (Gst.Pad pad, owned Gst.Buffer buffer);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate bool PadCheckGetRangeFunction (Gst.Pad pad);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate Gst.FlowReturn PadBufferAllocFunction (Gst.Pad pad, uint64 offset, uint size, Gst.Caps caps, out Gst.Buffer buf);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate Gst.FlowReturn PadChainFunction (Gst.Pad pad, owned Gst.Buffer buffer);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate bool PadCheckGetRangeFunction (Gst.Pad pad);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate bool PadDispatcherFunction (Gst.Pad pad);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate bool PadEventFunction (Gst.Pad pad, owned Gst.Event event);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate void PadFixateCapsFunction (Gst.Pad pad, Gst.Caps caps);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate unowned Gst.Caps PadGetCapsFunction (Gst.Pad pad);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate Gst.FlowReturn PadGetRangeFunction (Gst.Pad pad, uint64 offset, uint length, out Gst.Buffer buffer);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate unowned GLib.List PadIntLinkFunction (Gst.Pad pad);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate Gst.PadLinkReturn PadLinkFunction (Gst.Pad pad, Gst.Pad peer);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate bool PadQueryFunction (Gst.Pad pad, Gst.Query query);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate Gst.QueryType PadQueryTypeFunction (Gst.Pad pad);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate bool PadSetCapsFunction (Gst.Pad pad, Gst.Caps caps);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate void PadUnlinkFunction (Gst.Pad pad);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate bool PadEventFunction (Gst.Pad pad, owned Gst.Event event);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate void PadFixateCapsFunction (Gst.Pad pad, Gst.Caps caps);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate unowned Gst.Caps PadGetCapsFunction (Gst.Pad pad);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate Gst.FlowReturn PadGetRangeFunction (Gst.Pad pad, uint64 offset, uint length, out Gst.Buffer buffer);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate unowned GLib.List PadIntLinkFunction (Gst.Pad pad);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate Gst.PadLinkReturn PadLinkFunction (Gst.Pad pad, Gst.Pad peer);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate bool PadQueryFunction (Gst.Pad pad, Gst.Query query);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate Gst.QueryType PadQueryTypeFunction (Gst.Pad pad);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate bool PadSetCapsFunction (Gst.Pad pad, Gst.Caps caps);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate void PadUnlinkFunction (Gst.Pad pad);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate bool PluginFeatureFilter (Gst.PluginFeature feature);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate bool PluginFilter (Gst.Plugin plugin);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate bool PluginInitFunc (Gst.Plugin plugin);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate bool PluginInitFunc (Gst.Plugin plugin);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate bool StructureForeachFunc (GLib.Quark field_id, Gst.Value value);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate bool StructureMapFunc (GLib.Quark field_id, Gst.Value value);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate void TagForeachFunc (Gst.TagList list, string tag);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate void TagMergeFunc (Gst.Value dest, Gst.Value src);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate void TagMergeFunc (Gst.Value dest, Gst.Value src);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate void TaskFunction ();
 	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate void TypeFindFunction (Gst.TypeFind find);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate int ValueCompareFunc (Gst.Value value1, Gst.Value value2);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate bool ValueDeserializeFunc (Gst.Value dest, string s);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate bool ValueIntersectFunc (Gst.Value dest, Gst.Value value1, Gst.Value value2);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate unowned string ValueSerializeFunc (Gst.Value value1);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate bool ValueSubtractFunc (Gst.Value dest, Gst.Value minuend, Gst.Value subtrahend);
-	[CCode (cheader_filename = "gst/gst.h")]
-	public static delegate bool ValueUnionFunc (Gst.Value dest, Gst.Value value1, Gst.Value value2);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate int ValueCompareFunc (Gst.Value value1, Gst.Value value2);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate bool ValueDeserializeFunc (Gst.Value dest, string s);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate bool ValueIntersectFunc (Gst.Value dest, Gst.Value value1, Gst.Value value2);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate unowned string ValueSerializeFunc (Gst.Value value1);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate bool ValueSubtractFunc (Gst.Value dest, Gst.Value minuend, Gst.Value subtrahend);
+	[CCode (cheader_filename = "gst/gst.h", has_target = false)]
+	public delegate bool ValueUnionFunc (Gst.Value dest, Gst.Value value1, Gst.Value value2);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public const int BUFFER_COPY_ALL;
 	[CCode (cheader_filename = "gst/gst.h")]
diff --git a/vapi/gstreamer-base-0.10.vapi b/vapi/gstreamer-base-0.10.vapi
index bfbed1b71..d9f7a80be 100644
--- a/vapi/gstreamer-base-0.10.vapi
+++ b/vapi/gstreamer-base-0.10.vapi
@@ -418,10 +418,10 @@ namespace Gst {
 	public delegate void CollectDataDestroyNotify ();
 	[CCode (cheader_filename = "gst/gst.h")]
 	public delegate Gst.FlowReturn CollectPadsFunction (Gst.CollectPads pads);
-	[CCode (cheader_filename = "gst/base/gstdataqueue.h")]
-	public static delegate bool DataQueueCheckFullFunction (Gst.DataQueue queue, uint visible, uint bytes, uint64 time, void* checkdata);
-	[CCode (cheader_filename = "gst/base/gsttypefindhelper.h")]
-	public static delegate Gst.FlowReturn TypeFindHelperGetRangeFunction (Gst.Object obj, uint64 offset, uint length, out unowned Gst.Buffer buffer);
+	[CCode (cheader_filename = "gst/base/gstdataqueue.h", has_target = false)]
+	public delegate bool DataQueueCheckFullFunction (Gst.DataQueue queue, uint visible, uint bytes, uint64 time, void* checkdata);
+	[CCode (cheader_filename = "gst/base/gsttypefindhelper.h", has_target = false)]
+	public delegate Gst.FlowReturn TypeFindHelperGetRangeFunction (Gst.Object obj, uint64 offset, uint length, out unowned Gst.Buffer buffer);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static unowned Gst.Caps type_find_helper (Gst.Pad src, uint64 size);
 	[CCode (cheader_filename = "gst/gst.h")]
diff --git a/vapi/gstreamer-controller-0.10.vapi b/vapi/gstreamer-controller-0.10.vapi
index cd41b939d..8e2c5c7fa 100644
--- a/vapi/gstreamer-controller-0.10.vapi
+++ b/vapi/gstreamer-controller-0.10.vapi
@@ -1,4 +1,4 @@
-/* gstreamer-controller-0.10.vapi generated by lt-vapigen, do not modify. */
+/* gstreamer-controller-0.10.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
 namespace Gst {
@@ -102,12 +102,12 @@ namespace Gst {
 		Reverse saw waveform,
 		Triangle waveform
 	}
-	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
-	public static delegate bool ControlSourceBind (Gst.ControlSource _self, GLib.ParamSpec pspec);
-	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
-	public static delegate bool ControlSourceGetValue (Gst.ControlSource _self, Gst.ClockTime timestamp, Gst.Value value);
-	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
-	public static delegate bool ControlSourceGetValueArray (Gst.ControlSource _self, Gst.ClockTime timestamp, Gst.ValueArray value_array);
+	[CCode (cheader_filename = "gst/controller/gstcontroller.h", has_target = false)]
+	public delegate bool ControlSourceBind (Gst.ControlSource _self, GLib.ParamSpec pspec);
+	[CCode (cheader_filename = "gst/controller/gstcontroller.h", has_target = false)]
+	public delegate bool ControlSourceGetValue (Gst.ControlSource _self, Gst.ClockTime timestamp, Gst.Value value);
+	[CCode (cheader_filename = "gst/controller/gstcontroller.h", has_target = false)]
+	public delegate bool ControlSourceGetValueArray (Gst.ControlSource _self, Gst.ClockTime timestamp, Gst.ValueArray value_array);
 	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
 	public static unowned Gst.Controller object_control_properties (GLib.Object object);
 	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
diff --git a/vapi/gstreamer-dataprotocol-0.10.vapi b/vapi/gstreamer-dataprotocol-0.10.vapi
index cd7f1f9d7..930b2af26 100644
--- a/vapi/gstreamer-dataprotocol-0.10.vapi
+++ b/vapi/gstreamer-dataprotocol-0.10.vapi
@@ -1,4 +1,4 @@
-/* gstreamer-dataprotocol-0.10.vapi generated by lt-vapigen, do not modify. */
+/* gstreamer-dataprotocol-0.10.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
 namespace Gst {
@@ -31,12 +31,12 @@ namespace Gst {
 		GDP Version 0.2,
 		GDP Version 1.0
 	}
-	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
-	public static delegate bool DPHeaderFromBufferFunction (Gst.Buffer buffer, Gst.DPHeaderFlag flags, uint length, uchar header);
-	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
-	public static delegate bool DPPacketFromCapsFunction (Gst.Caps caps, Gst.DPHeaderFlag flags, uint length, uchar header, uchar payload);
-	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
-	public static delegate bool DPPacketFromEventFunction (Gst.Event event, Gst.DPHeaderFlag flags, uint length, uchar header, uchar payload);
+	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h", has_target = false)]
+	public delegate bool DPHeaderFromBufferFunction (Gst.Buffer buffer, Gst.DPHeaderFlag flags, uint length, uchar header);
+	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h", has_target = false)]
+	public delegate bool DPPacketFromCapsFunction (Gst.Caps caps, Gst.DPHeaderFlag flags, uint length, uchar header, uchar payload);
+	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h", has_target = false)]
+	public delegate bool DPPacketFromEventFunction (Gst.Event event, Gst.DPHeaderFlag flags, uint length, uchar header, uchar payload);
 	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
 	public const int DP_HEADER_LENGTH;
 	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index f33f49f47..1dfb4b7e5 100644
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -6878,12 +6878,12 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void AboutDialogActivateLinkFunc (Gtk.AboutDialog about, string link_);
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static delegate bool AccelGroupActivate (Gtk.AccelGroup accel_group, GLib.Object acceleratable, uint keyval, Gdk.ModifierType modifier);
+	[CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
+	public delegate bool AccelGroupActivate (Gtk.AccelGroup accel_group, GLib.Object acceleratable, uint keyval, Gdk.ModifierType modifier);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate bool AccelGroupFindFunc (Gtk.AccelKey key, GLib.Closure closure);
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static delegate void AccelMapForeach (void* data, string accel_path, uint accel_key, Gdk.ModifierType accel_mods, bool changed);
+	[CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
+	public delegate void AccelMapForeach (void* data, string accel_path, uint accel_key, Gdk.ModifierType accel_mods, bool changed);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void ActionCallback (Gtk.Action action);
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -6894,14 +6894,14 @@ namespace Gtk {
 	public delegate string CalendarDetailFunc (Gtk.Calendar calendar, uint year, uint month, uint day);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void Callback (Gtk.Widget widget);
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static delegate void CallbackMarshal (Gtk.Object object, void* data, Gtk.Arg[] args);
+	[CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
+	public delegate void CallbackMarshal (Gtk.Object object, void* data, Gtk.Arg[] args);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void CellLayoutDataFunc (Gtk.CellLayout cell_layout, Gtk.CellRenderer cell, Gtk.TreeModel tree_model, Gtk.TreeIter iter);
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static delegate void ClipboardClearFunc (Gtk.Clipboard clipboard, void* user_data_or_owner);
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static delegate void ClipboardGetFunc (Gtk.Clipboard clipboard, Gtk.SelectionData selection_data, uint info, void* user_data_or_owner);
+	[CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
+	public delegate void ClipboardClearFunc (Gtk.Clipboard clipboard, void* user_data_or_owner);
+	[CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
+	public delegate void ClipboardGetFunc (Gtk.Clipboard clipboard, Gtk.SelectionData selection_data, uint info, void* user_data_or_owner);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void ClipboardImageReceivedFunc (Gtk.Clipboard clipboard, Gdk.Pixbuf pixbuf);
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -6914,10 +6914,10 @@ namespace Gtk {
 	public delegate void ClipboardTextReceivedFunc (Gtk.Clipboard clipboard, string text);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void ClipboardURIReceivedFunc (Gtk.Clipboard clipboard, string uris);
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static delegate void ColorSelectionChangePaletteFunc (Gdk.Color colors, int n_colors);
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static delegate void ColorSelectionChangePaletteWithScreenFunc (Gdk.Screen screen, Gdk.Color colors, int n_colors);
+	[CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
+	public delegate void ColorSelectionChangePaletteFunc (Gdk.Color colors, int n_colors);
+	[CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
+	public delegate void ColorSelectionChangePaletteWithScreenFunc (Gdk.Screen screen, Gdk.Color colors, int n_colors);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate bool EntryCompletionMatchFunc (Gtk.EntryCompletion completion, string key, Gtk.TreeIter iter);
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -6926,18 +6926,18 @@ namespace Gtk {
 	public delegate bool Function ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void IconViewForeachFunc (Gtk.IconView icon_view, Gtk.TreePath path);
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static delegate int KeySnoopFunc (Gtk.Widget grab_widget, Gdk.EventKey event, void* func_data);
+	[CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
+	public delegate int KeySnoopFunc (Gtk.Widget grab_widget, Gdk.EventKey event, void* func_data);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void LinkButtonUriFunc (Gtk.LinkButton button, string link_);
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static delegate void MenuDetachFunc (Gtk.Widget attach_widget, Gtk.Menu menu);
+	[CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
+	public delegate void MenuDetachFunc (Gtk.Widget attach_widget, Gtk.Menu menu);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void MenuPositionFunc (Gtk.Menu menu, out int x, out int y, out bool push_in);
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static delegate void ModuleDisplayInitFunc (Gdk.Display display);
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static delegate void ModuleInitFunc (int argc, string argv);
+	[CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
+	public delegate void ModuleDisplayInitFunc (Gdk.Display display);
+	[CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
+	public delegate void ModuleInitFunc (int argc, string argv);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate unowned Gtk.Notebook NotebookWindowCreationFunc (Gtk.Notebook source, Gtk.Widget page, int x, int y);
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -6946,22 +6946,22 @@ namespace Gtk {
 	public delegate void PrintSettingsFunc (string key, string value);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void RadioActionCallback (Gtk.Action action, Gtk.Action current);
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static delegate bool RcPropertyParser (GLib.ParamSpec pspec, GLib.StringBuilder rc_string, GLib.Value property_value);
+	[CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
+	public delegate bool RcPropertyParser (GLib.ParamSpec pspec, GLib.StringBuilder rc_string, GLib.Value property_value);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate bool RecentFilterFunc (Gtk.RecentFilterInfo filter_info);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate int RecentSortFunc (Gtk.RecentInfo a, Gtk.RecentInfo b);
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static delegate bool TextBufferDeserializeFunc (Gtk.TextBuffer register_buffer, Gtk.TextBuffer content_buffer, Gtk.TextIter iter, uchar data, size_t length, bool create_tags, void* user_data, GLib.Error error);
+	[CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
+	public delegate bool TextBufferDeserializeFunc (Gtk.TextBuffer register_buffer, Gtk.TextBuffer content_buffer, Gtk.TextIter iter, uchar data, size_t length, bool create_tags, void* user_data, GLib.Error error);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate uchar TextBufferSerializeFunc (Gtk.TextBuffer register_buffer, Gtk.TextBuffer content_buffer, Gtk.TextIter start, Gtk.TextIter end, size_t length);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate bool TextCharPredicate (unichar ch);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void TextTagTableForeach (Gtk.TextTag tag);
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static delegate unowned string TranslateFunc (string path, void* func_data);
+	[CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
+	public delegate unowned string TranslateFunc (string path, void* func_data);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void TreeCellDataFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel tree_model, Gtk.TreeIter iter);
 	[CCode (cheader_filename = "gtk/gtk.h")]