Merge tag 'upstream/0.6.2'

Upstream version 0.6.2

11 files changed, 0 insertions, 2415 deletions

diff --git a/vapi/appindicator-0.1.vapi b/vapi/appindicator-0.1.vapi
deleted file mode 100644
index b2d3b34..0000000
--- a/vapi/appindicator-0.1.vapi
+++ /dev/null
@@ -1,94 +0,0 @@
-/* appindicator-0.1.vapi generated by vapigen, do not modify. */
-
-[CCode (cprefix = "App", lower_case_cprefix = "app_", gir_namespace = "AppIndicator", gir_version = "0.1")]
-namespace AppIndicator {
-	[CCode (cheader_filename = "libappindicator/app-indicator.h")]
-	public class Indicator : GLib.Object {
-		public AppIndicator.IndicatorPrivate priv;
-		[CCode (has_construct_function = false)]
-		public Indicator (string id, string icon_name, AppIndicator.IndicatorCategory category);
-		public void build_menu_from_desktop (string desktop_file, string desktop_profile);
-		public unowned string get_attention_icon ();
-		public unowned string get_attention_icon_desc ();
-		public AppIndicator.IndicatorCategory get_category ();
-		public unowned string get_icon ();
-		public unowned string get_icon_desc ();
-		public unowned string get_icon_theme_path ();
-		public unowned string get_id ();
-		public unowned string get_label ();
-		public unowned string get_label_guide ();
-		public unowned Gtk.Menu get_menu ();
-		public uint32 get_ordering_index ();
-		public unowned Gtk.Widget get_secondary_activate_target ();
-		public AppIndicator.IndicatorStatus get_status ();
-		public void set_attention_icon (string icon_name);
-		public void set_attention_icon_full (string icon_name, string icon_desc);
-		public void set_icon (string icon_name);
-		public void set_icon_full (string icon_name, string icon_desc);
-		public void set_icon_theme_path (string icon_theme_path);
-		public void set_label (string label, string guide);
-		public void set_menu (Gtk.Menu? menu);
-		public void set_ordering_index (uint32 ordering_index);
-		public void set_secondary_activate_target (Gtk.Widget? menuitem);
-		public void set_status (AppIndicator.IndicatorStatus status);
-		[NoWrapper]
-		public virtual void unfallback (Gtk.StatusIcon status_icon);
-		[CCode (has_construct_function = false)]
-		public Indicator.with_path (string id, string icon_name, AppIndicator.IndicatorCategory category, string icon_theme_path);
-		public string attention_icon_desc { get; set; }
-		[NoAccessorMethod]
-		public string attention_icon_name { get; set; }
-		public string category { get; construct; }
-		[NoAccessorMethod]
-		public bool connected { get; }
-		public string icon_desc { get; set; }
-		[NoAccessorMethod]
-		public string icon_name { get; set; }
-		public string icon_theme_path { get; set construct; }
-		public string id { get; construct; }
-		public string label { get; set; }
-		public string label_guide { get; set; }
-		public uint ordering_index { get; set; }
-		public string status { get; set; }
-		public virtual signal void connection_changed (bool indicator);
-		public virtual signal void new_attention_icon ();
-		public virtual signal void new_icon ();
-		public virtual signal void new_icon_theme_path (string indicator);
-		public virtual signal void new_label (string indicator, string label);
-		public virtual signal void new_status (string indicator);
-		public virtual signal void scroll_event (int indicator, uint delta);
-	}
-	[CCode (type_id = "APP_TYPE_INDICATOR_PRIVATE", cheader_filename = "libappindicator/app-indicator.h")]
-	public struct IndicatorPrivate {
-	}
-	[CCode (cprefix = "APP_INDICATOR_CATEGORY_", cheader_filename = "libappindicator/app-indicator.h")]
-	public enum IndicatorCategory {
-		APPLICATION_STATUS,
-		COMMUNICATIONS,
-		SYSTEM_SERVICES,
-		HARDWARE,
-		OTHER
-	}
-	[CCode (cprefix = "APP_INDICATOR_STATUS_", cheader_filename = "libappindicator/app-indicator.h")]
-	public enum IndicatorStatus {
-		PASSIVE,
-		ACTIVE,
-		ATTENTION
-	}
-	[CCode (cheader_filename = "libappindicator/app-indicator.h")]
-	public const string INDICATOR_SHORTY_NICK;
-	[CCode (cheader_filename = "libappindicator/app-indicator.h")]
-	public const string INDICATOR_SIGNAL_CONNECTION_CHANGED;
-	[CCode (cheader_filename = "libappindicator/app-indicator.h")]
-	public const string INDICATOR_SIGNAL_NEW_ATTENTION_ICON;
-	[CCode (cheader_filename = "libappindicator/app-indicator.h")]
-	public const string INDICATOR_SIGNAL_NEW_ICON;
-	[CCode (cheader_filename = "libappindicator/app-indicator.h")]
-	public const string INDICATOR_SIGNAL_NEW_ICON_THEME_PATH;
-	[CCode (cheader_filename = "libappindicator/app-indicator.h")]
-	public const string INDICATOR_SIGNAL_NEW_LABEL;
-	[CCode (cheader_filename = "libappindicator/app-indicator.h")]
-	public const string INDICATOR_SIGNAL_NEW_STATUS;
-	[CCode (cheader_filename = "libappindicator/app-indicator.h")]
-	public const string INDICATOR_SIGNAL_SCROLL_EVENT;
-}
diff --git a/vapi/bamf.vapi b/vapi/bamf.vapi
deleted file mode 100644
index 5086435..0000000
--- a/vapi/bamf.vapi
+++ /dev/null
@@ -1,117 +0,0 @@
-/* bamf.vapi generated by vapigen, do not modify. */
-
-[CCode (cprefix = "Bamf", lower_case_cprefix = "bamf_")]
-namespace Bamf {
-	[CCode (type_check_function = "BAMF_IS_APPLICATION", cheader_filename = "libbamf/libbamf.h")]
-	public class Application : Bamf.View {
-		[CCode (has_construct_function = false)]
-		protected Application ();
-		public unowned string get_application_type ();
-		public unowned string get_desktop_file ();
-		public bool get_show_menu_stubs ();
-		public unowned GLib.List get_windows ();
-		public unowned GLib.Array get_xids ();
-		public virtual signal void window_added (Bamf.View p0);
-		public virtual signal void window_removed (Bamf.View p0);
-	}
-	[CCode (type_check_function = "BAMF_IS_CONTROL", cheader_filename = "libbamf/libbamf.h")]
-	public class Control : GLib.Object {
-		[CCode (has_construct_function = false)]
-		protected Control ();
-		public static unowned Bamf.Control get_default ();
-		public void insert_desktop_file (string desktop_file);
-		public void register_application_for_pid (string application, int32 pid);
-		public void register_tab_provider (string path);
-		public void set_approver_behavior (int32 behavior);
-	}
-	[CCode (type_check_function = "BAMF_IS_INDICATOR", cheader_filename = "libbamf/libbamf.h")]
-	public class Indicator : Bamf.View {
-		[CCode (has_construct_function = false)]
-		protected Indicator ();
-		public unowned string get_dbus_menu_path ();
-		public unowned string get_remote_address ();
-		public unowned string get_remote_path ();
-	}
-	[CCode (type_check_function = "BAMF_IS_MATCHER", cheader_filename = "libbamf/libbamf.h")]
-	public class Matcher : GLib.Object {
-		[CCode (has_construct_function = false)]
-		protected Matcher ();
-		public bool application_is_running (string application);
-		public unowned Bamf.Application get_active_application ();
-		public unowned Bamf.Window get_active_window ();
-		public unowned Bamf.Application get_application_for_window (Bamf.Window window);
-		public unowned Bamf.Application get_application_for_xid (uint32 xid);
-		public unowned GLib.List get_applications ();
-		public static unowned Bamf.Matcher get_default ();
-		public unowned GLib.List get_running_applications ();
-		public unowned GLib.List get_tabs ();
-		public unowned GLib.List get_windows ();
-		public unowned GLib.Array get_xids_for_application (string application);
-		public void register_favorites ([CCode (array_length = false)] string[] favorites);
-		public virtual signal void active_application_changed (GLib.Object p0, GLib.Object p1);
-		public virtual signal void active_window_changed (GLib.Object p0, GLib.Object p1);
-		public virtual signal void view_closed (GLib.Object p0);
-		public virtual signal void view_opened (GLib.Object p0);
-	}
-	[CCode (type_check_function = "BAMF_IS_TAB_SOURCE", cheader_filename = "libbamf/libbamf.h")]
-	public class TabSource : GLib.Object {
-		[CCode (has_construct_function = false)]
-		protected TabSource ();
-		public unowned string get_tab_ids ();
-		public unowned GLib.Array get_tab_preview (string tab_id);
-		public unowned string get_tab_uri (string tab_id);
-		public uint32 get_tab_xid (string tab_id);
-		public virtual void show_tab (Bamf.TabSource source, string tab_id, GLib.Error error);
-		public virtual unowned string tab_ids ();
-		public virtual unowned GLib.Array tab_preview (string tab_id);
-		public virtual unowned string tab_uri (string tab_id);
-		public virtual uint32 tab_xid (string tab_id);
-		public string id { get; set construct; }
-		public virtual signal void tab_closed (string p0);
-		public virtual signal void tab_opened (string p0);
-		public virtual signal void tab_uri_changed (string p0, string p1, string p2);
-	}
-	[CCode (type_check_function = "BAMF_IS_VIEW", cheader_filename = "libbamf/libbamf.h")]
-	public class View : GLib.Object {
-		[CCode (has_construct_function = false)]
-		protected View ();
-		public virtual unowned GLib.List get_children ();
-		public virtual unowned string get_icon ();
-		public virtual unowned string get_name ();
-		public unowned string get_view_type ();
-		public virtual bool is_active ();
-		public virtual bool is_running ();
-		public virtual bool is_urgent ();
-		public virtual bool is_closed ();
-		public bool user_visible ();
-		public virtual unowned string view_type ();
-		public string path { get; set construct; }
-		public virtual signal void active_changed (bool active);
-		public virtual signal void child_added (Bamf.View child);
-		public virtual signal void child_removed (Bamf.View child);
-		public virtual signal void closed ();
-		public virtual signal void running_changed (bool running);
-		public virtual signal void urgent_changed (bool urgent);
-		public virtual signal void user_visible_changed (bool user_visible);
-	}
-	[CCode (type_check_function = "BAMF_IS_WINDOW", cheader_filename = "libbamf/libbamf.h")]
-	public class Window : Bamf.View {
-		[CCode (has_construct_function = false)]
-		protected Window ();
-		public unowned Bamf.Window get_transient ();
-		public Bamf.WindowType get_window_type ();
-		public uint32 get_xid ();
-		public ulong last_active ();
-	}
-	[CCode (cprefix = "BAMF_WINDOW_", has_type_id = false, cheader_filename = "libbamf/libbamf.h")]
-	public enum WindowType {
-		NORMAL,
-		DESKTOP,
-		DOCK,
-		DIALOG,
-		TOOLBAR,
-		MENU,
-		UTILITY,
-		SPLASHSCREEN
-	}
-}
diff --git a/vapi/gee-1.0.vapi b/vapi/gee-1.0.vapi
deleted file mode 100644
index fe9ea6c..0000000
--- a/vapi/gee-1.0.vapi
+++ /dev/null
@@ -1,416 +0,0 @@
-/* gee-1.0.vapi generated by valac-0.12 0.12.1, do not modify. */
-
-[CCode (cprefix = "Gee", lower_case_cprefix = "gee_", gir_namespace = "Gee", gir_version = "1.0")]
-namespace Gee {
-	[CCode (cprefix = "GeeFunctions", lower_case_cprefix = "gee_functions_")]
-	namespace Functions {
-		[CCode (cheader_filename = "gee.h")]
-		public static GLib.CompareFunc get_compare_func_for (GLib.Type t);
-		[CCode (cheader_filename = "gee.h")]
-		public static GLib.EqualFunc get_equal_func_for (GLib.Type t);
-		[CCode (cheader_filename = "gee.h")]
-		public static GLib.HashFunc get_hash_func_for (GLib.Type t);
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public abstract class AbstractCollection<G> : GLib.Object, Gee.Iterable<G>, Gee.Collection<G> {
-		public AbstractCollection ();
-		public abstract bool add (G item);
-		public virtual bool add_all (Gee.Collection<G> collection);
-		public abstract void clear ();
-		public abstract bool contains (G item);
-		public virtual bool contains_all (Gee.Collection<G> collection);
-		public abstract Gee.Iterator<G> iterator ();
-		public abstract bool remove (G item);
-		public virtual bool remove_all (Gee.Collection<G> collection);
-		public virtual bool retain_all (Gee.Collection<G> collection);
-		public virtual G[] to_array ();
-		public virtual bool is_empty { get; }
-		public virtual Gee.Collection<G> read_only_view { owned get; }
-		public abstract int size { get; }
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public abstract class AbstractList<G> : Gee.AbstractCollection<G>, Gee.List<G> {
-		public AbstractList ();
-		public virtual G first ();
-		public abstract new G @get (int index);
-		public abstract int index_of (G item);
-		public abstract void insert (int index, G item);
-		public virtual void insert_all (int index, Gee.Collection<G> collection);
-		public virtual G last ();
-		public abstract Gee.ListIterator<G> list_iterator ();
-		public abstract G remove_at (int index);
-		public abstract new void @set (int index, G item);
-		public abstract Gee.List<G>? slice (int start, int stop);
-		public virtual Gee.List<G> read_only_view { owned get; }
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public abstract class AbstractMap<K,V> : GLib.Object, Gee.Iterable<Gee.Map.Entry<K,V>>, Gee.Map<K,V> {
-		public AbstractMap ();
-		public abstract void clear ();
-		public abstract new V @get (K key);
-		public abstract bool has (K key, V value);
-		public virtual bool has_all (Gee.Map<K,V> map);
-		public abstract bool has_key (K key);
-		public abstract Gee.MapIterator<K,V> map_iterator ();
-		public abstract new void @set (K key, V value);
-		public virtual void set_all (Gee.Map<K,V> map);
-		public abstract bool unset (K key, out V value = null);
-		public virtual bool unset_all (Gee.Map<K,V> map);
-		public abstract Gee.Set<Gee.Map.Entry<K,V>> entries { owned get; }
-		public virtual bool is_empty { get; }
-		public abstract Gee.Set<K> keys { owned get; }
-		public virtual Gee.Map<K,V> read_only_view { owned get; }
-		public abstract int size { get; }
-		public abstract Gee.Collection<V> values { owned get; }
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public abstract class AbstractMultiMap<K,V> : GLib.Object, Gee.MultiMap<K,V> {
-		protected Gee.Map<K,Gee.Collection<V>> _storage_map;
-		public AbstractMultiMap (Gee.Map<K,Gee.Collection<V>> storage_map);
-		protected abstract Gee.MultiSet<K> create_multi_key_set ();
-		protected abstract Gee.Collection<V> create_value_storage ();
-		protected abstract GLib.EqualFunc get_value_equal_func ();
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public abstract class AbstractMultiSet<G> : Gee.AbstractCollection<G>, Gee.MultiSet<G> {
-		protected Gee.Map<G,int> _storage_map;
-		public AbstractMultiSet (Gee.Map<G,int> storage_map);
-		public override bool add (G item);
-		public override void clear ();
-		public override bool contains (G item);
-		public override Gee.Iterator<G> iterator ();
-		public override bool remove (G item);
-		public override int size { get; }
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public abstract class AbstractQueue<G> : Gee.AbstractCollection<G>, Gee.Queue<G> {
-		public AbstractQueue ();
-		public abstract int drain (Gee.Collection<G> recipient, int amount = -1);
-		public abstract bool offer (G element);
-		public abstract G peek ();
-		public abstract G poll ();
-		public abstract int capacity { get; }
-		public abstract bool is_full { get; }
-		public abstract int remaining_capacity { get; }
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public abstract class AbstractSet<G> : Gee.AbstractCollection<G>, Gee.Set<G> {
-		public AbstractSet ();
-		public virtual Gee.Set<G> read_only_view { owned get; }
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public class ArrayList<G> : Gee.AbstractList<G> {
-		public ArrayList (GLib.EqualFunc? equal_func = null);
-		public override bool add (G item);
-		public override bool add_all (Gee.Collection<G> collection);
-		public override void clear ();
-		public override bool contains (G item);
-		public override G @get (int index);
-		public override int index_of (G item);
-		public override void insert (int index, G item);
-		public override Gee.Iterator<G> iterator ();
-		public override Gee.ListIterator<G> list_iterator ();
-		public override bool remove (G item);
-		public override G remove_at (int index);
-		public override void @set (int index, G item);
-		public override Gee.List<G>? slice (int start, int stop);
-		public void sort_with_data (GLib.CompareDataFunc compare);
-		public GLib.EqualFunc equal_func { get; private set; }
-		public override int size { get; }
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public class HashMap<K,V> : Gee.AbstractMap<K,V> {
-		public HashMap (GLib.HashFunc? key_hash_func = null, GLib.EqualFunc? key_equal_func = null, GLib.EqualFunc? value_equal_func = null);
-		public override void clear ();
-		public override V @get (K key);
-		public override bool has (K key, V value);
-		public override bool has_key (K key);
-		public override Gee.MapIterator<K,V> map_iterator ();
-		public override void @set (K key, V value);
-		public override bool unset (K key, out V value = null);
-		public override Gee.Set<Gee.Map.Entry<K,V>> entries { owned get; }
-		public GLib.EqualFunc key_equal_func { get; private set; }
-		public GLib.HashFunc key_hash_func { get; private set; }
-		public override Gee.Set<K> keys { owned get; }
-		public override int size { get; }
-		public GLib.EqualFunc value_equal_func { get; private set; }
-		public override Gee.Collection<V> values { owned get; }
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public class HashMultiMap<K,V> : Gee.AbstractMultiMap<K,V> {
-		public HashMultiMap (GLib.HashFunc? key_hash_func = null, GLib.EqualFunc? key_equal_func = null, GLib.HashFunc? value_hash_func = null, GLib.EqualFunc? value_equal_func = null);
-		protected override Gee.MultiSet<K> create_multi_key_set ();
-		protected override Gee.Collection<V> create_value_storage ();
-		protected override GLib.EqualFunc get_value_equal_func ();
-		public GLib.EqualFunc key_equal_func { get; }
-		public GLib.HashFunc key_hash_func { get; }
-		public GLib.EqualFunc value_equal_func { get; private set; }
-		public GLib.HashFunc value_hash_func { get; private set; }
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public class HashMultiSet<G> : Gee.AbstractMultiSet<G> {
-		public HashMultiSet (GLib.HashFunc? hash_func = null, GLib.EqualFunc? equal_func = null);
-		public GLib.EqualFunc equal_func { get; }
-		public GLib.HashFunc hash_func { get; }
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public class HashSet<G> : Gee.AbstractSet<G> {
-		public HashSet (GLib.HashFunc? hash_func = null, GLib.EqualFunc? equal_func = null);
-		public override bool add (G key);
-		public override void clear ();
-		public override bool contains (G key);
-		public override Gee.Iterator<G> iterator ();
-		public override bool remove (G key);
-		public GLib.EqualFunc equal_func { get; private set; }
-		public GLib.HashFunc hash_func { get; private set; }
-		public override int size { get; }
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public class LinkedList<G> : Gee.AbstractList<G>, Gee.Queue<G>, Gee.Deque<G> {
-		public LinkedList (GLib.EqualFunc? equal_func = null);
-		public override bool add (G item);
-		public override void clear ();
-		public override bool contains (G item);
-		public override G first ();
-		public override G @get (int index);
-		public override int index_of (G item);
-		public override void insert (int index, G item);
-		public override Gee.Iterator<G> iterator ();
-		public override G last ();
-		public override Gee.ListIterator<G> list_iterator ();
-		public override bool remove (G item);
-		public override G remove_at (int index);
-		public override void @set (int index, G item);
-		public override Gee.List<G>? slice (int start, int stop);
-		public GLib.EqualFunc equal_func { get; private set; }
-		public override int size { get; }
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public class PriorityQueue<G> : Gee.AbstractQueue<G> {
-		public PriorityQueue (GLib.CompareFunc? compare_func = null);
-		public override bool add (G item);
-		public override void clear ();
-		public override bool contains (G item);
-		public override int drain (Gee.Collection<G> recipient, int amount = -1);
-		public override Gee.Iterator<G> iterator ();
-		public override bool offer (G element);
-		public override G peek ();
-		public override G poll ();
-		public override bool remove (G item);
-		public override int capacity { get; }
-		public GLib.CompareFunc compare_func { get; private set; }
-		public override bool is_full { get; }
-		public override int remaining_capacity { get; }
-		public override int size { get; }
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public class TreeMap<K,V> : Gee.AbstractMap<K,V> {
-		public TreeMap (GLib.CompareFunc? key_compare_func = null, GLib.EqualFunc? value_equal_func = null);
-		public override void clear ();
-		public override V @get (K key);
-		public override bool has (K key, V value);
-		public override bool has_key (K key);
-		public override Gee.MapIterator<K,V> map_iterator ();
-		public override void @set (K key, V value);
-		public override bool unset (K key, out V value = null);
-		public override Gee.Set<Gee.Map.Entry<K,V>> entries { owned get; }
-		public GLib.CompareFunc key_compare_func { get; private set; }
-		public override Gee.Set<K> keys { owned get; }
-		public override int size { get; }
-		public GLib.EqualFunc value_equal_func { get; private set; }
-		public override Gee.Collection<V> values { owned get; }
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public class TreeMultiMap<K,V> : Gee.AbstractMultiMap<K,V> {
-		public TreeMultiMap (GLib.CompareFunc? key_compare_func = null, GLib.CompareFunc? value_compare_func = null);
-		protected override Gee.MultiSet<K> create_multi_key_set ();
-		protected override Gee.Collection<V> create_value_storage ();
-		protected override GLib.EqualFunc get_value_equal_func ();
-		public GLib.CompareFunc key_compare_func { get; }
-		public GLib.CompareFunc value_compare_func { get; private set; }
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public class TreeMultiSet<G> : Gee.AbstractMultiSet<G> {
-		public TreeMultiSet (GLib.CompareFunc? compare_func = null);
-		public GLib.CompareFunc compare_func { get; }
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public class TreeSet<G> : Gee.AbstractSet<G>, Gee.SortedSet<G> {
-		public TreeSet (GLib.CompareFunc? compare_func = null);
-		public override bool add (G item);
-		public override void clear ();
-		public override bool contains (G item);
-		public override Gee.Iterator<G> iterator ();
-		public override bool remove (G item);
-		public GLib.CompareFunc compare_func { get; private set; }
-		public override int size { get; }
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public interface BidirIterator<G> : Gee.Iterator<G> {
-		public abstract bool has_previous ();
-		public abstract bool last ();
-		public abstract bool previous ();
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public interface Collection<G> : Gee.Iterable<G> {
-		public abstract bool add (G item);
-		public abstract bool add_all (Gee.Collection<G> collection);
-		public abstract void clear ();
-		public abstract bool contains (G item);
-		public abstract bool contains_all (Gee.Collection<G> collection);
-		public static Gee.Collection<G> empty<G> ();
-		public abstract bool remove (G item);
-		public abstract bool remove_all (Gee.Collection<G> collection);
-		public abstract bool retain_all (Gee.Collection<G> collection);
-		public abstract G[] to_array ();
-		public abstract bool is_empty { get; }
-		public abstract Gee.Collection<G> read_only_view { owned get; }
-		public abstract int size { get; }
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public interface Comparable<G> : GLib.Object {
-		public abstract int compare_to (G object);
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public interface Deque<G> : Gee.Queue<G> {
-		public abstract int drain_head (Gee.Collection<G> recipient, int amount = -1);
-		public abstract int drain_tail (Gee.Collection<G> recipient, int amount = -1);
-		public abstract bool offer_head (G element);
-		public abstract bool offer_tail (G element);
-		public abstract G peek_head ();
-		public abstract G peek_tail ();
-		public abstract G poll_head ();
-		public abstract G poll_tail ();
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public interface Iterable<G> : GLib.Object {
-		public abstract Gee.Iterator<G> iterator ();
-		public abstract GLib.Type element_type { get; }
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public interface Iterator<G> : GLib.Object {
-		public abstract bool first ();
-		public abstract G @get ();
-		public abstract bool has_next ();
-		public abstract bool next ();
-		public abstract void remove ();
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public interface List<G> : Gee.Collection<G> {
-		public static Gee.List<G> empty<G> ();
-		public abstract G first ();
-		public abstract G @get (int index);
-		public abstract int index_of (G item);
-		public abstract void insert (int index, G item);
-		public abstract void insert_all (int index, Gee.Collection<G> collection);
-		public abstract G last ();
-		public abstract new Gee.ListIterator<G> list_iterator ();
-		public abstract G remove_at (int index);
-		public abstract void @set (int index, G item);
-		public abstract Gee.List<G>? slice (int start, int stop);
-		public abstract void sort (GLib.CompareFunc? compare_func = null);
-		public abstract Gee.List<G> read_only_view { owned get; }
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public interface ListIterator<G> : Gee.BidirIterator<G> {
-		public abstract void add (G item);
-		public abstract int index ();
-		public abstract void insert (G item);
-		public abstract void @set (G item);
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public interface Map<K,V> : GLib.Object, Gee.Iterable<Gee.Map.Entry<K,V>> {
-		[CCode (cheader_filename = "gee.h")]
-		public abstract class Entry<K,V> : GLib.Object {
-			public Entry ();
-			public abstract K key { get; }
-			public abstract V value { get; set; }
-		}
-		public abstract void clear ();
-		[Deprecated]
-		public abstract bool contains (K key);
-		[Deprecated]
-		public abstract bool contains_all (Gee.Map<K,V> map);
-		public static Gee.Map<K,V> empty<K,V> ();
-		public abstract V @get (K key);
-		public abstract bool has (K key, V value);
-		public abstract bool has_all (Gee.Map<K,V> map);
-		public abstract bool has_key (K key);
-		public abstract Gee.MapIterator<K,V> map_iterator ();
-		[Deprecated]
-		public abstract bool remove (K key, out V value = null);
-		[Deprecated]
-		public abstract bool remove_all (Gee.Map<K,V> map);
-		public abstract void @set (K key, V value);
-		public abstract void set_all (Gee.Map<K,V> map);
-		public abstract bool unset (K key, out V value = null);
-		public abstract bool unset_all (Gee.Map<K,V> map);
-		public abstract Gee.Set<Gee.Map.Entry<K,V>> entries { owned get; }
-		public abstract bool is_empty { get; }
-		public abstract GLib.Type key_type { get; }
-		public abstract Gee.Set<K> keys { owned get; }
-		public abstract Gee.Map<K,V> read_only_view { owned get; }
-		public abstract int size { get; }
-		public abstract GLib.Type value_type { get; }
-		public abstract Gee.Collection<V> values { owned get; }
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public interface MapIterator<K,V> : GLib.Object {
-		public abstract bool first ();
-		public abstract K get_key ();
-		public abstract V get_value ();
-		public abstract bool has_next ();
-		public abstract bool next ();
-		public abstract void set_value (V value);
-		public abstract void unset ();
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public interface MultiMap<K,V> : GLib.Object {
-		public abstract void clear ();
-		public abstract bool contains (K key);
-		public abstract Gee.Collection<V> @get (K key);
-		public abstract Gee.MultiSet<K> get_all_keys ();
-		public abstract Gee.Set<K> get_keys ();
-		public abstract Gee.Collection<V> get_values ();
-		public abstract bool remove (K key, V value);
-		public abstract bool remove_all (K key);
-		public abstract void @set (K key, V value);
-		public abstract int size { get; }
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public interface MultiSet<G> : Gee.Collection<G> {
-		public abstract int count (G item);
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public interface Queue<G> : Gee.Collection<G> {
-		public const int UNBOUNDED_CAPACITY;
-		public abstract int drain (Gee.Collection<G> recipient, int amount = -1);
-		public abstract bool offer (G element);
-		public abstract G peek ();
-		public abstract G poll ();
-		public abstract int capacity { get; }
-		public abstract bool is_full { get; }
-		public abstract int remaining_capacity { get; }
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public interface Set<G> : Gee.Collection<G> {
-		public static Gee.Set<G> empty<G> ();
-		public abstract Gee.Set<G> read_only_view { owned get; }
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public interface SortedSet<G> : Gee.Set<G> {
-		public abstract Gee.BidirIterator<G> bidir_iterator ();
-		public abstract G ceil (G element);
-		public abstract G first ();
-		public abstract G floor (G element);
-		public abstract Gee.SortedSet<G> head_set (G before);
-		public abstract G higher (G element);
-		public abstract Gee.BidirIterator<G>? iterator_at (G element);
-		public abstract G last ();
-		public abstract G lower (G element);
-		public abstract Gee.SortedSet<G> sub_set (G from, G to);
-		public abstract Gee.SortedSet<G> tail_set (G after);
-	}
-	[CCode (cheader_filename = "gee.h")]
-	public static int direct_compare (void* _val1, void* _val2);
-}
diff --git a/vapi/libbamf3.vapi b/vapi/libbamf3.vapi
deleted file mode 100644
index 1edeacc..0000000
--- a/vapi/libbamf3.vapi
+++ /dev/null
@@ -1,166 +0,0 @@
-/* libbamf3.vapi generated by vapigen, do not modify. */
-
-namespace Bamf {
-	[CCode (cheader_filename = "libbamf3/libbamf/libbamf.h")]
-	public class Application : Bamf.View {
-		[CCode (has_construct_function = false)]
-		protected Application ();
-		public unowned string get_application_type ();
-		public unowned string get_desktop_file ();
-		public bool get_show_menu_stubs ();
-		public unowned GLib.List get_windows ();
-		public unowned GLib.Array get_xids ();
-		public virtual signal void window_added (Bamf.View p0);
-		public virtual signal void window_removed (Bamf.View p0);
-	}
-	[CCode (cheader_filename = "libbamf3/libbamf/libbamf.h")]
-	public class Control : GLib.Object {
-		[CCode (has_construct_function = false)]
-		protected Control ();
-		public static unowned Bamf.Control get_default ();
-		public void insert_desktop_file (string desktop_file);
-		public void register_application_for_pid (string application, int32 pid);
-		public void register_tab_provider (string path);
-		public void set_approver_behavior (int32 behavior);
-	}
-	[CCode (cheader_filename = "libbamf3/libbamf/libbamf.h")]
-	public class Indicator : Bamf.View {
-		[CCode (has_construct_function = false)]
-		protected Indicator ();
-		public unowned string get_dbus_menu_path ();
-		public unowned string get_remote_address ();
-		public unowned string get_remote_path ();
-	}
-	[CCode (cheader_filename = "libbamf3/libbamf/libbamf.h")]
-	public class Matcher : GLib.Object {
-		[CCode (has_construct_function = false)]
-		protected Matcher ();
-		public bool application_is_running (string application);
-		public unowned Bamf.Application get_active_application ();
-		public unowned Bamf.Window get_active_window ();
-		public unowned Bamf.Application get_application_for_desktop_file (string desktop_file_path, bool create_if_not_found);
-		public unowned Bamf.Application get_application_for_window (Bamf.Window window);
-		public unowned Bamf.Application get_application_for_xid (uint32 xid);
-		public unowned GLib.List get_applications ();
-		public static unowned Bamf.Matcher get_default ();
-		public unowned GLib.List get_running_applications ();
-		public unowned GLib.List get_tabs ();
-		public unowned GLib.List get_windows ();
-		public unowned GLib.Array get_xids_for_application (string application);
-		public void register_favorites (string favorites);
-		public virtual signal void active_application_changed (GLib.Object p0, GLib.Object p1);
-		public virtual signal void active_window_changed (GLib.Object p0, GLib.Object p1);
-		public virtual signal void view_closed (GLib.Object p0);
-		public virtual signal void view_opened (GLib.Object p0);
-	}
-	[CCode (cheader_filename = "libbamf3/libbamf/libbamf.h")]
-	public class Tab : Bamf.View {
-		[CCode (has_construct_function = false)]
-		public Tab (string id, string uri);
-		public unowned string get_id ();
-		public unowned string get_preview ();
-		public unowned string get_uri ();
-		public void set_preview (string uri);
-		public void set_uri (string uri);
-		public virtual void show ();
-		[NoAccessorMethod]
-		public string id { owned get; set construct; }
-		public string preview { get; set; }
-		public string uri { get; set construct; }
-		public virtual signal void preview_updated ();
-		public virtual signal void uri_changed (string new_uri, string p1);
-	}
-	[CCode (cheader_filename = "libbamf3/libbamf/libbamf.h")]
-	public class TabSource : GLib.Object {
-		[CCode (has_construct_function = false)]
-		protected TabSource ();
-		public unowned string get_tab_ids ();
-		public unowned GLib.Array get_tab_preview (string tab_id);
-		public unowned string get_tab_uri (string tab_id);
-		public uint32 get_tab_xid (string tab_id);
-		public virtual void show_tab (string tab_id, GLib.Error error);
-		[NoWrapper]
-		public virtual unowned string tab_ids ();
-		[NoWrapper]
-		public virtual unowned GLib.Array tab_preview (string tab_id);
-		[NoWrapper]
-		public virtual unowned string tab_uri (string tab_id);
-		[NoWrapper]
-		public virtual uint32 tab_xid (string tab_id);
-		[NoAccessorMethod]
-		public string id { owned get; set construct; }
-		public virtual signal void tab_closed (string p0);
-		public virtual signal void tab_opened (string p0);
-		public virtual signal void tab_uri_changed (string p0, string p1, string p2);
-	}
-	[CCode (cheader_filename = "libbamf3/libbamf/libbamf.h")]
-	public class View : GLib.InitiallyUnowned {
-		[CCode (has_construct_function = false)]
-		protected View ();
-		[NoWrapper]
-		public virtual Bamf.ClickBehavior click_behavior ();
-		public virtual unowned GLib.List get_children ();
-		public Bamf.ClickBehavior get_click_suggestion ();
-		public virtual unowned string get_icon ();
-		public virtual unowned string get_name ();
-		public unowned string get_view_type ();
-		public virtual bool is_active ();
-		public bool is_closed ();
-		public virtual bool is_running ();
-		public bool is_sticky ();
-		public virtual bool is_urgent ();
-		[NoWrapper]
-		public virtual void set_path (string path);
-		public void set_sticky (bool value);
-		public bool user_visible ();
-		[NoWrapper]
-		public virtual unowned string view_type ();
-		[NoAccessorMethod]
-		public bool active { get; }
-		[NoAccessorMethod]
-		public string path { owned get; }
-		[NoAccessorMethod]
-		public bool running { get; }
-		[NoAccessorMethod]
-		public bool urgent { get; }
-		public virtual signal void active_changed (bool active);
-		public virtual signal void child_added (Bamf.View child);
-		public virtual signal void child_removed (Bamf.View child);
-		public virtual signal void closed ();
-		public virtual signal void name_changed (string old_name, string new_name);
-		public virtual signal void running_changed (bool running);
-		public virtual signal void urgent_changed (bool urgent);
-		public virtual signal void user_visible_changed (bool user_visible);
-	}
-	[CCode (cheader_filename = "libbamf3/libbamf/libbamf.h")]
-	public class Window : Bamf.View {
-		[CCode (has_construct_function = false)]
-		protected Window ();
-		public unowned Bamf.Window get_transient ();
-		public Bamf.WindowType get_window_type ();
-		public uint32 get_xid ();
-		public ulong last_active ();
-	}
-	[CCode (cheader_filename = "libbamf3/libbamf/libbamf.h", cprefix = "BAMF_CLICK_BEHAVIOR_", has_type_id = false)]
-	public enum ClickBehavior {
-		NONE,
-		OPEN,
-		FOCUS,
-		FOCUS_ALL,
-		MINIMIZE,
-		RESTORE,
-		RESTORE_ALL,
-		PICKER
-	}
-	[CCode (cheader_filename = "libbamf3/libbamf/libbamf.h", cprefix = "BAMF_WINDOW_", has_type_id = false)]
-	public enum WindowType {
-		NORMAL,
-		DESKTOP,
-		DOCK,
-		DIALOG,
-		TOOLBAR,
-		MENU,
-		UTILITY,
-		SPLASHSCREEN
-	}
-}
diff --git a/vapi/libgnome-menu-3.0.vapi b/vapi/libgnome-menu-3.0.vapi
deleted file mode 100644
index 0afbea0..0000000
--- a/vapi/libgnome-menu-3.0.vapi
+++ /dev/null
@@ -1,93 +0,0 @@
-/* libgnome-menu-3.0.vapi generated by vapigen, do not modify. */
-
-namespace GMenu {
-	[CCode (cheader_filename = "gnome-menus-3.0/gmenu-tree.h")]
-	public class Tree : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public Tree (string menu_basename, GMenu.TreeFlags flags);
-		[CCode (has_construct_function = false)]
-		public Tree.for_path (string menu_path, GMenu.TreeFlags flags);
-		public unowned string get_canonical_menu_path ();
-		public unowned GMenu.TreeDirectory get_directory_from_path (string path);
-		public unowned GMenu.TreeEntry get_entry_by_id (string id);
-		public unowned GMenu.TreeDirectory get_root_directory ();
-		public static void* item_ref (void* item);
-		public static void item_unref (void* item);
-		public bool load_sync () throws GLib.Error;
-		[NoAccessorMethod]
-		public GMenu.TreeFlags flags { get; construct; }
-		[NoAccessorMethod]
-		public string menu_basename { owned get; construct; }
-		[NoAccessorMethod]
-		public string menu_path { owned get; construct; }
-		public virtual signal void changed ();
-	}
-	[CCode (cheader_filename = "gnome-menus-3.0/gmenu-tree.h")]
-	[Compact]
-	public class TreeAlias {
-		public unowned GMenu.TreeDirectory get_aliased_directory ();
-		public unowned GMenu.TreeEntry get_aliased_entry ();
-		public GMenu.TreeItemType get_aliased_item_type ();
-		public unowned GMenu.TreeDirectory get_directory ();
-	}
-	[CCode (cheader_filename = "gnome-menus-3.0/gmenu-tree.h")]
-	[Compact]
-	public class TreeDirectory {
-		public unowned string get_comment ();
-		public unowned string get_desktop_file_path ();
-		public unowned string get_generic_name ();
-		public unowned GLib.Icon get_icon ();
-		public bool get_is_nodisplay ();
-		public unowned string get_menu_id ();
-		public unowned string get_name ();
-		public unowned GMenu.TreeDirectory get_parent ();
-		public unowned GMenu.TreeIter iter ();
-		public unowned string make_path (GMenu.TreeEntry entry);
-	}
-	[CCode (cheader_filename = "gnome-menus-3.0/gmenu-tree.h")]
-	[Compact]
-	public class TreeEntry {
-		public unowned GLib.DesktopAppInfo get_app_info ();
-		public unowned string get_desktop_file_id ();
-		public unowned string get_desktop_file_path ();
-		public bool get_is_excluded ();
-		public unowned GMenu.TreeDirectory get_parent ();
-	}
-	[CCode (cheader_filename = "gnome-menus-3.0/gmenu-tree.h")]
-	[Compact]
-	public class TreeHeader {
-		public unowned GMenu.TreeDirectory get_directory ();
-	}
-	[CCode (cheader_filename = "gnome-menus-3.0/gmenu-tree.h", ref_function = "gmenu_tree_iter_ref", unref_function = "gmenu_tree_iter_unref")]
-	[Compact]
-	public class TreeIter {
-		public unowned GMenu.TreeAlias get_alias ();
-		public unowned GMenu.TreeDirectory get_directory ();
-		public unowned GMenu.TreeEntry get_entry ();
-		public unowned GMenu.TreeHeader get_header ();
-		public GMenu.TreeItemType next ();
-	}
-	[CCode (cheader_filename = "gnome-menus-3.0/gmenu-tree.h")]
-	[Compact]
-	public class TreeSeparator {
-	}
-	[CCode (cheader_filename = "gnome-menus-3.0/gmenu-tree.h", cprefix = "GMENU_TREE_FLAGS_")]
-	[Flags]
-	public enum TreeFlags {
-		NONE,
-		INCLUDE_EXCLUDED,
-		SHOW_EMPTY,
-		INCLUDE_NODISPLAY,
-		SHOW_ALL_SEPARATORS,
-		SORT_DISPLAY_NAME
-	}
-	[CCode (cheader_filename = "gnome-menus-3.0/gmenu-tree.h", cprefix = "GMENU_TREE_ITEM_", has_type_id = false)]
-	public enum TreeItemType {
-		INVALID,
-		DIRECTORY,
-		ENTRY,
-		SEPARATOR,
-		HEADER,
-		ALIAS
-	}
-}
diff --git a/vapi/libwnck-3.0.deps b/vapi/libwnck-3.0.deps
deleted file mode 100644
index 85f5d99..0000000
--- a/vapi/libwnck-3.0.deps
+++ /dev/null
@@ -1,2 +0,0 @@
-gio-2.0
-gtk+-3.0
diff --git a/vapi/libwnck-3.0.vapi b/vapi/libwnck-3.0.vapi
deleted file mode 100644
index 94c52a8..0000000
--- a/vapi/libwnck-3.0.vapi
+++ /dev/null
@@ -1,369 +0,0 @@
-/* libwnck-3.0.vapi generated by vapigen, do not modify. */
-
-[CCode (cprefix = "Wnck", gir_namespace = "Wnck", gir_version = "3.0", lower_case_cprefix = "wnck_")]
-namespace Wnck {
-	namespace Version {
-		[CCode (cheader_filename = "libwnck/libwnck.h", cname = "WNCK_MAJOR_VERSION")]
-		public const int MAJOR_VERSION;
-		[CCode (cheader_filename = "libwnck/libwnck.h", cname = "WNCK_MICRO_VERSION")]
-		public const int MICRO_VERSION;
-		[CCode (cheader_filename = "libwnck/libwnck.h", cname = "WNCK_MINOR_VERSION")]
-		public const int MINOR_VERSION;
-	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", type_id = "wnck_action_menu_get_type ()")]
-	public class ActionMenu : Gtk.Menu, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public ActionMenu (Wnck.Window window);
-		[NoAccessorMethod]
-		public void* window { get; construct; }
-	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", type_id = "wnck_application_get_type ()")]
-	public class Application : GLib.Object {
-		[CCode (has_construct_function = false)]
-		protected Application ();
-		public static unowned Wnck.Application @get (ulong xwindow);
-		public unowned Gdk.Pixbuf get_icon ();
-		public bool get_icon_is_fallback ();
-		public unowned string get_icon_name ();
-		public unowned Gdk.Pixbuf get_mini_icon ();
-		public int get_n_windows ();
-		public unowned string get_name ();
-		public int get_pid ();
-		public unowned string get_startup_id ();
-		public unowned GLib.List<Wnck.Window> get_windows ();
-		public ulong get_xid ();
-		public virtual signal void icon_changed ();
-		public virtual signal void name_changed ();
-	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", type_id = "wnck_class_group_get_type ()")]
-	public class ClassGroup : GLib.Object {
-		[CCode (has_construct_function = false)]
-		protected ClassGroup ();
-		public static unowned Wnck.ClassGroup @get (string id);
-		public unowned Gdk.Pixbuf get_icon ();
-		public unowned string get_id ();
-		public unowned Gdk.Pixbuf get_mini_icon ();
-		public unowned string get_name ();
-		public unowned string get_res_class ();
-		public unowned GLib.List<Wnck.Window> get_windows ();
-		public virtual signal void icon_changed ();
-		public virtual signal void name_changed ();
-	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", type_id = "wnck_pager_get_type ()")]
-	public class Pager : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public Pager ();
-		public void set_display_mode (Wnck.PagerDisplayMode mode);
-		public bool set_n_rows (int n_rows);
-		public bool set_orientation (Gtk.Orientation orientation);
-		public void set_shadow_type (Gtk.ShadowType shadow_type);
-		public void set_show_all (bool show_all_workspaces);
-	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", type_id = "wnck_screen_get_type ()")]
-	public class Screen : GLib.Object {
-		[CCode (has_construct_function = false)]
-		protected Screen ();
-		public void calc_workspace_layout (int num_workspaces, int space_index, Wnck.WorkspaceLayout layout);
-		public void change_workspace_count (int count);
-		public void force_update ();
-		public static void free_workspace_layout (Wnck.WorkspaceLayout layout);
-		public static unowned Wnck.Screen @get (int index);
-		public unowned Wnck.Window get_active_window ();
-		public unowned Wnck.Workspace get_active_workspace ();
-		public ulong get_background_pixmap ();
-		public static unowned Wnck.Screen get_default ();
-		public static unowned Wnck.Screen get_for_root (ulong root_window_id);
-		public int get_height ();
-		public int get_number ();
-		public unowned Wnck.Window get_previously_active_window ();
-		public bool get_showing_desktop ();
-		public int get_width ();
-		public unowned string get_window_manager_name ();
-		public unowned GLib.List<Wnck.Window> get_windows ();
-		public unowned GLib.List<Wnck.Window> get_windows_stacked ();
-		public unowned Wnck.Workspace get_workspace (int workspace);
-		public int get_workspace_count ();
-		public unowned GLib.List<Wnck.Workspace> get_workspaces ();
-		public void move_viewport (int x, int y);
-		public bool net_wm_supports (string atom);
-		public void release_workspace_layout (int current_token);
-		public void toggle_showing_desktop (bool show);
-		public int try_set_workspace_layout (int current_token, int rows, int columns);
-		public virtual signal void active_window_changed (Wnck.Window previous_window);
-		public virtual signal void active_workspace_changed (Wnck.Workspace previous_workspace);
-		public virtual signal void application_closed (Wnck.Application app);
-		public virtual signal void application_opened (Wnck.Application app);
-		public virtual signal void background_changed ();
-		public virtual signal void class_group_closed (Wnck.ClassGroup class_group);
-		public virtual signal void class_group_opened (Wnck.ClassGroup class_group);
-		public virtual signal void showing_desktop_changed ();
-		public virtual signal void viewports_changed ();
-		public virtual signal void window_closed (Wnck.Window window);
-		public virtual signal void window_manager_changed ();
-		public virtual signal void window_opened (Wnck.Window window);
-		public virtual signal void window_stacking_changed ();
-		public virtual signal void workspace_created (Wnck.Workspace space);
-		public virtual signal void workspace_destroyed (Wnck.Workspace space);
-	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", type_id = "wnck_selector_get_type ()")]
-	public class Selector : Gtk.MenuBar, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public Selector ();
-	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", type_id = "wnck_tasklist_get_type ()")]
-	public class Tasklist : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public Tasklist ();
-		public int get_size_hint_list (int n_elements);
-		public void set_button_relief (Gtk.ReliefStyle relief);
-		public void set_grouping (Wnck.TasklistGroupingType grouping);
-		public void set_grouping_limit (int limit);
-		public void set_include_all_workspaces (bool include_all_workspaces);
-		public void set_switch_workspace_on_unminimize (bool switch_workspace_on_unminimize);
-	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", type_id = "wnck_window_get_type ()")]
-	public class Window : GLib.Object {
-		[CCode (has_construct_function = false)]
-		protected Window ();
-		public void activate (uint32 timestamp);
-		public void activate_transient (uint32 timestamp);
-		public void close (uint32 timestamp);
-		public static unowned Wnck.Window @get (ulong xwindow);
-		public Wnck.WindowActions get_actions ();
-		public unowned Wnck.Application get_application ();
-		public unowned Wnck.ClassGroup get_class_group ();
-		public unowned string get_class_group_name ();
-		public unowned string get_class_instance_name ();
-		public void get_client_window_geometry (out int xp, out int yp, out int widthp, out int heightp);
-		public void get_geometry (out int xp, out int yp, out int widthp, out int heightp);
-		public ulong get_group_leader ();
-		public unowned Gdk.Pixbuf get_icon ();
-		public bool get_icon_is_fallback ();
-		public unowned string get_icon_name ();
-		public unowned Gdk.Pixbuf get_mini_icon ();
-		public unowned string get_name ();
-		public int get_pid ();
-		public unowned Wnck.Screen get_screen ();
-		public unowned string get_session_id ();
-		public unowned string get_session_id_utf8 ();
-		public int get_sort_order ();
-		public Wnck.WindowState get_state ();
-		public unowned Wnck.Window get_transient ();
-		public Wnck.WindowType get_window_type ();
-		public unowned Wnck.Workspace get_workspace ();
-		public ulong get_xid ();
-		public bool has_icon_name ();
-		public bool has_name ();
-		public bool is_above ();
-		public bool is_active ();
-		public bool is_below ();
-		public bool is_fullscreen ();
-		public bool is_in_viewport (Wnck.Workspace workspace);
-		public bool is_maximized ();
-		public bool is_maximized_horizontally ();
-		public bool is_maximized_vertically ();
-		public bool is_minimized ();
-		public bool is_most_recently_activated ();
-		public bool is_on_workspace (Wnck.Workspace workspace);
-		public bool is_pinned ();
-		public bool is_shaded ();
-		public bool is_skip_pager ();
-		public bool is_skip_tasklist ();
-		public bool is_sticky ();
-		public bool is_visible_on_workspace (Wnck.Workspace workspace);
-		public void keyboard_move ();
-		public void keyboard_size ();
-		public void make_above ();
-		public void make_below ();
-		public void maximize ();
-		public void maximize_horizontally ();
-		public void maximize_vertically ();
-		public void minimize ();
-		public void move_to_workspace (Wnck.Workspace space);
-		public bool needs_attention ();
-		public bool or_transient_needs_attention ();
-		public void pin ();
-		public void set_fullscreen (bool fullscreen);
-		public void set_geometry (Wnck.WindowGravity gravity, Wnck.WindowMoveResizeMask geometry_mask, int x, int y, int width, int height);
-		public void set_icon_geometry (int x, int y, int width, int height);
-		public void set_skip_pager (bool skip);
-		public void set_skip_tasklist (bool skip);
-		public void set_sort_order (int order);
-		public void set_window_type (Wnck.WindowType wintype);
-		public void shade ();
-		public void stick ();
-		public bool transient_is_most_recently_activated ();
-		public void unmake_above ();
-		public void unmake_below ();
-		public void unmaximize ();
-		public void unmaximize_horizontally ();
-		public void unmaximize_vertically ();
-		public void unminimize (uint32 timestamp);
-		public void unpin ();
-		public void unshade ();
-		public void unstick ();
-		public virtual signal void actions_changed (Wnck.WindowActions changed_mask, Wnck.WindowActions new_actions);
-		public virtual signal void geometry_changed ();
-		public virtual signal void icon_changed ();
-		public virtual signal void name_changed ();
-		public virtual signal void state_changed (Wnck.WindowState changed_mask, Wnck.WindowState new_state);
-		public virtual signal void workspace_changed ();
-	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", type_id = "wnck_workspace_get_type ()")]
-	public class Workspace : GLib.Object {
-		[CCode (has_construct_function = false)]
-		protected Workspace ();
-		public void activate (uint32 timestamp);
-		public void change_name (string name);
-		public int get_height ();
-		public int get_layout_column ();
-		public int get_layout_row ();
-		public unowned string get_name ();
-		public unowned Wnck.Workspace get_neighbor (Wnck.MotionDirection direction);
-		public int get_number ();
-		public unowned Wnck.Screen get_screen ();
-		public int get_viewport_x ();
-		public int get_viewport_y ();
-		public int get_width ();
-		public bool is_virtual ();
-		public virtual signal void name_changed ();
-	}
-	[CCode (cheader_filename = "libwnck/libwnck.h")]
-	public struct ResourceUsage {
-		public ulong total_bytes_estimate;
-		public ulong pixmap_bytes;
-		public uint n_pixmaps;
-		public uint n_windows;
-		public uint n_gcs;
-		public uint n_pictures;
-		public uint n_glyphsets;
-		public uint n_fonts;
-		public uint n_colormap_entries;
-		public uint n_passive_grabs;
-		public uint n_cursors;
-		public uint n_other;
-		[CCode (cname = "wnck_pid_read_resource_usage")]
-		public static Wnck.ResourceUsage pid_read (Gdk.Display gdk_display, ulong pid);
-		[CCode (cname = "wnck_xid_read_resource_usage")]
-		public static Wnck.ResourceUsage xid_read (Gdk.Display gdk_display, ulong xid);
-	}
-	[CCode (cheader_filename = "libwnck/libwnck.h")]
-	public struct WorkspaceLayout {
-		public int rows;
-		public int cols;
-		public int grid;
-		public int grid_area;
-		public int current_row;
-		public int current_col;
-	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_CLIENT_TYPE_")]
-	public enum ClientType {
-		APPLICATION,
-		PAGER
-	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_MOTION_")]
-	public enum MotionDirection {
-		UP,
-		DOWN,
-		LEFT,
-		RIGHT
-	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_PAGER_DISPLAY_")]
-	public enum PagerDisplayMode {
-		NAME,
-		CONTENT
-	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_TASKLIST_")]
-	public enum TasklistGroupingType {
-		NEVER_GROUP,
-		AUTO_GROUP,
-		ALWAYS_GROUP
-	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_WINDOW_ACTION_")]
-	[Flags]
-	public enum WindowActions {
-		MOVE,
-		RESIZE,
-		SHADE,
-		STICK,
-		MAXIMIZE_HORIZONTALLY,
-		MAXIMIZE_VERTICALLY,
-		CHANGE_WORKSPACE,
-		CLOSE,
-		UNMAXIMIZE_HORIZONTALLY,
-		UNMAXIMIZE_VERTICALLY,
-		UNSHADE,
-		UNSTICK,
-		MINIMIZE,
-		UNMINIMIZE,
-		MAXIMIZE,
-		UNMAXIMIZE,
-		FULLSCREEN,
-		ABOVE,
-		BELOW
-	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_WINDOW_GRAVITY_")]
-	public enum WindowGravity {
-		CURRENT,
-		NORTHWEST,
-		NORTH,
-		NORTHEAST,
-		WEST,
-		CENTER,
-		EAST,
-		SOUTHWEST,
-		SOUTH,
-		SOUTHEAST,
-		STATIC
-	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_WINDOW_CHANGE_")]
-	[Flags]
-	public enum WindowMoveResizeMask {
-		X,
-		Y,
-		WIDTH,
-		HEIGHT
-	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_WINDOW_STATE_")]
-	[Flags]
-	public enum WindowState {
-		MINIMIZED,
-		MAXIMIZED_HORIZONTALLY,
-		MAXIMIZED_VERTICALLY,
-		SHADED,
-		SKIP_PAGER,
-		SKIP_TASKLIST,
-		STICKY,
-		HIDDEN,
-		FULLSCREEN,
-		DEMANDS_ATTENTION,
-		URGENT,
-		ABOVE,
-		BELOW
-	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_WINDOW_")]
-	public enum WindowType {
-		NORMAL,
-		DESKTOP,
-		DOCK,
-		DIALOG,
-		TOOLBAR,
-		MENU,
-		UTILITY,
-		SPLASHSCREEN
-	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", cname = "_WnckLayoutCorner", cprefix = "WNCK_LAYOUT_CORNER_")]
-	public enum _LayoutCorner {
-		TOPLEFT,
-		TOPRIGHT,
-		BOTTOMRIGHT,
-		BOTTOMLEFT
-	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", cname = "_WnckLayoutOrientation", cprefix = "WNCK_LAYOUT_ORIENTATION_")]
-	public enum _LayoutOrientation {
-		HORIZONTAL,
-		VERTICAL
-	}
-	[CCode (cheader_filename = "libwnck/libwnck.h")]
-	public static void set_client_type (Wnck.ClientType ewmh_sourceindication_client_type);
-}
diff --git a/vapi/unique-3.0.deps b/vapi/unique-3.0.deps
deleted file mode 100644
index e762c58..0000000
--- a/vapi/unique-3.0.deps
+++ /dev/null
@@ -1,8 +0,0 @@
-gio-2.0
-cairo
-atk
-pango
-gdk-3.0
-gdk-pixbuf-2.0
-gtk+-3.0
-
diff --git a/vapi/unique-3.0.vapi b/vapi/unique-3.0.vapi
deleted file mode 100644
index 79f67c5..0000000
--- a/vapi/unique-3.0.vapi
+++ /dev/null
@@ -1,94 +0,0 @@
-/* unique-3.0.vapi generated by vapigen, do not modify. */
-/* Pulled from http://permalink.gmane.org/gmane.linux.redhat.fedora.devel/147876 */
-
-[CCode (cprefix = "Unique", lower_case_cprefix = "unique_")]
-namespace Unique {
-	[CCode (cheader_filename = "unique/uniqueapp.h")]
-	public class App : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public App (string name, string? startup_id);
-		public void add_command (string command_name, int command_id);
-		public bool is_running ();
-		public Unique.Response send_message (int command_id, Unique.MessageData? message_data);
-		public void watch_window (Gtk.Window window);
-		[CCode (has_construct_function = false)]
-		public App.with_commands (string name, string startup_id, ...);
-		[NoAccessorMethod]
-		public string name { owned get; construct; }
-		[NoAccessorMethod]
-		public Gdk.Screen screen { owned get; set construct; }
-		[NoAccessorMethod]
-		public string startup_id { owned get; construct; }
-		public virtual signal Unique.Response message_received (int command, Unique.MessageData message_data, uint time_);
-	}
-	[CCode (cheader_filename = "unique/uniquebackend.h")]
-	public class Backend : GLib.Object {
-		public weak string name;
-		public weak Unique.App parent;
-		public weak Gdk.Screen screen;
-		public weak string startup_id;
-		public uint workspace;
-		[CCode (has_construct_function = false)]
-		protected Backend ();
-		public static unowned Unique.Backend create ();
-		public unowned string get_name ();
-		public unowned Gdk.Screen get_screen ();
-		public unowned string get_startup_id ();
-		public uint get_workspace ();
-		public virtual bool request_name ();
-		public virtual Unique.Response send_message (int command_id, Unique.MessageData message_data, uint time_);
-		public void set_name (string name);
-		public void set_screen (Gdk.Screen screen);
-		public void set_startup_id (string startup_id);
-	}
-	[Compact]
-	[CCode (copy_function = "unique_message_data_copy", type_id = "UNIQUE_TYPE_MESSAGE_DATA", cheader_filename = "unique/uniquemessage.h")]
-	public class MessageData {
-		[CCode (has_construct_function = false)]
-		public MessageData ();
-		public unowned Unique.MessageData copy ();
-		public unowned uchar[]  @get (size_t length);
-		public unowned string get_filename ();
-		public unowned Gdk.Screen get_screen ();
-		public unowned string get_startup_id ();
-		public unowned string get_text ();
-		public unowned string get_uris ();
-		public uint get_workspace ();
-		public void  @set (uchar[] data, ssize_t length);
-		public void set_filename (string filename);
-		public bool set_text (string str, ssize_t length);
-		public bool set_uris (string uris);
-	}
-	[CCode (cprefix = "UNIQUE_", cheader_filename = "unique/uniqueenumtypes.h")]
-	public enum Command {
-		INVALID,
-		ACTIVATE,
-		NEW,
-		OPEN,
-		CLOSE
-	}
-	[CCode (cprefix = "UNIQUE_RESPONSE_", cheader_filename = "unique/uniqueenumtypes.h")]
-	public enum Response {
-		INVALID,
-		OK,
-		CANCEL,
-		FAIL,
-		PASSTHROUGH
-	}
-	[CCode (cheader_filename = "unique/uniqueversion.h")]
-	public const string API_VERSION_S;
-	[CCode (cheader_filename = "unique/uniqueversion.h")]
-	public const string DEFAULT_BACKEND_S;
-	[CCode (cheader_filename = "unique/uniqueversion.h")]
-	public const int MAJOR_VERSION;
-	[CCode (cheader_filename = "unique/uniqueversion.h")]
-	public const int MICRO_VERSION;
-	[CCode (cheader_filename = "unique/uniqueversion.h")]
-	public const int MINOR_VERSION;
-	[CCode (cheader_filename = "unique/uniqueversion.h")]
-	public const string PROTOCOL_VERSION_S;
-	[CCode (cheader_filename = "unique/uniqueversion.h")]
-	public const int VERSION_HEX;
-	[CCode (cheader_filename = "unique/uniqueversion.h")]
-	public const string VERSION_S;
-}
diff --git a/vapi/x11.vapi b/vapi/x11.vapi
deleted file mode 100644
index cf80228..0000000
--- a/vapi/x11.vapi
+++ /dev/null
@@ -1,996 +0,0 @@
-/* x11.vapi
- *
- * Copyright (C) 2009  Jürg Billeter
- * Copyright (C) 2011  Alexander Kurtz
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
- *
- * Authors:
- * 	Jürg Billeter <j@bitron.ch>
- *  Alexander Kurtz <kurtz.alex@googlemail.com>
- */
-
-[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "X11/Xlib.h,X11/Xatom.h,X11/Xutil.h,X11/Xregion.h")]
-namespace X {
-	// Note: must be called before opening a display or calling any other Xlib function,
-	// see http://tronche.com/gui/x/xlib/display/XInitThreads.html
-	[CCode (cname = "XInitThreads")]
-	public Status init_threads ();
-
-	[Compact]
-	[CCode (cname = "Display", ref_function = "", unref_function = "")]
-	public class Display {
-		[CCode (cname = "XOpenDisplay")]
-		public Display (string? name = null);
-
-		[CCode (cname = "XAllPlanes")]
-		public static ulong get_all_planes ();
-
-		[CCode (cname = "XActivateScreenSaver")]
-		public void activate_screensaver ();
-
-		[CCode (cname = "XAddToSaveSet")]
-		public int add_to_save_set (Window w);
-
-		[CCode (cname = "XAllowEvents")]
-		public int allow_events (int event_mode, int time);
-
-		[CCode (cname = "XBitmapBitOrder")]
-		public int bitmap_bit_order ();
-
-		[CCode (cname = "XBitmapUnit")]
-		public int bitmap_scanline_unit ();
-
-		[CCode (cname = "XBitmapPad")]
-		public int bitmap_scanline_padding ();
-
-		[CCode (cname = "XChangeProperty")]
-		public int change_property (Window w, Atom property, Atom type, int format, int mode, [CCode (array_length = false)] uchar[] data, int nelements);
-
-		[CCode (cname = "XChangeWindowAttributes")]
-		public int change_window_attributes (Window w, ulong valuemask, SetWindowAttributes attributes);
-
-		[CCode (cname = "XConfigureWindow")]
-		public int configure_window (Window w, uint value_mask, WindowChanges values);
-
-		[CCode (cname = "ConnectionNumber")]
-		public int connection_number ();
-
-		[CCode (cname = "DefaultRootWindow")]
-		public Window default_root_window ();
-
-		[CCode (cname = "XDefaultScreenOfDisplay")]
-		public unowned Screen default_screen ();
-
-		[CCode (cname = "XScreenOfDisplay")]
-		public unowned Screen screen_by_id (int screen_number);
-
-		[CCode (cname = "DisplayString")]
-		public string display_string ();
-
-		[CCode (cname = "XQLength")]
-		public int event_queue_length ();
-
-		[CCode (cname = "XFlush")]
-		public int flush ();
-
-		[CCode (cname = "XForceScreenSaver")]
-		public void force_screensaver (int mode);
-
-		[CCode (cname = "XGetKeyboardMapping", array_length = false)]
-		public unowned uint[] get_keyboard_mapping (uint first_keycode, int keycode_count, ref int keysyms_per_keycode_return);
-
-		[CCode (cname = "XGetModifierMapping")]
-		public ModifierKeymap get_modifier_mapping ();
-
-		[CCode (cname = "XGetScreenSaver")]
-		public void get_screensaver (out int timeout, out int interval, out int prefer_blanking, out int allow_exposures);
-
-		[CCode (cname = "XGetSelectionOwner")]
-		public Window get_selection_owner (Atom selection);
-
-		[CCode (cname = "XGetWindowAttributes")]
-		public void get_window_attributes (Window w, out WindowAttributes window_attributes_return);
-
-		[CCode (cname = "XGetWindowProperty")]
-		public int get_window_property (Window w, Atom property, long long_offset, long long_length, bool delete, Atom req_type, out Atom actual_type_return, out int actual_format_return, out ulong nitems_return, out ulong bytes_after_return, [CCode (type = "unsigned char **")] out void* prop_return);
-
-		[CCode (cname = "XGrabButton")]
-		public int grab_button (uint button, uint modifiers, Window grab_window, bool owner_events, uint event_mask, int pointer_mode, int keyboard_mode, Window confine_to, uint cursor);
-
-		[CCode (cname = "XGrabKey")]
-		public int grab_key (int keycode, uint modifiers, Window grab_window, bool owner_events, int pointer_mode, int keyboard_mode);
-
-		[CCode (cname = "XGrabPointer")]
-		public int grab_pointer (Window grab_window, bool owner_events, uint event_mask, int pointer_mode, int keyboard_mode, Window confine_to, uint cursor, int time);
-
-		[CCode (cname = "XGrabServer")]
-		public int grab_server ();
-
-		[CCode (cname = "XImageByteOrder")]
-		public int image_byte_order ();
-
-		[CCode (cname = "XInternAtom")]
-		public Atom intern_atom (string atom_name, bool only_if_exists);
-
-		[CCode (cname = "XInternAtoms")]
-		public void intern_atoms (string[] names, bool only_if_exists, [CCode (array_length = false)] Atom[] atoms_return);
-
-		[CCode (cname = "XInternalConnectionNumbers")]
-		public Status internal_connection_numbers (ref int[] fd_return);
-
-		[CCode (cname = "XDisplayKeycodes")]
-		public int keycodes (ref int min_keycodes_return, ref int max_keycodes_return);
-
-		[CCode (cname = "XKeysymToKeycode")]
-		public int keysym_to_keycode (uint keysym);
-
-		[CCode (cname = "XLastKnownRequestProcessed")]
-		public ulong last_known_request_processed ();
-
-		[CCode (cname = "XLockDisplay")]
-		public void lock_display ();
-
-		[CCode (cname = "XMapWindow")]
-		public int map_window (Window w);
-
-		[CCode (cname = "XMaxRequestSize")]
-		public long max_request_size ();
-
-		[CCode (cname = "XExtendedMaxRequestSize")]
-		public long max_extended_request_size ();
-
-		[CCode (cname = "XEventsQueued")]
-		public int events_queued (int mode);
-
-		[CCode (cname = "XNextEvent")]
-		public int next_event (ref Event event_return);
-
-		[CCode (cname = "XNextRequest")]
-		public ulong next_request ();
-
-		[CCode (cname = "XNoOp")]
-		public void no_operation ();
-
-		[CCode (cname = "XScreenCount")]
-		public int number_of_screens ();
-
-		[CCode (cname = "XPending")]
-		public int pending ();
-
-		[CCode (cname = "XProcessInternalConnection")]
-		public void process_internal_connection (int fd);
-
-		[CCode (cname = "XProtocolVersion")]
-		public int protocol_version ();
-
-		[CCode (cname = "XProtocolRevision")]
-		public int protocol_revision ();
-
-		[CCode (cname = "XRaiseWindow")]
-		public int raise_window (Window w);
-
-		[CCode (cname = "XReparentWindow")]
-		public int reparent_window (Window w, Window parent, int x, int y);
-
-		[CCode (cname = "XResetScreenSaver")]
-		public void reset_screensaver ();
-
-		[CCode (cname = "XResizeWindow")]
-		public int resize_window (Window w, uint width, uint height);
-
-		[CCode (cname = "XRootWindow")]
-		public Window root_window (int screen_number);
-
-		[CCode (cname = "ScreenCount")]
-		public int screen_count ();
-
-		[CCode (cname = "XScreenOfDisplay")]
-		public unowned Screen screen_of_display (int screen_number);
-
-		[CCode (cname = "XSelectInput")]
-		public int select_input (Window w, long event_mask);
-
-		[CCode (cname = "XSendEvent")]
-		public void send_event (Window w, bool propagate, long event_mask, ref Event event_send);
-
-		[CCode (cname = "XSetCloseDownMode")]
-		public void set_close_down_mode (int close_mode);
-
-		[CCode (cname = "XSetScreenSaver")]
-		public void set_screensaver (int timeout, int interval, int prefer_blanking, int allow_exposures);
-
-		[CCode (cname = "XSetSelectionOwner")]
-		public Window set_selection_owner (Atom selection, Window owner, int time);
-
-		[CCode (cname = "XSetInputFocus")]
-		public int set_input_focus (Window focus, int revert_to, int time);
-
-		[CCode (cname = "XUngrabButton")]
-		public int ungrab_button (uint button, uint modifiers, Window grab_window);
-
-		[CCode (cname = "XUngrabKey")]
-		public int ungrab_key (int keycode, uint modifiers, Window grab_window);
-
-		[CCode (cname = "XUngrabPointer")]
-		public int ungrab_pointer (int time);
-
-		[CCode (cname = "XUngrabServer")]
-		public int ungrab_server ();
-
-		[CCode (cname = "XUnlockDisplay")]
-		public void unlock_display ();
-
-		[CCode (cname = "XUnmapWindow")]
-		public int unmap_window (Window w);
-
-		[CCode (cname = "XQueryTree")]
-		public void query_tree (Window w, out Window root_return, out Window parent_return, out Window[] children_return);
-
-		[CCode (cname = "XWindowEvent")]
-		public int window_event (Window w, EventMask event_mask, out Event event_return);
-
-		[CCode (cname = "XServerVendor")]
-		public string xserver_vendor_name ();
-
-		[CCode (cname = "XVendorRelease")]
-		public string xserver_vendor_release ();
-
-		[CCode (cname = "XMoveWindow")]
-		public void move_window (Window window, int x, int y);
-	}
-
-	[Compact]
-	[CCode (cname = "XModifierKeymap", free_function = "XFreeModifiermap")]
-	public class ModifierKeymap {
-		// The server's max # of keys per modifier
-		public int max_keypermod;
-		// An 8 by max_keypermod array of modifiers
-		public uchar[] modifiermap;
-	}
-
-	[SimpleType]
-	[IntegerType (rank = 9)]
-	[CCode (cname = "Atom")]
-	public struct Atom {
-	}
-
-	[SimpleType]
-	[IntegerType (rank = 9)]
-	[CCode (cname = "Colormap")]
-	public struct Colormap {
-	}
-
-	[SimpleType]
-	[CCode (cname = "GC")]
-	public struct GC {
-	}
-
-	[SimpleType]
-	[IntegerType (rank = 9)]
-	[CCode (cname = "Status")]
-	public struct Status {
-	}
-
-	[SimpleType]
-	[IntegerType (rank = 9)]
-	[CCode (cname = "XID", type_id = "G_TYPE_INT",
-		marshaller_type_name = "INT",
-		get_value_function = "g_value_get_int",
-		set_value_function = "g_value_set_int", default_value = "0",
-		type_signature = "i")]
-	public struct ID {
-	}
-
-	[SimpleType]
-	[IntegerType (rank = 9)]
-	[CCode (cname = "Drawable", type_id = "G_TYPE_INT",
-		marshaller_type_name = "INT",
-		get_value_function = "g_value_get_int",
-		set_value_function = "g_value_set_int", default_value = "0",
-		type_signature = "i")]
-	public struct Drawable : ID
-	{
-	}
-
-	[SimpleType]
-	[IntegerType (rank = 9)]
-	[CCode (cname = "Window", type_id = "G_TYPE_INT",
-		marshaller_type_name = "INT",
-		get_value_function = "g_value_get_int",
-		set_value_function = "g_value_set_int", default_value = "0",
-		type_signature = "i")]
-	public struct Window : Drawable {
-	}
-
-
-	[SimpleType]
-	[IntegerType (rank = 9)]
-	[CCode (cname = "Pixmap", type_id = "G_TYPE_INT",
-		marshaller_type_name = "INT",
-		get_value_function = "g_value_get_int",
-		set_value_function = "g_value_set_int", default_value = "0",
-		type_signature = "i")]
-	public struct Pixmap : Drawable	{
-	}
-	
-	[SimpleType]
-	[IntegerType (rank = 9)]
-	[CCode (cname = "Mask")]
-	public struct Mask {
-	}
-
-	[SimpleType]
-	[IntegerType (rank = 9)]
-	[CCode (cname = "VisualID")]
-	public struct VisualID {
-	}
-
-	[SimpleType]
-	[IntegerType (rank = 9)]
-	[CCode (cname = "Time")]
-	public struct Time {
-	}
-
-	[SimpleType]
-	[IntegerType (rank = 9)]
-	[CCode (cname = "Cursor")]
-	public struct Cursor {
-	}
-
-	[SimpleType]
-	[IntegerType (rank = 9)]
-	[CCode (cname = "GContext")]
-	public struct GContext {
-	}
-
-	[SimpleType]
-	[IntegerType (rank = 9)]
-	[CCode (cname = "KeySym")]
-	public struct KeySym {
-	}
-
-	[SimpleType]
-	[IntegerType (rank = 9)]
-	[CCode (cname = "KeyCode")]	
-	public struct KeyCode {
-	}
-
-	public struct Visual {
-	}
-
-	public struct WindowChanges {
-		public int x;
-		public int y;
-		public int width;
-		public int height;
-		public int border_width;
-		public Window sibling;
-		public int stack_mode;
-	}
-	public struct SizeHints {
-		public long @flags;
-		public int x;
-		public int y;
-		public int width;
-		public int height;
-	}
-
-	[CCode (cname = "XCreateWindow")]
-	public Window create_window (Display display, Window parent, int x, int y, uint width, uint height, uint border_width, int depth, uint @class, Visual? visual, X.CW valuemask, ref SetWindowAttributes attributes);
-
-	[CCode (cname = "XSetWindowAttributes")]
-	public struct SetWindowAttributes {
-		// public Pixmap background_pixmap;	/* background or None or ParentRelative */
-		public ulong background_pixel;	/* background pixel */
-		// public Pixmap border_pixmap;	/* border of the window */
-		public ulong border_pixel;	/* border pixel value */
-		public int bit_gravity;		/* one of bit gravity values */
-		public int win_gravity;		/* one of the window gravity values */
-		public int backing_store;		/* NotUseful, WhenMapped, Always */
-		public ulong backing_planes;/* planes to be preseved if possible */
-		public ulong backing_pixel;/* value to use in restoring planes */
-		public bool save_under;		/* should bits under be saved? (popups) */
-		public long event_mask;		/* set of events that should be saved */
-		public long do_not_propagate_mask;	/* set of events that should not propagate */
-		public bool override_redirect;	/* boolean value for override-redirect */
-		// public Colormap colormap;		/* color map to be associated with window */
-		// public Cursor cursor;		/* cursor to be displayed (or None) */
-	}
-
-	[CCode(cname = "XWindowAttributes",
-	       cheader_filename = "X11/Xlib.h,X11/Xatom.h,X11/Xutil.h")]
-	public struct WindowAttributes {
-		public int x;
-		public int y;			/* location of window */
-		public int width;
-		public int height;		/* width and height of window */
-		public int border_width;		/* border width of window */
-		public int depth;          	/* depth of window */
-		public Visual visual;		/* the associated visual structure */
-		public Window root;        	/* root of screen containing window */
-		public int @class;			/* InputOutput, InputOnly*/
-		public int bit_gravity;		/* one of bit gravity values */
-		public int win_gravity;		/* one of the window gravity values */
-		public int backing_store;		/* NotUseful, WhenMapped, Always */
-		public ulong backing_planes;/* planes to be preserved if possible */
-		public ulong backing_pixel;/* value to be used when restoring planes */
-		public bool save_under;		/* boolean, should bits under be saved? */
-		// public Colormap colormap;		/* color map to be associated with window */
-		public bool map_installed;		/* boolean, is color map currently installed*/
-		public int map_state;		/* IsUnmapped, IsUnviewable, IsViewable */
-		public long all_event_masks;	/* set of events all people have interest in*/
-		public long your_event_mask;	/* my event mask */
-		public long do_not_propagate_mask; /* set of events that should not propagate */
-		public bool override_redirect;	/* boolean value for override-redirect */
-		// public Screen screen;		/* back pointer to correct screen */
-	}
-
-	[CCode (cname = "CopyFromParent")]
-	public const int COPY_FROM_PARENT;
-
-	[CCode (cname = "CurrentTime")]
-	public const ulong CURRENT_TIME;
-
-	[CCode (cname = "Success")]
-	public int Success;
-
-	[CCode (cname = "XFree")]
-	public int free (void* data);
-
-	[CCode (cprefix = "CW", cname = "int")]
-	public enum CW {
-		BackPixmap,
-		BackPixel,
-		BackingStore,
-		BackingPlanes,
-		BackingPixel,
-		BitGravity,
-		BorderPixmap,
-		BorderPixel,
-		BorderWidth,
-		Colormap,
-		Cursor,
-		DontPropagate,
-		EventMask,
-		Height,
-		OverrideRedirect,
-		SaveUnder,
-		Sibling,
-		StackMode,
-		X,
-		Y,
-		Width,
-		WinGravity
-	}
-
-	[CCode (cprefix = "GrabMode")]
-	public enum GrabMode {
-		Sync,
-		Async
-	}
-
-	[CCode (cprefix = "")]
-	public enum EventMask {
-		NoEventMask,
-		KeyPressMask,
-		KeyReleaseMask,
-		ButtonPressMask,
-		ButtonReleaseMask,
-		EnterWindowMask,
-		LeaveWindowMask,
-		PointerMotionMask,
-		PointerMotionHintMask,
-		Button1MotionMask,
-		Button2MotionMask,
-		Button3MotionMask,
-		Button4MotionMask,
-		Button5MotionMask,
-		ButtonMotionMask,
-		KeymapStateMask,
-		ExposureMask,
-		VisibilityChangeMask,
-		StructureNotifyMask,
-		ResizeRedirectMask,
-		SubstructureNotifyMask,
-		SubstructureRedirectMask,
-		FocusChangeMask,
-		PropertyChangeMask,
-		ColormapChangeMask,
-		OwnerGrabButtonMask
-	}
-
-	[CCode (cprefix = "")]
-	public enum KeyMask {
-		ShiftMask,
-		LockMask,
-		ControlMask,
-		Mod1Mask,
-		Mod2Mask,
-		Mod3Mask,
-		Mod4Mask,
-		Mod5Mask
-	}
-
-	[CCode (cprefix = "")]
-	public enum EventType {
-		KeyPress,
-		KeyRelease,
-		ButtonPress,
-		ButtonRelease,
-		MotionNotify,
-		EnterNotify,
-		LeaveNotify,
-		FocusIn,
-		FocusOut,
-		KeymapNotify,
-		Expose,
-		GraphicsExpose,
-		NoExpose,
-		VisibilityNotify,
-		CreateNotify,
-		DestroyNotify,
-		UnmapNotify,
-		MapNotify,
-		MapRequest,
-		ReparentNotify,
-		ConfigureNotify,
-		ConfigureRequest,
-		GravityNotify,
-		ResizeRequest,
-		CirculateNotify,
-		CirculateRequest,
-		PropertyNotify,
-		SelectionClear,
-		SelectionRequest,
-		SelectionNotify,
-		ColormapNotify,
-		ClientMessage,
-		MappingNotify
-	}
-
-	// union
-	[CCode (cname = "XEvent")]
-	public struct Event {
-		public int type;
-		public AnyEvent xany;
-		public KeyEvent xkey;
-		public ButtonEvent xbutton;
-		public MotionEvent xmotion;
-		public CrossingEvent xcrossing;
-		public CreateWindowEvent xcreatewindow;
-		public DestroyWindowEvent xdestroywindow;
-		public UnmapEvent xunmap;
-		public MapEvent xmap;
-		public MapRequestEvent xmaprequest;
-		public ReparentEvent xreparent;
-		public ConfigureEvent xconfigure;
-		public GravityEvent xgravity;
-		public ConfigureRequestEvent xconfigurerequest;
-		public CirculateEvent xcirculate;
-		public CirculateRequestEvent xcirculaterequest;
-		public PropertyEvent xproperty;
-		public SelectionEvent xselection;
-		public ClientMessageEvent xclient;
-	}
-
-	[CCode (cname = "XAnyEvent")]
-	public struct AnyEvent {
-		public int type;
-		public ulong serial;
-		public bool send_event;
-		public unowned Display display;
-		public Window window;
-	}
-
-	[CCode (cname = "XKeyEvent")]
-	public struct KeyEvent {
-		public int type;
-		public ulong serial;
-		public bool send_event;
-		public unowned Display display;
-		public Window window;
-		public Window root;
-		public Window subwindow;
-		public ulong time;
-		public int x;
-		public int y;
-		public int x_root;
-		public int y_root;
-		public uint state;
-		public uint keycode;
-		public bool same_screen;
-	}
-
-	[CCode (cname = "XButtonEvent")]
-	public struct ButtonEvent {
-		public int type;
-		public ulong serial;
-		public bool send_event;
-		public unowned Display display;
-		public Window window;
-		public Window subwindow;
-		public ulong time;
-		public int x;
-		public int y;
-		public int x_root;
-		public int y_root;
-		public uint state;
-		public uint button;
-		public bool same_screen;
-	}
-
-	[CCode (cname = "XMotionEvent")]
-	public struct MotionEvent {
-		public int type;
-		public ulong serial;
-		public bool send_event;
-		public unowned Display display;
-		public Window window;
-		public Window subwindow;
-		public ulong time;
-		public int x;
-		public int y;
-		public int x_root;
-		public int y_root;
-		public uint state;
-		public char is_hint;
-		public bool same_screen;
-	}
-
-	[CCode (cname = "XCrossingEvent")]
-	public struct CrossingEvent {
-		public int type;
-		public ulong serial;
-		public bool send_event;
-		public unowned Display display;
-		public Window window;
-		public Window root;
-		public Window subwindow;
-		public ulong time;
-		public int x;
-		public int y;
-		public int x_root;
-		public int y_root;
-		public int mode;
-		public int detail;
-		public bool same_screen;
-		public bool focus;
-		public uint state;
-	}
-
-	[CCode (cname = "XCreateWindowEvent")]
-	public struct CreateWindowEvent {
-		public int type;
-		public ulong serial;
-		public bool send_event;
-		public unowned Display display;
-		public Window parent;
-		public Window window;
-		public int x;
-		public int y;
-		public int width;
-		public int height;
-		public int border_width;
-		public bool override_redirect;
-	}
-
-	[CCode (cname = "XDestroyWindowEvent")]
-	public struct DestroyWindowEvent {
-		public int type;
-		public ulong serial;
-		public bool send_event;
-		public unowned Display display;
-		public Window event;
-		public Window window;
-	}
-
-	[CCode (cname = "XUnmapEvent")]
-	public struct UnmapEvent {
-		public int type;
-		public ulong serial;
-		public bool send_event;
-		public unowned Display display;
-		public Window event;
-		public Window window;
-		public bool from_configure;
-	}
-
-	[CCode (cname = "XMapEvent")]
-	public struct MapEvent {
-		public int type;
-		public ulong serial;
-		public bool send_event;
-		public unowned Display display;
-		public Window event;
-		public Window window;
-		public bool override_redirect;
-	}
-
-	[CCode (cname = "XMapRequestEvent")]
-	public struct MapRequestEvent {
-		public int type;
-		public ulong serial;
-		public bool send_event;
-		public unowned Display display;
-		public Window parent;
-		public Window window;
-	}
-
-	[CCode (cname = "XReparentEvent")]
-	public struct ReparentEvent {
-		public int type;
-		public ulong serial;
-		public bool send_event;
-		public unowned Display display;
-		public Window event;
-		public Window window;
-		public Window parent;
-		public int x;
-		public int y;
-		public bool override_redirect;
-	}
-
-	[CCode (cname = "XConfigureEvent")]
-	public struct ConfigureEvent {
-		public int type;
-		public ulong serial;
-		public bool send_event;
-		public unowned Display display;
-		public Window event;
-		public Window window;
-		public int x;
-		public int y;
-		public int width;
-		public int height;
-		public int border_width;
-		public Window above;
-		public bool override_redirect;
-	}
-
-	[CCode (cname = "XGravityEvent")]
-	public struct GravityEvent {
-		public int type;
-		public ulong serial;
-		public bool send_event;
-		public unowned Display display;
-		public Window event;
-		public Window window;
-		public int x;
-		public int y;
-	}
-
-	[CCode (cname = "XConfigureRequestEvent")]
-	public struct ConfigureRequestEvent {
-		public int type;
-		public ulong serial;
-		public bool send_event;
-		public unowned Display display;
-		public Window parent;
-		public Window window;
-		public int x;
-		public int y;
-		public int width;
-		public int height;
-		public int border_width;
-		public Window above;
-		public int detail;
-		public ulong value_mask;
-	}
-
-	[CCode (cname = "XCirculateEvent")]
-	public struct CirculateEvent {
-		public int type;
-		public ulong serial;
-		public bool send_event;
-		public unowned Display display;
-		public Window event;
-		public Window window;
-		public int place;
-	}
-
-	[CCode (cname = "XCirculateRequestEvent")]
-	public struct CirculateRequestEvent {
-		public int type;
-		public ulong serial;
-		public bool send_event;
-		public unowned Display display;
-		public Window parent;
-		public Window window;
-		public int place;
-	}
-
-	[CCode (cname = "XPropertyEvent")]
-	public struct PropertyEvent {
-		public int type;
-		public ulong serial;
-		public bool send_event;
-		public unowned Display display;
-		public Window window;
-		public Atom atom;
-		public ulong time;
-		public int state;
-	}
-
-	[CCode (cname = "XSelectionEvent")]
-	public struct SelectionEvent {
-		public int type;
-		public ulong serial;
-		public bool send_event;
-		public unowned Display display;
-		public Window requestor;
-		public Atom selection;
-		public Atom target;
-		public Atom property;
-		public ulong time;
-	}
-
-	[CCode (cname = "XClientMessageEvent")]
-	public struct ClientMessageEvent {
-		public int type;
-		public ulong serial;	/* # of last request processed by server */
-		public bool send_event;	/* true if this came from a SendEvent request */
-		public unowned Display display;	/* Display the event was read from */
-		public Window window;
-		public Atom message_type;
-		public int format;
-		public ClientMessageEventData data;
-	}
-
-	[CCode (cname = "RECTANGLE", has_type_id = false)]
-	public struct Rectangle {
-		public short x;
-		public short y;
-		public short width;
-		public short height;
-	}
-
-	// union
-	public struct ClientMessageEventData {
-		public unowned char[] b;
-		public unowned short[] s;
-		public unowned long[] l;
-	}
-
-	[CCode (cprefix = "Queued")]
-	public enum QueuedMode {
-		Already,
-		AfterFlush,
-		AfterReading
-	}
-
-	[CCode (cprefix = "PropMode")]
-	public enum PropMode {
-		Replace,
-		Prepend,
-		Append
-	}
-
-	[CCode (cprefix = "")]
-	public enum AllowEventsMode {
-		AsyncPointer,
-		SyncPointer,
-		ReplayPointer,
-		AsyncKeyboard,
-		SyncKeyboard,
-		ReplayKeyboard,
-		AsyncBoth,
-		SyncBoth
-	}
-
-	[CCode (cprefix = "")]
-	public enum MapState {
-		IsUnmapped,
-		IsUnviewable,
-		IsViewable
-	}
-
-	[CCode (cprefix = "RevertTo")]
-	public enum RevertTo {
-		None,
-		PointerRoot,
-		Parent
-	}
-
-	[Compact]
-	[CCode (cname = "Screen")]
-	public class Screen {
-		public Display display;
-		public Window root;
-		public int width;
-		public int height;
-
-		[CCode (cname = "XScreenOfDisplay")]
-		public static unowned Screen get_screen (Display disp, int screen_number);
-
-		[CCode (cname = "XBlackPixelOfScreen")]
-		public ulong black_pixel_of_screen ();
-
-		[CCode (cname = "XCellsOfScreen")]
-		public int cells_of_screen ();
-
-		[CCode (cname = "XDefaultColormapOfScreen")]
-		public Colormap default_colormap_of_screen ();
-
-		[CCode (cname = "XDefaultDepthOfScreen")]
-		public int default_depth_of_screen ();
-
-		[CCode (cname = "XDefaultGCOfScreen")]
-		public GC default_gc_of_screen ();
-
-		[CCode (cname = "XDefaultVisualOfScreen")]
-		public Visual default_visual_of_screen ();
-
-		[CCode (cname = "XDisplayOfScreen")]
-		public unowned Display display_of_screen ();
-
-		[CCode (cname = "XDoesBackingStore")]
-		public int does_backing_store ();
-
-		[CCode (cname = "XDoesSaveUnders")]
-		public bool does_save_unders ();
-
-		[CCode (cname = "XEventMaskOfScreen")]
-		public long event_mask_of_Screen ();
-
-		[CCode (cname = "XHeightMMOfScreen")]
-		public int height_in_mm_of_screen ();
-
-		[CCode (cname = "XHeightOfScreen")]
-		public int height_of_screen ();
-
-		[CCode (cname = "XMaxCmapsOfScreen")]
-		public int max_colormaps_of_screen ();
-
-		[CCode (cname = "XMinCmapsOfScreen")]
-		public int min_colormaps_of_screen ();
-
-		[CCode (cname = "XPlanesOfScreen")]
-		public int planes_of_screen ();
-
-		[CCode (cname = "XRootWindowOfScreen")]
-		public Window root_window_of_screen ();
-
-		[CCode (cname = "XScreenNumberOfScreen")]
-		public int screen_number_of_screen ();
-
-		[CCode (cname = "XWhitePixelOfScreen")]
-		public ulong white_pixel_of_screen ();
-
-		[CCode (cname = "XWidthMMOfScreen")]
-		public int width_in_mm_of_screen ();
-
-		[CCode (cname = "XWidthOfScreen")]
-		public int width_of_screen ();
-	}
-
-	public const X.ID None;
-
-	public const X.Atom XA_ATOM;
-	public const X.Atom XA_CARDINAL;
-	public const X.Atom XA_WINDOW;
-	public const X.Atom XA_WM_CLASS;
-	public const X.Atom XA_WM_HINTS;
-	public const X.Atom XA_WM_ICON_NAME;
-	public const X.Atom XA_WM_NAME;
-	public const X.Atom XA_WM_NORMAL_HINTS;
-	public const X.Atom XA_WM_TRANSIENT_FOR;
-
-	public const uint XK_Num_Lock;
-	public const uint XK_Scroll_Lock;
-	public const uint XK_Super_L;
-	public const uint XK_Super_R;
-}
-
diff --git a/vapi/xtst.vapi b/vapi/xtst.vapi
deleted file mode 100644
index a773dfa..0000000
--- a/vapi/xtst.vapi
+++ /dev/null
@@ -1,60 +0,0 @@
-/* xtst.vapi
- *
- * Copyright (C) 2011  Alexander Kurtz
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
- *
- * Author:
- * 	Alexander Kurtz <kurtz.alex@googlemail.com>
- */
-
-
-[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "X11/extensions/XTest.h")]
-namespace X {
-	class Test {
-		[CCode (cname = "XTestQueryExtension")]
-		public static bool query_extension(Display display, out int event_base_return, out int error_base_return, out int major_version_return, out int minor_version_return);
-
-		[CCode (cname = "XTestCompareCursorWithWindow")]
-		public static bool compare_cursor_with_window(Display display, Window window, Cursor cursor);
-
-		[CCode (cname = "XTestCompareCurrentCursorWithWindow")]
-		public static bool compare_current_cursor_with_window(Display display, Window window);
-
-		[CCode (cname = "XTestFakeKeyEvent")]
-		public static int fake_key_event(Display display, uint keycode, bool is_press, ulong delay);
-
-		[CCode (cname = "XTestFakeButtonEvent")]
-		public static int fake_button_event(Display display, uint button, bool is_press, ulong delay);
-
-		[CCode (cname = "XTestFakeMotionEvent")]
-		public static int fake_motion_event(Display display, int screen_number, int x, int y, ulong delay);
-	
-		[CCode (cname = "XTestFakeRelativeMotionEvent")]
-		public static int fake_relative_motion_event(Display display, int screen_number, int x, int y, ulong delay);
-
-		[CCode (cname = "XTestGrabControl")]
-		public static int grab_control(Display display, bool impervious);
-
-		[CCode (cname = "XTestSetGContextOfGC")]
-		public static void set_g_context_of_gc(GC gc, GContext gid);
-
-		[CCode (cname = "XTestSetVisualIDOfVisual")]
-		public static void set_visual_id_of_visual(Visual visual, VisualID visualid);
-
-		[CCode (cname = "XTestDiscard")]
-		public static Status discard(Display display);
-	}
-}