File valencia-vala-0.16.patch of Package valencia

diff --git a/Makefile b/Makefile
index a40da01..7eab10f 100644
--- a/Makefile
+++ b/Makefile
@@ -9,21 +9,21 @@ SOURCES = autocomplete.vala browser.vala expression.vala gtk_util.vala parser.va
           scanner.vala settings.vala util.vala valencia.vala
  
 PACKAGES = --pkg gedit --pkg gee-1.0 --pkg gtk+-3.0 --pkg gtksourceview-3.0 \
-           --pkg libvala-0.12 --pkg PeasGtk-1.0 --pkg vte-2.90
+           --pkg libpeas-1.0 --pkg libvala-0.16 --pkg vte-2.90
 
 PACKAGE_VERSIONS = \
     gedit >= 2.91.0 \
     gee-1.0 >= 0.1.3 \
     gtksourceview-3.0 >= 3.0.0 \
     gtk+-3.0 >= 3.0.0 \
-    libvala-0.12 >= 0.11.0 \
+    libvala-0.16 >= 0.15.0 \
     vte-2.90 >= 0.27.90
 
 OUTPUTS = libvalencia.so valencia.plugin
 
 DIST_FILES = $(SOURCES) \
              Makefile \
-             gedit-2.20.deps gedit-2.20.vapi valencia.png \
+             valencia.png \
              valencia.plugin valencia.plugin.m4 \
              AUTHORS COPYING INSTALL NEWS README THANKS
 DIST_TAR = $(PLUGIN)-$(VERSION).tar
@@ -40,7 +40,7 @@ valencia.plugin: valencia.plugin.m4 Makefile
 
 libvalencia.so: $(SOURCES) Makefile
 	@ pkg-config --print-errors --exists '$(PACKAGE_VERSIONS)'
-	$(VALAC) $(VFLAGS) -X --shared -X -fPIC --vapidir=vapi $(PACKAGES) $(SOURCES) -o $@
+	$(VALAC) $(VFLAGS) -X --shared -X -fPIC $(PACKAGES) $(SOURCES) -o $@
 
 install: libvalencia.so valencia.plugin
 	@ [ `whoami` != "root" ] || ( echo 'Run make install as yourself, not as root.' ; exit 1 )
diff --git a/autocomplete.vala b/autocomplete.vala
index 97cc167..fb6043b 100644
--- a/autocomplete.vala
+++ b/autocomplete.vala
@@ -247,7 +247,7 @@ class AutocompleteDialog : Object {
         // Text insertion/deletion signals have been linked to updating the autocomplete dialog -
         // we don't want to do that if we're already inserting text.
         inserting_text = true;
-        buffer.delete(start, end);
+        buffer.delete(ref start, ref end);
 
         long offset = selection.has_suffix(")") ? 1 : 0;
         buffer.insert_at_cursor(selection, (int) (selection.length - offset));
diff --git a/gtk_util.vala b/gtk_util.vala
index 2382cef..fb1e74b 100644
--- a/gtk_util.vala
+++ b/gtk_util.vala
@@ -29,7 +29,7 @@ void append_with_tag(Gtk.TextBuffer buffer, string text, Gtk.TextTag? tag) {
     if (tag != null)
         buffer.insert_with_tags(end, text, -1, tag);
     else
-        buffer.insert(end, text, -1);
+        buffer.insert(ref end, text, -1);
 }
 
 void append(Gtk.TextBuffer buffer, string text) {
@@ -528,5 +528,6 @@ Gedit.Tab? find_tab(string filename, out Gedit.Window window) {
             return tab;
         }
     }
+    window = null;
     return null;
 }
