libgsf-1: Update to 1.14.16, regenerate.

Partially fixes bug 600295.

1 files changed, 178 insertions, 124 deletions

diff --git a/vapi/libgsf-1.vapi b/vapi/libgsf-1.vapi
index 4bfe922e4..8d4e104c1 100644
--- a/vapi/libgsf-1.vapi
+++ b/vapi/libgsf-1.vapi
@@ -1,92 +1,102 @@
-/* libgsf-1.vapi generated by lt-vapigen, do not modify. */
+/* libgsf-1.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Gsf", lower_case_cprefix = "gsf_")]
 namespace Gsf {
 	[CCode (cheader_filename = "gsf/gsf-blob.h")]
 	public class Blob : GLib.Object {
-		public ulong get_size ();
 		[CCode (has_construct_function = false)]
-		public Blob (ulong size, void* data_to_copy) throws GLib.Error;
+		public Blob (size_t size, void* data_to_copy) throws GLib.Error;
+		public size_t get_size ();
 		public void* peek_data ();
 	}
 	[CCode (cheader_filename = "gsf/gsf-clip-data.h")]
 	public class ClipData : GLib.Object {
-		public weak Gsf.Blob get_data_blob ();
-		public Gsf.ClipFormat get_format ();
-		public Gsf.ClipFormatWindows get_windows_clipboard_format () throws GLib.Error;
 		[CCode (has_construct_function = false)]
 		public ClipData (Gsf.ClipFormat format, Gsf.Blob data_blob);
-		public void* peek_real_data (ulong ret_size) throws GLib.Error;
+		public unowned Gsf.Blob get_data_blob ();
+		public Gsf.ClipFormat get_format ();
+		public Gsf.ClipFormatWindows get_windows_clipboard_format () throws GLib.Error;
+		public void* peek_real_data (size_t ret_size) throws GLib.Error;
 	}
 	[CCode (cheader_filename = "gsf/gsf-doc-meta-data.h")]
 	public class DocMetaData : GLib.Object {
-		public void @foreach (GLib.HFunc func);
-		public void insert (string name, GLib.Value value);
-		public weak Gsf.DocProp? lookup (string name);
 		[CCode (has_construct_function = false)]
 		public DocMetaData ();
+		public void @foreach (GLib.HFunc func);
+		public void insert (string name, GLib.Value value);
+		public unowned Gsf.DocProp? lookup (string name);
 		public void remove (string name);
-		public ulong size ();
-		public weak Gsf.DocProp? steal (string name);
+		public size_t size ();
+		public unowned Gsf.DocProp? steal (string name);
 		public void store (Gsf.DocProp prop);
 	}
 	[Compact]
 	[CCode (cheader_filename = "gsf/gsf-doc-meta-data.h")]
 	public class DocProp {
-		public void dump ();
-		public weak string? get_link ();
-		public weak string get_name ();
-		public weak GLib.Value? get_val ();
 		[CCode (has_construct_function = false)]
 		public DocProp (owned string name);
+		public void dump ();
+		public unowned string? get_link ();
+		public unowned string get_name ();
+		public unowned GLib.Value? get_val ();
 		public void set_link (owned string link);
 		public void set_val (owned GLib.Value val);
 		public GLib.Value swap_val (GLib.Value val);
 	}
 	[CCode (cheader_filename = "gsf/gsf-docprop-vector.h")]
 	public class DocPropVector : GLib.Object {
+		[CCode (cname = "gsf_docprop_vector_new", has_construct_function = false)]
+		public DocPropVector ();
 		[CCode (cname = "gsf_docprop_vector_append")]
 		public void append (GLib.Value value);
 		[CCode (cname = "gsf_docprop_vector_as_string")]
 		public string as_string ();
-		[CCode (cname = "gsf_docprop_vector_new", has_construct_function = false)]
-		public DocPropVector ();
 	}
 	[CCode (cheader_filename = "gsf/gsf-infile-impl.h")]
 	public class Infile : Gsf.Input {
-		public virtual weak Gsf.Input? child_by_index (int i);
-		public virtual weak Gsf.Input? child_by_name (string name);
-		public weak Gsf.Input? child_by_vname (string name);
-		public virtual weak string? name_by_index (int i);
+		public unowned Gsf.Input child_by_aname (string[] names);
+		public virtual unowned Gsf.Input? child_by_index (int i);
+		public virtual unowned Gsf.Input? child_by_name (string name);
+		public unowned Gsf.Input child_by_vaname (void* names);
+		public unowned Gsf.Input? child_by_vname ();
+		public virtual unowned string? name_by_index (int i);
 		public virtual int num_children ();
 	}
 	[CCode (cheader_filename = "gsf/gsf-infile-msole.h")]
 	public class InfileMSOle : Gsf.Infile {
-		[CCode (cname = "gsf_infile_msole_get_class_id")]
-		public bool get_class_id (uchar res);
 		[CCode (cname = "gsf_infile_msole_new", type = "GsfInfile*", has_construct_function = false)]
 		public InfileMSOle (Gsf.Input source) throws GLib.Error;
+		[CCode (cname = "gsf_infile_msole_get_class_id")]
+		public bool get_class_id (uchar res);
 	}
 	[CCode (cheader_filename = "gsf/gsf-infile-msvba.h")]
 	public class InfileMSVBA : Gsf.Infile {
 		[CCode (type = "GsfInfile*", has_construct_function = false)]
 		public InfileMSVBA (Gsf.Infile source) throws GLib.Error;
+		public unowned GLib.HashTable get_modules ();
+		public unowned GLib.HashTable steal_modules ();
 	}
 	[CCode (cheader_filename = "gsf/gsf-infile-stdio.h")]
 	public class InfileStdio : Gsf.Infile {
 		[CCode (type = "GsfInfile*", has_construct_function = false)]
 		public InfileStdio (string root) throws GLib.Error;
 	}
+	[CCode (cheader_filename = "gsf/gsf.h")]
+	public class InfileTar : Gsf.Infile {
+		[CCode (type = "GsfInfile*", has_construct_function = false)]
+		public InfileTar (Gsf.Input source) throws GLib.Error;
+		[NoAccessorMethod]
+		public Gsf.Input source { owned get; construct; }
+	}
 	[CCode (cheader_filename = "gsf/gsf-infile-zip.h")]
 	public class InfileZip : Gsf.Infile {
 		[CCode (type = "GsfInfile*", has_construct_function = false)]
 		public InfileZip (Gsf.Input source) throws GLib.Error;
 		[NoAccessorMethod]
 		public int compression_level { get; }
-		[NoAccessorMethod]
 		public Gsf.InfileZip internal_parent { construct; }
 		[NoAccessorMethod]
-		public Gsf.Input source { get; construct; }
+		public Gsf.Input source { owned get; construct; }
 	}
 	[CCode (cheader_filename = "gsf/gsf-input-impl.h")]
 	public class Input : GLib.Object {
@@ -96,22 +106,22 @@ namespace Gsf {
 		[NoWrapper]
 		public virtual Gsf.Input OpenSibling (string path) throws GLib.Error;
 		[NoWrapper]
-		[NoArrayLength]
-		public virtual weak uchar[]? Read (ulong num_bytes, uchar[]? optional_buffer);
+		[CCode (array_length = false)]
+		public virtual unowned uchar[]? Read (size_t num_bytes, [CCode (array_length = false)] uchar[]? optional_buffer);
 		[NoWrapper]
 		public virtual bool Seek (Gsf.off_t offset, GLib.SeekType whence);
-		public weak Gsf.Infile? container ();
+		public unowned Gsf.Infile? container ();
 		public bool copy (Gsf.Output output);
 		public void dump (bool dump_as_hex);
 		public Gsf.Input dup () throws GLib.Error;
 		public bool eof ();
 		public static GLib.Quark error ();
 		public static GLib.Quark error_id ();
+		public unowned Gsf.InfileMSVBA find_vba () throws GLib.Error;
 		public static Gsf.Input mmap_new (string filename) throws GLib.Error;
-		public weak string? name ();
-		public Input ();
-		[NoArrayLength]
-		public weak uchar[]? read (ulong num_bytes, uchar[]? optional_buffer);
+		public unowned string? name ();
+		[CCode (array_length = false)]
+		public unowned uchar[]? read (size_t num_bytes, [CCode (array_length = false)] uchar[]? optional_buffer);
 		public Gsf.off_t remaining ();
 		public bool seek (Gsf.off_t offset, GLib.SeekType whence);
 		public bool seek_emulate (Gsf.off_t pos);
@@ -119,10 +129,10 @@ namespace Gsf {
 		public bool set_name (string? name);
 		public bool set_name_from_filename (string filename);
 		public bool set_size (Gsf.off_t size);
-		public weak Gsf.Input? sibling (string name) throws GLib.Error;
+		public unowned Gsf.Input? sibling (string name) throws GLib.Error;
 		public Gsf.off_t size ();
 		public Gsf.off_t tell ();
-		public static Gsf.Input uncompress (owned Gsf.Input src);
+		public unowned Gsf.Input uncompress ();
 		[NoAccessorMethod]
 		public int64 position { get; }
 	}
@@ -133,31 +143,38 @@ namespace Gsf {
 		[NoAccessorMethod]
 		public bool raw { get; construct; }
 		[NoAccessorMethod]
-		public Gsf.Input source { get; construct; }
+		public Gsf.Input source { owned get; construct; }
 		[NoAccessorMethod]
 		public int64 uncompressed_size { get; construct; }
 	}
+	[CCode (cheader_filename = "gsf/gsf.h")]
+	public class InputGio : Gsf.Input {
+		[CCode (type = "GsfInput*", has_construct_function = false)]
+		public InputGio (GLib.File file) throws GLib.Error;
+		[CCode (type = "GsfInput*", has_construct_function = false)]
+		public InputGio.for_path (string path) throws GLib.Error;
+		[CCode (type = "GsfInput*", has_construct_function = false)]
+		public InputGio.for_uri (string uri) throws GLib.Error;
+	}
 	[CCode (cheader_filename = "gsf/gsf-input-http.h")]
 	public class InputHTTP : Gsf.Input {
-		public weak string get_content_type ();
-		public weak string get_url ();
 		[CCode (type = "GsfInput*", has_construct_function = false)]
 		public InputHTTP (string url) throws GLib.Error;
-		[NoAccessorMethod]
+		public unowned string get_content_type ();
+		public unowned string get_url ();
 		public string content_type { get; construct; }
-		[NoAccessorMethod]
 		public string url { get; construct; }
 	}
 	[CCode (cheader_filename = "gsf/gsf-input-memory.h")]
 	public class InputMemory : Gsf.Input {
 		[CCode (type = "GsfInput*", has_construct_function = false)]
+		public InputMemory (uchar buf, Gsf.off_t length, bool needs_free);
+		[CCode (type = "GsfInput*", has_construct_function = false)]
 		public InputMemory.clone (uchar buf, Gsf.off_t length);
 		[CCode (type = "GsfInput*", has_construct_function = false)]
 		public InputMemory.from_bzip (Gsf.Input source) throws GLib.Error;
 		[CCode (type = "GsfInput*", has_construct_function = false)]
 		public InputMemory.from_iochannel (GLib.IOChannel channel) throws GLib.Error;
-		[CCode (type = "GsfInput*", has_construct_function = false)]
-		public InputMemory (uchar buf, Gsf.off_t length, bool needs_free);
 	}
 	[CCode (cheader_filename = "gsf/gsf-input-proxy.h")]
 	public class InputProxy : Gsf.Input {
@@ -173,17 +190,17 @@ namespace Gsf {
 	}
 	[CCode (cheader_filename = "gsf/gsf-input-textline.h")]
 	public class InputTextline : Gsf.Input {
-		[NoArrayLength]
-		public weak uint[]? ascii_gets ();
 		[CCode (type = "GsfInput*", has_construct_function = false)]
 		public InputTextline (Gsf.Input source);
-		[NoArrayLength]
-		public weak uchar[]? utf8_gets ();
+		[CCode (array_length = false)]
+		public unowned uint[]? ascii_gets ();
+		[CCode (array_length = false)]
+		public unowned uchar[]? utf8_gets ();
 	}
 	[Compact]
 	[CCode (cheader_filename = "gsf/gsf-open-pkg-utils.h")]
 	public class OpenPkgRel {
-		public weak string get_target ();
+		public unowned string get_target ();
 		public bool is_extern ();
 	}
 	[Compact]
@@ -192,42 +209,40 @@ namespace Gsf {
 	}
 	[CCode (cheader_filename = "gsf/gsf-outfile-impl.h")]
 	public class Outfile : Gsf.Output {
-		[CCode (type = "GsfOutput*", has_construct_function = false)]
-		public Outfile.child (Gsf.Outfile outfile, string name, bool is_dir);
-		[CCode (type = "GsfOutput*", has_construct_function = false)]
-		public Outfile.child_full (Gsf.Outfile outfile, string name, bool is_dir, ...);
+		public Gsf.Output new_child (string name, bool is_dir);
+		public Gsf.Output new_child_full (string name, bool is_dir, ...);
 	}
 	[CCode (cheader_filename = "gsf/gsf-outfile-msole.h")]
 	public class OutfileMSOle : Gsf.Outfile {
-		[CCode (cname = "gsf_outfile_msole_new_full", type = "GsfOutfile*", has_construct_function = false)]
-		public OutfileMSOle.full (Gsf.Output sink, uint bb_size, uint sb_size);
 		[CCode (cname = "gsf_outfile_msole_new", type = "GsfOutfile*", has_construct_function = false)]
 		public OutfileMSOle (Gsf.Output sink);
+		[CCode (cname = "gsf_outfile_msole_new_full", type = "GsfOutfile*", has_construct_function = false)]
+		public OutfileMSOle.full (Gsf.Output sink, uint bb_size, uint sb_size);
 		[CCode (cname = "gsf_outfile_msole_set_class_id")]
 		public bool set_class_id (uchar clsid);
 	}
 	[CCode (cheader_filename = "gsf/gsf-open-pkg-utils.h")]
 	public class OutfileOpenPkg : Gsf.Outfile {
-		public weak string add_extern_rel (string target, string content_type);
-		public static Gsf.Output add_rel (Gsf.Outfile dir, string name, string content_type, Gsf.Outfile parent, string type);
 		[CCode (type = "GsfOutfile*", has_construct_function = false)]
 		public OutfileOpenPkg (Gsf.Outfile sink);
-		public weak string relate (Gsf.OutfileOpenPkg parent, string type);
+		public unowned string add_extern_rel (string target, string content_type);
+		public static Gsf.Output add_rel (Gsf.Outfile dir, string name, string content_type, Gsf.Outfile parent, string type);
+		public unowned string relate (Gsf.OutfileOpenPkg parent, string type);
 		public void set_content_type (string content_type);
 		public void set_sink (Gsf.Output sink);
 		[NoAccessorMethod]
-		public string content_type { get; construct; }
+		public string content_type { owned get; construct; }
 		[NoAccessorMethod]
 		public bool is_dir { get; construct; }
 		[NoAccessorMethod]
-		public Gsf.Outfile sink { get; construct; }
+		public Gsf.Outfile sink { owned get; construct; }
 	}
 	[CCode (cheader_filename = "gsf/gsf-outfile-stdio.h")]
 	public class OutfileStdio : Gsf.Outfile {
 		[CCode (type = "GsfOutfile*", has_construct_function = false)]
-		public OutfileStdio.full (string root, ...) throws GLib.Error;
-		[CCode (type = "GsfOutfile*", has_construct_function = false)]
 		public OutfileStdio (string root) throws GLib.Error;
+		[CCode (type = "GsfOutfile*", has_construct_function = false)]
+		public OutfileStdio.full (string root, ...) throws GLib.Error;
 	}
 	[CCode (cheader_filename = "gsf/gsf-outfile-zip.h")]
 	public class OutfileZip : Gsf.Outfile {
@@ -237,9 +252,9 @@ namespace Gsf {
 		[NoAccessorMethod]
 		public int compression_level { get; construct; }
 		[NoAccessorMethod]
-		public string entry_name { get; construct; }
+		public string entry_name { owned get; construct; }
 		[NoAccessorMethod]
-		public Gsf.Output sink { get; construct; }
+		public Gsf.Output sink { owned get; construct; }
 	}
 	[CCode (cheader_filename = "gsf/gsf-output-impl.h")]
 	public class Output : GLib.Object {
@@ -254,13 +269,13 @@ namespace Gsf {
 		[NoWrapper]
 		public virtual bool Seek (Gsf.off_t offset, GLib.SeekType whence);
 		[NoWrapper]
-		public virtual bool Write (ulong num_bytes, uchar[] data);
+		public virtual bool Write (size_t num_bytes, [CCode (array_length = false)] uchar[] data);
 		public bool close ();
-		public weak Gsf.Outfile? container ();
-		public weak GLib.Error error ();
+		public unowned Gsf.Outfile? container ();
+		public unowned GLib.Error error ();
 		public static GLib.Quark error_id ();
 		public bool is_closed ();
-		public weak string? name ();
+		public unowned string? name ();
 		public bool printf (string format, ...);
 		public bool puts (string line);
 		public bool seek (Gsf.off_t offset, GLib.SeekType whence);
@@ -272,7 +287,7 @@ namespace Gsf {
 		public Gsf.off_t tell ();
 		public static bool unwrap (GLib.Object wrapper, Gsf.Output wrapee);
 		public static bool wrap (GLib.Object wrapper, Gsf.Output wrapee);
-		public bool write (ulong num_bytes, uchar[] data);
+		public bool write (size_t num_bytes, [CCode (array_length = false)] uchar[] data);
 		[NoAccessorMethod]
 		public int64 position { get; }
 	}
@@ -284,26 +299,26 @@ namespace Gsf {
 	[CCode (cheader_filename = "gsf/gsf-output-csv.h")]
 	public class OutputCsv : Gsf.Output {
 		public weak GLib.StringBuilder buf;
-		public ulong eol_len;
+		public size_t eol_len;
 		public bool fields_on_line;
-		public ulong quote_len;
-		public ulong separator_len;
+		public size_t quote_len;
+		public size_t separator_len;
 		public bool write_eol ();
-		public bool write_field (string field, ulong len);
+		public bool write_field (string field, size_t len);
 		[NoAccessorMethod]
-		public string eol { get; set construct; }
+		public string eol { owned get; set construct; }
 		[NoAccessorMethod]
-		public string quote { get; set construct; }
+		public string quote { owned get; set construct; }
 		[NoAccessorMethod]
 		public Gsf.OutputCsvQuotingMode quoting_mode { get; set construct; }
 		[NoAccessorMethod]
 		public bool quoting_on_whitespace { get; set; }
 		[NoAccessorMethod]
-		public string quoting_triggers { get; set; }
+		public string quoting_triggers { owned get; set; }
 		[NoAccessorMethod]
-		public string separator { get; set construct; }
+		public string separator { owned get; set construct; }
 		[NoAccessorMethod]
-		public Gsf.Output sink { get; set; }
+		public Gsf.Output sink { owned get; set; }
 	}
 	[CCode (cheader_filename = "gsf/gsf-output-gzip.h")]
 	public class OutputGZip : Gsf.Output {
@@ -312,7 +327,16 @@ namespace Gsf {
 		[NoAccessorMethod]
 		public bool raw { get; construct; }
 		[NoAccessorMethod]
-		public Gsf.Output sink { get; construct; }
+		public Gsf.Output sink { owned get; construct; }
+	}
+	[CCode (cheader_filename = "gsf/gsf.h")]
+	public class OutputGio : Gsf.Output {
+		[CCode (type = "GsfOutput*", has_construct_function = false)]
+		public OutputGio (GLib.File file);
+		[CCode (type = "GsfOutput*", has_construct_function = false)]
+		public OutputGio.for_path (string path) throws GLib.Error;
+		[CCode (type = "GsfOutput*", has_construct_function = false)]
+		public OutputGio.for_uri (string uri) throws GLib.Error;
 	}
 	[CCode (cheader_filename = "gsf/gsf-output-iochannel.h")]
 	public class OutputIOChannel : Gsf.Output {
@@ -324,27 +348,37 @@ namespace Gsf {
 		[CCode (type = "GsfOutput*", has_construct_function = false)]
 		public OutputIconv (Gsf.Output sink, string dst, string src);
 		[NoAccessorMethod]
-		public string fallback { get; set; }
+		public string fallback { owned get; set; }
 		[NoAccessorMethod]
-		public string input_charset { get; construct; }
+		public string input_charset { owned get; construct; }
 		[NoAccessorMethod]
-		public string output_charset { get; construct; }
+		public string output_charset { owned get; construct; }
 		[NoAccessorMethod]
-		public Gsf.Output sink { get; construct; }
+		public Gsf.Output sink { owned get; construct; }
 	}
 	[CCode (cheader_filename = "gsf/gsf-output-memory.h")]
 	public class OutputMemory : Gsf.Output {
-		[NoArrayLength]
-		public weak uchar[] get_bytes ();
 		[CCode (type = "GsfOutput*", has_construct_function = false)]
 		public OutputMemory ();
+		[CCode (array_length = false)]
+		public unowned uchar[] get_bytes ();
 	}
 	[CCode (cheader_filename = "gsf/gsf-output-stdio.h")]
 	public class OutputStdio : Gsf.Output {
 		[CCode (type = "GsfOutput*", has_construct_function = false)]
-		public OutputStdio.full (string filename, ...) throws GLib.Error;
-		[CCode (type = "GsfOutput*", has_construct_function = false)]
 		public OutputStdio (string filename) throws GLib.Error;
+		[CCode (type = "GsfOutput*", has_construct_function = false)]
+		public OutputStdio.full (string filename, ...) throws GLib.Error;
+	}
+	[CCode (cheader_filename = "gsf/gsf-infile-msvba.h")]
+	public class SharedMemory : GLib.Object {
+		public void* buf;
+		public bool needs_free;
+		public bool needs_unmap;
+		public Gsf.off_t size;
+		[CCode (has_construct_function = false)]
+		public SharedMemory (void* buf, Gsf.off_t size, bool needs_free);
+		public static unowned Gsf.SharedMemory mmapped_new (void* buf, Gsf.off_t size);
 	}
 	[CCode (cheader_filename = "gsf/gsf-structured-blob.h")]
 	public class StructuredBlob : Gsf.Infile {
@@ -352,17 +386,21 @@ namespace Gsf {
 		public bool write (Gsf.Outfile container);
 	}
 	[Compact]
-	[CCode (copy_function = "gsf_timestamp_copy", cheader_filename = "gsf/gsf-timestamp.h")]
+	[CCode (copy_function = "gsf_timestamp_copy", type_id = "GSF_TYPE_TIMESTAMP", cheader_filename = "gsf/gsf-timestamp.h")]
 	public class Timestamp {
 		public GLib.Date date;
 		public long seconds;
 		public weak GLib.StringBuilder time_zone;
-		public uint timet;
+		public uint32 timet;
+		[CCode (has_construct_function = false)]
+		public Timestamp ();
 		public string as_string ();
 		public Gsf.Timestamp copy ();
 		public bool equal (Gsf.Timestamp b);
+		public static int from_string (string spec, Gsf.Timestamp stamp);
 		public uint hash ();
 		public static int parse (string spec, Gsf.Timestamp stamp);
+		public void set_time (uint64 t);
 	}
 	[Compact]
 	[CCode (cheader_filename = "gsf/gsf-libxml.h")]
@@ -376,16 +414,17 @@ namespace Gsf {
 		public weak Gsf.XMLInNode node;
 		public weak GLib.SList node_stack;
 		public void* user_state;
-		public weak string check_ns (string str, uint ns_id);
-		public weak Gsf.Input get_input ();
+		public unowned string check_ns (string str, uint ns_id);
+		public unowned Gsf.Input get_input ();
 		public bool namecmp (string str, uint ns_id, string name);
-		public void push_state (Gsf.XMLInDoc doc, void* new_state, Gsf.XMLInExtDtor dtor, string[] attrs);
+		public void push_state (Gsf.XMLInDoc doc, void* new_state, Gsf.XMLInExtDtor dtor, [CCode (array_length = false)] string[] attrs);
 	}
 	[Compact]
 	[CCode (cheader_filename = "gsf/gsf-libxml.h")]
 	public class XMLInDoc {
 		[CCode (has_construct_function = false)]
-		public XMLInDoc (Gsf.XMLInNode[] nodes, Gsf.XMLInNS ns);
+		public XMLInDoc ([CCode (array_length = false)] Gsf.XMLInNode[] nodes, Gsf.XMLInNS ns);
+		public void add_nodes (Gsf.XMLInNode nodes);
 		public bool parse (Gsf.Input input, void* user_state);
 		public void set_unknown_handler (Gsf.XMLInUnknownFunc handler);
 	}
@@ -411,6 +450,8 @@ namespace Gsf {
 	}
 	[CCode (cheader_filename = "gsf/gsf-libxml.h")]
 	public class XMLOut : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public XMLOut (Gsf.Output output);
 		public void add_base64 (string id, uchar data, uint len);
 		public void add_bool (string id, bool val);
 		public void add_color (string id, uint r, uint g, uint b);
@@ -421,10 +462,8 @@ namespace Gsf {
 		public void add_gvalue (string id, GLib.Value val);
 		public void add_int (string id, int val);
 		public void add_uint (string id, uint val);
-		public weak string end_element ();
-		public weak Gsf.Output get_output ();
-		[CCode (has_construct_function = false)]
-		public XMLOut (Gsf.Output output);
+		public unowned string end_element ();
+		public unowned Gsf.Output get_output ();
 		public void set_doc_type (string type);
 		public void simple_element (string id, string content);
 		public void simple_float_element (string id, double val, int precision);
@@ -486,10 +525,14 @@ namespace Gsf {
 		OUT_OF_MEMORY,
 		INVALID_DATA,
 	}
-	[CCode (cheader_filename = "gsf/gsf-libxml.h")]
-	public static delegate void XMLInExtDtor (Gsf.XMLIn xin, void* old_state);
-	[CCode (cheader_filename = "gsf/gsf-libxml.h")]
-	public static delegate bool XMLInUnknownFunc (Gsf.XMLIn xin, string elem, out weak string attrs);
+	[CCode (cheader_filename = "gsf/gsf.h")]
+	public delegate void OpenPkgIter (Gsf.Input opkg, Gsf.OpenPkgRel rel);
+	[CCode (cheader_filename = "gsf/gsf-libxml.h", has_target = false)]
+	public delegate void XMLInExtDtor (Gsf.XMLIn xin, void* old_state);
+	[CCode (cheader_filename = "gsf/gsf-libxml.h", has_target = false)]
+	public delegate bool XMLInUnknownFunc (Gsf.XMLIn xin, string elem, out unowned string attrs);
+	[CCode (cheader_filename = "gsf/gsf.h", has_target = false)]
+	public delegate bool XMLProbeFunc (string name, string prefix, string URI, int nb_namespaces, out unowned string namespaces, int nb_attributes, int nb_defaulted, out unowned string attributes);
 	[CCode (cheader_filename = "gsf/gsf-meta-names.h")]
 	public const string META_NAME_BYTE_COUNT;
 	[CCode (cheader_filename = "gsf/gsf-meta-names.h")]
@@ -603,24 +646,29 @@ namespace Gsf {
 	[CCode (cheader_filename = "gsf/gsf-outfile-ole.h")]
 	public const int OLE_DEFAULT_SB_SHIFT;
 	[CCode (cheader_filename = "gsf/gsf-utils.h")]
-	public static ulong base64_decode_simple (uchar[] data, ulong len);
+	public static size_t base64_decode_simple ([CCode (array_length = false)] uchar[] data, size_t len);
 	[CCode (cheader_filename = "gsf/gsf-utils.h")]
-	public static ulong base64_decode_step (uchar[] @in, ulong len, uchar[] @out, out int state, out uint save);
+	public static size_t base64_decode_step ([CCode (array_length = false)] uchar[] @in, size_t len, [CCode (array_length = false)] uchar[] @out, out int state, out uint save);
 	[CCode (cheader_filename = "gsf/gsf-utils.h")]
-	public static ulong base64_encode_close (uchar[] @in, ulong inlen, bool break_lines, uchar[] @out, out int state, out uint save);
-	[NoArrayLength]
+	public static size_t base64_encode_close ([CCode (array_length = false)] uchar[] @in, size_t inlen, bool break_lines, [CCode (array_length = false)] uchar[] @out, out int state, out uint save);
+	[CCode (cheader_filename = "gsf/gsf-utils.h", array_length = false)]
+	public static unowned uchar[] base64_encode_simple ([CCode (array_length = false)] uchar[] data, size_t len);
 	[CCode (cheader_filename = "gsf/gsf-utils.h")]
-	public static weak uchar[] base64_encode_simple (uchar[] data, ulong len);
-	[CCode (cheader_filename = "gsf/gsf-utils.h")]
-	public static ulong base64_encode_step (uchar[] @in, ulong len, bool break_lines, uchar[] @out, out int state, out uint save);
+	public static size_t base64_encode_step ([CCode (array_length = false)] uchar[] @in, size_t len, bool break_lines, [CCode (array_length = false)] uchar[] @out, out int state, out uint save);
 	[CCode (cheader_filename = "gsf/gsf-doc-meta-data.h")]
 	public static void doc_meta_dump (Gsf.DocMetaData meta);
 	[CCode (cheader_filename = "gsf/gsf-utils.h")]
 	public static GLib.Quark error_quark ();
 	[CCode (cheader_filename = "gsf/gsf-utils.h")]
-	public static weak string extension_pointer (string path);
+	public static unowned string extension_pointer (string path);
 	[CCode (cheader_filename = "gsf/gsf-utils.h")]
 	public static string filename_to_utf8 (string filename, bool quoted);
+	[CCode (cname = "get_gsf_odf_version", cheader_filename = "gsf/gsf.h")]
+	public static short get_gsf_odf_version ();
+	[CCode (cname = "get_gsf_odf_version_string", cheader_filename = "gsf/gsf.h")]
+	public static unowned string get_gsf_odf_version_string ();
+	[CCode (cname = "get_gsf_ooo_ns", cheader_filename = "gsf/gsf.h")]
+	public static unowned Gsf.XMLInNS get_gsf_ooo_ns ();
 	[CCode (cheader_filename = "gsf/gsf-utils.h")]
 	public static void iconv_close (GLib.IConv handle);
 	[CCode (cheader_filename = "gsf/gsf-utils.h")]
@@ -638,7 +686,7 @@ namespace Gsf {
 	[CCode (cheader_filename = "gsf/gsf-utils.h")]
 	public static void le_set_float (void* p, float f);
 	[CCode (cheader_filename = "gsf/gsf-utils.h")]
-	public static void mem_dump (uchar[] ptr, ulong len);
+	public static void mem_dump ([CCode (array_length = false)] uchar[] ptr, size_t len);
 	[CCode (cheader_filename = "gsf/gsf-msole-utils.h")]
 	public static uint msole_codepage_to_lid (int codepage);
 	[CCode (cheader_filename = "gsf/gsf-msole-utils.h")]
@@ -654,53 +702,57 @@ namespace Gsf {
 	[CCode (cheader_filename = "gsf/gsf-msole-utils.h")]
 	public static int msole_iconv_win_codepage ();
 	[CCode (cheader_filename = "gsf/gsf-msole-utils.h")]
-	public static weak GLib.ByteArray msole_inflate (Gsf.Input input, Gsf.off_t offset);
+	public static unowned GLib.ByteArray msole_inflate (Gsf.Input input, Gsf.off_t offset);
 	[CCode (cheader_filename = "gsf/gsf-msole-utils.h")]
-	public static weak string msole_language_for_lid (uint lid);
+	public static unowned string msole_language_for_lid (uint lid);
 	[CCode (cheader_filename = "gsf/gsf-msole-utils.h")]
 	public static uint msole_lid_for_language (string lang);
 	[CCode (cheader_filename = "gsf/gsf-msole-utils.h")]
 	public static int msole_lid_to_codepage (uint lid);
 	[CCode (cheader_filename = "gsf/gsf-msole-utils.h")]
-	public static weak string msole_lid_to_codepage_str (uint lid);
+	public static unowned string msole_lid_to_codepage_str (uint lid);
 	[CCode (cheader_filename = "gsf/gsf-msole-utils.h")]
-	public static weak GLib.Error msole_metadata_read (Gsf.Input @in, Gsf.DocMetaData accum);
+	public static unowned GLib.Error msole_metadata_read (Gsf.Input @in, Gsf.DocMetaData accum);
 	[CCode (cheader_filename = "gsf/gsf-msole-utils.h")]
 	public static bool msole_metadata_write (Gsf.Output @out, Gsf.DocMetaData meta_data, bool doc_not_component);
 	[CCode (cheader_filename = "gsf/gsf-open-pkg-utils.h")]
 	public static int open_pkg_error_id ();
+	[CCode (cheader_filename = "gsf/gsf.h")]
+	public static void open_pkg_foreach_rel (Gsf.Input opkg, Gsf.OpenPkgIter func);
 	[CCode (cheader_filename = "gsf/gsf-open-pkg-utils.h")]
-	public static Gsf.Input open_pkg_get_rel_by_id (Gsf.Input @in, string id);
+	public static Gsf.Input open_pkg_get_rel_by_id (Gsf.Input opkg, string id);
 	[CCode (cheader_filename = "gsf/gsf-open-pkg-utils.h")]
-	public static Gsf.Input open_pkg_get_rel_by_type (Gsf.Input @in, string type);
+	public static Gsf.Input open_pkg_get_rel_by_type (Gsf.Input opkg, string type);
 	[CCode (cheader_filename = "gsf/gsf-open-pkg-utils.h")]
-	public static weak Gsf.OpenPkgRel open_pkg_lookup_rel_by_id (Gsf.Input @in, string id);
+	public static unowned Gsf.OpenPkgRel open_pkg_lookup_rel_by_id (Gsf.Input opkg, string id);
 	[CCode (cheader_filename = "gsf/gsf-open-pkg-utils.h")]
-	public static weak Gsf.OpenPkgRel open_pkg_lookup_rel_by_type (Gsf.Input @in, string type);
+	public static unowned Gsf.OpenPkgRel open_pkg_lookup_rel_by_type (Gsf.Input opkg, string type);
+	[CCode (cheader_filename = "gsf/gsf.h")]
+	public static unowned Gsf.Input open_pkg_open_rel (Gsf.Input opkg, Gsf.OpenPkgRel rel) throws GLib.Error;
 	[CCode (cheader_filename = "gsf/gsf-open-pkg-utils.h")]
-	public static Gsf.Input open_pkg_open_rel_by_id (Gsf.Input @in, string id) throws GLib.Error;
+	public static Gsf.Input open_pkg_open_rel_by_id (Gsf.Input opkg, string id) throws GLib.Error;
 	[CCode (cheader_filename = "gsf/gsf-open-pkg-utils.h")]
-	public static Gsf.Input open_pkg_open_rel_by_type (Gsf.Input @in, string type) throws GLib.Error;
+	public static Gsf.Input open_pkg_open_rel_by_type (Gsf.Input opkg, string type) throws GLib.Error;
 	[CCode (cheader_filename = "gsf/gsf-open-pkg-utils.h")]
-	public static weak GLib.Error open_pkg_parse_rel_by_id (Gsf.XMLIn xin, string id, Gsf.XMLInNode dtd, Gsf.XMLInNS ns);
+	public static unowned GLib.Error open_pkg_parse_rel_by_id (Gsf.XMLIn xin, string id, Gsf.XMLInNode dtd, Gsf.XMLInNS ns);
 	[CCode (cheader_filename = "gsf/gsf-opendoc-utils.h")]
-	public static weak GLib.Error opendoc_metadata_read (Gsf.Input input, Gsf.DocMetaData md);
+	public static unowned GLib.Error opendoc_metadata_read (Gsf.Input input, Gsf.DocMetaData md);
 	[CCode (cheader_filename = "gsf/gsf-opendoc-utils.h")]
 	public static void opendoc_metadata_subtree (Gsf.XMLIn doc, Gsf.DocMetaData md);
 	[CCode (cheader_filename = "gsf/gsf-opendoc-utils.h")]
 	public static bool opendoc_metadata_write (Gsf.XMLOut output, Gsf.DocMetaData md);
 	[CCode (cheader_filename = "gsf/gsf-utils.h")]
-	public static void property_settings_collect (GLib.Type object_type, GLib.Parameter[] p_params, ref ulong p_n_params, ...);
+	public static void property_settings_collect (GLib.Type object_type, [CCode (array_length = false)] GLib.Parameter[] p_params, ref size_t p_n_params, ...);
 	[CCode (cheader_filename = "gsf/gsf-utils.h")]
-	public static void property_settings_free (GLib.Parameter[] params);
+	public static void property_settings_free (GLib.Parameter[] @params);
 	[CCode (cheader_filename = "gsf/gsf-utils.h")]
 	public static void shutdown ();
 	[CCode (cheader_filename = "gsf/gsf-utils.h")]
 	public static void shutdown_dynamic (GLib.TypeModule module);
 	[CCode (cheader_filename = "gsf/gsf-docprop-vector.h")]
-	public static weak GLib.ValueArray value_get_docprop_varray (GLib.Value value);
+	public static unowned GLib.ValueArray value_get_docprop_varray (GLib.Value value);
 	[CCode (cheader_filename = "gsf/gsf-docprop-vector.h")]
-	public static weak Gsf.DocPropVector value_get_docprop_vector (GLib.Value value);
+	public static unowned Gsf.DocPropVector value_get_docprop_vector (GLib.Value value);
 	[CCode (cheader_filename = "gsf/gsf-timestamp.h")]
 	public static void value_set_timestamp (GLib.Value value, Gsf.Timestamp stamp);
 	[CCode (cheader_filename = "gsf/gsf-libxml.h")]
@@ -709,4 +761,6 @@ namespace Gsf {
 	public static bool xml_gvalue_from_str (GLib.Value res, GLib.Type t, string str);
 	[CCode (cheader_filename = "gsf/gsf-libxml.h")]
 	public static Xml.ParserCtxt xml_parser_context (Gsf.Input input);
+	[CCode (cheader_filename = "gsf/gsf.h")]
+	public static bool xml_probe (Gsf.Input input, Gsf.XMLProbeFunc startElement);
 }