diff --git a/parser.vala b/parser.vala
index c25935d..276cfc7 100644
--- a/parser.vala
+++ b/parser.vala
@@ -100,14 +100,15 @@ public class Parser : Object {
         while (!scanner.eof()) {
             switch (peek_token()) {
                 case Token.COMMA:
-                case Token.RIGHT_BRACE:
                 case Token.SEMICOLON:
                     if (depth == 0)
                         return;
                     break;
+                case Token.LEFT_BRACE:
                 case Token.LEFT_PAREN:
                     ++depth;
                     break;
+                case Token.RIGHT_BRACE:
                 case Token.RIGHT_PAREN:
                     if (depth == 0)
                         return;
diff --git a/program.vala b/program.vala
index f2206ae..09bd2ce 100644
--- a/program.vala
+++ b/program.vala
@@ -1088,7 +1088,7 @@ public class Program : Object {
             recursive_project = false;
         }
 
-        idle_add(parse_local_vala_files_idle_callback);
+        Idle.add(parse_local_vala_files_idle_callback);
         
         programs.add(this);
     }
@@ -1310,7 +1310,7 @@ public class Program : Object {
             parsing = true;
             parse_list_index = 0;
             sourcefile_paths.clear();
-            idle_add(this.parse_system_vala_files_idle_callback);
+            Idle.add(this.parse_system_vala_files_idle_callback);
         }
     }
     
diff --git a/util.vala b/util.vala
index b60f500..d5a67ff 100644
--- a/util.vala
+++ b/util.vala
@@ -72,8 +72,3 @@ void make_pipe(int fd, IOFunc func) throws IOChannelError {
     pipe.add_watch(IOCondition.IN | IOCondition.HUP, func);
 }
 
-// a workaround for bug https://bugzilla.gnome.org/show_bug.cgi?id=595885 in Vala 0.7.6
-void idle_add(SourceFunc function, int priority = Priority.DEFAULT_IDLE) {
-    Idle.add_full(priority, function);
-}
-
diff --git a/valencia.vala b/valencia.vala
index bcf0008..3fd8424 100644
--- a/valencia.vala
+++ b/valencia.vala
@@ -124,7 +124,7 @@ public class Instance : Peas.ExtensionBase, Gedit.WindowActivatable {
     Gtk.ScrolledWindow output_pane;
     
     delegate bool ProcessFinished();
-    ProcessFinished on_process_finshed;
+    unowned ProcessFinished on_process_finshed;
 
     // Settings dialog
     ProjectSettingsDialog settings_dialog;
@@ -605,7 +605,7 @@ public class Instance : Peas.ExtensionBase, Gedit.WindowActivatable {
             appended = true;
         }
         if (appended)
-            idle_add(scroll_to_end);
+            Idle.add(scroll_to_end);
         return ret;
     }
     
@@ -742,7 +742,7 @@ public class Instance : Peas.ExtensionBase, Gedit.WindowActivatable {
             if (!d.is_untitled() && d.get_modified()) {
                 ++saving;
                 Signal.connect(d, "saved", (Callback) saved_callback, this);
-                d.save(0);
+                d.do_save(0);
             }
         if (saving == 0)
             build();
diff --git a/vapi/gedit.vapi b/vapi/gedit.vapi
deleted file mode 100644
index b2cd400..0000000
--- a/vapi/gedit.vapi
+++ /dev/null
@@ -1,456 +0,0 @@
-/* This VAPI file came from the Vala Toys for Gedit source tree.
- * Despite the warning immediately below, we've made some small edits to it:
- * - added Document.save() method
- * - commented out Document.save_as() method and Document.save() signal
- */
-
-/* gedit-3.0.vapi generated by vapigen, do not modify. */
-
-[CCode (cprefix = "Gedit", lower_case_cprefix = "gedit_", gir_namespace = "Gedit", gir_version = "3.0")]
-namespace Gedit {
-	[CCode (type_id = "gedit_app_get_type ()", cheader_filename = "gedit/gedit-app.h")]
-	public class App : GLib.InitiallyUnowned {
-		[CCode (has_construct_function = false)]
-		protected App ();
-		public unowned Gedit.Window create_window (Gdk.Screen? screen);
-		public unowned Gedit.Window get_active_window ();
-		public static unowned Gedit.App get_default ();
-		public GLib.List<weak Gedit.Document> get_documents ();
-		public Gedit.LockdownMask get_lockdown ();
-		public GLib.List<weak Gedit.View> get_views ();
-		public unowned GLib.List<weak Gedit.Window> get_windows ();
-		[NoWrapper]
-		public virtual string help_link_id (string name, string link_id);
-		[NoWrapper]
-		public virtual bool last_window_destroyed ();
-		public virtual void set_window_title (Gedit.Window window, string title);
-		public virtual bool show_help (Gtk.Window parent, string name, string link_id);
-		public Gedit.LockdownMask lockdown { get; }
-	}
-	[CCode (type_id = "gedit_document_get_type ()", cheader_filename = "gedit/gedit-document.h")]
-	public class Document : GtkSource.Buffer {
-		[CCode (has_construct_function = false)]
-		public Document ();
-		public static GLib.Quark error_quark ();
-		public bool get_can_search_again ();
-		public Gedit.DocumentCompressionType get_compression_type ();
-		public string get_content_type ();
-		public bool get_deleted ();
-		public bool get_enable_search_highlighting ();
-		public unowned Gedit.Encoding get_encoding ();
-		public unowned GtkSource.Language get_language ();
-		public GLib.File get_location ();
-		public string get_metadata (string key);
-		public string get_mime_type ();
-		public Gedit.DocumentNewlineType get_newline_type ();
-		public bool get_readonly ();
-		public string get_search_text (uint? flags);
-		public string get_short_name_for_display ();
-		public string get_uri_for_display ();
-		public bool goto_line (int line);
-		public bool goto_line_offset (int line, int line_offset);
-		public bool is_local ();
-		public bool is_untitled ();
-		public bool is_untouched ();
-		public bool load_cancel ();
-		public void load_stream (GLib.InputStream stream, Gedit.Encoding? encoding, int line_pos, int column_pos);
-		public int replace_all (string find, string replace, uint flags);
-		public void save(Gedit.DocumentSaveFlags flags);
-//		[CCode (vfunc_name = "save")]
-//		public virtual void save_as (GLib.File location, Gedit.Encoding encoding, Gedit.DocumentNewlineType newline_type, Gedit.DocumentCompressionType compression_type, Gedit.DocumentSaveFlags flags);
-		public bool search_backward (Gtk.TextIter? start, Gtk.TextIter? end, Gtk.TextIter? match_start, Gtk.TextIter? match_end);
-		public bool search_forward (Gtk.TextIter? start, Gtk.TextIter? end, Gtk.TextIter? match_start, Gtk.TextIter? match_end);
-		public void set_content_type (string? content_type);
-		public void set_enable_search_highlighting (bool enable);
-		public void set_language (GtkSource.Language? lang);
-		public void set_location (GLib.File location);
-		public void set_search_text (string text, uint flags);
-		public void set_short_name_for_display (string? short_name);
-		public bool can_search_again { get; }
-		public Gedit.DocumentCompressionType compression_type { get; set construct; }
-		public string content_type { owned get; set; }
-		public bool enable_search_highlighting { get; set; }
-		public Gedit.Encoding encoding { get; }
-		public GLib.File location { owned get; set; }
-		public string mime_type { owned get; }
-		public Gedit.DocumentNewlineType newline_type { get; set construct; }
-		[NoAccessorMethod]
-		public bool read_only { get; }
-		[NoAccessorMethod]
-		public string shortname { owned get; set; }
-		public virtual signal void cursor_moved ();
-		[HasEmitter]
-		public virtual signal void load (GLib.File location, Gedit.Encoding encoding, int line_pos, bool column_pos);
-		public virtual signal void loaded (void* error);
-		public virtual signal void loading (uint64 size, uint64 total_size);
-		[HasEmitter]
-//		public virtual signal void save (GLib.File location, Gedit.Encoding encoding, Gedit.DocumentNewlineType newline_type, Gedit.DocumentCompressionType compression_type, Gedit.DocumentSaveFlags flags);
-		public virtual signal void saved (void* error);
-		public virtual signal void saving (uint64 size, uint64 total_size);
-		public virtual signal void search_highlight_updated (Gtk.TextIter start, Gtk.TextIter end);
-	}
-	[Compact]
-	[CCode (copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "gedit_encoding_get_type ()", cheader_filename = "gedit/gedit-encodings.h")]
-	public class Encoding {
-		[CCode (has_construct_function = false)]
-		protected Encoding ();
-		public Gedit.Encoding copy ();
-		public void free ();
-		public unowned string get_charset ();
-		public static unowned Gedit.Encoding get_current ();
-		public static unowned Gedit.Encoding get_from_charset (string charset);
-		public static unowned Gedit.Encoding get_from_index (int index);
-		public unowned string get_name ();
-		public static unowned Gedit.Encoding get_utf8 ();
-		public string to_string ();
-	}
-	[CCode (type_id = "gedit_encodings_combo_box_get_type ()", cheader_filename = "gedit/gedit-encodings-combo-box.h")]
-	public class EncodingsComboBox : Gtk.ComboBox, Atk.Implementor, Gtk.Buildable, Gtk.CellEditable, Gtk.CellLayout {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public EncodingsComboBox (bool save_mode);
-		public unowned Gedit.Encoding get_selected_encoding ();
-		public void set_selected_encoding (Gedit.Encoding? encoding);
-		[NoAccessorMethod]
-		public bool save_mode { get; set construct; }
-	}
-	[CCode (type_id = "gedit_message_get_type ()", cheader_filename = "gedit/gedit-message.h")]
-	public class Message : GLib.Object {
-		[CCode (has_construct_function = false)]
-		protected Message ();
-		public GLib.Type get_key_type (string key);
-		public void* get_message_type ();
-		public unowned string get_method ();
-		public unowned string get_object_path ();
-		public void get_value (string key, out GLib.Value value);
-		public bool has_key (string key);
-		public void set_value (string key, out GLib.Value value);
-		public void set_valuesv ([CCode (array_length_cname = "n_values", array_length_pos = 2.1)] string[] keys, [CCode (array_length_cname = "n_values", array_length_pos = 2.1)] GLib.Value[] values);
-		public bool validate ();
-		public string method { get; }
-		public string object_path { get; }
-		[NoAccessorMethod]
-		public Gedit.MessageType type { owned get; construct; }
-	}
-	[CCode (type_id = "gedit_message_bus_get_type ()", cheader_filename = "gedit/gedit-message-bus.h")]
-	public class MessageBus : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public MessageBus ();
-		public void block (uint id);
-		public void block_by_func (string object_path, string method, [CCode (delegate_target_pos = 3.1)] Gedit.MessageCallback callback);
-		public uint connect (string object_path, string method, [CCode (delegate_target_pos = 3.1)] owned Gedit.MessageCallback callback);
-		public void disconnect (uint id);
-		public void disconnect_by_func (string object_path, string method, [CCode (delegate_target_pos = 3.1)] Gedit.MessageCallback callback);
-		public void @foreach (Gedit.MessageBusForeach func);
-		public static unowned Gedit.MessageBus get_default ();
-		public bool is_registered (string object_path, string method);
-		public Gedit.MessageType lookup (string object_path, string method);
-		public void send_message (Gedit.Message message);
-		public void send_message_sync (Gedit.Message message);
-		public void unblock (uint id);
-		public void unblock_by_func (string object_path, string method, [CCode (delegate_target_pos = 3.1)] Gedit.MessageCallback callback);
-		public void unregister (Gedit.MessageType message_type);
-		public void unregister_all (string object_path);
-		public virtual signal void dispatch (Gedit.Message message);
-		public virtual signal void registered (Gedit.MessageType message_type);
-		public virtual signal void unregistered (Gedit.MessageType message_type);
-	}
-	[Compact]
-	[CCode (copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "gedit_message_type_get_type ()", cheader_filename = "gedit/gedit-message-type.h")]
-	public class MessageType {
-		[CCode (has_construct_function = false)]
-		protected MessageType ();
-		public void @foreach (Gedit.MessageTypeForeach func);
-		public unowned string get_method ();
-		public unowned string get_object_path ();
-		public static string identifier (string? object_path, string? method);
-		public static bool is_supported (GLib.Type type);
-		public static bool is_valid_object_path (string? object_path);
-		public GLib.Type lookup (string key);
-		public Gedit.MessageType @ref ();
-		public void unref ();
-	}
-	[CCode (type_id = "gedit_panel_get_type ()", cheader_filename = "gedit/gedit-panel.h")]
-	public class Panel : Gtk.VBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Panel (Gtk.Orientation orientation);
-		public bool activate_item (Gtk.Widget item);
-		public bool add_item (Gtk.Widget item, string id, string display_name, Gtk.Widget? image);
-		public bool add_item_with_stock_icon (Gtk.Widget item, string id, string display_name, string? stock_id);
-		public int get_n_items ();
-		public Gtk.Orientation get_orientation ();
-		public bool item_is_active (Gtk.Widget item);
-		public bool remove_item (Gtk.Widget item);
-		public Gtk.Orientation orientation { get; construct; }
-		public virtual signal void close ();
-		public virtual signal void focus_document ();
-		public virtual signal void item_added (Gtk.Widget item);
-		public virtual signal void item_removed (Gtk.Widget item);
-	}
-	[CCode (type_id = "gedit_progress_info_bar_get_type ()", cheader_filename = "gedit/gedit-progress-info-bar.h")]
-	public class ProgressInfoBar : Gtk.InfoBar, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public ProgressInfoBar (string stock_id, string markup, bool has_cancel);
-		public void pulse ();
-		public void set_fraction (double fraction);
-		public void set_markup (string markup);
-		public void set_stock_image (string stock_id);
-		public void set_text (string text);
-		[NoAccessorMethod]
-		public bool has_cancel_button { construct; }
-	}
-	[CCode (type_id = "gedit_statusbar_get_type ()", cheader_filename = "gedit/gedit-statusbar.h")]
-	public class Statusbar : Gtk.Statusbar, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Statusbar ();
-		public void clear_overwrite ();
-		public void set_cursor_position (int line, int col);
-		public void set_overwrite (bool overwrite);
-		public void set_window_state (Gedit.WindowState state, int num_of_errors);
-	}
-	[CCode (type_id = "gedit_tab_get_type ()", cheader_filename = "gedit/gedit-tab.h")]
-	public class Tab : Gtk.VBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (has_construct_function = false)]
-		protected Tab ();
-		public bool get_auto_save_enabled ();
-		public int get_auto_save_interval ();
-		public unowned Gedit.Document get_document ();
-		public static unowned Gedit.Tab get_from_document (Gedit.Document doc);
-		public Gedit.TabState get_state ();
-		public unowned Gedit.View get_view ();
-		public void set_auto_save_enabled (bool enable);
-		public void set_auto_save_interval (int interval);
-		public void set_info_bar (Gtk.Widget info_bar);
-		[NoAccessorMethod]
-		public bool autosave { get; set; }
-		[NoAccessorMethod]
-		public int autosave_interval { get; set; }
-		[NoAccessorMethod]
-		public string name { owned get; }
-		public Gedit.TabState state { get; }
-		public virtual signal void drop_uris ([CCode (array_length = false, array_null_terminated = true)] string[] uri_list);
-	}
-	[CCode (type_id = "gedit_view_get_type ()", cheader_filename = "gedit/gedit-view.h")]
-	public class View : GtkSource.View, Atk.Implementor, Gtk.Buildable, Gtk.Scrollable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public View (Gedit.Document doc);
-		public void copy_clipboard ();
-		public void cut_clipboard ();
-		public void delete_selection ();
-		public void paste_clipboard ();
-		public void scroll_to_cursor ();
-		public void select_all ();
-		public void set_font (bool def, string font_name);
-		public virtual signal void drop_uris ([CCode (array_length = false, array_null_terminated = true)] string[] uri_list);
-	}
-	[CCode (type_id = "gedit_window_get_type ()", cheader_filename = "gedit/gedit-window.h")]
-	public class Window : Gtk.Window, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false)]
-		protected Window ();
-		public void close_all_tabs ();
-		public void close_tab (Gedit.Tab tab);
-		public void close_tabs (GLib.List<weak Gedit.Tab> tabs);
-		public unowned Gedit.Tab create_tab (bool jump_to);
-		public unowned Gedit.Tab create_tab_from_location (GLib.File location, Gedit.Encoding encoding, int line_pos, int column_pos, bool create, bool jump_to);
-		public unowned Gedit.Tab create_tab_from_stream (GLib.InputStream stream, Gedit.Encoding encoding, int line_pos, int column_pos, bool jump_to);
-		public unowned Gedit.Document get_active_document ();
-		public unowned Gedit.Tab get_active_tab ();
-		public unowned Gedit.View get_active_view ();
-		public unowned Gedit.Panel get_bottom_panel ();
-		public GLib.List<weak Gedit.Document> get_documents ();
-		public unowned Gtk.WindowGroup get_group ();
-		public unowned Gedit.MessageBus get_message_bus ();
-		public unowned Gedit.Panel get_side_panel ();
-		public Gedit.WindowState get_state ();
-		public unowned Gtk.Widget get_statusbar ();
-		public unowned Gedit.Tab get_tab_from_location (GLib.File location);
-		public unowned Gtk.UIManager get_ui_manager ();
-		public GLib.List<weak Gedit.Document> get_unsaved_documents ();
-		public GLib.List<weak Gedit.View> get_views ();
-		public void set_active_tab (Gedit.Tab tab);
-		public Gedit.WindowState state { get; }
-		public virtual signal void active_tab_changed (Gedit.Tab tab);
-		public virtual signal void active_tab_state_changed ();
-		public virtual signal void tab_added (Gedit.Tab tab);
-		public virtual signal void tab_removed (Gedit.Tab tab);
-		public virtual signal void tabs_reordered ();
-	}
-	[CCode (cheader_filename = "gedit/gedit-app-activatable.h", type_cname = "GeditAppActivatableInterface", type_id = "gedit_app_activatable_get_type ()")]
-	public interface AppActivatable : GLib.Object {
-		public abstract void activate ();
-		public abstract void deactivate ();
-		[NoAccessorMethod]
-		public Gedit.App app { owned get; construct; }
-	}
-	[CCode (cheader_filename = "gedit/gedit-view-activatable.h", type_cname = "GeditViewActivatableInterface", type_id = "gedit_view_activatable_get_type ()")]
-	public interface ViewActivatable : GLib.Object {
-		public abstract void activate ();
-		public abstract void deactivate ();
-		[NoAccessorMethod]
-		public Gedit.View view { owned get; construct; }
-	}
-	[CCode (cheader_filename = "gedit/gedit-window-activatable.h", type_cname = "GeditWindowActivatableInterface", type_id = "gedit_window_activatable_get_type ()")]
-	public interface WindowActivatable : GLib.Object {
-		public abstract void activate ();
-		public abstract void deactivate ();
-		public abstract void update_state ();
-		[NoAccessorMethod]
-		public Gedit.Window window { owned get; construct; }
-	}
-	[CCode (cprefix = "GEDIT_", cheader_filename = "gedit/gedit-debug.h")]
-	[Flags]
-	public enum DebugSection {
-		NO_DEBUG,
-		DEBUG_VIEW,
-		DEBUG_SEARCH,
-		DEBUG_PRINT,
-		DEBUG_PREFS,
-		DEBUG_PLUGINS,
-		DEBUG_TAB,
-		DEBUG_DOCUMENT,
-		DEBUG_COMMANDS,
-		DEBUG_APP,
-		DEBUG_SESSION,
-		DEBUG_UTILS,
-		DEBUG_METADATA,
-		DEBUG_WINDOW,
-		DEBUG_LOADER,
-		DEBUG_SAVER,
-		DEBUG_PANEL
-	}
-	[CCode (cprefix = "GEDIT_DOCUMENT_COMPRESSION_TYPE_", cheader_filename = "gedit/gedit-document.h")]
-	public enum DocumentCompressionType {
-		NONE,
-		GZIP
-	}
-	[CCode (cprefix = "GEDIT_DOCUMENT_NEWLINE_TYPE_", cheader_filename = "gedit/gedit-document.h")]
-	public enum DocumentNewlineType {
-		LF,
-		CR,
-		CR_LF
-	}
-	[CCode (cprefix = "GEDIT_DOCUMENT_SAVE_", cheader_filename = "gedit/gedit-document.h")]
-	[Flags]
-	public enum DocumentSaveFlags {
-		IGNORE_MTIME,
-		IGNORE_BACKUP,
-		PRESERVE_BACKUP,
-		IGNORE_INVALID_CHARS
-	}
-	[CCode (cprefix = "GEDIT_LOCKDOWN_", cheader_filename = "gedit/gedit-app.h")]
-	[Flags]
-	public enum LockdownMask {
-		COMMAND_LINE,
-		PRINTING,
-		PRINT_SETUP,
-		SAVE_TO_DISK
-	}
-	[CCode (cprefix = "GEDIT_SEARCH_", cheader_filename = "gedit/gedit-document.h")]
-	[Flags]
-	public enum SearchFlags {
-		DONT_SET_FLAGS,
-		ENTIRE_WORD,
-		CASE_SENSITIVE
-	}
-	[CCode (cprefix = "GEDIT_TAB_", cheader_filename = "gedit/gedit-tab.h")]
-	public enum TabState {
-		STATE_NORMAL,
-		STATE_LOADING,
-		STATE_REVERTING,
-		STATE_SAVING,
-		STATE_PRINTING,
-		STATE_PRINT_PREVIEWING,
-		STATE_SHOWING_PRINT_PREVIEW,
-		STATE_GENERIC_NOT_EDITABLE,
-		STATE_LOADING_ERROR,
-		STATE_REVERTING_ERROR,
-		STATE_SAVING_ERROR,
-		STATE_GENERIC_ERROR,
-		STATE_CLOSING,
-		STATE_EXTERNALLY_MODIFIED_NOTIFICATION,
-		NUM_OF_STATES
-	}
-	[CCode (cprefix = "GEDIT_WINDOW_STATE_", cheader_filename = "gedit/gedit-window.h")]
-	[Flags]
-	public enum WindowState {
-		NORMAL,
-		SAVING,
-		PRINTING,
-		LOADING,
-		ERROR,
-		SAVING_SESSION
-	}
-	[CCode (cheader_filename = "gedit/gedit-message-bus.h", instance_pos = 1.9)]
-	public delegate void MessageBusForeach (Gedit.MessageType message_type);
-	[CCode (cheader_filename = "gedit/gedit-message-bus.h", instance_pos = 2.9)]
-	public delegate void MessageCallback (Gedit.MessageBus bus, Gedit.Message message);
-	[CCode (cheader_filename = "gedit/gedit-message-type.h", instance_pos = 3.9)]
-	public delegate void MessageTypeForeach (string key, GLib.Type type, bool required);
-	[CCode (cheader_filename = "gedit/gedit-app.h")]
-	public const int LOCKDOWN_ALL;
-	[CCode (cheader_filename = "gedit/gedit-document.h")]
-	public const string METADATA_ATTRIBUTE_ENCODING;
-	[CCode (cheader_filename = "gedit/gedit-document.h")]
-	public const string METADATA_ATTRIBUTE_LANGUAGE;
-	[CCode (cheader_filename = "gedit/gedit-document.h")]
-	public const string METADATA_ATTRIBUTE_POSITION;
-	[CCode (cheader_filename = "gedit/gedit-commands.h")]
-	public static void commands_load_location (Gedit.Window window, GLib.File location, Gedit.Encoding? encoding, int line_pos, int column_pos);
-	[CCode (cheader_filename = "gedit/gedit-commands.h")]
-	public static GLib.SList<weak Gedit.Document> commands_load_locations (Gedit.Window window, GLib.SList<weak GLib.File> locations, Gedit.Encoding? encoding, int line_pos, int column_pos);
-	[CCode (cheader_filename = "gedit/gedit-commands.h")]
-	public static void commands_save_all_documents (Gedit.Window window);
-	[CCode (cheader_filename = "gedit/gedit-commands.h")]
-	public static void commands_save_document (Gedit.Window window, Gedit.Document document);
-	[CCode (cheader_filename = "gedit/gedit-debug.h")]
-	public static void debug (Gedit.DebugSection section, string file, int line, string function);
-	[CCode (cheader_filename = "gedit/gedit-debug.h")]
-	public static void debug_init ();
-	[CCode (cheader_filename = "gedit/gedit-utils.h")]
-	public static string utils_basename_for_display (GLib.File location);
-	[CCode (cheader_filename = "gedit/gedit-utils.h")]
-	public static bool utils_can_read_from_stdin ();
-	[CCode (cheader_filename = "gedit/gedit-utils.h")]
-	public static bool utils_decode_uri (string uri, out string? scheme, out string? user, out string? port, out string? host, out string? path);
-	[CCode (cheader_filename = "gedit/gedit-utils.h", array_length = false, array_null_terminated = true)]
-	public static string[] utils_drop_get_uris (Gtk.SelectionData selection_data);
-	[CCode (cheader_filename = "gedit/gedit-utils.h")]
-	public static string utils_escape_search_text (string text);
-	[CCode (cheader_filename = "gedit/gedit-utils.h")]
-	public static string utils_escape_underscores (string text, ssize_t length);
-	[CCode (cheader_filename = "gedit/gedit-utils.h")]
-	public static Gedit.DocumentCompressionType utils_get_compression_type_from_content_type (string content_type);
-	[CCode (cheader_filename = "gedit/gedit-utils.h")]
-	public static void utils_get_current_viewport (Gdk.Screen screen, out int x, out int y);
-	[CCode (cheader_filename = "gedit/gedit-utils.h")]
-	public static uint utils_get_current_workspace (Gdk.Screen screen);
-	[CCode (cheader_filename = "gedit/gedit-utils.h")]
-	public static uint utils_get_window_workspace (Gtk.Window gtkwindow);
-	[CCode (cheader_filename = "gedit/gedit-utils.h")]
-	public static bool utils_is_valid_location (GLib.File location);
-	[CCode (cheader_filename = "gedit/gedit-utils.h")]
-	public static string utils_location_get_dirname_for_display (GLib.File location);
-	[CCode (cheader_filename = "gedit/gedit-utils.h")]
-	public static bool utils_location_has_file_scheme (GLib.File location);
-	[CCode (cheader_filename = "gedit/gedit-utils.h")]
-	public static string utils_make_canonical_uri_from_shell_arg (string str);
-	[CCode (cheader_filename = "gedit/gedit-utils.h")]
-	public static string utils_make_valid_utf8 (string name);
-	[CCode (cheader_filename = "gedit/gedit-utils.h")]
-	public static void utils_menu_position_under_tree_view (Gtk.Menu menu, int x, int y, bool push_in, void* user_data);
-	[CCode (cheader_filename = "gedit/gedit-utils.h")]
-	public static void utils_menu_position_under_widget (Gtk.Menu menu, int x, int y, bool push_in, void* user_data);
-	[CCode (cheader_filename = "gedit/gedit-utils.h")]
-	public static string utils_replace_home_dir_with_tilde (string uri);
-	[CCode (cheader_filename = "gedit/gedit-utils.h")]
-	public static void utils_set_atk_name_description (Gtk.Widget widget, string name, string description);
-	[CCode (cheader_filename = "gedit/gedit-utils.h")]
-	public static void utils_set_atk_relation (Gtk.Widget obj1, Gtk.Widget obj2, Atk.RelationType rel_type);
-	[CCode (cheader_filename = "gedit/gedit-utils.h")]
-	public static string utils_str_end_truncate (string string, uint truncate_length);
-	[CCode (cheader_filename = "gedit/gedit-utils.h")]
-	public static string utils_str_middle_truncate (string string, uint truncate_length);
-	[CCode (cheader_filename = "gedit/gedit-utils.h")]
-	public static string utils_unescape_search_text (string text);
-	[CCode (cheader_filename = "gedit/gedit-utils.h")]
-	public static string utils_uri_get_dirname (string uri);
-}
diff --git a/vapi/gtksourceview-3.0.vapi b/vapi/gtksourceview-3.0.vapi
deleted file mode 100644
index 85935f2..0000000
--- a/vapi/gtksourceview-3.0.vapi
+++ /dev/null
@@ -1,605 +0,0 @@
-/* gtksourceview-3.0.vapi generated by vapigen, do not modify. */
-
-[CCode (cprefix = "GtkSource", lower_case_cprefix = "gtk_source_", gir_namespace = "GtkSource", gir_version = "3.0")]
-namespace GtkSource {
-	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
-	public class Buffer : Gtk.TextBuffer {
-		[CCode (has_construct_function = false)]
-		public Buffer (Gtk.TextTagTable? table);
-		public bool backward_iter_to_source_mark (Gtk.TextIter iter, string? category);
-		public void begin_not_undoable_action ();
-		public unowned GtkSource.Mark create_source_mark (string? name, string category, Gtk.TextIter where);
-		public void end_not_undoable_action ();
-		public void ensure_highlight (Gtk.TextIter start, Gtk.TextIter end);
-		public bool forward_iter_to_source_mark (Gtk.TextIter iter, string? category);
-		[CCode (array_length = false, array_null_terminated = true)]
-		public string[] get_context_classes_at_iter (Gtk.TextIter iter);
-		public bool get_highlight_matching_brackets ();
-		public bool get_highlight_syntax ();
-		public unowned GtkSource.Language get_language ();
-		public int get_max_undo_levels ();
-		public GLib.SList<weak GtkSource.Mark> get_source_marks_at_iter (Gtk.TextIter iter, string? category);
-		public GLib.SList<weak GtkSource.Mark> get_source_marks_at_line (int line, string? category);
-		public unowned GtkSource.StyleScheme get_style_scheme ();
-		public unowned GtkSource.UndoManager get_undo_manager ();
-		public bool iter_backward_to_context_class_toggle (Gtk.TextIter iter, string context_class);
-		public bool iter_forward_to_context_class_toggle (Gtk.TextIter iter, string context_class);
-		public bool iter_has_context_class (Gtk.TextIter iter, string context_class);
-		public void remove_source_marks (Gtk.TextIter start, Gtk.TextIter end, string? category);
-		public void set_highlight_matching_brackets (bool highlight);
-		public void set_highlight_syntax (bool highlight);
-		public void set_language (GtkSource.Language? language);
-		public void set_max_undo_levels (int max_undo_levels);
-		public void set_style_scheme (GtkSource.StyleScheme? scheme);
-		public void set_undo_manager (GtkSource.UndoManager? manager);
-		[CCode (has_construct_function = false)]
-		public Buffer.with_language (GtkSource.Language language);
-		[NoAccessorMethod]
-		public bool can_redo { get; }
-		[NoAccessorMethod]
-		public bool can_undo { get; }
-		public bool highlight_matching_brackets { get; set; }
-		public bool highlight_syntax { get; set; }
-		public GtkSource.Language language { get; set; }
-		public int max_undo_levels { get; set; }
-		public GtkSource.StyleScheme style_scheme { get; set; }
-		public GtkSource.UndoManager undo_manager { get; set construct; }
-		public virtual signal void bracket_matched (Gtk.TextIter iter, GtkSource.BracketMatchType state);
-		public signal void highlight_updated (Gtk.TextIter object, Gtk.TextIter p0);
-		[HasEmitter]
-		public virtual signal void redo ();
-		public signal void source_mark_updated (Gtk.TextMark object);
-		[HasEmitter]
-		public virtual signal void undo ();
-	}
-	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
-	public class Completion : GLib.Object {
-		[CCode (has_construct_function = false)]
-		protected Completion ();
-		public bool add_provider (GtkSource.CompletionProvider provider) throws GLib.Error;
-		public void block_interactive ();
-		public GtkSource.CompletionContext create_context (Gtk.TextIter? position);
-		public static GLib.Quark error_quark ();
-		public unowned GtkSource.CompletionInfo get_info_window ();
-		public unowned GLib.List<weak GtkSource.CompletionProvider> get_providers ();
-		public unowned GtkSource.View get_view ();
-		public void move_window (Gtk.TextIter iter);
-		[NoWrapper]
-		public virtual bool proposal_activated (GtkSource.CompletionProvider provider, GtkSource.CompletionProposal proposal);
-		public bool remove_provider (GtkSource.CompletionProvider provider) throws GLib.Error;
-		public void unblock_interactive ();
-		[NoAccessorMethod]
-		public uint accelerators { get; set construct; }
-		[NoAccessorMethod]
-		public uint auto_complete_delay { get; set construct; }
-		[NoAccessorMethod]
-		public uint proposal_page_size { get; set construct; }
-		[NoAccessorMethod]
-		public uint provider_page_size { get; set construct; }
-		[NoAccessorMethod]
-		public bool remember_info_visibility { get; set construct; }
-		[NoAccessorMethod]
-		public bool select_on_show { get; set construct; }
-		[NoAccessorMethod]
-		public bool show_headers { get; set construct; }
-		[NoAccessorMethod]
-		public bool show_icons { get; set construct; }
-		public GtkSource.View view { get; construct; }
-		public virtual signal void activate_proposal ();
-		[HasEmitter]
-		public virtual signal void hide ();
-		public virtual signal void move_cursor (Gtk.ScrollStep step, int num);
-		public virtual signal void move_page (Gtk.ScrollStep step, int num);
-		public virtual signal void populate_context (GtkSource.CompletionContext context);
-		[HasEmitter]
-		public virtual signal void show ();
-	}
-	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
-	public class CompletionContext : GLib.InitiallyUnowned {
-		[CCode (has_construct_function = false)]
-		protected CompletionContext ();
-		public void add_proposals (GtkSource.CompletionProvider provider, GLib.List<weak GtkSource.CompletionProposal> proposals, bool finished);
-		public GtkSource.CompletionActivation get_activation ();
-		public void get_iter (out Gtk.TextIter iter);
-		public GtkSource.CompletionActivation activation { get; set; }
-		[NoAccessorMethod]
-		public GtkSource.Completion completion { owned get; construct; }
-		public Gtk.TextIter iter { get; set; }
-		public virtual signal void cancelled ();
-	}
-	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
-	public class CompletionInfo : Gtk.Window, Atk.Implementor, Gtk.Buildable {
-		[CCode (has_construct_function = false)]
-		public CompletionInfo ();
-		public unowned Gtk.Widget get_widget ();
-		public void move_to_iter (Gtk.TextView view, Gtk.TextIter? iter);
-		public void set_widget (Gtk.Widget? widget);
-		public virtual signal void before_show ();
-	}
-	[CCode (cheader_filename = "gtksourceview/gtksourcecompletionitem.h")]
-	public class CompletionItem : GLib.Object, GtkSource.CompletionProposal {
-		[CCode (has_construct_function = false)]
-		public CompletionItem (string label, string text, Gdk.Pixbuf? icon, string? info);
-		[CCode (has_construct_function = false)]
-		public CompletionItem.from_stock (string? label, string text, string stock, string? info);
-		[CCode (has_construct_function = false)]
-		public CompletionItem.with_markup (string markup, string text, Gdk.Pixbuf? icon, string? info);
-		[NoAccessorMethod]
-		public Gdk.Pixbuf icon { owned get; set; }
-		[NoAccessorMethod]
-		public string info { owned get; set; }
-		[NoAccessorMethod]
-		public string label { owned get; set; }
-		[NoAccessorMethod]
-		public string markup { owned get; set; }
-		[NoAccessorMethod]
-		public string text { owned get; set; }
-	}
-	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
-	public class CompletionWords : GLib.Object, GtkSource.CompletionProvider {
-		[CCode (has_construct_function = false)]
-		public CompletionWords (string? name, Gdk.Pixbuf? icon);
-		public void register (Gtk.TextBuffer buffer);
-		public void unregister (Gtk.TextBuffer buffer);
-		[NoAccessorMethod]
-		public Gdk.Pixbuf icon { owned get; set construct; }
-		[NoAccessorMethod]
-		public int interactive_delay { get; set construct; }
-		[NoAccessorMethod]
-		public uint minimum_word_size { get; set construct; }
-		[NoAccessorMethod]
-		public string name { owned get; set construct; }
-		[NoAccessorMethod]
-		public int priority { get; set construct; }
-		[NoAccessorMethod]
-		public uint proposals_batch_size { get; set construct; }
-		[NoAccessorMethod]
-		public uint scan_batch_size { get; set construct; }
-	}
-	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
-	public class Gutter : GLib.Object {
-		[CCode (has_construct_function = false)]
-		protected Gutter ();
-		public void get_padding (int xpad, int ypad);
-		public unowned Gdk.Window get_window ();
-		public bool insert (GtkSource.GutterRenderer renderer, int position);
-		public void queue_draw ();
-		public void remove (GtkSource.GutterRenderer renderer);
-		public void reorder (GtkSource.GutterRenderer renderer, int position);
-		public void set_padding (int xpad, int ypad);
-		[NoAccessorMethod]
-		public GtkSource.View view { owned get; construct; }
-		[NoAccessorMethod]
-		public Gtk.TextWindowType window_type { get; construct; }
-		[NoAccessorMethod]
-		public int xpad { get; set construct; }
-		[NoAccessorMethod]
-		public int ypad { get; set construct; }
-	}
-	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
-	public class GutterRenderer : GLib.InitiallyUnowned {
-		[CCode (has_construct_function = false)]
-		protected GutterRenderer ();
-		public virtual void activate (Gtk.TextIter iter, Gdk.Rectangle area, Gdk.Event event);
-		public virtual void begin (Cairo.Context cr, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.TextIter start, Gtk.TextIter end);
-		[NoWrapper]
-		public virtual void change_buffer (Gtk.TextBuffer old_buffer);
-		[NoWrapper]
-		public virtual void change_view (Gtk.TextView old_view);
-		public virtual void draw (Cairo.Context cr, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.TextIter start, Gtk.TextIter end, GtkSource.GutterRendererState state);
-		public virtual void end ();
-		public void get_alignment (out unowned float? xalign, out unowned float? yalign);
-		public GtkSource.GutterRendererAlignmentMode get_alignment_mode ();
-		public bool get_background (out unowned Gdk.RGBA? color);
-		public void get_padding (out unowned int? xpad, out unowned int? ypad);
-		public int get_size ();
-		public unowned Gtk.TextView get_view ();
-		public bool get_visible ();
-		public Gtk.TextWindowType get_window_type ();
-		public virtual bool query_activatable (Gtk.TextIter iter, Gdk.Rectangle area, Gdk.Event event);
-		public virtual bool query_tooltip (Gtk.TextIter iter, Gdk.Rectangle area, int x, int y, Gtk.Tooltip tooltip);
-		public void set_alignment (float xalign, float yalign);
-		public void set_alignment_mode (GtkSource.GutterRendererAlignmentMode mode);
-		public void set_background (Gdk.RGBA? color);
-		public void set_padding (int xpad, int ypad);
-		public void set_size (int size);
-		public void set_visible (bool visible);
-		public GtkSource.GutterRendererAlignmentMode alignment_mode { get; set construct; }
-		[NoAccessorMethod]
-		public Gdk.RGBA background_rgba { get; set; }
-		[NoAccessorMethod]
-		public bool background_set { get; set construct; }
-		public int size { get; set construct; }
-		public Gtk.TextView view { get; }
-		public bool visible { get; set construct; }
-		public Gtk.TextWindowType window_type { get; }
-		[NoAccessorMethod]
-		public float xalign { get; set construct; }
-		[NoAccessorMethod]
-		public int xpad { get; set construct; }
-		[NoAccessorMethod]
-		public float yalign { get; set construct; }
-		[NoAccessorMethod]
-		public int ypad { get; set construct; }
-		[HasEmitter]
-		public virtual signal void query_data (Gtk.TextIter start, Gtk.TextIter end, GtkSource.GutterRendererState state);
-		[HasEmitter]
-		public virtual signal void queue_draw ();
-	}
-	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
-	public class GutterRendererPixbuf : GtkSource.GutterRenderer {
-		[CCode (type = "GtkSourceGutterRenderer*", has_construct_function = false)]
-		public GutterRendererPixbuf ();
-		public unowned GLib.Icon get_gicon ();
-		public unowned string get_icon_name ();
-		public unowned Gdk.Pixbuf get_pixbuf ();
-		public unowned string get_stock_id ();
-		public void set_gicon (GLib.Icon icon);
-		public void set_icon_name (string icon_name);
-		public void set_pixbuf (Gdk.Pixbuf pixbuf);
-		public void set_stock_id (string stock_id);
-		public GLib.Icon gicon { get; set; }
-		public string icon_name { get; set; }
-		public Gdk.Pixbuf pixbuf { get; set; }
-		public string stock_id { get; set; }
-	}
-	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
-	public class GutterRendererText : GtkSource.GutterRenderer {
-		[CCode (type = "GtkSourceGutterRenderer*", has_construct_function = false)]
-		public GutterRendererText ();
-		public void measure (string text, int width, int height);
-		public void measure_markup (string markup, int width, int height);
-		public void set_markup (string markup, int length);
-		public void set_text (string text, int length);
-		[NoAccessorMethod]
-		public string markup { owned get; set construct; }
-		[NoAccessorMethod]
-		public string text { owned get; set construct; }
-	}
-	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
-	public class Language : GLib.Object {
-		[CCode (has_construct_function = false)]
-		protected Language ();
-		[CCode (array_length = false, array_null_terminated = true)]
-		public string[] get_globs ();
-		public bool get_hidden ();
-		public unowned string get_id ();
-		public unowned string get_metadata (string name);
-		[CCode (array_length = false, array_null_terminated = true)]
-		public string[] get_mime_types ();
-		public unowned string get_name ();
-		public unowned string get_section ();
-		[CCode (array_length = false, array_null_terminated = true)]
-		public string[] get_style_ids ();
-		public unowned string get_style_name (string style_id);
-		public bool hidden { get; }
-		public string id { get; }
-		public string name { get; }
-		public string section { get; }
-	}
-	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
-	public class LanguageManager : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public LanguageManager ();
-		public static unowned GtkSource.LanguageManager get_default ();
-		public unowned GtkSource.Language get_language (string id);
-		[CCode (array_length = false, array_null_terminated = true)]
-		public unowned string[] get_language_ids ();
-		[CCode (array_length = false, array_null_terminated = true)]
-		public unowned string[] get_search_path ();
-		public unowned GtkSource.Language guess_language (string? filename, string? content_type);
-		public void set_search_path ([CCode (array_length = false, array_null_terminated = true)] string[]? dirs);
-		public string[] language_ids { get; }
-		public string[] search_path { get; set; }
-	}
-	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
-	public class Mark : Gtk.TextMark {
-		[CCode (has_construct_function = false)]
-		public Mark (string name, string category);
-		public unowned string get_category ();
-		public unowned GtkSource.Mark next (string? category);
-		public unowned GtkSource.Mark prev (string category);
-		public string category { get; construct; }
-	}
-	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
-	public class MarkAttributes : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public MarkAttributes ();
-		public bool get_background (out Gdk.RGBA background);
-		public unowned GLib.Icon get_gicon ();
-		public unowned string get_icon_name ();
-		public unowned Gdk.Pixbuf get_pixbuf ();
-		public unowned string get_stock_id ();
-		public string get_tooltip_markup (GtkSource.Mark mark);
-		public string get_tooltip_text (GtkSource.Mark mark);
-		public unowned Gdk.Pixbuf render_icon (Gtk.Widget widget, int size);
-		public void set_background (Gdk.RGBA background);
-		public void set_gicon (GLib.Icon gicon);
-		public void set_icon_name (string icon_name);
-		public void set_pixbuf (Gdk.Pixbuf pixbuf);
-		public void set_stock_id (string stock_id);
-		public Gdk.RGBA background { get; set; }
-		public GLib.Icon gicon { get; set; }
-		public string icon_name { get; set; }
-		public Gdk.Pixbuf pixbuf { get; set; }
-		public string stock_id { get; set; }
-		public signal string query_tooltip_markup (GtkSource.Mark object);
-		public signal string query_tooltip_text (GtkSource.Mark object);
-	}
-	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
-	public class PrintCompositor : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public PrintCompositor (GtkSource.Buffer buffer);
-		public void draw_page (Gtk.PrintContext context, int page_nr);
-		[CCode (has_construct_function = false)]
-		public PrintCompositor.from_view (GtkSource.View view);
-		public string get_body_font_name ();
-		public double get_bottom_margin (Gtk.Unit unit);
-		public unowned GtkSource.Buffer get_buffer ();
-		public string get_footer_font_name ();
-		public string get_header_font_name ();
-		public bool get_highlight_syntax ();
-		public double get_left_margin (Gtk.Unit unit);
-		public string get_line_numbers_font_name ();
-		public int get_n_pages ();
-		public double get_pagination_progress ();
-		public bool get_print_footer ();
-		public bool get_print_header ();
-		public uint get_print_line_numbers ();
-		public double get_right_margin (Gtk.Unit unit);
-		public uint get_tab_width ();
-		public double get_top_margin (Gtk.Unit unit);
-		public Gtk.WrapMode get_wrap_mode ();
-		public bool paginate (Gtk.PrintContext context);
-		public void set_body_font_name (string font_name);
-		public void set_bottom_margin (double margin, Gtk.Unit unit);
-		public void set_footer_font_name (string? font_name);
-		public void set_footer_format (bool separator, string? left, string? center, string? right);
-		public void set_header_font_name (string? font_name);
-		public void set_header_format (bool separator, string? left, string? center, string? right);
-		public void set_highlight_syntax (bool highlight);
-		public void set_left_margin (double margin, Gtk.Unit unit);
-		public void set_line_numbers_font_name (string? font_name);
-		public void set_print_footer (bool print);
-		public void set_print_header (bool print);
-		public void set_print_line_numbers (uint interval);
-		public void set_right_margin (double margin, Gtk.Unit unit);
-		public void set_tab_width (uint width);
-		public void set_top_margin (double margin, Gtk.Unit unit);
-		public void set_wrap_mode (Gtk.WrapMode wrap_mode);
-		public string body_font_name { owned get; set; }
-		public GtkSource.Buffer buffer { get; construct; }
-		public string footer_font_name { owned get; set; }
-		public string header_font_name { owned get; set; }
-		public bool highlight_syntax { get; set; }
-		public string line_numbers_font_name { owned get; set; }
-		public int n_pages { get; }
-		public bool print_footer { get; set; }
-		public bool print_header { get; set; }
-		public uint print_line_numbers { get; set; }
-		public uint tab_width { get; set; }
-		public Gtk.WrapMode wrap_mode { get; set; }
-	}
-	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
-	public class Style : GLib.Object {
-		[CCode (has_construct_function = false)]
-		protected Style ();
-		public GtkSource.Style copy ();
-		[NoAccessorMethod]
-		public string background { owned get; construct; }
-		[NoAccessorMethod]
-		public bool background_set { get; construct; }
-		[NoAccessorMethod]
-		public bool bold { get; construct; }
-		[NoAccessorMethod]
-		public bool bold_set { get; construct; }
-		[NoAccessorMethod]
-		public string foreground { owned get; construct; }
-		[NoAccessorMethod]
-		public bool foreground_set { get; construct; }
-		[NoAccessorMethod]
-		public bool italic { get; construct; }
-		[NoAccessorMethod]
-		public bool italic_set { get; construct; }
-		[NoAccessorMethod]
-		public string line_background { owned get; construct; }
-		[NoAccessorMethod]
-		public bool line_background_set { get; construct; }
-		[NoAccessorMethod]
-		public bool strikethrough { get; construct; }
-		[NoAccessorMethod]
-		public bool strikethrough_set { get; construct; }
-		[NoAccessorMethod]
-		public bool underline { get; construct; }
-		[NoAccessorMethod]
-		public bool underline_set { get; construct; }
-	}
-	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
-	public class StyleScheme : GLib.Object {
-		[CCode (has_construct_function = false)]
-		protected StyleScheme ();
-		[CCode (array_length = false, array_null_terminated = true)]
-		public unowned string[] get_authors ();
-		public unowned string get_description ();
-		public unowned string get_filename ();
-		public unowned string get_id ();
-		public unowned string get_name ();
-		public unowned GtkSource.Style get_style (string style_id);
-		public string description { get; }
-		public string filename { get; }
-		public string id { get; construct; }
-		public string name { get; }
-	}
-	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
-	public class StyleSchemeManager : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public StyleSchemeManager ();
-		public void append_search_path (string path);
-		public void force_rescan ();
-		public static unowned GtkSource.StyleSchemeManager get_default ();
-		public unowned GtkSource.StyleScheme get_scheme (string scheme_id);
-		[CCode (array_length = false, array_null_terminated = true)]
-		public unowned string[] get_scheme_ids ();
-		[CCode (array_length = false, array_null_terminated = true)]
-		public unowned string[] get_search_path ();
-		public void prepend_search_path (string path);
-		public void set_search_path ([CCode (array_length = false, array_null_terminated = true)] string[]? path);
-		public string[] scheme_ids { get; }
-		public string[] search_path { get; set; }
-	}
-	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
-	public class View : Gtk.TextView, Atk.Implementor, Gtk.Buildable, Gtk.Scrollable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public View ();
-		public bool get_auto_indent ();
-		public unowned GtkSource.Completion get_completion ();
-		public GtkSource.DrawSpacesFlags get_draw_spaces ();
-		public unowned GtkSource.Gutter get_gutter (Gtk.TextWindowType window_type);
-		public bool get_highlight_current_line ();
-		public bool get_indent_on_tab ();
-		public int get_indent_width ();
-		public bool get_insert_spaces_instead_of_tabs ();
-		public unowned GtkSource.MarkAttributes get_mark_attributes (string category, int priority);
-		public uint get_right_margin_position ();
-		public bool get_show_line_marks ();
-		public bool get_show_line_numbers ();
-		public bool get_show_right_margin ();
-		public GtkSource.SmartHomeEndType get_smart_home_end ();
-		public uint get_tab_width ();
-		public uint get_visual_column (Gtk.TextIter iter);
-		public void set_auto_indent (bool enable);
-		public void set_draw_spaces (GtkSource.DrawSpacesFlags flags);
-		public void set_highlight_current_line (bool hl);
-		public void set_indent_on_tab (bool enable);
-		public void set_indent_width (int width);
-		public void set_insert_spaces_instead_of_tabs (bool enable);
-		public void set_mark_attributes (string category, GtkSource.MarkAttributes attributes, int priority);
-		public void set_right_margin_position (uint pos);
-		public void set_show_line_marks (bool show);
-		public void set_show_line_numbers (bool show);
-		public void set_show_right_margin (bool show);
-		public void set_smart_home_end (GtkSource.SmartHomeEndType smart_he);
-		public void set_tab_width (uint width);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public View.with_buffer (GtkSource.Buffer buffer);
-		public bool auto_indent { get; set; }
-		public GtkSource.Completion completion { get; }
-		public GtkSource.DrawSpacesFlags draw_spaces { get; set; }
-		public bool highlight_current_line { get; set; }
-		public bool indent_on_tab { get; set; }
-		public int indent_width { get; set; }
-		public bool insert_spaces_instead_of_tabs { get; set; }
-		public uint right_margin_position { get; set; }
-		public bool show_line_marks { get; set; }
-		public bool show_line_numbers { get; set; }
-		public bool show_right_margin { get; set; }
-		public GtkSource.SmartHomeEndType smart_home_end { get; set; }
-		public uint tab_width { get; set; }
-		public virtual signal void line_mark_activated (Gtk.TextIter iter, Gdk.Event event);
-		public virtual signal void move_lines (bool copy, int step);
-		public virtual signal void move_words (int step);
-		public virtual signal void redo ();
-		public virtual signal void show_completion ();
-		public virtual signal void undo ();
-	}
-	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
-	public interface CompletionProposal : GLib.Object {
-		public abstract bool equal (GtkSource.CompletionProposal other);
-		public abstract unowned Gdk.Pixbuf get_icon ();
-		public abstract string get_info ();
-		public abstract string get_label ();
-		public abstract string get_markup ();
-		public abstract string get_text ();
-		public abstract uint hash ();
-		[HasEmitter]
-		public virtual signal void changed ();
-	}
-	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
-	public interface CompletionProvider : GLib.Object {
-		public abstract bool activate_proposal (GtkSource.CompletionProposal proposal, Gtk.TextIter iter);
-		public abstract GtkSource.CompletionActivation get_activation ();
-		public abstract unowned Gdk.Pixbuf get_icon ();
-		public abstract unowned Gtk.Widget get_info_widget (GtkSource.CompletionProposal proposal);
-		public abstract int get_interactive_delay ();
-		public abstract string get_name ();
-		public abstract int get_priority ();
-		public abstract bool get_start_iter (GtkSource.CompletionContext context, GtkSource.CompletionProposal proposal, Gtk.TextIter iter);
-		public abstract bool match (GtkSource.CompletionContext context);
-		public abstract void populate (GtkSource.CompletionContext context);
-		public abstract void update_info (GtkSource.CompletionProposal proposal, GtkSource.CompletionInfo info);
-	}
-	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
-	public interface UndoManager : GLib.Object {
-		public abstract void begin_not_undoable_action ();
-		public abstract bool can_redo ();
-		public abstract bool can_undo ();
-		public abstract void end_not_undoable_action ();
-		public abstract void redo ();
-		public abstract void undo ();
-		[HasEmitter]
-		public virtual signal void can_redo_changed ();
-		[HasEmitter]
-		public virtual signal void can_undo_changed ();
-	}
-	[CCode (cprefix = "GTK_SOURCE_BRACKET_MATCH_", cheader_filename = "gtksourceview/gtksourceview.h")]
-	public enum BracketMatchType {
-		NONE,
-		OUT_OF_RANGE,
-		NOT_FOUND,
-		FOUND
-	}
-	[CCode (cprefix = "GTK_SOURCE_COMPLETION_ACTIVATION_", cheader_filename = "gtksourceview/gtksourceview.h")]
-	[Flags]
-	public enum CompletionActivation {
-		NONE,
-		INTERACTIVE,
-		USER_REQUESTED
-	}
-	[CCode (cprefix = "GTK_SOURCE_DRAW_SPACES_", cheader_filename = "gtksourceview/gtksourceview.h")]
-	[Flags]
-	public enum DrawSpacesFlags {
-		SPACE,
-		TAB,
-		NEWLINE,
-		NBSP,
-		LEADING,
-		TEXT,
-		TRAILING,
-		ALL
-	}
-	[CCode (cprefix = "GTK_SOURCE_GUTTER_RENDERER_ALIGNMENT_MODE_", cheader_filename = "gtksourceview/gtksourceview.h")]
-	public enum GutterRendererAlignmentMode {
-		CELL,
-		FIRST,
-		LAST
-	}
-	[CCode (cprefix = "GTK_SOURCE_GUTTER_RENDERER_STATE_", cheader_filename = "gtksourceview/gtksourceview.h")]
-	[Flags]
-	public enum GutterRendererState {
-		NORMAL,
-		CURSOR,
-		PRELIT,
-		SELECTED
-	}
-	[CCode (cprefix = "GTK_SOURCE_SMART_HOME_END_", cheader_filename = "gtksourceview/gtksourceview.h")]
-	public enum SmartHomeEndType {
-		DISABLED,
-		BEFORE,
-		AFTER,
-		ALWAYS
-	}
-	[CCode (cprefix = "GTK_SOURCE_VIEW_GUTTER_POSITION_", cheader_filename = "gtksourceview/gtksourceview.h")]
-	public enum ViewGutterPosition {
-		LINES,
-		MARKS
-	}
-	[CCode (cprefix = "GTK_SOURCE_COMPLETION_ERROR_", cheader_filename = "gtksourceview/gtksourceview.h")]
-	public errordomain CompletionError {
-		ALREADY_BOUND,
-		NOT_BOUND,
-	}
-	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
-	public const string COMPLETION_CAPABILITY_AUTOMATIC;
-	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
-	public const string COMPLETION_CAPABILITY_INTERACTIVE;
-}
diff --git a/vapi/vte-2.90.vapi b/vapi/vte-2.90.vapi
deleted file mode 100644
index 715a421..0000000
--- a/vapi/vte-2.90.vapi
+++ /dev/null
@@ -1,230 +0,0 @@
-/* vte-2.90.vapi generated by vapigen, do not modify. */
-
-[CCode (cprefix = "Vte", lower_case_cprefix = "vte_", gir_namespace = "Vte", gir_version = "2.90")]
-namespace Vte {
-	[CCode (type_id = "vte_pty_get_type ()", cheader_filename = "vte/vte.h")]
-	public class Pty : GLib.Object, GLib.Initable {
-		[CCode (has_construct_function = false)]
-		public Pty (Vte.PtyFlags flags) throws GLib.Error;
-		public void child_setup ();
-		public void close ();
-		public static GLib.Quark error_quark ();
-		[CCode (has_construct_function = false)]
-		public Pty.foreign (owned int fd) throws GLib.Error;
-		public int get_fd ();
-		public bool get_size (out int rows, out int columns) throws GLib.Error;
-		public bool set_size (int rows, int columns) throws GLib.Error;
-		public void set_term (string? emulation);
-		public bool set_utf8 (bool utf8) throws GLib.Error;
-		public int fd { get; construct; }
-		[NoAccessorMethod]
-		public string term { owned get; set; }
-	}
-	[CCode (type_id = "vte_terminal_get_type ()", cheader_filename = "vte/vte.h")]
-	public class Terminal : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.Scrollable {
-		[CCode (has_construct_function = false)]
-		public Terminal ();
-		public void copy_primary ();
-		public void feed (string data, long length);
-		public void feed_child (string text, long length);
-		public void feed_child_binary (string data, long length);
-		public bool fork_command_full (Vte.PtyFlags pty_flags, string? working_directory, [CCode (array_length = false, array_null_terminated = true)] string[] argv, [CCode (array_length = false, array_null_terminated = true)] string[]? envv, GLib.SpawnFlags spawn_flags, [CCode (delegate_target_pos = 6.5)] GLib.SpawnChildSetupFunc? child_setup, out GLib.Pid child_pid) throws GLib.Error;
-		public bool get_allow_bold ();
-		public bool get_audible_bell ();
-		public long get_char_height ();
-		public long get_char_width ();
-		public int get_child_exit_status ();
-		public long get_column_count ();
-		public Vte.TerminalCursorBlinkMode get_cursor_blink_mode ();
-		public void get_cursor_position (out long column, long row);
-		public Vte.TerminalCursorShape get_cursor_shape ();
-		public unowned string get_default_emulation ();
-		public unowned string get_emulation ();
-		public unowned string get_encoding ();
-		public unowned Pango.FontDescription get_font ();
-		public bool get_has_selection ();
-		public unowned string get_icon_title ();
-		public bool get_mouse_autohide ();
-		public unowned Vte.Pty get_pty_object ();
-		public long get_row_count ();
-		public unowned string get_status_line ();
-		public bool get_visible_bell ();
-		public unowned string get_window_title ();
-		public void im_append_menuitems (Gtk.MenuShell menushell);
-		public bool is_word_char (unichar c);
-		public int match_add_gregex (GLib.Regex regex, GLib.RegexMatchFlags flags);
-		public string match_check (long column, long row, out int tag);
-		public void match_clear_all ();
-		public void match_remove (int tag);
-		public void match_set_cursor (int tag, Gdk.Cursor? cursor);
-		public void match_set_cursor_name (int tag, string cursor_name);
-		public void match_set_cursor_type (int tag, Gdk.CursorType cursor_type);
-		public void paste_primary ();
-		public Vte.Pty pty_new (Vte.PtyFlags flags) throws GLib.Error;
-		public void reset (bool clear_tabstops, bool clear_history);
-		public bool search_find_next ();
-		public bool search_find_previous ();
-		public unowned GLib.Regex search_get_gregex ();
-		public bool search_get_wrap_around ();
-		public void search_set_gregex (GLib.Regex? regex);
-		public void search_set_wrap_around (bool wrap_around);
-		public void select_all ();
-		public void select_none ();
-		public void set_allow_bold (bool allow_bold);
-		public void set_audible_bell (bool is_audible);
-		public void set_background_image (Gdk.Pixbuf? image);
-		public void set_background_image_file (string path);
-		public void set_background_saturation (double saturation);
-		public void set_background_tint_color (Gdk.Color color);
-		public void set_background_transparent (bool transparent);
-		public void set_backspace_binding (Vte.TerminalEraseBinding binding);
-		public void set_color_background (Gdk.Color background);
-		public void set_color_background_rgba (Gdk.RGBA background);
-		public void set_color_bold (Gdk.Color bold);
-		public void set_color_bold_rgba (Gdk.RGBA? bold);
-		public void set_color_cursor (Gdk.Color? cursor_background);
-		public void set_color_cursor_rgba (Gdk.RGBA? cursor_background);
-		public void set_color_dim (Gdk.Color dim);
-		public void set_color_dim_rgba (Gdk.RGBA? dim);
-		public void set_color_foreground (Gdk.Color foreground);
-		public void set_color_foreground_rgba (Gdk.RGBA foreground);
-		public void set_color_highlight (Gdk.Color? highlight_background);
-		public void set_color_highlight_rgba (Gdk.RGBA? highlight_background);
-		public void set_colors (Gdk.Color? foreground, Gdk.Color? background, [CCode (array_length_type = "glong", array_length_cname = "palette_size", array_length_pos = 3.1)] Gdk.Color[] palette);
-		public void set_colors_rgba (Gdk.RGBA? foreground, Gdk.RGBA? background, [CCode (array_length_type = "gsize", array_length_cname = "palette_size", array_length_pos = 3.1)] Gdk.RGBA[] palette);
-		public void set_cursor_blink_mode (Vte.TerminalCursorBlinkMode mode);
-		public void set_cursor_shape (Vte.TerminalCursorShape shape);
-		public void set_default_colors ();
-		public void set_delete_binding (Vte.TerminalEraseBinding binding);
-		public void set_emulation (string? emulation);
-		public void set_encoding (string? codeset);
-		public void set_font (Pango.FontDescription? font_desc);
-		public void set_font_from_string (string name);
-		public void set_mouse_autohide (bool setting);
-		public void set_opacity (uint16 opacity);
-		public void set_pty_object (Vte.Pty? pty);
-		public void set_scroll_background (bool scroll);
-		public void set_scroll_on_keystroke (bool scroll);
-		public void set_scroll_on_output (bool scroll);
-		public void set_scrollback_lines (long lines);
-		public void set_size (long columns, long rows);
-		public void set_visible_bell (bool is_visible);
-		public void set_word_chars (string spec);
-		public void watch_child (GLib.Pid child_pid);
-		public bool write_contents (GLib.OutputStream stream, Vte.TerminalWriteFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool allow_bold { get; set; }
-		public bool audible_bell { get; set; }
-		[NoAccessorMethod]
-		public string background_image_file { owned get; set; }
-		[NoAccessorMethod]
-		public Gdk.Pixbuf background_image_pixbuf { owned get; set; }
-		[NoAccessorMethod]
-		public double background_opacity { get; set; }
-		[NoAccessorMethod]
-		public double background_saturation { get; set; }
-		[NoAccessorMethod]
-		public Gdk.Color background_tint_color { get; set; }
-		[NoAccessorMethod]
-		public bool background_transparent { get; set; }
-		public string emulation { get; set; }
-		public string encoding { get; set; }
-		[NoAccessorMethod]
-		public Pango.FontDescription font_desc { owned get; set; }
-		public string icon_title { get; }
-		[NoAccessorMethod]
-		public bool pointer_autohide { get; set; }
-		[Deprecated (since = "0.26")]
-		[NoAccessorMethod]
-		public int pty { get; set; }
-		public Vte.Pty pty_object { get; set; }
-		[NoAccessorMethod]
-		public bool scroll_background { get; set; }
-		[NoAccessorMethod]
-		public bool scroll_on_keystroke { get; set; }
-		[NoAccessorMethod]
-		public bool scroll_on_output { get; set; }
-		[NoAccessorMethod]
-		public uint scrollback_lines { get; set; }
-		public bool visible_bell { get; set; }
-		public string window_title { get; }
-		[NoAccessorMethod]
-		public string word_chars { owned get; set; }
-		public virtual signal void beep ();
-		public virtual signal void char_size_changed (uint char_width, uint char_height);
-		public virtual signal void child_exited ();
-		public virtual signal void commit (string text, uint size);
-		public virtual signal void contents_changed ();
-		public virtual signal void copy_clipboard ();
-		public virtual signal void cursor_moved ();
-		public virtual signal void decrease_font_size ();
-		public virtual signal void deiconify_window ();
-		public virtual signal void emulation_changed ();
-		public virtual signal void encoding_changed ();
-		public virtual signal void eof ();
-		public virtual signal void icon_title_changed ();
-		public virtual signal void iconify_window ();
-		public virtual signal void increase_font_size ();
-		public virtual signal void lower_window ();
-		public virtual signal void maximize_window ();
-		public virtual signal void move_window (uint x, uint y);
-		public virtual signal void paste_clipboard ();
-		public virtual signal void raise_window ();
-		public virtual signal void refresh_window ();
-		public virtual signal void resize_window (uint width, uint height);
-		public virtual signal void restore_window ();
-		public virtual signal void selection_changed ();
-		public virtual signal void status_line_changed ();
-		public virtual signal void text_deleted ();
-		public virtual signal void text_inserted ();
-		public virtual signal void text_modified ();
-		public virtual signal void text_scrolled (int delta);
-		public virtual signal void window_title_changed ();
-	}
-	[CCode (cname = "_VteCharAttributes", type_id = "VTE_TYPE__CHARATTRIBUTES", cheader_filename = "vte/vte.h")]
-	public struct _CharAttributes {
-	}
-	[CCode (cprefix = "VTE_PTY_ERROR_", cheader_filename = "vte/vte.h")]
-	public enum PtyError {
-		PTY_HELPER_FAILED,
-		PTY98_FAILED
-	}
-	[CCode (cprefix = "VTE_PTY_", cheader_filename = "vte/vte.h")]
-	[Flags]
-	public enum PtyFlags {
-		NO_LASTLOG,
-		NO_UTMP,
-		NO_WTMP,
-		NO_HELPER,
-		NO_FALLBACK,
-		DEFAULT
-	}
-	[CCode (cprefix = "VTE_CURSOR_BLINK_", cheader_filename = "vte/vte.h")]
-	public enum TerminalCursorBlinkMode {
-		SYSTEM,
-		ON,
-		OFF
-	}
-	[CCode (cprefix = "VTE_CURSOR_SHAPE_", cheader_filename = "vte/vte.h")]
-	public enum TerminalCursorShape {
-		BLOCK,
-		IBEAM,
-		UNDERLINE
-	}
-	[CCode (cprefix = "VTE_ERASE_", cheader_filename = "vte/vte.h")]
-	public enum TerminalEraseBinding {
-		AUTO,
-		ASCII_BACKSPACE,
-		ASCII_DELETE,
-		DELETE_SEQUENCE,
-		TTY
-	}
-	[CCode (cprefix = "VTE_TERMINAL_WRITE_", cheader_filename = "vte/vte.h")]
-	public enum TerminalWriteFlags {
-		[CCode (cname = "VTE_TERMINAL_WRITE_DEFAULT")]
-		TERMINAL_WRITE_DEFAULT
-	}
-	[CCode (cheader_filename = "vte/vte.h", has_target = false)]
-	public delegate bool SelectionFunc (Vte.Terminal terminal, long column, long row, void* data);
-	[CCode (cheader_filename = "vte/vte.h")]
-	public static string get_user_shell ();
-}