]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
libgsf-1: Switch to GIR and update to 1.14.42
authorRico Tzschichholz <ricotz@ubuntu.com>
Mon, 19 Mar 2018 15:07:32 +0000 (16:07 +0100)
committerRico Tzschichholz <ricotz@ubuntu.com>
Wed, 21 Mar 2018 13:22:45 +0000 (14:22 +0100)
vapi/Makefile.am
vapi/libgsf-1.vapi
vapi/metadata/Gsf-1.metadata [new file with mode: 0644]
vapi/packages/libgsf-1/libgsf-1-custom.vala [deleted file]
vapi/packages/libgsf-1/libgsf-1.deps [deleted file]
vapi/packages/libgsf-1/libgsf-1.excludes [deleted file]
vapi/packages/libgsf-1/libgsf-1.files [deleted file]
vapi/packages/libgsf-1/libgsf-1.gi [deleted file]
vapi/packages/libgsf-1/libgsf-1.metadata [deleted file]
vapi/packages/libgsf-1/libgsf-1.namespace [deleted file]

index 8d02c41171658339ff6b25bba5eacb7084a0ce52..61f9213fecf4507b5d656f4315455d6e78123906 100644 (file)
@@ -308,7 +308,6 @@ GIDL_BINDINGS = \
        libgnome-2.0 \
        libgnome-menu \
        libgnomeui-2.0 \
-       libgsf-1 \
        liboobs-1 \
        libsexy \
        libwnck-1.0 \
@@ -369,6 +368,7 @@ GIR_BINDINGS = \
        libgeoclue-2.0 \
        libgnome-menu-3.0 \
        libgrss \
+       libgsf-1 \
        libnotify \
        libpeas-1.0 \
        libpeas-gtk-1.0 \
@@ -631,7 +631,7 @@ libgrss:
        $(GENVAPI) --library $(srcdir)/libgrss --metadatadir $(METADATADIR) --pkg gio-2.0 --pkg libsoup-2.4 --pkg libxml-2.0 $(GIRDIR)/Grss-0.7.gir
 
 libgsf-1:
-       $(GENVAPI) --library $(srcdir)/libgsf-1 $(PACKAGESDIR)/libgsf-1/libgsf-1-custom.vala $(PACKAGESDIR)/libgsf-1/libgsf-1.gi
+       $(GENVAPI) --library $(srcdir)/libgsf-1 --pkg gio-2.0 --pkg libxml-2.0 --metadatadir $(METADATADIR) $(GIRDIR)/Gsf-1.gir
 
 libnotify:
        $(GENVAPI) --library $(srcdir)/libnotify --pkg gdk-pixbuf-2.0 --pkg gio-2.0 --metadatadir $(METADATADIR) $(GIRDIR)/Notify-0.7.gir
index 69e72283ac4928984bfa9b79f857ed1558254c65..58beb041aafcc55ccb3083bac34d886d9b20543b 100644 (file)
 /* libgsf-1.vapi generated by vapigen, do not modify. */
 
+[CCode (cprefix = "Gsf", gir_namespace = "Gsf", gir_version = "1", lower_case_cprefix = "gsf_")]
 namespace Gsf {
-       [CCode (cheader_filename = "gsf/gsf-blob.h", type_id = "GSF_BLOB_TYPE")]
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_blob_get_type ()")]
        public class Blob : GLib.Object {
                [CCode (has_construct_function = false)]
-               public Blob (size_t size, void* data_to_copy) throws GLib.Error;
+               public Blob ([CCode (array_length_cname = "size", array_length_pos = 0.5, array_length_type = "gsize")] uint8[] data_to_copy) throws GLib.Error;
                public size_t get_size ();
                public void* peek_data ();
        }
-       [CCode (cheader_filename = "gsf/gsf-clip-data.h", type_id = "GSF_CLIP_DATA_TYPE")]
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_clip_data_get_type ()")]
        public class ClipData : GLib.Object {
                [CCode (has_construct_function = false)]
                public ClipData (Gsf.ClipFormat format, Gsf.Blob data_blob);
-               public unowned Gsf.Blob get_data_blob ();
+               public 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", type_id = "GSF_DOC_META_DATA_TYPE")]
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_doc_meta_data_get_type ()")]
        public class DocMetaData : GLib.Object {
                [CCode (has_construct_function = false)]
                public DocMetaData ();
-               public void @foreach (GLib.HFunc<string,Gsf.DocProp> func);
-               public void insert (string name, GLib.Value value);
+               public void @foreach ([CCode (type = "GHFunc")] GLib.HFunc<string,Gsf.DocProp> func);
+               public void insert (owned string name, owned GLib.Value value);
                public unowned Gsf.DocProp? lookup (string name);
+               [Version (since = "1.14.24")]
+               public void odf_subtree (Gsf.XMLIn doc);
+               [Version (since = "1.14.24")]
+               public GLib.Error read_from_msole (Gsf.Input @in);
+               [Version (since = "1.14.24")]
+               public GLib.Error read_from_odf (Gsf.Input input);
                public void remove (string name);
                public size_t size ();
-               public unowned Gsf.DocProp? steal (string name);
+               public Gsf.DocProp? steal (string name);
                public void store (Gsf.DocProp prop);
+               [Version (since = "1.14.24")]
+               public bool write_to_msole (Gsf.Output @out, bool doc_not_component);
+               [Version (since = "1.14.24")]
+               public bool write_to_odf ([CCode (type = "gpointer")] Gsf.XMLOut output);
        }
-       [CCode (cheader_filename = "gsf/gsf-doc-meta-data.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "gsf_doc_prop_get_type ()")]
        [Compact]
        public class DocProp {
                [CCode (has_construct_function = false)]
                public DocProp (owned string name);
                public void dump ();
+               [DestroysInstance]
+               public void free ();
                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);
+               public GLib.Value? swap_val (owned GLib.Value val);
        }
-       [CCode (cheader_filename = "gsf/gsf-docprop-vector.h", type_id = "GSF_DOC_PROP_VECTOR_TYPE")]
+       [CCode (cheader_filename = "gsf/gsf.h", lower_case_csuffix = "docprop_vector", type_id = "gsf_docprop_vector_get_type ()")]
        public class DocPropVector : GLib.Object {
-               [CCode (cname = "gsf_docprop_vector_new", has_construct_function = false)]
+               [CCode (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 (cheader_filename = "gsf/gsf-infile-impl.h", type_id = "GSF_INFILE_TYPE")]
-       public class Infile : Gsf.Input {
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_infile_get_type ()")]
+       public abstract class Infile : Gsf.Input {
                [CCode (has_construct_function = false)]
                protected Infile ();
-               public unowned Gsf.Input child_by_aname ([CCode (array_length = false)] 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 Gsf.Input child_by_aname ([CCode (array_length = false, type = "const char*")] string[] names);
+               public Gsf.Input child_by_index (int i);
+               public Gsf.Input child_by_name (string name);
+               public Gsf.Input child_by_vaname (va_list names);
                public virtual unowned string? name_by_index (int i);
                public virtual int num_children ();
        }
-       [CCode (cheader_filename = "gsf/gsf-infile-msole.h", type_id = "GSF_INFILE_MSOLE_TYPE")]
+       [CCode (cheader_filename = "gsf/gsf.h", lower_case_csuffix = "infile_msole", type_id = "gsf_infile_msole_get_type ()")]
        public class InfileMSOle : Gsf.Infile {
-               [CCode (cname = "gsf_infile_msole_new", has_construct_function = false, type = "GsfInfile*")]
+               [CCode (has_construct_function = false, type = "GsfInfile*")]
                public InfileMSOle (Gsf.Input source) throws GLib.Error;
-               [CCode (cname = "gsf_infile_msole_get_class_id")]
-               public bool get_class_id (uchar res);
+               public bool get_class_id (uint8 res);
        }
-       [CCode (cheader_filename = "gsf/gsf-infile-msvba.h", type_id = "GSF_INFILE_MSVBA_TYPE")]
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_infile_msvba_get_type ()")]
        public class InfileMSVBA : Gsf.Infile {
                [CCode (has_construct_function = false, type = "GsfInfile*")]
                public InfileMSVBA (Gsf.Infile source) throws GLib.Error;
-               public unowned GLib.HashTable get_modules ();
-               public unowned GLib.HashTable steal_modules ();
+               public unowned GLib.HashTable<string,uint8[]?> get_modules ();
+               public GLib.HashTable<string,uint8[]?> steal_modules ();
        }
-       [CCode (cheader_filename = "gsf/gsf-infile-stdio.h", type_id = "GSF_INFILE_STDIO_TYPE")]
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_infile_stdio_get_type ()")]
        public class InfileStdio : Gsf.Infile {
                [CCode (has_construct_function = false, type = "GsfInfile*")]
                public InfileStdio (string root) throws GLib.Error;
        }
-       [CCode (cheader_filename = "gsf/gsf.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_infile_tar_get_type ()")]
        public class InfileTar : Gsf.Infile {
                [CCode (has_construct_function = false, type = "GsfInfile*")]
                public InfileTar (Gsf.Input source) throws GLib.Error;
                [NoAccessorMethod]
                public Gsf.Input source { owned get; construct; }
        }
-       [CCode (cheader_filename = "gsf/gsf-infile-zip.h", type_id = "GSF_INFILE_GZIP_TYPE")]
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_infile_zip_get_type ()")]
        public class InfileZip : Gsf.Infile {
                [CCode (has_construct_function = false, type = "GsfInfile*")]
                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 { owned get; construct; }
        }
-       [CCode (cheader_filename = "gsf/gsf-input-impl.h", type_id = "GSF_INPUT_TYPE")]
-       public class Input : GLib.Object {
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_input_get_type ()")]
+       public abstract class Input : GLib.Object {
                public Gsf.off_t cur_offset;
                [CCode (has_construct_function = false)]
                protected Input ();
-               [NoWrapper]
-               public virtual Gsf.Input Dup () throws GLib.Error;
-               [NoWrapper]
-               public virtual Gsf.Input OpenSibling (string path) throws GLib.Error;
-               [CCode (array_length = false)]
-               [NoWrapper]
-               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 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 ();
+               [CCode (vfunc_name = "Dup")]
+               public virtual Gsf.Input dup () throws GLib.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 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 Gsf.InfileMSVBA find_vba () throws GLib.Error;
+               public unowned GLib.DateTime get_modtime ();
+               [CCode (cname = "gsf_input_mmap_new", has_construct_function = false)]
+               public Input.mmap_new (string filename) throws GLib.Error;
+               [CCode (array_length = false, vfunc_name = "Read")]
+               public virtual unowned uint8[]? read (size_t num_bytes, [CCode (array_length = false, type = "guint8*")] uint8[]? optional_buffer);
+               [CCode (array_length_pos = 1.1, array_length_type = "gsize")]
+               public uint8[] read0 (size_t num_bytes);
+               [CCode (vfunc_name = "Seek")]
+               public virtual bool seek (Gsf.off_t offset, GLib.SeekType whence);
                public bool seek_emulate (Gsf.off_t pos);
                public bool set_container (Gsf.Infile? container);
+               public bool set_modtime (GLib.DateTime? modtime);
                public bool set_name (string? name);
                public bool set_name_from_filename (string filename);
                public bool set_size (Gsf.off_t size);
-               public unowned Gsf.Input? sibling (string name) throws GLib.Error;
-               public Gsf.off_t size ();
+               [CCode (vfunc_name = "OpenSibling")]
+               public virtual Gsf.Input sibling (string name) throws GLib.Error;
                public Gsf.off_t tell ();
-               public unowned Gsf.Input uncompress ();
+               public Gsf.Input uncompress ();
+               [NoAccessorMethod]
+               public Gsf.Infile container { owned get; }
+               [NoAccessorMethod]
+               public bool eof { get; }
+               public GLib.DateTime modtime { get; }
+               [NoAccessorMethod]
+               public string name { owned get; }
                [NoAccessorMethod]
                public int64 position { get; }
+               [NoAccessorMethod]
+               public int64 remaining { get; }
+               [NoAccessorMethod]
+               public int64 size { get; }
        }
-       [CCode (cheader_filename = "gsf/gsf-input-gzip.h", type_id = "GSF_INPUT_GZIP_TYPE")]
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_input_gzip_get_type ()")]
        public class InputGZip : Gsf.Input {
                [CCode (has_construct_function = false, type = "GsfInput*")]
                public InputGZip (Gsf.Input source) throws GLib.Error;
@@ -150,7 +164,7 @@ namespace Gsf {
                [NoAccessorMethod]
                public int64 uncompressed_size { get; construct; }
        }
-       [CCode (cheader_filename = "gsf/gsf.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_input_gio_get_type ()")]
        public class InputGio : Gsf.Input {
                [CCode (has_construct_function = false, type = "GsfInput*")]
                public InputGio (GLib.File file) throws GLib.Error;
@@ -159,79 +173,107 @@ namespace Gsf {
                [CCode (has_construct_function = false, type = "GsfInput*")]
                public InputGio.for_uri (string uri) throws GLib.Error;
        }
-       [CCode (cheader_filename = "gsf/gsf-input-http.h", type_id = "GSF_INPUT_HTTP_TYPE")]
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_input_http_get_type ()")]
        public class InputHTTP : Gsf.Input {
                [CCode (has_construct_function = false, type = "GsfInput*")]
                public InputHTTP (string url) throws GLib.Error;
-               public unowned string get_content_type ();
-               public unowned string get_url ();
-               public string content_type { get; construct; }
-               public string url { get; construct; }
+               public string get_content_type ();
+               public string get_url ();
+               public string content_type { owned get; construct; }
+               public string url { owned get; construct; }
        }
-       [CCode (cheader_filename = "gsf/gsf-input-memory.h", type_id = "GSF_INPUT_MEMORY_TYPE")]
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_input_memory_get_type ()")]
        public class InputMemory : Gsf.Input {
                [CCode (has_construct_function = false, type = "GsfInput*")]
-               public InputMemory ([CCode (array_length_type = "Gsf.off_t")] uint8[] buf, bool needs_free);
+               public InputMemory ([CCode (array_length_cname = "length", array_length_pos = 1.5, type = "const guint8*")] uint8[] buf, bool needs_free);
                [CCode (has_construct_function = false, type = "GsfInput*")]
-               public InputMemory.clone ([CCode (array_length_type = "Gsf.off_t")] uint8[] buf);
+               public InputMemory.clone ([CCode (array_length_cname = "length", array_length_pos = 1.1, type = "const guint8*")] uint8[] buf);
                [CCode (has_construct_function = false, type = "GsfInput*")]
                public InputMemory.from_bzip (Gsf.Input source) throws GLib.Error;
                [CCode (has_construct_function = false, type = "GsfInput*")]
                public InputMemory.from_iochannel (GLib.IOChannel channel) throws GLib.Error;
        }
-       [CCode (cheader_filename = "gsf/gsf-input-proxy.h", type_id = "GSF_INPUT_PROXY_TYPE")]
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_input_proxy_get_type ()")]
        public class InputProxy : Gsf.Input {
                [CCode (has_construct_function = false, type = "GsfInput*")]
                public InputProxy (Gsf.Input source);
                [CCode (has_construct_function = false, type = "GsfInput*")]
                public InputProxy.section (Gsf.Input source, Gsf.off_t offset, Gsf.off_t size);
        }
-       [CCode (cheader_filename = "gsf/gsf-input-stdio.h", type_id = "GSF_INPUT_STDIO_TYPE")]
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_input_stdio_get_type ()")]
        public class InputStdio : Gsf.Input {
                [CCode (has_construct_function = false, type = "GsfInput*")]
                public InputStdio (string filename) throws GLib.Error;
+               [CCode (has_construct_function = false, type = "GsfInput*")]
+               public InputStdio.FILE (string filename, owned void* file, bool keep_open);
        }
-       [CCode (cheader_filename = "gsf/gsf-input-textline.h", type_id = "GSF_INPUT_TEXTLINE_TYPE")]
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_input_textline_get_type ()")]
        public class InputTextline : Gsf.Input {
                [CCode (has_construct_function = false, type = "GsfInput*")]
                public InputTextline (Gsf.Input source);
                [CCode (array_length = false)]
-               public unowned uint[]? ascii_gets ();
+               public unowned uint8[]? ascii_gets ();
                [CCode (array_length = false)]
-               public unowned uchar[]? utf8_gets ();
+               public unowned uint8[]? utf8_gets ();
+       }
+       [CCode (cheader_filename = "gsf/gsf.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", lower_case_csuffix = "msole_sorting_key", type_id = "gsf_msole_sorting_key_get_type ()")]
+       [Compact]
+       public class MSOleSortingKey {
+               [CCode (has_construct_function = false)]
+               public MSOleSortingKey (string name);
+               public int cmp (Gsf.MSOleSortingKey b);
+               [DestroysInstance]
+               public void free ();
+       }
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_odf_out_get_type ()")]
+       public class ODFOut : Gsf.XMLOut {
+               [CCode (has_construct_function = false)]
+               protected ODFOut ();
+               public int get_version ();
+               public string get_version_string ();
+               [NoAccessorMethod]
+               public int odf_version { get; construct; }
        }
-       [CCode (cheader_filename = "gsf/gsf-open-pkg-utils.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", has_type_id = false)]
        [Compact]
        public class OpenPkgRel {
                public unowned string get_target ();
+               public unowned string get_type ();
                public bool is_extern ();
        }
-       [CCode (cheader_filename = "gsf/gsf-open-pkg-utils.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", has_type_id = false)]
        [Compact]
        public class OpenPkgRels {
        }
-       [CCode (cheader_filename = "gsf/gsf-outfile-impl.h")]
-       public class Outfile : Gsf.Output {
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_outfile_get_type ()")]
+       public abstract class Outfile : Gsf.Output {
                [CCode (has_construct_function = false)]
                protected Outfile ();
-               public Gsf.Output new_child (string name, bool is_dir);
+               [NoWrapper]
+               public virtual unowned Gsf.Output new_child (string name, bool is_dir, string first_property_name, va_list args);
                public Gsf.Output new_child_full (string name, bool is_dir, ...);
+               public Gsf.Output new_child_varg (string name, bool is_dir, string first_property_name, va_list args);
+               public Gsf.Output open_pkg_add_rel (string name, string content_type, Gsf.Outfile parent, string type);
        }
-       [CCode (cheader_filename = "gsf/gsf-outfile-msole.h", type_id = "GSF_OUTFILE_MSOLE_TYPE")]
+       [CCode (cheader_filename = "gsf/gsf.h", lower_case_csuffix = "outfile_msole", type_id = "gsf_outfile_msole_get_type ()")]
        public class OutfileMSOle : Gsf.Outfile {
-               [CCode (cname = "gsf_outfile_msole_new", has_construct_function = false, type = "GsfOutfile*")]
+               [CCode (has_construct_function = false, type = "GsfOutfile*")]
                public OutfileMSOle (Gsf.Output sink);
-               [CCode (cname = "gsf_outfile_msole_new_full", has_construct_function = false, type = "GsfOutfile*")]
+               [CCode (has_construct_function = false, type = "GsfOutfile*")]
                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);
+               public bool set_class_id ([CCode (array_length = false)] uint8 clsid[16]);
+               [NoAccessorMethod]
+               public uint big_block_size { get; construct; }
+               [NoAccessorMethod]
+               public Gsf.Output sink { owned get; construct; }
+               [NoAccessorMethod]
+               public uint small_block_size { get; construct; }
        }
-       [CCode (cheader_filename = "gsf/gsf-open-pkg-utils.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_outfile_open_pkg_get_type ()")]
        public class OutfileOpenPkg : Gsf.Outfile {
                [CCode (has_construct_function = false, type = "GsfOutfile*")]
                public OutfileOpenPkg (Gsf.Outfile sink);
                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);
@@ -242,14 +284,12 @@ namespace Gsf {
                [NoAccessorMethod]
                public Gsf.Outfile sink { owned get; construct; }
        }
-       [CCode (cheader_filename = "gsf/gsf-outfile-stdio.h", type_id = "GSF_OUTFILE_STDIO_TYPE")]
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_outfile_stdio_get_type ()")]
        public class OutfileStdio : Gsf.Outfile {
                [CCode (has_construct_function = false, type = "GsfOutfile*")]
                public OutfileStdio (string root) throws GLib.Error;
-               [CCode (has_construct_function = false, type = "GsfOutfile*")]
-               public OutfileStdio.full (string root, ...) throws GLib.Error;
        }
-       [CCode (cheader_filename = "gsf/gsf-outfile-zip.h", type_id = "GSF_OUTFILE_ZIP_TYPE")]
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_outfile_zip_get_type ()")]
        public class OutfileZip : Gsf.Outfile {
                [CCode (has_construct_function = false, type = "GsfOutfile*")]
                public OutfileZip (Gsf.Output sink) throws GLib.Error;
@@ -257,12 +297,16 @@ namespace Gsf {
                [NoAccessorMethod]
                public int compression_level { get; construct; }
                [NoAccessorMethod]
+               public int deflate_level { get; construct; }
+               [NoAccessorMethod]
                public string entry_name { owned get; construct; }
                [NoAccessorMethod]
                public Gsf.Output sink { owned get; construct; }
+               [NoAccessorMethod]
+               public int zip64 { get; construct; }
        }
-       [CCode (cheader_filename = "gsf/gsf-output-impl.h", type_id = "GSF_OUTPUT_TYPE")]
-       public class Output : GLib.Object {
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_output_get_type ()")]
+       public abstract class Output : GLib.Object {
                public Gsf.off_t cur_offset;
                public Gsf.off_t cur_size;
                public weak GLib.Error err;
@@ -271,39 +315,45 @@ namespace Gsf {
                public weak GLib.Object wrapped_by;
                [CCode (has_construct_function = false)]
                protected Output ();
-               [NoWrapper]
-               public virtual bool Close ();
-               [NoWrapper]
-               public virtual bool Seek (Gsf.off_t offset, GLib.SeekType whence);
-               [NoWrapper]
-               public virtual bool Write (size_t num_bytes, [CCode (array_length = false)] uchar[] data);
-               public bool close ();
-               public unowned Gsf.Outfile? container ();
+               [CCode (vfunc_name = "Close")]
+               public virtual bool close ();
                public unowned GLib.Error error ();
                public static GLib.Quark error_id ();
-               public bool is_closed ();
-               public unowned string? name ();
+               public unowned GLib.DateTime get_modtime ();
                public bool printf (string format, ...);
                public bool puts (string line);
-               public bool seek (Gsf.off_t offset, GLib.SeekType whence);
-               public bool set_container (Gsf.Outfile? container);
-               public bool set_error (int code, string format);
-               public bool set_name (string? name);
+               [CCode (vfunc_name = "Seek")]
+               public virtual bool seek (Gsf.off_t offset, GLib.SeekType whence);
+               public bool set_container (Gsf.Outfile container);
+               public bool set_error (int code, string format, ...);
+               public bool set_modtime (GLib.DateTime? modtime);
+               public bool set_name (string name);
                public bool set_name_from_filename (string filename);
-               public Gsf.off_t size ();
                public Gsf.off_t tell ();
                public static bool unwrap (GLib.Object wrapper, Gsf.Output wrapee);
+               [CCode (vfunc_name = "Vprintf")]
+               public virtual Gsf.off_t vprintf (string format, va_list args);
                public static bool wrap (GLib.Object wrapper, Gsf.Output wrapee);
-               public bool write (size_t num_bytes, [CCode (array_length = false)] uchar[] data);
+               [CCode (vfunc_name = "Write")]
+               public virtual bool write ([CCode (array_length_cname = "num_bytes", array_length_pos = 0.5, array_length_type = "gsize")] uint8[] data);
+               [NoAccessorMethod]
+               public Gsf.Outfile container { owned get; set; }
+               [NoAccessorMethod]
+               public bool is_closed { get; }
+               public GLib.DateTime modtime { get; construct; }
+               [NoAccessorMethod]
+               public string name { owned get; set; }
                [NoAccessorMethod]
                public int64 position { get; }
+               [NoAccessorMethod]
+               public int64 size { get; }
        }
-       [CCode (cheader_filename = "gsf/gsf-output-bzip.h", type_id = "GSF_OUTPUT_BZIP_TYPE")]
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_output_bzip_get_type ()")]
        public class OutputBzip : Gsf.Output {
                [CCode (has_construct_function = false, type = "GsfOutput*")]
                public OutputBzip (Gsf.Output sink) throws GLib.Error;
        }
-       [CCode (cheader_filename = "gsf/gsf-output-csv.h", type_id = "GSF_OUTPUT_CSV_TYPE")]
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_output_csv_get_type ()")]
        public class OutputCsv : Gsf.Output {
                public weak GLib.StringBuilder buf;
                public size_t eol_len;
@@ -329,7 +379,7 @@ namespace Gsf {
                [NoAccessorMethod]
                public Gsf.Output sink { owned get; set; }
        }
-       [CCode (cheader_filename = "gsf/gsf-output-gzip.h", type_id = "GSF_OUTPUT_GZIP_TYPE")]
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_output_gzip_get_type ()")]
        public class OutputGZip : Gsf.Output {
                [CCode (has_construct_function = false, type = "GsfOutput*")]
                public OutputGZip (Gsf.Output sink) throws GLib.Error;
@@ -338,7 +388,7 @@ namespace Gsf {
                [NoAccessorMethod]
                public Gsf.Output sink { owned get; construct; }
        }
-       [CCode (cheader_filename = "gsf/gsf-output-gio.h", type_id = "GSF_OUTPUT_GIO_TYPE")]
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_output_gio_get_type ()")]
        public class OutputGio : Gsf.Output {
                [CCode (has_construct_function = false, type = "GsfOutput*")]
                public OutputGio (GLib.File file);
@@ -347,12 +397,12 @@ namespace Gsf {
                [CCode (has_construct_function = false, type = "GsfOutput*")]
                public OutputGio.for_uri (string uri) throws GLib.Error;
        }
-       [CCode (cheader_filename = "gsf/gsf-output-iochannel.h", type_id = "GSF_OUTPUT_IOCHANNEL_TYPE")]
+       [CCode (cheader_filename = "gsf/gsf.h", lower_case_csuffix = "output_iochannel", type_id = "gsf_output_iochannel_get_type ()")]
        public class OutputIOChannel : Gsf.Output {
-               [CCode (cname = "gsf_output_iochannel_new", has_construct_function = false, type = "GsfOutput*")]
+               [CCode (has_construct_function = false, type = "GsfOutput*")]
                public OutputIOChannel (GLib.IOChannel channel);
        }
-       [CCode (cheader_filename = "gsf/gsf-output-iconv.h", type_id = "GSF_OUTPUT_ICONV_TYPE")]
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_output_iconv_get_type ()")]
        public class OutputIconv : Gsf.Output {
                [CCode (has_construct_function = false, type = "GsfOutput*")]
                public OutputIconv (Gsf.Output sink, string dst, string src);
@@ -365,21 +415,25 @@ namespace Gsf {
                [NoAccessorMethod]
                public Gsf.Output sink { owned get; construct; }
        }
-       [CCode (cheader_filename = "gsf/gsf-output-memory.h", type_id = "GSF_OUTPUT_MEMORY_TYPE")]
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_output_memory_get_type ()")]
        public class OutputMemory : Gsf.Output {
                [CCode (has_construct_function = false, type = "GsfOutput*")]
                public OutputMemory ();
                [CCode (array_length = false)]
-               public unowned uchar[] get_bytes ();
+               public unowned uint8[] get_bytes ();
        }
-       [CCode (cheader_filename = "gsf/gsf-output-stdio.h", type_id = "GSF_OUTPUT_STDIO_TYPE")]
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_output_stdio_get_type ()")]
        public class OutputStdio : Gsf.Output {
                [CCode (has_construct_function = false, type = "GsfOutput*")]
                public OutputStdio (string filename) throws GLib.Error;
                [CCode (has_construct_function = false, type = "GsfOutput*")]
+               public OutputStdio.FILE (string filename, owned void* file, bool keep_open);
+               [CCode (has_construct_function = false, type = "GsfOutput*")]
                public OutputStdio.full (string filename, ...) throws GLib.Error;
+               [CCode (has_construct_function = false, type = "GsfOutput*")]
+               public OutputStdio.valist (string filename, GLib.Error err, string first_property_name, va_list var_args);
        }
-       [CCode (cheader_filename = "gsf/gsf-infile-msvba.h", type_id = "GSF_SHARED_MEMORY_TYPE")]
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_shared_memory_get_type ()")]
        public class SharedMemory : GLib.Object {
                public void* buf;
                public bool needs_free;
@@ -387,16 +441,17 @@ namespace Gsf {
                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 (cname = "gsf_shared_memory_mmapped_new", has_construct_function = false)]
+               public SharedMemory.mmapped_new (void* buf, Gsf.off_t size);
        }
-       [CCode (cheader_filename = "gsf/gsf-structured-blob.h", type_id = "GSF_STRUCTURED_BLOB_TYPE")]
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_structured_blob_get_type ()")]
        public class StructuredBlob : Gsf.Infile {
                [CCode (has_construct_function = false)]
                protected StructuredBlob ();
                public static Gsf.StructuredBlob read (Gsf.Input input);
                public bool write (Gsf.Outfile container);
        }
-       [CCode (cheader_filename = "gsf/gsf-timestamp.h", copy_function = "gsf_timestamp_copy", type_id = "gsf_timestamp_get_type ()")]
+       [CCode (cheader_filename = "gsf/gsf.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "gsf_timestamp_get_type ()")]
        [Compact]
        public class Timestamp {
                public GLib.Date date;
@@ -408,87 +463,105 @@ namespace Gsf {
                public string as_string ();
                public Gsf.Timestamp copy ();
                public bool equal (Gsf.Timestamp b);
-               public static int from_string (string spec, Gsf.Timestamp stamp);
+               [DestroysInstance]
+               public void free ();
                public uint hash ();
-               public static int parse (string spec, Gsf.Timestamp stamp);
+               [Version (since = "1.14.24")]
+               public int load_from_string (string spec);
                public void set_time (uint64 t);
+               [Version (since = "1.14.24")]
+               public void to_value (GLib.Value value);
        }
-       [CCode (cheader_filename = "gsf/gsf-libxml.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", has_type_id = false)]
        [Compact]
        public class XMLBlob {
        }
-       [CCode (cheader_filename = "gsf/gsf-libxml.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", has_type_id = false)]
        [Compact]
        public class XMLIn {
                public weak GLib.StringBuilder content;
                public weak Gsf.XMLInDoc doc;
                public weak Gsf.XMLInNode node;
-               public weak GLib.SList node_stack;
+               public weak GLib.SList<void*> node_stack;
                public void* user_state;
                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, [CCode (array_length = false)] string[] attrs);
+               public void push_state (Gsf.XMLInDoc doc, void* new_state, Gsf.XMLInExtDtor dtor, [CCode (type = "const xmlChar**")] string attrs);
+               public void set_silent_unknowns (bool silent);
        }
-       [CCode (cheader_filename = "gsf/gsf-libxml.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "gsf_xml_in_doc_get_type ()")]
        [Compact]
        public class XMLInDoc {
                [CCode (has_construct_function = false)]
-               public XMLInDoc ([CCode (array_length = false)] Gsf.XMLInNode[] nodes, Gsf.XMLInNS ns);
+               public XMLInDoc ([CCode (array_length = false, type = "const GsfXMLInNode*")] Gsf.XMLInNode[] nodes, Gsf.XMLInNS ns);
                public void add_nodes (Gsf.XMLInNode nodes);
+               [DestroysInstance]
+               public void free ();
                public bool parse (Gsf.Input input, void* user_state);
                public void set_unknown_handler (Gsf.XMLInUnknownFunc handler);
        }
-       [CCode (cheader_filename = "gsf/gsf-libxml.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "gsf_xml_in_ns_get_type ()")]
        [Compact]
        public class XMLInNS {
                public uint ns_id;
                public weak string uri;
        }
-       [CCode (cheader_filename = "gsf/gsf-libxml.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", has_type_id = false)]
        [Compact]
        public class XMLInNode {
                public uint check_children_for_ns;
-               public weak GLib.Callback end;
+               public GLib.Callback end;
                public Gsf.XMLContent has_content;
                public weak string id;
                public weak string name;
                public int ns_id;
                public weak string parent_id;
                public uint share_children_with_parent;
-               public weak GLib.Callback start;
-               public void* user_data;
-       }
-       [CCode (cheader_filename = "gsf/gsf-libxml.h", type_id = "GSF_XML_OUT_TYPE")]
+               public GLib.Callback start;
+               [CCode (cname = "user_data.v_blob")]
+               public void* user_data_v_blob;
+               [CCode (cname = "user_data.v_bool")]
+               public bool user_data_v_bool;
+               [CCode (cname = "user_data.v_int")]
+               public int user_data_v_int;
+               [CCode (cname = "user_data.v_str")]
+               public weak string user_data_v_str;
+       }
+       [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_xml_out_get_type ()")]
        public class XMLOut : GLib.Object {
+               public weak Gsf.Output output;
                [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);
-               public void add_cstr (string id, string val_utf8);
-               public void add_cstr_unchecked (string id, string val_utf8);
-               public void add_enum (string id, GLib.Type etype, int val);
-               public void add_float (string id, double val, int precision);
-               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 void add_base64 (string? id, uint8 data, uint len);
+               public void add_bool (string? id, bool val);
+               public void add_color (string? id, uint r, uint g, uint b);
+               public void add_cstr (string? id, string? val_utf8);
+               public void add_cstr_unchecked (string? id, string? val_utf8);
+               public void add_enum (string? id, GLib.Type etype, int val);
+               public void add_float (string? id, double val, int precision);
+               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 unowned string end_element ();
                public unowned Gsf.Output get_output ();
+               public bool get_pretty_print ();
                public void set_doc_type (string type);
+               public bool set_pretty_print (bool pp);
                public void simple_element (string id, string content);
                public void simple_float_element (string id, double val, int precision);
                public void simple_int_element (string id, int val);
                public void start_element (string id);
-               [NoAccessorMethod]
                public bool pretty_print { get; set; }
+               [NoAccessorMethod]
+               public Gsf.Output sink { owned get; construct; }
        }
-       [CCode (cheader_filename = "glib.h", cname = "gint64", default_value = "0LL", get_value_function = "g_value_get_int64", marshaller_type_name = "INT64", set_value_function = "g_value_set_int64", type_id = "G_TYPE_INT64", type_signature = "x")]
-       [IntegerType (rank = 10)]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "gsf_off_t")]
+       [GIR (name = "gsf_off_t")]
        [SimpleType]
        public struct off_t : int64 {
        }
-       [CCode (cheader_filename = "gsf/gsf-clip-data.h", cprefix = "GSF_CLIP_FORMAT_", has_type_id = false)]
+       [CCode (cheader_filename = "gsf/gsf.h", cprefix = "GSF_CLIP_FORMAT_", has_type_id = false)]
        public enum ClipFormat {
                WINDOWS_CLIPBOARD,
                MACINTOSH_CLIPBOARD,
@@ -497,7 +570,7 @@ namespace Gsf {
                CLIPBOARD_FORMAT_NAME,
                UNKNOWN
        }
-       [CCode (cheader_filename = "gsf/gsf-clip-data.h", cprefix = "GSF_CLIP_FORMAT_WINDOWS_", has_type_id = false)]
+       [CCode (cheader_filename = "gsf/gsf.h", cprefix = "GSF_CLIP_FORMAT_WINDOWS_", has_type_id = false)]
        public enum ClipFormatWindows {
                ERROR,
                UNKNOWN,
@@ -505,273 +578,248 @@ namespace Gsf {
                DIB,
                ENHANCED_METAFILE
        }
-       [CCode (cheader_filename = "gsf/gsf-output-csv.h", cprefix = "GSF_OUTPUT_CSV_QUOTING_MODE_")]
+       [CCode (cheader_filename = "gsf/gsf.h", cprefix = "GSF_OUTPUT_CSV_QUOTING_MODE_", type_id = "gsf_output_csv_quoting_mode_get_type ()")]
        public enum OutputCsvQuotingMode {
                NEVER,
                AUTO,
                ALWAYS
        }
-       [CCode (cheader_filename = "gsf/gsf-libxml.h", cprefix = "GSF_XML_", has_type_id = false)]
+       [CCode (cheader_filename = "gsf/gsf.h", cprefix = "GSF_XML_", has_type_id = false)]
        public enum XMLContent {
                NO_CONTENT,
                CONTENT,
-               SHARED_CONTENT
+               SHARED_CONTENT,
+               @2ND
        }
-       [CCode (cheader_filename = "gsf/gsf-outfile-zip.h", cprefix = "GSF_ZIP_", has_type_id = false)]
+       [CCode (cheader_filename = "gsf/gsf.h", cprefix = "GSF_ZIP_", has_type_id = false)]
        public enum ZipCompressionMethod {
                STORED,
                SHRUNK,
-               REDUCEDx1,
-               REDUCEDx2,
-               REDUCEDx3,
-               REDUCEDx4,
+               [CCode (cname = "GSF_ZIP_REDUCEDx1")]
+               REDUCEDX1,
+               [CCode (cname = "GSF_ZIP_REDUCEDx2")]
+               REDUCEDX2,
+               [CCode (cname = "GSF_ZIP_REDUCEDx3")]
+               REDUCEDX3,
+               [CCode (cname = "GSF_ZIP_REDUCEDx4")]
+               REDUCEDX4,
                IMPLODED,
                TOKENIZED,
                DEFLATED,
                DEFLATED_BETTER,
                IMPLODED_BETTER
        }
-       [CCode (cheader_filename = "gsf/gsf-utils.h", cprefix = "GSF_ERROR_")]
+       [CCode (cheader_filename = "gsf/gsf.h", cprefix = "GSF_ERROR_")]
        public errordomain Error {
                OUT_OF_MEMORY,
-               INVALID_DATA
+               INVALID_DATA;
+               public static GLib.Quark quark ();
        }
-       [CCode (cheader_filename = "gsf/gsf.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", instance_pos = 2.9)]
        public delegate void OpenPkgIter (Gsf.Input opkg, Gsf.OpenPkgRel rel);
-       [CCode (cheader_filename = "gsf/gsf-libxml.h", has_target = false)]
+       [CCode (cheader_filename = "gsf/gsf.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 delegate bool XMLInUnknownFunc (Gsf.XMLIn xin, [CCode (type = "const xmlChar*")] string elem, [CCode (array_length = false, type = "const xmlChar**")] string[] attrs);
+       [CCode (cheader_filename = "gsf/gsf.h", has_target = false)]
+       public delegate bool XMLProbeFunc ([CCode (type = "const xmlChar*")] string name, [CCode (type = "const xmlChar*")] string prefix, [CCode (type = "const xmlChar*")] string URI, [CCode (array_length_cname = "nb_namespaces", array_length_pos = 3.5, type = "const xmlChar**")] string[] namespaces, int nb_defaulted, [CCode (array_length_cname = "nb_attributes", array_length_pos = 4.5, type = "const xmlChar**")] string[] attributes);
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_BYTE_COUNT")]
        public const string META_NAME_BYTE_COUNT;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_CASE_SENSITIVE")]
        public const string META_NAME_CASE_SENSITIVE;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_CATEGORY")]
        public const string META_NAME_CATEGORY;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_CELL_COUNT")]
        public const string META_NAME_CELL_COUNT;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_CHARACTER_COUNT")]
        public const string META_NAME_CHARACTER_COUNT;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_CODEPAGE")]
        public const string META_NAME_CODEPAGE;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_COMPANY")]
        public const string META_NAME_COMPANY;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_CREATOR")]
        public const string META_NAME_CREATOR;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_DATE_CREATED")]
        public const string META_NAME_DATE_CREATED;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_DATE_MODIFIED")]
        public const string META_NAME_DATE_MODIFIED;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_DESCRIPTION")]
        public const string META_NAME_DESCRIPTION;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_DICTIONARY")]
        public const string META_NAME_DICTIONARY;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_DOCUMENT_PARTS")]
        public const string META_NAME_DOCUMENT_PARTS;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_EDITING_DURATION")]
        public const string META_NAME_EDITING_DURATION;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_GENERATOR")]
        public const string META_NAME_GENERATOR;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_HEADING_PAIRS")]
        public const string META_NAME_HEADING_PAIRS;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_HIDDEN_SLIDE_COUNT")]
        public const string META_NAME_HIDDEN_SLIDE_COUNT;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_IMAGE_COUNT")]
        public const string META_NAME_IMAGE_COUNT;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_INITIAL_CREATOR")]
        public const string META_NAME_INITIAL_CREATOR;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_KEYWORD")]
        public const string META_NAME_KEYWORD;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_KEYWORDS")]
        public const string META_NAME_KEYWORDS;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_LANGUAGE")]
        public const string META_NAME_LANGUAGE;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_LAST_PRINTED")]
        public const string META_NAME_LAST_PRINTED;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_LAST_SAVED_BY")]
        public const string META_NAME_LAST_SAVED_BY;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_LINE_COUNT")]
        public const string META_NAME_LINE_COUNT;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_LINKS_DIRTY")]
        public const string META_NAME_LINKS_DIRTY;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_LOCALE_SYSTEM_DEFAULT")]
        public const string META_NAME_LOCALE_SYSTEM_DEFAULT;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_MANAGER")]
        public const string META_NAME_MANAGER;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_MM_CLIP_COUNT")]
        public const string META_NAME_MM_CLIP_COUNT;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_MSOLE_UNKNOWN_17")]
        public const string META_NAME_MSOLE_UNKNOWN_17;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_MSOLE_UNKNOWN_18")]
        public const string META_NAME_MSOLE_UNKNOWN_18;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_MSOLE_UNKNOWN_19")]
        public const string META_NAME_MSOLE_UNKNOWN_19;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_MSOLE_UNKNOWN_20")]
        public const string META_NAME_MSOLE_UNKNOWN_20;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_MSOLE_UNKNOWN_21")]
        public const string META_NAME_MSOLE_UNKNOWN_21;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_MSOLE_UNKNOWN_22")]
        public const string META_NAME_MSOLE_UNKNOWN_22;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_MSOLE_UNKNOWN_23")]
        public const string META_NAME_MSOLE_UNKNOWN_23;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_NOTE_COUNT")]
        public const string META_NAME_NOTE_COUNT;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_OBJECT_COUNT")]
        public const string META_NAME_OBJECT_COUNT;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_PAGE_COUNT")]
        public const string META_NAME_PAGE_COUNT;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_PARAGRAPH_COUNT")]
        public const string META_NAME_PARAGRAPH_COUNT;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_PRESENTATION_FORMAT")]
        public const string META_NAME_PRESENTATION_FORMAT;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_PRINTED_BY")]
        public const string META_NAME_PRINTED_BY;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_PRINT_DATE")]
        public const string META_NAME_PRINT_DATE;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_REVISION_COUNT")]
        public const string META_NAME_REVISION_COUNT;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_SCALE")]
        public const string META_NAME_SCALE;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_SECURITY")]
        public const string META_NAME_SECURITY;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_SLIDE_COUNT")]
        public const string META_NAME_SLIDE_COUNT;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_SPREADSHEET_COUNT")]
        public const string META_NAME_SPREADSHEET_COUNT;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_SUBJECT")]
        public const string META_NAME_SUBJECT;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_TABLE_COUNT")]
        public const string META_NAME_TABLE_COUNT;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_TEMPLATE")]
        public const string META_NAME_TEMPLATE;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_THUMBNAIL")]
        public const string META_NAME_THUMBNAIL;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_TITLE")]
        public const string META_NAME_TITLE;
-       [CCode (cheader_filename = "gsf/gsf-meta-names.h")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_META_NAME_WORD_COUNT")]
        public const string META_NAME_WORD_COUNT;
-       [CCode (cheader_filename = "gsf/gsf-outfile-ole.h")]
-       public const int OLE_DEFAULT_BB_SHIFT;
-       [CCode (cheader_filename = "gsf/gsf-outfile-ole.h")]
-       public const int OLE_DEFAULT_SB_SHIFT;
-       [CCode (cheader_filename = "gsf/gsf-utils.h")]
-       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 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 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 (array_length = false, cheader_filename = "gsf/gsf-utils.h")]
-       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 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")]
+       [CCode (cheader_filename = "gsf/gsf.h", cname = "GSF_PARAM_STATIC")]
+       public const int PARAM_STATIC;
+       [CCode (cheader_filename = "gsf/gsf.h")]
+       public static size_t base64_decode_simple ([CCode (array_length = false, type = "guint8*")] uint8[] data, size_t len);
+       [CCode (cheader_filename = "gsf/gsf.h")]
+       public static size_t base64_decode_step ([CCode (array_length = false, type = "const guint8*")] uint8[] @in, size_t len, [CCode (array_length = false, type = "guint8*")] uint8[] @out, out int state, out uint save);
+       [CCode (cheader_filename = "gsf/gsf.h")]
+       public static size_t base64_encode_close ([CCode (array_length = false, type = "const guint8*")] uint8[] @in, size_t inlen, bool break_lines, [CCode (array_length = false, type = "guint8*")] uint8[] @out, out int state, out uint save);
+       [CCode (cheader_filename = "gsf/gsf.h")]
+       public static uint8 base64_encode_simple ([CCode (array_length = false, type = "const guint8*")] uint8[] data, size_t len);
+       [CCode (cheader_filename = "gsf/gsf.h")]
+       public static size_t base64_encode_step ([CCode (array_length = false, type = "const guint8*")] uint8[] @in, size_t len, bool break_lines, [CCode (array_length = false, type = "guint8*")] uint8[] @out, out int state, out uint save);
+       [CCode (cheader_filename = "gsf/gsf.h")]
+       public static bool debug_flag (string flag);
+       [CCode (cheader_filename = "gsf/gsf.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")]
+       [CCode (cheader_filename = "gsf/gsf.h")]
        public static unowned string extension_pointer (string path);
-       [CCode (cheader_filename = "gsf/gsf-utils.h")]
+       [CCode (cheader_filename = "gsf/gsf.h")]
        public static string filename_to_utf8 (string filename, bool quoted);
-       [CCode (cheader_filename = "gsf/gsf.h", cname = "get_gsf_odf_version")]
-       public static short get_gsf_odf_version ();
-       [CCode (cheader_filename = "gsf/gsf.h", cname = "get_gsf_odf_version_string")]
-       public static unowned string get_gsf_odf_version_string ();
-       [CCode (cheader_filename = "gsf/gsf.h", cname = "get_gsf_ooo_ns")]
-       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")]
+       [CCode (cheader_filename = "gsf/gsf.h")]
        public static void init ();
-       [CCode (cheader_filename = "gsf/gsf-utils.h")]
+       [CCode (cheader_filename = "gsf/gsf.h")]
        public static void init_dynamic (GLib.TypeModule module);
-       [CCode (cheader_filename = "gsf/gsf-utils.h")]
+       [CCode (cheader_filename = "gsf/gsf.h")]
        public static double le_get_double (void* p);
-       [CCode (cheader_filename = "gsf/gsf-utils.h")]
+       [CCode (cheader_filename = "gsf/gsf.h")]
        public static float le_get_float (void* p);
-       [CCode (cheader_filename = "gsf/gsf-utils.h")]
+       [CCode (cheader_filename = "gsf/gsf.h")]
        public static uint64 le_get_guint64 (void* p);
-       [CCode (cheader_filename = "gsf/gsf-utils.h")]
+       [CCode (cheader_filename = "gsf/gsf.h")]
        public static void le_set_double (void* p, double d);
-       [CCode (cheader_filename = "gsf/gsf-utils.h")]
+       [CCode (cheader_filename = "gsf/gsf.h")]
        public static void le_set_float (void* p, float f);
-       [CCode (cheader_filename = "gsf/gsf-utils.h")]
-       public static void mem_dump ([CCode (array_length = false)] uchar[] ptr, size_t len);
-       [CCode (cheader_filename = "gsf/gsf-msole-utils.h")]
+       [CCode (cheader_filename = "gsf/gsf.h")]
+       public static void mem_dump (uint8 ptr, size_t len);
+       [CCode (cheader_filename = "gsf/gsf.h")]
        public static uint msole_codepage_to_lid (int codepage);
-       [CCode (cheader_filename = "gsf/gsf-msole-utils.h")]
-       public static GLib.IConv msole_iconv_open_codepage_for_export (int codepage_to);
-       [CCode (cheader_filename = "gsf/gsf-msole-utils.h")]
-       public static GLib.IConv msole_iconv_open_codepage_for_import (string to, int codepage);
-       [CCode (cheader_filename = "gsf/gsf-msole-utils.h")]
-       public static GLib.IConv msole_iconv_open_codepages_for_export (int codepage_to, string from);
-       [CCode (cheader_filename = "gsf/gsf-msole-utils.h")]
-       public static GLib.IConv msole_iconv_open_for_export ();
-       [CCode (cheader_filename = "gsf/gsf-msole-utils.h")]
-       public static GLib.IConv msole_iconv_open_for_import (int codepage);
-       [CCode (cheader_filename = "gsf/gsf-msole-utils.h")]
+       [CCode (cheader_filename = "gsf/gsf.h")]
        public static int msole_iconv_win_codepage ();
-       [CCode (cheader_filename = "gsf/gsf-msole-utils.h")]
-       public static unowned GLib.ByteArray msole_inflate (Gsf.Input input, Gsf.off_t offset);
-       [CCode (cheader_filename = "gsf/gsf-msole-utils.h")]
+       [CCode (cheader_filename = "gsf/gsf.h")]
+       public static GLib.ByteArray msole_inflate (Gsf.Input input, Gsf.off_t offset);
+       [CCode (cheader_filename = "gsf/gsf.h")]
        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")]
+       [CCode (cheader_filename = "gsf/gsf.h")]
+       public static uint msole_lid_for_language (string? lang);
+       [CCode (cheader_filename = "gsf/gsf.h")]
        public static int msole_lid_to_codepage (uint lid);
-       [CCode (cheader_filename = "gsf/gsf-msole-utils.h")]
-       public static unowned string msole_lid_to_codepage_str (uint lid);
-       [CCode (cheader_filename = "gsf/gsf-msole-utils.h")]
-       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")]
+       [CCode (cheader_filename = "gsf/gsf.h")]
+       public static string msole_lid_to_codepage_str (uint lid);
+       [CCode (cheader_filename = "gsf/gsf.h")]
+       [Version (since = "1.14.24")]
+       public static unowned Gsf.XMLInNS odf_get_ns ();
+       [CCode (cheader_filename = "gsf/gsf.h")]
+       [Version (since = "1.14.24")]
+       public static short odf_get_version ();
+       [CCode (cheader_filename = "gsf/gsf.h")]
+       [Version (since = "1.14.24")]
+       public static unowned string odf_get_version_string ();
+       [CCode (cheader_filename = "gsf/gsf.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 opkg, string id);
-       [CCode (cheader_filename = "gsf/gsf-open-pkg-utils.h")]
-       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 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 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")]
+       [CCode (cheader_filename = "gsf/gsf.h")]
+       public static Gsf.Input open_pkg_open_rel (Gsf.Input opkg, Gsf.OpenPkgRel rel) throws GLib.Error;
+       [CCode (cheader_filename = "gsf/gsf.h")]
        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")]
+       [CCode (cheader_filename = "gsf/gsf.h")]
        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 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 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, [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);
-       [CCode (cheader_filename = "gsf/gsf-utils.h")]
+       [CCode (cheader_filename = "gsf/gsf.h")]
+       public static GLib.Error open_pkg_parse_rel_by_id (Gsf.XMLIn xin, string id, Gsf.XMLInNode dtd, Gsf.XMLInNS ns);
+       [CCode (cheader_filename = "gsf/gsf.h")]
+       public static unowned GLib.Parameter? property_settings_find (string name, [CCode (array_length_cname = "n_params", array_length_pos = 2.1, array_length_type = "gsize", type = "const GParameter*")] GLib.Parameter[] @params);
+       [CCode (cheader_filename = "gsf/gsf.h")]
+       public static void property_settings_free ([CCode (array_length_cname = "n_params", array_length_pos = 1.1, array_length_type = "gsize", type = "GParameter*")] owned GLib.Parameter[] @params);
+       [CCode (cheader_filename = "gsf/gsf.h")]
        public static void shutdown ();
-       [CCode (cheader_filename = "gsf/gsf-utils.h")]
+       [CCode (cheader_filename = "gsf/gsf.h")]
        public static void shutdown_dynamic (GLib.TypeModule module);
-       [CCode (cheader_filename = "gsf/gsf-docprop-vector.h")]
-       public static unowned GLib.ValueArray value_get_docprop_varray (GLib.Value value);
-       [CCode (cheader_filename = "gsf/gsf-docprop-vector.h")]
+       [CCode (cheader_filename = "gsf/gsf.h")]
+       public static GLib.ValueArray value_get_docprop_varray (GLib.Value value);
+       [CCode (cheader_filename = "gsf/gsf.h")]
        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")]
-       public static int xmlDocFormatDump (Gsf.Output output, Xml.Doc cur, string encoding, bool format);
-       [CCode (cheader_filename = "gsf/gsf-libxml.h")]
+       [CCode (cheader_filename = "gsf/gsf.h")]
+       public static uint8 vba_inflate (Gsf.Input input, Gsf.off_t offset, int size, bool add_null_terminator);
+       [CCode (cheader_filename = "gsf/gsf.h")]
+       public static int xmlDocFormatDump (Gsf.Output output, Xml.Doc cur, string? encoding, bool format);
+       [CCode (cheader_filename = "gsf/gsf.h")]
        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);
+       public static bool xml_probe (Gsf.Input input, Gsf.XMLProbeFunc func);
 }
diff --git a/vapi/metadata/Gsf-1.metadata b/vapi/metadata/Gsf-1.metadata
new file mode 100644 (file)
index 0000000..99caeaa
--- /dev/null
@@ -0,0 +1,98 @@
+Gsf cheader_filename="gsf/gsf.h"
+
+*.free destroys_instance
+
+gsf_off_t name="off_t"
+
+DocMetaData
+  .foreach.func type="GLib.HFunc<string,Gsf.DocProp>"
+  .insert.name owned
+  .insert.value owned
+  .lookup nullable
+  .steal nullable
+  .write_to_odf.output type="Gsf.XMLOut"
+
+DocProp
+  .get_link nullable
+
+Infile
+  .child_by_aname.names array
+  .child_by_vaname skip=false
+  .name_by_index nullable
+
+InfileMSVBA
+  .get_modules type="unowned GLib.HashTable<string,uint8[]?>"
+  .steal_modules type="GLib.HashTable<string,uint8[]?>"
+
+Input
+  .* skip=false
+  .Dup unowned=false
+  .dup vfunc_name="Dup"
+  .Read array nullable
+  .Read.optional_buffer array nullable
+  .read array nullable vfunc_name="Read"
+  .read.optional_buffer array nullable
+  .seek vfunc_name="Seek"
+  .OpenSibling unowned=false
+  .sibling vfunc_name="OpenSibling"
+  .set_container.container nullable
+  .set_name.name nullable
+
+InputMemory
+  .new*.buf array array_length_idx=1
+
+InputTextline
+  .*_gets array unowned nullable
+
+Outfile
+  .* skip=false
+//  .new_child#virtual name="new_child_varg"
+//  .new_child_varg vfunc_name="new_child"
+
+Output
+  .* skip=false
+  .close vfunc_name="Close"
+  .seek vfunc_name="Seek"
+  .vprintf vfunc_name="Vprintf"
+  .Write.data array
+  .write vfunc_name="Write"
+
+OutputMemory
+  .get_bytes array
+
+OutputStdio
+  .* skip=false
+  .new_full.err skip
+  .new_full throws="GLib.Error"
+
+XMLIn struct=false
+  .* skip=false
+  .push_state.attrs type="string"
+
+XMLInDoc
+  .new.nodes array
+
+XMLInNode struct=false
+  .* skip=false
+  .end type="GLib.Callback"
+  .start type="GLib.Callback"
+
+XMLInUnknownFunc
+  .elem type="string"
+  .attrs array type="string[]"
+
+XMLProbeFunc
+  .name type="string"
+  .prefix type="string"
+  .URI type="string"
+  .namespaces array array_length_idx=3 type="string[]"
+  .attributes array array_length_idx=5 type="string[]"
+
+base64_*code_*.data array
+base64_*code_*.in array
+base64_*code_*.out array
+base64_*code_*.save out
+base64_*code_*.state out
+
+property_settings_find.params array array_length_idx=2
+property_settings_free.params array array_length_idx=1 owned
diff --git a/vapi/packages/libgsf-1/libgsf-1-custom.vala b/vapi/packages/libgsf-1/libgsf-1-custom.vala
deleted file mode 100644 (file)
index da1e09b..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Gsf {
-       [SimpleType]
-       [CCode (cname = "gint64", cheader_filename = "glib.h", type_id = "G_TYPE_INT64", marshaller_type_name = "INT64", get_value_function = "g_value_get_int64", set_value_function = "g_value_set_int64", default_value = "0LL", type_signature = "x")]
-       [IntegerType (rank = 10)]
-       public struct off_t : int64 {
-       }
-
-       [CCode (cheader_filename = "gsf/gsf-outfile-impl.h")]
-       public class Outfile {
-               public Gsf.Output new_child (string name, bool is_dir);
-               public Gsf.Output new_child_full (string name, bool is_dir, ...);
-       }
-}
\ No newline at end of file
diff --git a/vapi/packages/libgsf-1/libgsf-1.deps b/vapi/packages/libgsf-1/libgsf-1.deps
deleted file mode 100644 (file)
index 4478fb0..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-libxml-2.0
-gio-2.0
diff --git a/vapi/packages/libgsf-1/libgsf-1.excludes b/vapi/packages/libgsf-1/libgsf-1.excludes
deleted file mode 100644 (file)
index 85360f5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-gsf-impl-utils.h
\ No newline at end of file
diff --git a/vapi/packages/libgsf-1/libgsf-1.files b/vapi/packages/libgsf-1/libgsf-1.files
deleted file mode 100644 (file)
index 0b74a07..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-include/libgsf-1/gsf
-lib/libgsf-1.so
diff --git a/vapi/packages/libgsf-1/libgsf-1.gi b/vapi/packages/libgsf-1/libgsf-1.gi
deleted file mode 100644 (file)
index 671d07a..0000000
+++ /dev/null
@@ -1,2020 +0,0 @@
-<?xml version="1.0"?>
-<api version="1.0">
-       <namespace name="Gsf">
-               <function name="base64_decode_simple" symbol="gsf_base64_decode_simple">
-                       <return-type type="size_t"/>
-                       <parameters>
-                               <parameter name="data" type="guint8*"/>
-                               <parameter name="len" type="size_t"/>
-                       </parameters>
-               </function>
-               <function name="base64_decode_step" symbol="gsf_base64_decode_step">
-                       <return-type type="size_t"/>
-                       <parameters>
-                               <parameter name="in" type="guint8*"/>
-                               <parameter name="len" type="size_t"/>
-                               <parameter name="out" type="guint8*"/>
-                               <parameter name="state" type="int*"/>
-                               <parameter name="save" type="guint*"/>
-                       </parameters>
-               </function>
-               <function name="base64_encode_close" symbol="gsf_base64_encode_close">
-                       <return-type type="size_t"/>
-                       <parameters>
-                               <parameter name="in" type="guint8*"/>
-                               <parameter name="inlen" type="size_t"/>
-                               <parameter name="break_lines" type="gboolean"/>
-                               <parameter name="out" type="guint8*"/>
-                               <parameter name="state" type="int*"/>
-                               <parameter name="save" type="guint*"/>
-                       </parameters>
-               </function>
-               <function name="base64_encode_simple" symbol="gsf_base64_encode_simple">
-                       <return-type type="guint8*"/>
-                       <parameters>
-                               <parameter name="data" type="guint8*"/>
-                               <parameter name="len" type="size_t"/>
-                       </parameters>
-               </function>
-               <function name="base64_encode_step" symbol="gsf_base64_encode_step">
-                       <return-type type="size_t"/>
-                       <parameters>
-                               <parameter name="in" type="guint8*"/>
-                               <parameter name="len" type="size_t"/>
-                               <parameter name="break_lines" type="gboolean"/>
-                               <parameter name="out" type="guint8*"/>
-                               <parameter name="state" type="int*"/>
-                               <parameter name="save" type="guint*"/>
-                       </parameters>
-               </function>
-               <function name="doc_meta_dump" symbol="gsf_doc_meta_dump">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="meta" type="GsfDocMetaData*"/>
-                       </parameters>
-               </function>
-               <function name="error_quark" symbol="gsf_error_quark">
-                       <return-type type="GQuark"/>
-               </function>
-               <function name="extension_pointer" symbol="gsf_extension_pointer">
-                       <return-type type="char*"/>
-                       <parameters>
-                               <parameter name="path" type="char*"/>
-                       </parameters>
-               </function>
-               <function name="filename_to_utf8" symbol="gsf_filename_to_utf8">
-                       <return-type type="char*"/>
-                       <parameters>
-                               <parameter name="filename" type="char*"/>
-                               <parameter name="quoted" type="gboolean"/>
-                       </parameters>
-               </function>
-               <function name="get_gsf_odf_version" symbol="get_gsf_odf_version">
-                       <return-type type="short"/>
-               </function>
-               <function name="get_gsf_odf_version_string" symbol="get_gsf_odf_version_string">
-                       <return-type type="char*"/>
-               </function>
-               <function name="get_gsf_ooo_ns" symbol="get_gsf_ooo_ns">
-                       <return-type type="GsfXMLInNS*"/>
-               </function>
-               <function name="iconv_close" symbol="gsf_iconv_close">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="handle" type="GIConv"/>
-                       </parameters>
-               </function>
-               <function name="init" symbol="gsf_init">
-                       <return-type type="void"/>
-               </function>
-               <function name="init_dynamic" symbol="gsf_init_dynamic">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="module" type="GTypeModule*"/>
-                       </parameters>
-               </function>
-               <function name="le_get_double" symbol="gsf_le_get_double">
-                       <return-type type="double"/>
-                       <parameters>
-                               <parameter name="p" type="void*"/>
-                       </parameters>
-               </function>
-               <function name="le_get_float" symbol="gsf_le_get_float">
-                       <return-type type="float"/>
-                       <parameters>
-                               <parameter name="p" type="void*"/>
-                       </parameters>
-               </function>
-               <function name="le_get_guint64" symbol="gsf_le_get_guint64">
-                       <return-type type="guint64"/>
-                       <parameters>
-                               <parameter name="p" type="void*"/>
-                       </parameters>
-               </function>
-               <function name="le_set_double" symbol="gsf_le_set_double">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="p" type="void*"/>
-                               <parameter name="d" type="double"/>
-                       </parameters>
-               </function>
-               <function name="le_set_float" symbol="gsf_le_set_float">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="p" type="void*"/>
-                               <parameter name="f" type="float"/>
-                       </parameters>
-               </function>
-               <function name="mem_dump" symbol="gsf_mem_dump">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="ptr" type="guint8*"/>
-                               <parameter name="len" type="size_t"/>
-                       </parameters>
-               </function>
-               <function name="msole_codepage_to_lid" symbol="gsf_msole_codepage_to_lid">
-                       <return-type type="guint"/>
-                       <parameters>
-                               <parameter name="codepage" type="int"/>
-                       </parameters>
-               </function>
-               <function name="msole_iconv_open_codepage_for_export" symbol="gsf_msole_iconv_open_codepage_for_export">
-                       <return-type type="GIConv"/>
-                       <parameters>
-                               <parameter name="codepage_to" type="int"/>
-                       </parameters>
-               </function>
-               <function name="msole_iconv_open_codepage_for_import" symbol="gsf_msole_iconv_open_codepage_for_import">
-                       <return-type type="GIConv"/>
-                       <parameters>
-                               <parameter name="to" type="char*"/>
-                               <parameter name="codepage" type="int"/>
-                       </parameters>
-               </function>
-               <function name="msole_iconv_open_codepages_for_export" symbol="gsf_msole_iconv_open_codepages_for_export">
-                       <return-type type="GIConv"/>
-                       <parameters>
-                               <parameter name="codepage_to" type="int"/>
-                               <parameter name="from" type="char*"/>
-                       </parameters>
-               </function>
-               <function name="msole_iconv_open_for_export" symbol="gsf_msole_iconv_open_for_export">
-                       <return-type type="GIConv"/>
-               </function>
-               <function name="msole_iconv_open_for_import" symbol="gsf_msole_iconv_open_for_import">
-                       <return-type type="GIConv"/>
-                       <parameters>
-                               <parameter name="codepage" type="int"/>
-                       </parameters>
-               </function>
-               <function name="msole_iconv_win_codepage" symbol="gsf_msole_iconv_win_codepage">
-                       <return-type type="int"/>
-               </function>
-               <function name="msole_inflate" symbol="gsf_msole_inflate">
-                       <return-type type="GByteArray*"/>
-                       <parameters>
-                               <parameter name="input" type="GsfInput*"/>
-                               <parameter name="offset" type="gsf_off_t"/>
-                       </parameters>
-               </function>
-               <function name="msole_language_for_lid" symbol="gsf_msole_language_for_lid">
-                       <return-type type="char*"/>
-                       <parameters>
-                               <parameter name="lid" type="guint"/>
-                       </parameters>
-               </function>
-               <function name="msole_lid_for_language" symbol="gsf_msole_lid_for_language">
-                       <return-type type="guint"/>
-                       <parameters>
-                               <parameter name="lang" type="char*"/>
-                       </parameters>
-               </function>
-               <function name="msole_lid_to_codepage" symbol="gsf_msole_lid_to_codepage">
-                       <return-type type="int"/>
-                       <parameters>
-                               <parameter name="lid" type="guint"/>
-                       </parameters>
-               </function>
-               <function name="msole_lid_to_codepage_str" symbol="gsf_msole_lid_to_codepage_str">
-                       <return-type type="gchar*"/>
-                       <parameters>
-                               <parameter name="lid" type="guint"/>
-                       </parameters>
-               </function>
-               <function name="msole_metadata_read" symbol="gsf_msole_metadata_read">
-                       <return-type type="GError*"/>
-                       <parameters>
-                               <parameter name="in" type="GsfInput*"/>
-                               <parameter name="accum" type="GsfDocMetaData*"/>
-                       </parameters>
-               </function>
-               <function name="msole_metadata_write" symbol="gsf_msole_metadata_write">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="out" type="GsfOutput*"/>
-                               <parameter name="meta_data" type="GsfDocMetaData*"/>
-                               <parameter name="doc_not_component" type="gboolean"/>
-                       </parameters>
-               </function>
-               <function name="open_pkg_error_id" symbol="gsf_open_pkg_error_id">
-                       <return-type type="gint"/>
-               </function>
-               <function name="open_pkg_foreach_rel" symbol="gsf_open_pkg_foreach_rel">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="opkg" type="GsfInput*"/>
-                               <parameter name="func" type="GsfOpenPkgIter"/>
-                               <parameter name="user_data" type="gpointer"/>
-                       </parameters>
-               </function>
-               <function name="open_pkg_get_rel_by_id" symbol="gsf_open_pkg_get_rel_by_id">
-                       <return-type type="GsfInput*"/>
-                       <parameters>
-                               <parameter name="opkg" type="GsfInput*"/>
-                               <parameter name="id" type="char*"/>
-                       </parameters>
-               </function>
-               <function name="open_pkg_get_rel_by_type" symbol="gsf_open_pkg_get_rel_by_type">
-                       <return-type type="GsfInput*"/>
-                       <parameters>
-                               <parameter name="opkg" type="GsfInput*"/>
-                               <parameter name="type" type="char*"/>
-                       </parameters>
-               </function>
-               <function name="open_pkg_lookup_rel_by_id" symbol="gsf_open_pkg_lookup_rel_by_id">
-                       <return-type type="GsfOpenPkgRel*"/>
-                       <parameters>
-                               <parameter name="opkg" type="GsfInput*"/>
-                               <parameter name="id" type="char*"/>
-                       </parameters>
-               </function>
-               <function name="open_pkg_lookup_rel_by_type" symbol="gsf_open_pkg_lookup_rel_by_type">
-                       <return-type type="GsfOpenPkgRel*"/>
-                       <parameters>
-                               <parameter name="opkg" type="GsfInput*"/>
-                               <parameter name="type" type="char*"/>
-                       </parameters>
-               </function>
-               <function name="open_pkg_open_rel" symbol="gsf_open_pkg_open_rel">
-                       <return-type type="GsfInput*"/>
-                       <parameters>
-                               <parameter name="opkg" type="GsfInput*"/>
-                               <parameter name="rel" type="GsfOpenPkgRel*"/>
-                               <parameter name="err" type="GError**"/>
-                       </parameters>
-               </function>
-               <function name="open_pkg_open_rel_by_id" symbol="gsf_open_pkg_open_rel_by_id">
-                       <return-type type="GsfInput*"/>
-                       <parameters>
-                               <parameter name="opkg" type="GsfInput*"/>
-                               <parameter name="id" type="char*"/>
-                               <parameter name="err" type="GError**"/>
-                       </parameters>
-               </function>
-               <function name="open_pkg_open_rel_by_type" symbol="gsf_open_pkg_open_rel_by_type">
-                       <return-type type="GsfInput*"/>
-                       <parameters>
-                               <parameter name="opkg" type="GsfInput*"/>
-                               <parameter name="type" type="char*"/>
-                               <parameter name="err" type="GError**"/>
-                       </parameters>
-               </function>
-               <function name="open_pkg_parse_rel_by_id" symbol="gsf_open_pkg_parse_rel_by_id">
-                       <return-type type="GError*"/>
-                       <parameters>
-                               <parameter name="xin" type="GsfXMLIn*"/>
-                               <parameter name="id" type="char*"/>
-                               <parameter name="dtd" type="GsfXMLInNode*"/>
-                               <parameter name="ns" type="GsfXMLInNS*"/>
-                       </parameters>
-               </function>
-               <function name="opendoc_metadata_read" symbol="gsf_opendoc_metadata_read">
-                       <return-type type="GError*"/>
-                       <parameters>
-                               <parameter name="input" type="GsfInput*"/>
-                               <parameter name="md" type="GsfDocMetaData*"/>
-                       </parameters>
-               </function>
-               <function name="opendoc_metadata_subtree" symbol="gsf_opendoc_metadata_subtree">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="doc" type="GsfXMLIn*"/>
-                               <parameter name="md" type="GsfDocMetaData*"/>
-                       </parameters>
-               </function>
-               <function name="opendoc_metadata_write" symbol="gsf_opendoc_metadata_write">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="output" type="GsfXMLOut*"/>
-                               <parameter name="md" type="GsfDocMetaData*"/>
-                       </parameters>
-               </function>
-               <function name="property_settings_collect" symbol="gsf_property_settings_collect">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="object_type" type="GType"/>
-                               <parameter name="p_params" type="GParameter**"/>
-                               <parameter name="p_n_params" type="size_t*"/>
-                               <parameter name="first_property_name" type="gchar*"/>
-                       </parameters>
-               </function>
-               <function name="property_settings_collect_valist" symbol="gsf_property_settings_collect_valist">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="object_type" type="GType"/>
-                               <parameter name="p_params" type="GParameter**"/>
-                               <parameter name="p_n_params" type="size_t*"/>
-                               <parameter name="first_property_name" type="gchar*"/>
-                               <parameter name="var_args" type="va_list"/>
-                       </parameters>
-               </function>
-               <function name="property_settings_free" symbol="gsf_property_settings_free">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="params" type="GParameter*"/>
-                               <parameter name="n_params" type="size_t"/>
-                       </parameters>
-               </function>
-               <function name="shutdown" symbol="gsf_shutdown">
-                       <return-type type="void"/>
-               </function>
-               <function name="shutdown_dynamic" symbol="gsf_shutdown_dynamic">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="module" type="GTypeModule*"/>
-                       </parameters>
-               </function>
-               <function name="value_get_docprop_varray" symbol="gsf_value_get_docprop_varray">
-                       <return-type type="GValueArray*"/>
-                       <parameters>
-                               <parameter name="value" type="GValue*"/>
-                       </parameters>
-               </function>
-               <function name="value_get_docprop_vector" symbol="gsf_value_get_docprop_vector">
-                       <return-type type="GsfDocPropVector*"/>
-                       <parameters>
-                               <parameter name="value" type="GValue*"/>
-                       </parameters>
-               </function>
-               <function name="value_set_timestamp" symbol="gsf_value_set_timestamp">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="value" type="GValue*"/>
-                               <parameter name="stamp" type="GsfTimestamp*"/>
-                       </parameters>
-               </function>
-               <function name="xmlDocFormatDump" symbol="gsf_xmlDocFormatDump">
-                       <return-type type="int"/>
-                       <parameters>
-                               <parameter name="output" type="GsfOutput*"/>
-                               <parameter name="cur" type="xmlDoc*"/>
-                               <parameter name="encoding" type="char*"/>
-                               <parameter name="format" type="gboolean"/>
-                       </parameters>
-               </function>
-               <function name="xml_gvalue_from_str" symbol="gsf_xml_gvalue_from_str">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="res" type="GValue*"/>
-                               <parameter name="t" type="GType"/>
-                               <parameter name="str" type="char*"/>
-                       </parameters>
-               </function>
-               <function name="xml_parser_context" symbol="gsf_xml_parser_context">
-                       <return-type type="xmlParserCtxt*"/>
-                       <parameters>
-                               <parameter name="input" type="GsfInput*"/>
-                       </parameters>
-               </function>
-               <function name="xml_probe" symbol="gsf_xml_probe">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="input" type="GsfInput*"/>
-                               <parameter name="startElement" type="GsfXMLProbeFunc"/>
-                       </parameters>
-               </function>
-               <callback name="GsfOpenPkgIter">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="opkg" type="GsfInput*"/>
-                               <parameter name="rel" type="GsfOpenPkgRel*"/>
-                               <parameter name="user_data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GsfXMLInExtDtor">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="xin" type="GsfXMLIn*"/>
-                               <parameter name="old_state" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GsfXMLInUnknownFunc">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="xin" type="GsfXMLIn*"/>
-                               <parameter name="elem" type="xmlChar*"/>
-                               <parameter name="attrs" type="xmlChar**"/>
-                       </parameters>
-               </callback>
-               <callback name="GsfXMLProbeFunc">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="name" type="xmlChar*"/>
-                               <parameter name="prefix" type="xmlChar*"/>
-                               <parameter name="URI" type="xmlChar*"/>
-                               <parameter name="nb_namespaces" type="int"/>
-                               <parameter name="namespaces" type="xmlChar**"/>
-                               <parameter name="nb_attributes" type="int"/>
-                               <parameter name="nb_defaulted" type="int"/>
-                               <parameter name="attributes" type="xmlChar**"/>
-                       </parameters>
-               </callback>
-               <struct name="GsfDocProp">
-                       <method name="dump" symbol="gsf_doc_prop_dump">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="prop" type="GsfDocProp*"/>
-                               </parameters>
-                       </method>
-                       <method name="free" symbol="gsf_doc_prop_free">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="prop" type="GsfDocProp*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_link" symbol="gsf_doc_prop_get_link">
-                               <return-type type="char*"/>
-                               <parameters>
-                                       <parameter name="prop" type="GsfDocProp*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_name" symbol="gsf_doc_prop_get_name">
-                               <return-type type="char*"/>
-                               <parameters>
-                                       <parameter name="prop" type="GsfDocProp*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_val" symbol="gsf_doc_prop_get_val">
-                               <return-type type="GValue*"/>
-                               <parameters>
-                                       <parameter name="prop" type="GsfDocProp*"/>
-                               </parameters>
-                       </method>
-                       <method name="new" symbol="gsf_doc_prop_new">
-                               <return-type type="GsfDocProp*"/>
-                               <parameters>
-                                       <parameter name="name" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_link" symbol="gsf_doc_prop_set_link">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="prop" type="GsfDocProp*"/>
-                                       <parameter name="link" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_val" symbol="gsf_doc_prop_set_val">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="prop" type="GsfDocProp*"/>
-                                       <parameter name="val" type="GValue*"/>
-                               </parameters>
-                       </method>
-                       <method name="swap_val" symbol="gsf_doc_prop_swap_val">
-                               <return-type type="GValue*"/>
-                               <parameters>
-                                       <parameter name="prop" type="GsfDocProp*"/>
-                                       <parameter name="val" type="GValue*"/>
-                               </parameters>
-                       </method>
-               </struct>
-               <struct name="GsfOpenPkgRel">
-                       <method name="get_target" symbol="gsf_open_pkg_rel_get_target">
-                               <return-type type="char*"/>
-                               <parameters>
-                                       <parameter name="rel" type="GsfOpenPkgRel*"/>
-                               </parameters>
-                       </method>
-                       <method name="is_extern" symbol="gsf_open_pkg_rel_is_extern">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="rel" type="GsfOpenPkgRel*"/>
-                               </parameters>
-                       </method>
-               </struct>
-               <struct name="GsfOpenPkgRels">
-               </struct>
-               <struct name="GsfXMLBlob">
-               </struct>
-               <struct name="GsfXMLIn">
-                       <method name="check_ns" symbol="gsf_xml_in_check_ns">
-                               <return-type type="char*"/>
-                               <parameters>
-                                       <parameter name="xin" type="GsfXMLIn*"/>
-                                       <parameter name="str" type="char*"/>
-                                       <parameter name="ns_id" type="unsigned"/>
-                               </parameters>
-                       </method>
-                       <method name="get_input" symbol="gsf_xml_in_get_input">
-                               <return-type type="GsfInput*"/>
-                               <parameters>
-                                       <parameter name="xin" type="GsfXMLIn*"/>
-                               </parameters>
-                       </method>
-                       <method name="namecmp" symbol="gsf_xml_in_namecmp">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="xin" type="GsfXMLIn*"/>
-                                       <parameter name="str" type="char*"/>
-                                       <parameter name="ns_id" type="unsigned"/>
-                                       <parameter name="name" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="push_state" symbol="gsf_xml_in_push_state">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="xin" type="GsfXMLIn*"/>
-                                       <parameter name="doc" type="GsfXMLInDoc*"/>
-                                       <parameter name="new_state" type="gpointer"/>
-                                       <parameter name="dtor" type="GsfXMLInExtDtor"/>
-                                       <parameter name="attrs" type="xmlChar**"/>
-                               </parameters>
-                       </method>
-                       <field name="user_state" type="gpointer"/>
-                       <field name="content" type="GString*"/>
-                       <field name="doc" type="GsfXMLInDoc*"/>
-                       <field name="node" type="GsfXMLInNode*"/>
-                       <field name="node_stack" type="GSList*"/>
-               </struct>
-               <struct name="GsfXMLInDoc">
-                       <method name="add_nodes" symbol="gsf_xml_in_doc_add_nodes">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="doc" type="GsfXMLInDoc*"/>
-                                       <parameter name="nodes" type="GsfXMLInNode*"/>
-                               </parameters>
-                       </method>
-                       <method name="free" symbol="gsf_xml_in_doc_free">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="doc" type="GsfXMLInDoc*"/>
-                               </parameters>
-                       </method>
-                       <method name="new" symbol="gsf_xml_in_doc_new">
-                               <return-type type="GsfXMLInDoc*"/>
-                               <parameters>
-                                       <parameter name="nodes" type="GsfXMLInNode*"/>
-                                       <parameter name="ns" type="GsfXMLInNS*"/>
-                               </parameters>
-                       </method>
-                       <method name="parse" symbol="gsf_xml_in_doc_parse">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="doc" type="GsfXMLInDoc*"/>
-                                       <parameter name="input" type="GsfInput*"/>
-                                       <parameter name="user_state" type="gpointer"/>
-                               </parameters>
-                       </method>
-                       <method name="set_unknown_handler" symbol="gsf_xml_in_doc_set_unknown_handler">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="doc" type="GsfXMLInDoc*"/>
-                                       <parameter name="handler" type="GsfXMLInUnknownFunc"/>
-                               </parameters>
-                       </method>
-               </struct>
-               <struct name="GsfXMLInNS">
-                       <field name="uri" type="char*"/>
-                       <field name="ns_id" type="unsigned"/>
-               </struct>
-               <struct name="GsfXMLInNode">
-                       <field name="id" type="char*"/>
-                       <field name="ns_id" type="int"/>
-                       <field name="name" type="char*"/>
-                       <field name="parent_id" type="char*"/>
-                       <field name="start" type="GCallback"/>
-                       <field name="end" type="GCallback"/>
-                       <field name="user_data" type="gpointer"/>
-                       <field name="has_content" type="GsfXMLContent"/>
-                       <field name="check_children_for_ns" type="unsigned"/>
-                       <field name="share_children_with_parent" type="unsigned"/>
-               </struct>
-               <struct name="gsf_off_t">
-               </struct>
-               <boxed name="GsfTimestamp" type-name="GsfTimestamp" get-type="gsf_timestamp_get_type">
-                       <method name="as_string" symbol="gsf_timestamp_as_string">
-                               <return-type type="char*"/>
-                               <parameters>
-                                       <parameter name="stamp" type="GsfTimestamp*"/>
-                               </parameters>
-                       </method>
-                       <method name="copy" symbol="gsf_timestamp_copy">
-                               <return-type type="GsfTimestamp*"/>
-                               <parameters>
-                                       <parameter name="stamp" type="GsfTimestamp*"/>
-                               </parameters>
-                       </method>
-                       <method name="equal" symbol="gsf_timestamp_equal">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="a" type="GsfTimestamp*"/>
-                                       <parameter name="b" type="GsfTimestamp*"/>
-                               </parameters>
-                       </method>
-                       <method name="free" symbol="gsf_timestamp_free">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="stamp" type="GsfTimestamp*"/>
-                               </parameters>
-                       </method>
-                       <method name="from_string" symbol="gsf_timestamp_from_string">
-                               <return-type type="int"/>
-                               <parameters>
-                                       <parameter name="spec" type="char*"/>
-                                       <parameter name="stamp" type="GsfTimestamp*"/>
-                               </parameters>
-                       </method>
-                       <method name="hash" symbol="gsf_timestamp_hash">
-                               <return-type type="guint"/>
-                               <parameters>
-                                       <parameter name="stamp" type="GsfTimestamp*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gsf_timestamp_new">
-                               <return-type type="GsfTimestamp*"/>
-                       </constructor>
-                       <method name="parse" symbol="gsf_timestamp_parse">
-                               <return-type type="int"/>
-                               <parameters>
-                                       <parameter name="spec" type="char*"/>
-                                       <parameter name="stamp" type="GsfTimestamp*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_time" symbol="gsf_timestamp_set_time">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="stamp" type="GsfTimestamp*"/>
-                                       <parameter name="t" type="guint64"/>
-                               </parameters>
-                       </method>
-                       <field name="date" type="GDate"/>
-                       <field name="seconds" type="glong"/>
-                       <field name="time_zone" type="GString"/>
-                       <field name="timet" type="guint32"/>
-               </boxed>
-               <enum name="GsfClipFormat">
-                       <member name="GSF_CLIP_FORMAT_WINDOWS_CLIPBOARD" value="-1"/>
-                       <member name="GSF_CLIP_FORMAT_MACINTOSH_CLIPBOARD" value="-2"/>
-                       <member name="GSF_CLIP_FORMAT_GUID" value="-3"/>
-                       <member name="GSF_CLIP_FORMAT_NO_DATA" value="0"/>
-                       <member name="GSF_CLIP_FORMAT_CLIPBOARD_FORMAT_NAME" value="1"/>
-                       <member name="GSF_CLIP_FORMAT_UNKNOWN" value="2"/>
-               </enum>
-               <enum name="GsfClipFormatWindows">
-                       <member name="GSF_CLIP_FORMAT_WINDOWS_ERROR" value="-1"/>
-                       <member name="GSF_CLIP_FORMAT_WINDOWS_UNKNOWN" value="-2"/>
-                       <member name="GSF_CLIP_FORMAT_WINDOWS_METAFILE" value="3"/>
-                       <member name="GSF_CLIP_FORMAT_WINDOWS_DIB" value="8"/>
-                       <member name="GSF_CLIP_FORMAT_WINDOWS_ENHANCED_METAFILE" value="14"/>
-               </enum>
-               <enum name="GsfError">
-                       <member name="GSF_ERROR_OUT_OF_MEMORY" value="0"/>
-                       <member name="GSF_ERROR_INVALID_DATA" value="1"/>
-               </enum>
-               <enum name="GsfOutputCsvQuotingMode" type-name="GsfOutputCsvQuotingMode" get-type="gsf_output_csv_quoting_mode_get_type">
-                       <member name="GSF_OUTPUT_CSV_QUOTING_MODE_NEVER" value="0"/>
-                       <member name="GSF_OUTPUT_CSV_QUOTING_MODE_AUTO" value="1"/>
-                       <member name="GSF_OUTPUT_CSV_QUOTING_MODE_ALWAYS" value="2"/>
-               </enum>
-               <enum name="GsfXMLContent">
-                       <member name="GSF_XML_NO_CONTENT" value="0"/>
-                       <member name="GSF_XML_CONTENT" value="1"/>
-                       <member name="GSF_XML_SHARED_CONTENT" value="2"/>
-               </enum>
-               <enum name="GsfZipCompressionMethod">
-                       <member name="GSF_ZIP_STORED" value="0"/>
-                       <member name="GSF_ZIP_SHRUNK" value="1"/>
-                       <member name="GSF_ZIP_REDUCEDx1" value="2"/>
-                       <member name="GSF_ZIP_REDUCEDx2" value="3"/>
-                       <member name="GSF_ZIP_REDUCEDx3" value="4"/>
-                       <member name="GSF_ZIP_REDUCEDx4" value="5"/>
-                       <member name="GSF_ZIP_IMPLODED" value="6"/>
-                       <member name="GSF_ZIP_TOKENIZED" value="7"/>
-                       <member name="GSF_ZIP_DEFLATED" value="8"/>
-                       <member name="GSF_ZIP_DEFLATED_BETTER" value="9"/>
-                       <member name="GSF_ZIP_IMPLODED_BETTER" value="10"/>
-               </enum>
-               <object name="GsfBlob" parent="GObject" type-name="GsfBlob" get-type="gsf_blob_get_type">
-                       <method name="get_size" symbol="gsf_blob_get_size">
-                               <return-type type="gsize"/>
-                               <parameters>
-                                       <parameter name="blob" type="GsfBlob*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gsf_blob_new">
-                               <return-type type="GsfBlob*"/>
-                               <parameters>
-                                       <parameter name="size" type="gsize"/>
-                                       <parameter name="data_to_copy" type="gconstpointer"/>
-                                       <parameter name="error" type="GError**"/>
-                               </parameters>
-                       </constructor>
-                       <method name="peek_data" symbol="gsf_blob_peek_data">
-                               <return-type type="gconstpointer"/>
-                               <parameters>
-                                       <parameter name="blob" type="GsfBlob*"/>
-                               </parameters>
-                       </method>
-               </object>
-               <object name="GsfClipData" parent="GObject" type-name="GsfClipData" get-type="gsf_clip_data_get_type">
-                       <method name="get_data_blob" symbol="gsf_clip_data_get_data_blob">
-                               <return-type type="GsfBlob*"/>
-                               <parameters>
-                                       <parameter name="clip_data" type="GsfClipData*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_format" symbol="gsf_clip_data_get_format">
-                               <return-type type="GsfClipFormat"/>
-                               <parameters>
-                                       <parameter name="clip_data" type="GsfClipData*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_windows_clipboard_format" symbol="gsf_clip_data_get_windows_clipboard_format">
-                               <return-type type="GsfClipFormatWindows"/>
-                               <parameters>
-                                       <parameter name="clip_data" type="GsfClipData*"/>
-                                       <parameter name="error" type="GError**"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gsf_clip_data_new">
-                               <return-type type="GsfClipData*"/>
-                               <parameters>
-                                       <parameter name="format" type="GsfClipFormat"/>
-                                       <parameter name="data_blob" type="GsfBlob*"/>
-                               </parameters>
-                       </constructor>
-                       <method name="peek_real_data" symbol="gsf_clip_data_peek_real_data">
-                               <return-type type="gconstpointer"/>
-                               <parameters>
-                                       <parameter name="clip_data" type="GsfClipData*"/>
-                                       <parameter name="ret_size" type="gsize*"/>
-                                       <parameter name="error" type="GError**"/>
-                               </parameters>
-                       </method>
-               </object>
-               <object name="GsfDocMetaData" parent="GObject" type-name="GsfDocMetaData" get-type="gsf_doc_meta_data_get_type">
-                       <method name="foreach" symbol="gsf_doc_meta_data_foreach">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="meta" type="GsfDocMetaData*"/>
-                                       <parameter name="func" type="GHFunc"/>
-                                       <parameter name="user_data" type="gpointer"/>
-                               </parameters>
-                       </method>
-                       <method name="insert" symbol="gsf_doc_meta_data_insert">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="meta" type="GsfDocMetaData*"/>
-                                       <parameter name="name" type="char*"/>
-                                       <parameter name="value" type="GValue*"/>
-                               </parameters>
-                       </method>
-                       <method name="lookup" symbol="gsf_doc_meta_data_lookup">
-                               <return-type type="GsfDocProp*"/>
-                               <parameters>
-                                       <parameter name="meta" type="GsfDocMetaData*"/>
-                                       <parameter name="name" type="char*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gsf_doc_meta_data_new">
-                               <return-type type="GsfDocMetaData*"/>
-                       </constructor>
-                       <method name="remove" symbol="gsf_doc_meta_data_remove">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="meta" type="GsfDocMetaData*"/>
-                                       <parameter name="name" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="size" symbol="gsf_doc_meta_data_size">
-                               <return-type type="gsize"/>
-                               <parameters>
-                                       <parameter name="meta" type="GsfDocMetaData*"/>
-                               </parameters>
-                       </method>
-                       <method name="steal" symbol="gsf_doc_meta_data_steal">
-                               <return-type type="GsfDocProp*"/>
-                               <parameters>
-                                       <parameter name="meta" type="GsfDocMetaData*"/>
-                                       <parameter name="name" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="store" symbol="gsf_doc_meta_data_store">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="meta" type="GsfDocMetaData*"/>
-                                       <parameter name="prop" type="GsfDocProp*"/>
-                               </parameters>
-                       </method>
-               </object>
-               <object name="GsfDocPropVector" parent="GObject" type-name="GsfDocPropVector" get-type="gsf_docprop_vector_get_type">
-                       <method name="append" symbol="gsf_docprop_vector_append">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="vector" type="GsfDocPropVector*"/>
-                                       <parameter name="value" type="GValue*"/>
-                               </parameters>
-                       </method>
-                       <method name="as_string" symbol="gsf_docprop_vector_as_string">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="vector" type="GsfDocPropVector*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gsf_docprop_vector_new">
-                               <return-type type="GsfDocPropVector*"/>
-                       </constructor>
-               </object>
-               <object name="GsfInfile" parent="GsfInput" type-name="GsfInfile" get-type="gsf_infile_get_type">
-                       <method name="child_by_aname" symbol="gsf_infile_child_by_aname">
-                               <return-type type="GsfInput*"/>
-                               <parameters>
-                                       <parameter name="infile" type="GsfInfile*"/>
-                                       <parameter name="names" type="char*[]"/>
-                               </parameters>
-                       </method>
-                       <method name="child_by_index" symbol="gsf_infile_child_by_index">
-                               <return-type type="GsfInput*"/>
-                               <parameters>
-                                       <parameter name="infile" type="GsfInfile*"/>
-                                       <parameter name="i" type="int"/>
-                               </parameters>
-                       </method>
-                       <method name="child_by_name" symbol="gsf_infile_child_by_name">
-                               <return-type type="GsfInput*"/>
-                               <parameters>
-                                       <parameter name="infile" type="GsfInfile*"/>
-                                       <parameter name="name" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="child_by_vaname" symbol="gsf_infile_child_by_vaname">
-                               <return-type type="GsfInput*"/>
-                               <parameters>
-                                       <parameter name="infile" type="GsfInfile*"/>
-                                       <parameter name="names" type="va_list"/>
-                               </parameters>
-                       </method>
-                       <method name="child_by_vname" symbol="gsf_infile_child_by_vname">
-                               <return-type type="GsfInput*"/>
-                               <parameters>
-                                       <parameter name="infile" type="GsfInfile*"/>
-                               </parameters>
-                       </method>
-                       <method name="name_by_index" symbol="gsf_infile_name_by_index">
-                               <return-type type="char*"/>
-                               <parameters>
-                                       <parameter name="infile" type="GsfInfile*"/>
-                                       <parameter name="i" type="int"/>
-                               </parameters>
-                       </method>
-                       <method name="num_children" symbol="gsf_infile_num_children">
-                               <return-type type="int"/>
-                               <parameters>
-                                       <parameter name="infile" type="GsfInfile*"/>
-                               </parameters>
-                       </method>
-                       <vfunc name="child_by_index">
-                               <return-type type="GsfInput*"/>
-                               <parameters>
-                                       <parameter name="infile" type="GsfInfile*"/>
-                                       <parameter name="i" type="int"/>
-                                       <parameter name="err" type="GError**"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="child_by_name">
-                               <return-type type="GsfInput*"/>
-                               <parameters>
-                                       <parameter name="infile" type="GsfInfile*"/>
-                                       <parameter name="name" type="char*"/>
-                                       <parameter name="err" type="GError**"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="name_by_index">
-                               <return-type type="char*"/>
-                               <parameters>
-                                       <parameter name="infile" type="GsfInfile*"/>
-                                       <parameter name="i" type="int"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="num_children">
-                               <return-type type="int"/>
-                               <parameters>
-                                       <parameter name="infile" type="GsfInfile*"/>
-                               </parameters>
-                       </vfunc>
-               </object>
-               <object name="GsfInfileMSOle" parent="GsfInfile" type-name="GsfInfileMSOle" get-type="gsf_infile_msole_get_type">
-                       <method name="get_class_id" symbol="gsf_infile_msole_get_class_id">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="ole" type="GsfInfileMSOle*"/>
-                                       <parameter name="res" type="guint8*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gsf_infile_msole_new">
-                               <return-type type="GsfInfile*"/>
-                               <parameters>
-                                       <parameter name="source" type="GsfInput*"/>
-                                       <parameter name="err" type="GError**"/>
-                               </parameters>
-                       </constructor>
-               </object>
-               <object name="GsfInfileMSVBA" parent="GsfInfile" type-name="GsfInfileMSVBA" get-type="gsf_infile_msvba_get_type">
-                       <method name="get_modules" symbol="gsf_infile_msvba_get_modules">
-                               <return-type type="GHashTable*"/>
-                               <parameters>
-                                       <parameter name="vba_stream" type="GsfInfileMSVBA*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gsf_infile_msvba_new">
-                               <return-type type="GsfInfile*"/>
-                               <parameters>
-                                       <parameter name="source" type="GsfInfile*"/>
-                                       <parameter name="err" type="GError**"/>
-                               </parameters>
-                       </constructor>
-                       <method name="steal_modules" symbol="gsf_infile_msvba_steal_modules">
-                               <return-type type="GHashTable*"/>
-                               <parameters>
-                                       <parameter name="vba_stream" type="GsfInfileMSVBA*"/>
-                               </parameters>
-                       </method>
-               </object>
-               <object name="GsfInfileStdio" parent="GsfInfile" type-name="GsfInfileStdio" get-type="gsf_infile_stdio_get_type">
-                       <constructor name="new" symbol="gsf_infile_stdio_new">
-                               <return-type type="GsfInfile*"/>
-                               <parameters>
-                                       <parameter name="root" type="char*"/>
-                                       <parameter name="err" type="GError**"/>
-                               </parameters>
-                       </constructor>
-               </object>
-               <object name="GsfInfileTar" parent="GsfInfile" type-name="GsfInfileTar" get-type="gsf_infile_tar_get_type">
-                       <constructor name="new" symbol="gsf_infile_tar_new">
-                               <return-type type="GsfInfile*"/>
-                               <parameters>
-                                       <parameter name="source" type="GsfInput*"/>
-                                       <parameter name="err" type="GError**"/>
-                               </parameters>
-                       </constructor>
-                       <property name="source" type="GsfInput*" readable="1" writable="1" construct="0" construct-only="1"/>
-               </object>
-               <object name="GsfInfileZip" parent="GsfInfile" type-name="GsfInfileZip" get-type="gsf_infile_zip_get_type">
-                       <constructor name="new" symbol="gsf_infile_zip_new">
-                               <return-type type="GsfInfile*"/>
-                               <parameters>
-                                       <parameter name="source" type="GsfInput*"/>
-                                       <parameter name="err" type="GError**"/>
-                               </parameters>
-                       </constructor>
-                       <property name="compression-level" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="internal-parent" type="GsfInfileZip*" readable="0" writable="1" construct="0" construct-only="1"/>
-                       <property name="source" type="GsfInput*" readable="1" writable="1" construct="0" construct-only="1"/>
-               </object>
-               <object name="GsfInput" parent="GObject" type-name="GsfInput" get-type="gsf_input_get_type">
-                       <method name="container" symbol="gsf_input_container">
-                               <return-type type="GsfInfile*"/>
-                               <parameters>
-                                       <parameter name="input" type="GsfInput*"/>
-                               </parameters>
-                       </method>
-                       <method name="copy" symbol="gsf_input_copy">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="input" type="GsfInput*"/>
-                                       <parameter name="output" type="GsfOutput*"/>
-                               </parameters>
-                       </method>
-                       <method name="dump" symbol="gsf_input_dump">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="input" type="GsfInput*"/>
-                                       <parameter name="dump_as_hex" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="dup" symbol="gsf_input_dup">
-                               <return-type type="GsfInput*"/>
-                               <parameters>
-                                       <parameter name="input" type="GsfInput*"/>
-                                       <parameter name="err" type="GError**"/>
-                               </parameters>
-                       </method>
-                       <method name="eof" symbol="gsf_input_eof">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="input" type="GsfInput*"/>
-                               </parameters>
-                       </method>
-                       <method name="error" symbol="gsf_input_error">
-                               <return-type type="GQuark"/>
-                       </method>
-                       <method name="error_id" symbol="gsf_input_error_id">
-                               <return-type type="GQuark"/>
-                       </method>
-                       <method name="find_vba" symbol="gsf_input_find_vba">
-                               <return-type type="GsfInfileMSVBA*"/>
-                               <parameters>
-                                       <parameter name="input" type="GsfInput*"/>
-                                       <parameter name="err" type="GError**"/>
-                               </parameters>
-                       </method>
-                       <method name="mmap_new" symbol="gsf_input_mmap_new">
-                               <return-type type="GsfInput*"/>
-                               <parameters>
-                                       <parameter name="filename" type="char*"/>
-                                       <parameter name="err" type="GError**"/>
-                               </parameters>
-                       </method>
-                       <method name="name" symbol="gsf_input_name">
-                               <return-type type="char*"/>
-                               <parameters>
-                                       <parameter name="input" type="GsfInput*"/>
-                               </parameters>
-                       </method>
-                       <method name="read" symbol="gsf_input_read">
-                               <return-type type="guint8*"/>
-                               <parameters>
-                                       <parameter name="input" type="GsfInput*"/>
-                                       <parameter name="num_bytes" type="size_t"/>
-                                       <parameter name="optional_buffer" type="guint8*"/>
-                               </parameters>
-                       </method>
-                       <method name="remaining" symbol="gsf_input_remaining">
-                               <return-type type="gsf_off_t"/>
-                               <parameters>
-                                       <parameter name="input" type="GsfInput*"/>
-                               </parameters>
-                       </method>
-                       <method name="seek" symbol="gsf_input_seek">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="input" type="GsfInput*"/>
-                                       <parameter name="offset" type="gsf_off_t"/>
-                                       <parameter name="whence" type="GSeekType"/>
-                               </parameters>
-                       </method>
-                       <method name="seek_emulate" symbol="gsf_input_seek_emulate">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="input" type="GsfInput*"/>
-                                       <parameter name="pos" type="gsf_off_t"/>
-                               </parameters>
-                       </method>
-                       <method name="set_container" symbol="gsf_input_set_container">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="input" type="GsfInput*"/>
-                                       <parameter name="container" type="GsfInfile*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_name" symbol="gsf_input_set_name">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="input" type="GsfInput*"/>
-                                       <parameter name="name" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_name_from_filename" symbol="gsf_input_set_name_from_filename">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="input" type="GsfInput*"/>
-                                       <parameter name="filename" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_size" symbol="gsf_input_set_size">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="input" type="GsfInput*"/>
-                                       <parameter name="size" type="gsf_off_t"/>
-                               </parameters>
-                       </method>
-                       <method name="sibling" symbol="gsf_input_sibling">
-                               <return-type type="GsfInput*"/>
-                               <parameters>
-                                       <parameter name="input" type="GsfInput*"/>
-                                       <parameter name="name" type="char*"/>
-                                       <parameter name="err" type="GError**"/>
-                               </parameters>
-                       </method>
-                       <method name="size" symbol="gsf_input_size">
-                               <return-type type="gsf_off_t"/>
-                               <parameters>
-                                       <parameter name="input" type="GsfInput*"/>
-                               </parameters>
-                       </method>
-                       <method name="tell" symbol="gsf_input_tell">
-                               <return-type type="gsf_off_t"/>
-                               <parameters>
-                                       <parameter name="input" type="GsfInput*"/>
-                               </parameters>
-                       </method>
-                       <method name="uncompress" symbol="gsf_input_uncompress">
-                               <return-type type="GsfInput*"/>
-                               <parameters>
-                                       <parameter name="src" type="GsfInput*"/>
-                               </parameters>
-                       </method>
-                       <property name="eof" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="name" type="char*" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="position" type="gint64" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="remaining" type="gint64" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="size" type="gint64" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <vfunc name="Dup">
-                               <return-type type="GsfInput*"/>
-                               <parameters>
-                                       <parameter name="input" type="GsfInput*"/>
-                                       <parameter name="err" type="GError**"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="OpenSibling">
-                               <return-type type="GsfInput*"/>
-                               <parameters>
-                                       <parameter name="input" type="GsfInput*"/>
-                                       <parameter name="path" type="char*"/>
-                                       <parameter name="err" type="GError**"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="Read">
-                               <return-type type="guint8*"/>
-                               <parameters>
-                                       <parameter name="input" type="GsfInput*"/>
-                                       <parameter name="num_bytes" type="size_t"/>
-                                       <parameter name="optional_buffer" type="guint8*"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="Seek">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="input" type="GsfInput*"/>
-                                       <parameter name="offset" type="gsf_off_t"/>
-                                       <parameter name="whence" type="GSeekType"/>
-                               </parameters>
-                       </vfunc>
-                       <field name="size" type="gsf_off_t"/>
-                       <field name="cur_offset" type="gsf_off_t"/>
-                       <field name="name" type="char*"/>
-                       <field name="container" type="GsfInfile*"/>
-               </object>
-               <object name="GsfInputGZip" parent="GsfInput" type-name="GsfInputGZip" get-type="gsf_input_gzip_get_type">
-                       <constructor name="new" symbol="gsf_input_gzip_new">
-                               <return-type type="GsfInput*"/>
-                               <parameters>
-                                       <parameter name="source" type="GsfInput*"/>
-                                       <parameter name="err" type="GError**"/>
-                               </parameters>
-                       </constructor>
-                       <property name="raw" type="gboolean" readable="1" writable="1" construct="0" construct-only="1"/>
-                       <property name="source" type="GsfInput*" readable="1" writable="1" construct="0" construct-only="1"/>
-                       <property name="uncompressed-size" type="gint64" readable="1" writable="1" construct="0" construct-only="1"/>
-               </object>
-               <object name="GsfInputGio" parent="GsfInput" type-name="GsfInputGio" get-type="gsf_input_gio_get_type">
-                       <constructor name="new" symbol="gsf_input_gio_new">
-                               <return-type type="GsfInput*"/>
-                               <parameters>
-                                       <parameter name="file" type="GFile*"/>
-                                       <parameter name="err" type="GError**"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_for_path" symbol="gsf_input_gio_new_for_path">
-                               <return-type type="GsfInput*"/>
-                               <parameters>
-                                       <parameter name="path" type="char*"/>
-                                       <parameter name="err" type="GError**"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_for_uri" symbol="gsf_input_gio_new_for_uri">
-                               <return-type type="GsfInput*"/>
-                               <parameters>
-                                       <parameter name="uri" type="char*"/>
-                                       <parameter name="err" type="GError**"/>
-                               </parameters>
-                       </constructor>
-               </object>
-               <object name="GsfInputHTTP" parent="GsfInput" type-name="GsfInputHTTP" get-type="gsf_input_http_get_type">
-                       <method name="get_content_type" symbol="gsf_input_http_get_content_type">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="input" type="GsfInputHTTP*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_url" symbol="gsf_input_http_get_url">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="input" type="GsfInputHTTP*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gsf_input_http_new">
-                               <return-type type="GsfInput*"/>
-                               <parameters>
-                                       <parameter name="url" type="gchar*"/>
-                                       <parameter name="error" type="GError**"/>
-                               </parameters>
-                       </constructor>
-                       <property name="content-type" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
-                       <property name="url" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
-               </object>
-               <object name="GsfInputMemory" parent="GsfInput" type-name="GsfInputMemory" get-type="gsf_input_memory_get_type">
-                       <constructor name="new" symbol="gsf_input_memory_new">
-                               <return-type type="GsfInput*"/>
-                               <parameters>
-                                       <parameter name="buf" type="guint8*"/>
-                                       <parameter name="length" type="gsf_off_t"/>
-                                       <parameter name="needs_free" type="gboolean"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_clone" symbol="gsf_input_memory_new_clone">
-                               <return-type type="GsfInput*"/>
-                               <parameters>
-                                       <parameter name="buf" type="guint8*"/>
-                                       <parameter name="length" type="gsf_off_t"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_from_bzip" symbol="gsf_input_memory_new_from_bzip">
-                               <return-type type="GsfInput*"/>
-                               <parameters>
-                                       <parameter name="source" type="GsfInput*"/>
-                                       <parameter name="err" type="GError**"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_from_iochannel" symbol="gsf_input_memory_new_from_iochannel">
-                               <return-type type="GsfInput*"/>
-                               <parameters>
-                                       <parameter name="channel" type="GIOChannel*"/>
-                                       <parameter name="error" type="GError**"/>
-                               </parameters>
-                       </constructor>
-               </object>
-               <object name="GsfInputProxy" parent="GsfInput" type-name="GsfInputProxy" get-type="gsf_input_proxy_get_type">
-                       <constructor name="new" symbol="gsf_input_proxy_new">
-                               <return-type type="GsfInput*"/>
-                               <parameters>
-                                       <parameter name="source" type="GsfInput*"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_section" symbol="gsf_input_proxy_new_section">
-                               <return-type type="GsfInput*"/>
-                               <parameters>
-                                       <parameter name="source" type="GsfInput*"/>
-                                       <parameter name="offset" type="gsf_off_t"/>
-                                       <parameter name="size" type="gsf_off_t"/>
-                               </parameters>
-                       </constructor>
-               </object>
-               <object name="GsfInputStdio" parent="GsfInput" type-name="GsfInputStdio" get-type="gsf_input_stdio_get_type">
-                       <constructor name="new" symbol="gsf_input_stdio_new">
-                               <return-type type="GsfInput*"/>
-                               <parameters>
-                                       <parameter name="filename" type="char*"/>
-                                       <parameter name="err" type="GError**"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_FILE" symbol="gsf_input_stdio_new_FILE">
-                               <return-type type="GsfInput*"/>
-                               <parameters>
-                                       <parameter name="filename" type="char*"/>
-                                       <parameter name="file" type="FILE*"/>
-                                       <parameter name="keep_open" type="gboolean"/>
-                               </parameters>
-                       </constructor>
-               </object>
-               <object name="GsfInputTextline" parent="GsfInput" type-name="GsfInputTextline" get-type="gsf_input_textline_get_type">
-                       <method name="ascii_gets" symbol="gsf_input_textline_ascii_gets">
-                               <return-type type="unsigned*"/>
-                               <parameters>
-                                       <parameter name="textline" type="GsfInputTextline*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gsf_input_textline_new">
-                               <return-type type="GsfInput*"/>
-                               <parameters>
-                                       <parameter name="source" type="GsfInput*"/>
-                               </parameters>
-                       </constructor>
-                       <method name="utf8_gets" symbol="gsf_input_textline_utf8_gets">
-                               <return-type type="guint8*"/>
-                               <parameters>
-                                       <parameter name="textline" type="GsfInputTextline*"/>
-                               </parameters>
-                       </method>
-               </object>
-               <object name="GsfOutfile" parent="GsfOutput" type-name="GsfOutfile" get-type="gsf_outfile_get_type">
-                       <constructor name="new_child" symbol="gsf_outfile_new_child">
-                               <return-type type="GsfOutput*"/>
-                               <parameters>
-                                       <parameter name="outfile" type="GsfOutfile*"/>
-                                       <parameter name="name" type="char*"/>
-                                       <parameter name="is_dir" type="gboolean"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_child_full" symbol="gsf_outfile_new_child_full">
-                               <return-type type="GsfOutput*"/>
-                               <parameters>
-                                       <parameter name="outfile" type="GsfOutfile*"/>
-                                       <parameter name="name" type="char*"/>
-                                       <parameter name="is_dir" type="gboolean"/>
-                                       <parameter name="first_property_name" type="char*"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_child_varg" symbol="gsf_outfile_new_child_varg">
-                               <return-type type="GsfOutput*"/>
-                               <parameters>
-                                       <parameter name="outfile" type="GsfOutfile*"/>
-                                       <parameter name="name" type="char*"/>
-                                       <parameter name="is_dir" type="gboolean"/>
-                                       <parameter name="first_property_name" type="char*"/>
-                                       <parameter name="args" type="va_list"/>
-                               </parameters>
-                       </constructor>
-                       <vfunc name="new_child">
-                               <return-type type="GsfOutput*"/>
-                               <parameters>
-                                       <parameter name="outfile" type="GsfOutfile*"/>
-                                       <parameter name="name" type="char*"/>
-                                       <parameter name="is_dir" type="gboolean"/>
-                                       <parameter name="first_property_name" type="char*"/>
-                                       <parameter name="args" type="va_list"/>
-                               </parameters>
-                       </vfunc>
-               </object>
-               <object name="GsfOutfileMSOle" parent="GsfOutfile" type-name="GsfOutfileMSOle" get-type="gsf_outfile_msole_get_type">
-                       <constructor name="new" symbol="gsf_outfile_msole_new">
-                               <return-type type="GsfOutfile*"/>
-                               <parameters>
-                                       <parameter name="sink" type="GsfOutput*"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_full" symbol="gsf_outfile_msole_new_full">
-                               <return-type type="GsfOutfile*"/>
-                               <parameters>
-                                       <parameter name="sink" type="GsfOutput*"/>
-                                       <parameter name="bb_size" type="guint"/>
-                                       <parameter name="sb_size" type="guint"/>
-                               </parameters>
-                       </constructor>
-                       <method name="set_class_id" symbol="gsf_outfile_msole_set_class_id">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="ole" type="GsfOutfileMSOle*"/>
-                                       <parameter name="clsid" type="guint8*"/>
-                               </parameters>
-                       </method>
-               </object>
-               <object name="GsfOutfileOpenPkg" parent="GsfOutfile" type-name="GsfOutfileOpenPkg" get-type="gsf_outfile_open_pkg_get_type">
-                       <method name="add_extern_rel" symbol="gsf_outfile_open_pkg_add_extern_rel">
-                               <return-type type="char*"/>
-                               <parameters>
-                                       <parameter name="parent" type="GsfOutfileOpenPkg*"/>
-                                       <parameter name="target" type="char*"/>
-                                       <parameter name="content_type" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="add_rel" symbol="gsf_outfile_open_pkg_add_rel">
-                               <return-type type="GsfOutput*"/>
-                               <parameters>
-                                       <parameter name="dir" type="GsfOutfile*"/>
-                                       <parameter name="name" type="char*"/>
-                                       <parameter name="content_type" type="char*"/>
-                                       <parameter name="parent" type="GsfOutfile*"/>
-                                       <parameter name="type" type="char*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gsf_outfile_open_pkg_new">
-                               <return-type type="GsfOutfile*"/>
-                               <parameters>
-                                       <parameter name="sink" type="GsfOutfile*"/>
-                               </parameters>
-                       </constructor>
-                       <method name="relate" symbol="gsf_outfile_open_pkg_relate">
-                               <return-type type="char*"/>
-                               <parameters>
-                                       <parameter name="child" type="GsfOutfileOpenPkg*"/>
-                                       <parameter name="parent" type="GsfOutfileOpenPkg*"/>
-                                       <parameter name="type" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_content_type" symbol="gsf_outfile_open_pkg_set_content_type">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="open_pkg" type="GsfOutfileOpenPkg*"/>
-                                       <parameter name="content_type" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_sink" symbol="gsf_outfile_open_pkg_set_sink">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="open_pkg" type="GsfOutfileOpenPkg*"/>
-                                       <parameter name="sink" type="GsfOutput*"/>
-                               </parameters>
-                       </method>
-                       <property name="content-type" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
-                       <property name="is-dir" type="gboolean" readable="1" writable="1" construct="0" construct-only="1"/>
-                       <property name="sink" type="GsfOutfile*" readable="1" writable="1" construct="0" construct-only="1"/>
-               </object>
-               <object name="GsfOutfileStdio" parent="GsfOutfile" type-name="GsfOutfileStdio" get-type="gsf_outfile_stdio_get_type">
-                       <constructor name="new" symbol="gsf_outfile_stdio_new">
-                               <return-type type="GsfOutfile*"/>
-                               <parameters>
-                                       <parameter name="root" type="char*"/>
-                                       <parameter name="err" type="GError**"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_full" symbol="gsf_outfile_stdio_new_full">
-                               <return-type type="GsfOutfile*"/>
-                               <parameters>
-                                       <parameter name="root" type="char*"/>
-                                       <parameter name="err" type="GError**"/>
-                                       <parameter name="first_property_name" type="char*"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_valist" symbol="gsf_outfile_stdio_new_valist">
-                               <return-type type="GsfOutfile*"/>
-                               <parameters>
-                                       <parameter name="root" type="char*"/>
-                                       <parameter name="err" type="GError**"/>
-                                       <parameter name="first_property_name" type="char*"/>
-                                       <parameter name="var_args" type="va_list"/>
-                               </parameters>
-                       </constructor>
-               </object>
-               <object name="GsfOutfileZip" parent="GsfOutfile" type-name="GsfOutfileZip" get-type="gsf_outfile_zip_get_type">
-                       <constructor name="new" symbol="gsf_outfile_zip_new">
-                               <return-type type="GsfOutfile*"/>
-                               <parameters>
-                                       <parameter name="sink" type="GsfOutput*"/>
-                                       <parameter name="err" type="GError**"/>
-                               </parameters>
-                       </constructor>
-                       <method name="set_compression_method" symbol="gsf_outfile_zip_set_compression_method">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="zip" type="GsfOutfileZip*"/>
-                                       <parameter name="method" type="GsfZipCompressionMethod"/>
-                               </parameters>
-                       </method>
-                       <property name="compression-level" type="gint" readable="1" writable="1" construct="0" construct-only="1"/>
-                       <property name="entry-name" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
-                       <property name="sink" type="GsfOutput*" readable="1" writable="1" construct="0" construct-only="1"/>
-               </object>
-               <object name="GsfOutput" parent="GObject" type-name="GsfOutput" get-type="gsf_output_get_type">
-                       <method name="close" symbol="gsf_output_close">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="output" type="GsfOutput*"/>
-                               </parameters>
-                       </method>
-                       <method name="container" symbol="gsf_output_container">
-                               <return-type type="GsfOutfile*"/>
-                               <parameters>
-                                       <parameter name="output" type="GsfOutput*"/>
-                               </parameters>
-                       </method>
-                       <method name="error" symbol="gsf_output_error">
-                               <return-type type="GError*"/>
-                               <parameters>
-                                       <parameter name="output" type="GsfOutput*"/>
-                               </parameters>
-                       </method>
-                       <method name="error_id" symbol="gsf_output_error_id">
-                               <return-type type="GQuark"/>
-                       </method>
-                       <method name="is_closed" symbol="gsf_output_is_closed">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="output" type="GsfOutput*"/>
-                               </parameters>
-                       </method>
-                       <method name="name" symbol="gsf_output_name">
-                               <return-type type="char*"/>
-                               <parameters>
-                                       <parameter name="output" type="GsfOutput*"/>
-                               </parameters>
-                       </method>
-                       <method name="printf" symbol="gsf_output_printf">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="output" type="GsfOutput*"/>
-                                       <parameter name="format" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="puts" symbol="gsf_output_puts">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="output" type="GsfOutput*"/>
-                                       <parameter name="line" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="seek" symbol="gsf_output_seek">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="output" type="GsfOutput*"/>
-                                       <parameter name="offset" type="gsf_off_t"/>
-                                       <parameter name="whence" type="GSeekType"/>
-                               </parameters>
-                       </method>
-                       <method name="set_container" symbol="gsf_output_set_container">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="output" type="GsfOutput*"/>
-                                       <parameter name="container" type="GsfOutfile*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_error" symbol="gsf_output_set_error">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="output" type="GsfOutput*"/>
-                                       <parameter name="code" type="gint"/>
-                                       <parameter name="format" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_name" symbol="gsf_output_set_name">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="output" type="GsfOutput*"/>
-                                       <parameter name="name" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_name_from_filename" symbol="gsf_output_set_name_from_filename">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="output" type="GsfOutput*"/>
-                                       <parameter name="filename" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="size" symbol="gsf_output_size">
-                               <return-type type="gsf_off_t"/>
-                               <parameters>
-                                       <parameter name="output" type="GsfOutput*"/>
-                               </parameters>
-                       </method>
-                       <method name="tell" symbol="gsf_output_tell">
-                               <return-type type="gsf_off_t"/>
-                               <parameters>
-                                       <parameter name="output" type="GsfOutput*"/>
-                               </parameters>
-                       </method>
-                       <method name="unwrap" symbol="gsf_output_unwrap">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="wrapper" type="GObject*"/>
-                                       <parameter name="wrapee" type="GsfOutput*"/>
-                               </parameters>
-                       </method>
-                       <method name="vprintf" symbol="gsf_output_vprintf">
-                               <return-type type="gsf_off_t"/>
-                               <parameters>
-                                       <parameter name="output" type="GsfOutput*"/>
-                                       <parameter name="format" type="char*"/>
-                                       <parameter name="args" type="va_list"/>
-                               </parameters>
-                       </method>
-                       <method name="wrap" symbol="gsf_output_wrap">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="wrapper" type="GObject*"/>
-                                       <parameter name="wrapee" type="GsfOutput*"/>
-                               </parameters>
-                       </method>
-                       <method name="write" symbol="gsf_output_write">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="output" type="GsfOutput*"/>
-                                       <parameter name="num_bytes" type="size_t"/>
-                                       <parameter name="data" type="guint8*"/>
-                               </parameters>
-                       </method>
-                       <property name="is-closed" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="name" type="char*" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="position" type="gint64" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="size" type="gint64" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <vfunc name="Close">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="output" type="GsfOutput*"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="Seek">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="output" type="GsfOutput*"/>
-                                       <parameter name="offset" type="gsf_off_t"/>
-                                       <parameter name="whence" type="GSeekType"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="Vprintf">
-                               <return-type type="gsf_off_t"/>
-                               <parameters>
-                                       <parameter name="output" type="GsfOutput*"/>
-                                       <parameter name="format" type="char*"/>
-                                       <parameter name="args" type="va_list"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="Write">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="output" type="GsfOutput*"/>
-                                       <parameter name="num_bytes" type="size_t"/>
-                                       <parameter name="data" type="guint8*"/>
-                               </parameters>
-                       </vfunc>
-                       <field name="cur_size" type="gsf_off_t"/>
-                       <field name="cur_offset" type="gsf_off_t"/>
-                       <field name="name" type="char*"/>
-                       <field name="wrapped_by" type="GObject*"/>
-                       <field name="container" type="GsfOutfile*"/>
-                       <field name="err" type="GError*"/>
-                       <field name="is_closed" type="gboolean"/>
-                       <field name="printf_buf" type="char*"/>
-                       <field name="printf_buf_size" type="int"/>
-               </object>
-               <object name="GsfOutputBzip" parent="GsfOutput" type-name="GsfOutputBzip" get-type="gsf_output_bzip_get_type">
-                       <constructor name="new" symbol="gsf_output_bzip_new">
-                               <return-type type="GsfOutput*"/>
-                               <parameters>
-                                       <parameter name="sink" type="GsfOutput*"/>
-                                       <parameter name="err" type="GError**"/>
-                               </parameters>
-                       </constructor>
-               </object>
-               <object name="GsfOutputCsv" parent="GsfOutput" type-name="GsfOutputCsv" get-type="gsf_output_csv_get_type">
-                       <method name="write_eol" symbol="gsf_output_csv_write_eol">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="csv" type="GsfOutputCsv*"/>
-                               </parameters>
-                       </method>
-                       <method name="write_field" symbol="gsf_output_csv_write_field">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="csv" type="GsfOutputCsv*"/>
-                                       <parameter name="field" type="char*"/>
-                                       <parameter name="len" type="size_t"/>
-                               </parameters>
-                       </method>
-                       <property name="eol" type="char*" readable="1" writable="1" construct="1" construct-only="0"/>
-                       <property name="quote" type="char*" readable="1" writable="1" construct="1" construct-only="0"/>
-                       <property name="quoting-mode" type="GsfOutputCsvQuotingMode" readable="1" writable="1" construct="1" construct-only="0"/>
-                       <property name="quoting-on-whitespace" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="quoting-triggers" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="separator" type="char*" readable="1" writable="1" construct="1" construct-only="0"/>
-                       <property name="sink" type="GsfOutput*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <field name="sink" type="GsfOutput*"/>
-                       <field name="quote" type="char*"/>
-                       <field name="quote_len" type="size_t"/>
-                       <field name="quoting_mode" type="GsfOutputCsvQuotingMode"/>
-                       <field name="quoting_triggers" type="char*"/>
-                       <field name="eol" type="char*"/>
-                       <field name="eol_len" type="size_t"/>
-                       <field name="separator" type="char*"/>
-                       <field name="separator_len" type="size_t"/>
-                       <field name="fields_on_line" type="gboolean"/>
-                       <field name="buf" type="GString*"/>
-               </object>
-               <object name="GsfOutputGZip" parent="GsfOutput" type-name="GsfOutputGZip" get-type="gsf_output_gzip_get_type">
-                       <constructor name="new" symbol="gsf_output_gzip_new">
-                               <return-type type="GsfOutput*"/>
-                               <parameters>
-                                       <parameter name="sink" type="GsfOutput*"/>
-                                       <parameter name="err" type="GError**"/>
-                               </parameters>
-                       </constructor>
-                       <property name="raw" type="gboolean" readable="1" writable="1" construct="0" construct-only="1"/>
-                       <property name="sink" type="GsfOutput*" readable="1" writable="1" construct="0" construct-only="1"/>
-               </object>
-               <object name="GsfOutputGio" parent="GsfOutput" type-name="GsfOutputGio" get-type="gsf_output_gio_get_type">
-                       <constructor name="new" symbol="gsf_output_gio_new">
-                               <return-type type="GsfOutput*"/>
-                               <parameters>
-                                       <parameter name="file" type="GFile*"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_for_path" symbol="gsf_output_gio_new_for_path">
-                               <return-type type="GsfOutput*"/>
-                               <parameters>
-                                       <parameter name="path" type="char*"/>
-                                       <parameter name="err" type="GError**"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_for_uri" symbol="gsf_output_gio_new_for_uri">
-                               <return-type type="GsfOutput*"/>
-                               <parameters>
-                                       <parameter name="uri" type="char*"/>
-                                       <parameter name="err" type="GError**"/>
-                               </parameters>
-                       </constructor>
-               </object>
-               <object name="GsfOutputIOChannel" parent="GsfOutput" type-name="GsfOutputIOChannel" get-type="gsf_output_iochannel_get_type">
-                       <constructor name="new" symbol="gsf_output_iochannel_new">
-                               <return-type type="GsfOutput*"/>
-                               <parameters>
-                                       <parameter name="channel" type="GIOChannel*"/>
-                               </parameters>
-                       </constructor>
-               </object>
-               <object name="GsfOutputIconv" parent="GsfOutput" type-name="GsfOutputIconv" get-type="gsf_output_iconv_get_type">
-                       <constructor name="new" symbol="gsf_output_iconv_new">
-                               <return-type type="GsfOutput*"/>
-                               <parameters>
-                                       <parameter name="sink" type="GsfOutput*"/>
-                                       <parameter name="dst" type="char*"/>
-                                       <parameter name="src" type="char*"/>
-                               </parameters>
-                       </constructor>
-                       <property name="fallback" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="input-charset" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
-                       <property name="output-charset" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
-                       <property name="sink" type="GsfOutput*" readable="1" writable="1" construct="0" construct-only="1"/>
-               </object>
-               <object name="GsfOutputMemory" parent="GsfOutput" type-name="GsfOutputMemory" get-type="gsf_output_memory_get_type">
-                       <method name="get_bytes" symbol="gsf_output_memory_get_bytes">
-                               <return-type type="guint8*"/>
-                               <parameters>
-                                       <parameter name="mem" type="GsfOutputMemory*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gsf_output_memory_new">
-                               <return-type type="GsfOutput*"/>
-                       </constructor>
-               </object>
-               <object name="GsfOutputStdio" parent="GsfOutput" type-name="GsfOutputStdio" get-type="gsf_output_stdio_get_type">
-                       <constructor name="new" symbol="gsf_output_stdio_new">
-                               <return-type type="GsfOutput*"/>
-                               <parameters>
-                                       <parameter name="filename" type="char*"/>
-                                       <parameter name="err" type="GError**"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_FILE" symbol="gsf_output_stdio_new_FILE">
-                               <return-type type="GsfOutput*"/>
-                               <parameters>
-                                       <parameter name="filename" type="char*"/>
-                                       <parameter name="file" type="FILE*"/>
-                                       <parameter name="keep_open" type="gboolean"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_full" symbol="gsf_output_stdio_new_full">
-                               <return-type type="GsfOutput*"/>
-                               <parameters>
-                                       <parameter name="filename" type="char*"/>
-                                       <parameter name="err" type="GError**"/>
-                                       <parameter name="first_property_name" type="char*"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_valist" symbol="gsf_output_stdio_new_valist">
-                               <return-type type="GsfOutput*"/>
-                               <parameters>
-                                       <parameter name="filename" type="char*"/>
-                                       <parameter name="err" type="GError**"/>
-                                       <parameter name="first_property_name" type="char*"/>
-                                       <parameter name="var_args" type="va_list"/>
-                               </parameters>
-                       </constructor>
-               </object>
-               <object name="GsfSharedMemory" parent="GObject" type-name="GsfSharedMemory" get-type="gsf_shared_memory_get_type">
-                       <method name="mmapped_new" symbol="gsf_shared_memory_mmapped_new">
-                               <return-type type="GsfSharedMemory*"/>
-                               <parameters>
-                                       <parameter name="buf" type="void*"/>
-                                       <parameter name="size" type="gsf_off_t"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gsf_shared_memory_new">
-                               <return-type type="GsfSharedMemory*"/>
-                               <parameters>
-                                       <parameter name="buf" type="void*"/>
-                                       <parameter name="size" type="gsf_off_t"/>
-                                       <parameter name="needs_free" type="gboolean"/>
-                               </parameters>
-                       </constructor>
-                       <field name="buf" type="void*"/>
-                       <field name="size" type="gsf_off_t"/>
-                       <field name="needs_free" type="gboolean"/>
-                       <field name="needs_unmap" type="gboolean"/>
-               </object>
-               <object name="GsfStructuredBlob" parent="GsfInfile" type-name="GsfStructuredBlob" get-type="gsf_structured_blob_get_type">
-                       <method name="read" symbol="gsf_structured_blob_read">
-                               <return-type type="GsfStructuredBlob*"/>
-                               <parameters>
-                                       <parameter name="input" type="GsfInput*"/>
-                               </parameters>
-                       </method>
-                       <method name="write" symbol="gsf_structured_blob_write">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="blob" type="GsfStructuredBlob*"/>
-                                       <parameter name="container" type="GsfOutfile*"/>
-                               </parameters>
-                       </method>
-               </object>
-               <object name="GsfXMLOut" parent="GObject" type-name="GsfXMLOut" get-type="gsf_xml_out_get_type">
-                       <method name="add_base64" symbol="gsf_xml_out_add_base64">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="xout" type="GsfXMLOut*"/>
-                                       <parameter name="id" type="char*"/>
-                                       <parameter name="data" type="guint8*"/>
-                                       <parameter name="len" type="unsigned"/>
-                               </parameters>
-                       </method>
-                       <method name="add_bool" symbol="gsf_xml_out_add_bool">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="xout" type="GsfXMLOut*"/>
-                                       <parameter name="id" type="char*"/>
-                                       <parameter name="val" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="add_color" symbol="gsf_xml_out_add_color">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="xout" type="GsfXMLOut*"/>
-                                       <parameter name="id" type="char*"/>
-                                       <parameter name="r" type="unsigned"/>
-                                       <parameter name="g" type="unsigned"/>
-                                       <parameter name="b" type="unsigned"/>
-                               </parameters>
-                       </method>
-                       <method name="add_cstr" symbol="gsf_xml_out_add_cstr">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="xout" type="GsfXMLOut*"/>
-                                       <parameter name="id" type="char*"/>
-                                       <parameter name="val_utf8" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="add_cstr_unchecked" symbol="gsf_xml_out_add_cstr_unchecked">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="xout" type="GsfXMLOut*"/>
-                                       <parameter name="id" type="char*"/>
-                                       <parameter name="val_utf8" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="add_enum" symbol="gsf_xml_out_add_enum">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="xout" type="GsfXMLOut*"/>
-                                       <parameter name="id" type="char*"/>
-                                       <parameter name="etype" type="GType"/>
-                                       <parameter name="val" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="add_float" symbol="gsf_xml_out_add_float">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="xout" type="GsfXMLOut*"/>
-                                       <parameter name="id" type="char*"/>
-                                       <parameter name="val" type="double"/>
-                                       <parameter name="precision" type="int"/>
-                               </parameters>
-                       </method>
-                       <method name="add_gvalue" symbol="gsf_xml_out_add_gvalue">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="xout" type="GsfXMLOut*"/>
-                                       <parameter name="id" type="char*"/>
-                                       <parameter name="val" type="GValue*"/>
-                               </parameters>
-                       </method>
-                       <method name="add_int" symbol="gsf_xml_out_add_int">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="xout" type="GsfXMLOut*"/>
-                                       <parameter name="id" type="char*"/>
-                                       <parameter name="val" type="int"/>
-                               </parameters>
-                       </method>
-                       <method name="add_uint" symbol="gsf_xml_out_add_uint">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="xout" type="GsfXMLOut*"/>
-                                       <parameter name="id" type="char*"/>
-                                       <parameter name="val" type="unsigned"/>
-                               </parameters>
-                       </method>
-                       <method name="end_element" symbol="gsf_xml_out_end_element">
-                               <return-type type="char*"/>
-                               <parameters>
-                                       <parameter name="xout" type="GsfXMLOut*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_output" symbol="gsf_xml_out_get_output">
-                               <return-type type="GsfOutput*"/>
-                               <parameters>
-                                       <parameter name="xout" type="GsfXMLOut*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gsf_xml_out_new">
-                               <return-type type="GsfXMLOut*"/>
-                               <parameters>
-                                       <parameter name="output" type="GsfOutput*"/>
-                               </parameters>
-                       </constructor>
-                       <method name="set_doc_type" symbol="gsf_xml_out_set_doc_type">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="xout" type="GsfXMLOut*"/>
-                                       <parameter name="type" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="simple_element" symbol="gsf_xml_out_simple_element">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="xout" type="GsfXMLOut*"/>
-                                       <parameter name="id" type="char*"/>
-                                       <parameter name="content" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="simple_float_element" symbol="gsf_xml_out_simple_float_element">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="xout" type="GsfXMLOut*"/>
-                                       <parameter name="id" type="char*"/>
-                                       <parameter name="val" type="double"/>
-                                       <parameter name="precision" type="int"/>
-                               </parameters>
-                       </method>
-                       <method name="simple_int_element" symbol="gsf_xml_out_simple_int_element">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="xout" type="GsfXMLOut*"/>
-                                       <parameter name="id" type="char*"/>
-                                       <parameter name="val" type="int"/>
-                               </parameters>
-                       </method>
-                       <method name="start_element" symbol="gsf_xml_out_start_element">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="xout" type="GsfXMLOut*"/>
-                                       <parameter name="id" type="char*"/>
-                               </parameters>
-                       </method>
-                       <property name="pretty-print" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-               </object>
-               <constant name="GSF_META_NAME_BYTE_COUNT" type="char*" value="gsf:byte-count"/>
-               <constant name="GSF_META_NAME_CASE_SENSITIVE" type="char*" value="gsf:case-sensitivity"/>
-               <constant name="GSF_META_NAME_CATEGORY" type="char*" value="gsf:category"/>
-               <constant name="GSF_META_NAME_CELL_COUNT" type="char*" value="gsf:cell-count"/>
-               <constant name="GSF_META_NAME_CHARACTER_COUNT" type="char*" value="gsf:character-count"/>
-               <constant name="GSF_META_NAME_CODEPAGE" type="char*" value="msole:codepage"/>
-               <constant name="GSF_META_NAME_COMPANY" type="char*" value="dc:publisher"/>
-               <constant name="GSF_META_NAME_CREATOR" type="char*" value="dc:creator"/>
-               <constant name="GSF_META_NAME_DATE_CREATED" type="char*" value="meta:creation-date"/>
-               <constant name="GSF_META_NAME_DATE_MODIFIED" type="char*" value="dc:date"/>
-               <constant name="GSF_META_NAME_DESCRIPTION" type="char*" value="dc:description"/>
-               <constant name="GSF_META_NAME_DICTIONARY" type="char*" value="gsf:dictionary"/>
-               <constant name="GSF_META_NAME_DOCUMENT_PARTS" type="char*" value="gsf:document-parts"/>
-               <constant name="GSF_META_NAME_EDITING_DURATION" type="char*" value="meta:editing-duration"/>
-               <constant name="GSF_META_NAME_GENERATOR" type="char*" value="meta:generator"/>
-               <constant name="GSF_META_NAME_HEADING_PAIRS" type="char*" value="gsf:heading-pairs"/>
-               <constant name="GSF_META_NAME_HIDDEN_SLIDE_COUNT" type="char*" value="gsf:hidden-slide-count"/>
-               <constant name="GSF_META_NAME_IMAGE_COUNT" type="char*" value="gsf:image-count"/>
-               <constant name="GSF_META_NAME_INITIAL_CREATOR" type="char*" value="meta:initial-creator"/>
-               <constant name="GSF_META_NAME_KEYWORD" type="char*" value="meta:keyword"/>
-               <constant name="GSF_META_NAME_KEYWORDS" type="char*" value="dc:keywords"/>
-               <constant name="GSF_META_NAME_LANGUAGE" type="char*" value="dc:language"/>
-               <constant name="GSF_META_NAME_LAST_PRINTED" type="char*" value="gsf:last-printed"/>
-               <constant name="GSF_META_NAME_LAST_SAVED_BY" type="char*" value="gsf:last-saved-by"/>
-               <constant name="GSF_META_NAME_LINE_COUNT" type="char*" value="gsf:line-count"/>
-               <constant name="GSF_META_NAME_LINKS_DIRTY" type="char*" value="gsf:links-dirty"/>
-               <constant name="GSF_META_NAME_LOCALE_SYSTEM_DEFAULT" type="char*" value="gsf:default-locale"/>
-               <constant name="GSF_META_NAME_MANAGER" type="char*" value="gsf:manager"/>
-               <constant name="GSF_META_NAME_MM_CLIP_COUNT" type="char*" value="gsf:MM-clip-count"/>
-               <constant name="GSF_META_NAME_MSOLE_UNKNOWN_17" type="char*" value="msole:unknown-doc-17"/>
-               <constant name="GSF_META_NAME_MSOLE_UNKNOWN_18" type="char*" value="msole:unknown-doc-18"/>
-               <constant name="GSF_META_NAME_MSOLE_UNKNOWN_19" type="char*" value="msole:unknown-doc-19"/>
-               <constant name="GSF_META_NAME_MSOLE_UNKNOWN_20" type="char*" value="msole:unknown-doc-20"/>
-               <constant name="GSF_META_NAME_MSOLE_UNKNOWN_21" type="char*" value="msole:unknown-doc-21"/>
-               <constant name="GSF_META_NAME_MSOLE_UNKNOWN_22" type="char*" value="msole:unknown-doc-22"/>
-               <constant name="GSF_META_NAME_MSOLE_UNKNOWN_23" type="char*" value="msole:unknown-doc-23"/>
-               <constant name="GSF_META_NAME_NOTE_COUNT" type="char*" value="gsf:note-count"/>
-               <constant name="GSF_META_NAME_OBJECT_COUNT" type="char*" value="gsf:object-count"/>
-               <constant name="GSF_META_NAME_PAGE_COUNT" type="char*" value="gsf:page-count"/>
-               <constant name="GSF_META_NAME_PARAGRAPH_COUNT" type="char*" value="gsf:paragraph-count"/>
-               <constant name="GSF_META_NAME_PRESENTATION_FORMAT" type="char*" value="gsf:presentation-format"/>
-               <constant name="GSF_META_NAME_PRINTED_BY" type="char*" value="meta:printed-by"/>
-               <constant name="GSF_META_NAME_PRINT_DATE" type="char*" value="meta:print-date"/>
-               <constant name="GSF_META_NAME_REVISION_COUNT" type="char*" value="meta:editing-cycles"/>
-               <constant name="GSF_META_NAME_SCALE" type="char*" value="gsf:scale"/>
-               <constant name="GSF_META_NAME_SECURITY" type="char*" value="gsf:security"/>
-               <constant name="GSF_META_NAME_SLIDE_COUNT" type="char*" value="gsf:slide-count"/>
-               <constant name="GSF_META_NAME_SPREADSHEET_COUNT" type="char*" value="gsf:spreadsheet-count"/>
-               <constant name="GSF_META_NAME_SUBJECT" type="char*" value="dc:subject"/>
-               <constant name="GSF_META_NAME_TABLE_COUNT" type="char*" value="gsf:table-count"/>
-               <constant name="GSF_META_NAME_TEMPLATE" type="char*" value="meta:template"/>
-               <constant name="GSF_META_NAME_THUMBNAIL" type="char*" value="gsf:thumbnail"/>
-               <constant name="GSF_META_NAME_TITLE" type="char*" value="dc:title"/>
-               <constant name="GSF_META_NAME_WORD_COUNT" type="char*" value="gsf:word-count"/>
-               <constant name="OLE_DEFAULT_BB_SHIFT" type="int" value="9"/>
-               <constant name="OLE_DEFAULT_SB_SHIFT" type="int" value="6"/>
-       </namespace>
-</api>
diff --git a/vapi/packages/libgsf-1/libgsf-1.metadata b/vapi/packages/libgsf-1/libgsf-1.metadata
deleted file mode 100644 (file)
index 96181c9..0000000
+++ /dev/null
@@ -1,201 +0,0 @@
-Gsf cheader_filename="gsf/gsf.h"
-GsfClipFormat cheader_filename="gsf/gsf-clip-data.h"
-GsfClipFormatWindows cheader_filename="gsf/gsf-clip-data.h"
-GsfError errordomain="1" cheader_filename="gsf/gsf-utils.h"
-GsfOutputCsvQuotingMode cheader_filename="gsf/gsf-output-csv.h"
-GsfXMLContent cheader_filename="gsf/gsf-libxml.h"
-GsfZipCompressionMethod cheader_filename="gsf/gsf-outfile-zip.h"
-GsfBlob type_id="GSF_BLOB_TYPE" cheader_filename="gsf/gsf-blob.h"
-GsfDocPropVector type_id="GSF_DOC_PROP_VECTOR_TYPE" cheader_filename="gsf/gsf-docprop-vector.h"
-GsfDocMetaData type_id="GSF_DOC_META_DATA_TYPE" cheader_filename="gsf/gsf-doc-meta-data.h"
-GsfInfileMSOle type_id="GSF_INFILE_MSOLE_TYPE" cheader_filename="gsf/gsf-infile-msole.h"
-GsfInfileMSVBA type_id="GSF_INFILE_MSVBA_TYPE" cheader_filename="gsf/gsf-infile-msvba.h"
-GsfInfileStdio type_id="GSF_INFILE_STDIO_TYPE" cheader_filename="gsf/gsf-infile-stdio.h"
-GsfInfile type_id="GSF_INFILE_TYPE" cheader_filename="gsf/gsf-infile-impl.h"
-GsfInfileZip type_id="GSF_INFILE_GZIP_TYPE" cheader_filename="gsf/gsf-infile-zip.h"
-GsfInputGZip type_id="GSF_INPUT_GZIP_TYPE" cheader_filename="gsf/gsf-input-gzip.h"
-GsfInputMemory type_id="GSF_INPUT_MEMORY_TYPE" cheader_filename="gsf/gsf-input-memory.h"
-GsfInputProxy type_id="GSF_INPUT_PROXY_TYPE" cheader_filename="gsf/gsf-input-proxy.h"
-GsfInputStdio type_id="GSF_INPUT_STDIO_TYPE" cheader_filename="gsf/gsf-input-stdio.h"
-GsfInputTextline type_id="GSF_INPUT_TEXTLINE_TYPE" cheader_filename="gsf/gsf-input-textline.h"
-GsfInputHTTP type_id="GSF_INPUT_HTTP_TYPE" cheader_filename="gsf/gsf-input-http.h"
-GsfInput type_id="GSF_INPUT_TYPE" cheader_filename="gsf/gsf-input-impl.h"
-GsfOutfileMSOle type_id="GSF_OUTFILE_MSOLE_TYPE" cheader_filename="gsf/gsf-outfile-msole.h"
-GsfOutfileStdio type_id="GSF_OUTFILE_STDIO_TYPE" cheader_filename="gsf/gsf-outfile-stdio.h"
-GsfOutfile type_id="GSF_OUTFILE_TYPE" cheader_filename="gsf/gsf-outfile-impl.h"
-GsfOutfileZip type_id="GSF_OUTFILE_ZIP_TYPE" cheader_filename="gsf/gsf-outfile-zip.h"
-GsfOutputBzip type_id="GSF_OUTPUT_BZIP_TYPE" cheader_filename="gsf/gsf-output-bzip.h"
-GsfOutputCsv type_id="GSF_OUTPUT_CSV_TYPE" cheader_filename="gsf/gsf-output-csv.h"
-GsfOutputGio type_id="GSF_OUTPUT_GIO_TYPE" cheader_filename="gsf/gsf-output-gio.h"
-GsfOutputGZip type_id="GSF_OUTPUT_GZIP_TYPE" cheader_filename="gsf/gsf-output-gzip.h"
-GsfOutputIconv type_id="GSF_OUTPUT_ICONV_TYPE" cheader_filename="gsf/gsf-output-iconv.h"
-GsfOutputIOChannel type_id="GSF_OUTPUT_IOCHANNEL_TYPE" cheader_filename="gsf/gsf-output-iochannel.h"
-GsfOutputMemory type_id="GSF_OUTPUT_MEMORY_TYPE" cheader_filename="gsf/gsf-output-memory.h"
-GsfOutputStdio type_id="GSF_OUTPUT_STDIO_TYPE" cheader_filename="gsf/gsf-output-stdio.h"
-GsfOutput type_id="GSF_OUTPUT_TYPE" cheader_filename="gsf/gsf-output-impl.h"
-GsfSharedMemory type_id="GSF_SHARED_MEMORY_TYPE" cheader_filename="gsf/gsf-infile-msvba.h"
-GsfStructuredBlob type_id="GSF_STRUCTURED_BLOB_TYPE" cheader_filename="gsf/gsf-structured-blob.h"
-GsfClipData type_id="GSF_CLIP_DATA_TYPE" cheader_filename="gsf/gsf-clip-data.h"
-GsfXMLOut type_id="GSF_XML_OUT_TYPE" cheader_filename="gsf/gsf-libxml.h"
-GsfDocProp cheader_filename="gsf/gsf-doc-meta-data.h"
-GsfTimestamp cheader_filename="gsf/gsf-timestamp.h"
-GsfXMLBlob cheader_filename="gsf/gsf-libxml.h"
-GsfXMLIn cheader_filename="gsf/gsf-libxml.h"
-GsfXMLInDoc cheader_filename="gsf/gsf-libxml.h"
-GsfXMLInNS cheader_filename="gsf/gsf-libxml.h"
-GsfXMLInNode cheader_filename="gsf/gsf-libxml.h"
-GsfXMLInExtDtor cheader_filename="gsf/gsf-libxml.h"
-GsfXMLInUnknownFunc cheader_filename="gsf/gsf-libxml.h"
-gsf_doc_meta_dump cheader_filename="gsf/gsf-doc-meta-data.h"
-gsf_filename_to_utf8 transfer_ownership="1" cheader_filename="gsf/gsf-utils.h"
-gsf_iconv_close cheader_filename="gsf/gsf-utils.h"
-gsf_mem_dump cheader_filename="gsf/gsf-utils.h"
-GsfOpenPkgRel cheader_filename="gsf/gsf-open-pkg-utils.h"
-GsfOpenPkgRels cheader_filename="gsf/gsf-open-pkg-utils.h"
-GsfOutfileOpenPkg cheader_filename="gsf/gsf-open-pkg-utils.h"
-gsf_off_t name="off_t" is_value_type="1" has_type_id="0" hidden="1"
-GsfInput:eof hidden="1"
-GsfInput:name hidden="1"
-GsfInput:remaining hidden="1"
-GsfInput:size hidden="1"
-GsfOutput:is-closed hidden="1"
-GsfOutput:name hidden="1"
-GsfOutput:size hidden="1"
-gsf_outfile_new_child hidden="1"
-gsf_outfile_new_child_full hidden="1"
-gsf_timestamp_as_string transfer_ownership="1"
-gsf_timestamp_copy transfer_ownership="1"
-gsf_docprop_vector_as_string transfer_ownership="1"
-gsf_doc_prop_swap_val transfer_ownership="1"
-gsf_input_uncompress.src transfer_ownership="1"
-gsf_input_sibling transfer_ownership="1"
-gsf_input_memory_new.buf type_name="uint8[]" array_length_type="Gsf.off_t"
-gsf_input_memory_new.length hidden="1"
-gsf_input_memory_new_clone.buf type_name="uint8[]" array_length_type="Gsf.off_t"
-gsf_input_memory_new_clone.length hidden="1"
-gsf_input_mmap_new transfer_ownership="1"
-gsf_input_dup transfer_ownership="1"
-gsf_infile_child_by_aname.names no_array_length="1"
-gsf_infile_child_by_index transfer_ownership="1"
-gsf_infile_child_by_vname transfer_ownership="1" ellipsis="1"
-gsf_infile_child_by_name transfer_ownership="1"
-gsf_input_Dup transfer_ownership="1"
-gsf_input_OpenSibling transfer_ownership="1"
-gsf_input_textline_ascii_gets no_array_length="1" is_array="1" nullable="1"
-gsf_input_textline_utf8_gets no_array_length="1" is_array="1" nullable="1"
-gsf_outfile_open_pkg_add_rel transfer_ownership="1"
-gsf_outfile_new_child_varg hidden="1"
-gsf_structured_blob_read transfer_ownership="1"
-gsf_msole_inflate transfer_ownership="1"
-gsf_output_vprintf hidden="1"
-gsf_output_Vprintf hidden="1"
-gsf_output_printf ellipsis="1"
-gsf_input_stdio_new_FILE hidden="1"
-gsf_output_stdio_new_FILE hidden="1"
-gsf_output_stdio_new_valist hidden="1"
-gsf_output_stdio_new_full ellipsis="1"
-xmlChar name="string"
-gsf_xml_in_push_state.attrs no_array_length="1" is_array="1"
-gsf_xml_in_doc_new.nodes no_array_length="1" is_array="1"
-gsf_doc_prop_new.name transfer_ownership="1"
-gsf_doc_prop_set_val.val transfer_ownership="1"
-gsf_doc_prop_get_val nullable="1"
-gsf_doc_prop_set_link.link transfer_ownership="1"
-gsf_doc_prop_get_link nullable="1"
-gsf_input_read.optional_buffer no_array_length="1" is_array="1" nullable="1"
-gsf_input_read is_array="1" no_array_length="1" nullable="1"
-gsf_input_Read.optional_buffer is_array="1" no_array_length="1" nullable="1"
-gsf_input_Read is_array="1" nullable="1" no_array_length="1"
-gsf_doc_meta_data_lookup nullable="1"
-gsf_doc_meta_data_steal nullable="1"
-gsf_doc_meta_data_foreach.func type_arguments="string" type_arguments="DocProp"
-gsf_infile_child_by_vname nullable="1"
-gsf_infile_child_by_name nullable="1"
-gsf_infile_child_by_index nullable="1"
-gsf_infile_name_by_index nullable="1"
-gsf_input_container nullable="1"
-gsf_input_sibling nullable="1"
-gsf_input_name nullable="1"
-gsf_input_set_name.name nullable="1"
-gsf_input_set_container.container nullable="1"
-gsf_output_container nullable="1"
-gsf_output_name nullable="1"
-gsf_output_set_name.name nullable="1"
-gsf_output_set_container.container nullable="1"
-gsf_outfile_stdio_new_valist hidden="1"
-gsf_output_Write.data no_array_length="1" is_array="1"
-gsf_output_write.data no_array_length="1" is_array="1"
-gsf_output_memory_get_bytes is_array="1" no_array_length="1"
-gsf_base64_decode_simple.data is_array="1" no_array_length="1"
-gsf_base64_decode_step.in is_array="1" no_array_length="1"
-gsf_base64_decode_step.out is_array="1" no_array_length="1"
-gsf_base64_decode_step.state is_out="1"
-gsf_base64_decode_step.save is_out="1"
-gsf_base64_encode_close.in is_array="1" no_array_length="1"
-gsf_base64_encode_close.out is_array="1" no_array_length="1"
-gsf_base64_encode_close.state is_out="1"
-gsf_base64_encode_close.save is_out="1"
-gsf_base64_encode_simple.data is_array="1" no_array_length="1"
-gsf_base64_encode_simple cheader_filename="gsf/gsf-utils.h" is_array="1" no_array_length="1"
-gsf_base64_encode_step.in is_array="1" no_array_length="1"
-gsf_base64_encode_step.out is_array="1" no_array_length="1"
-gsf_base64_encode_step.state is_out="1"
-gsf_base64_encode_step.save is_out="1"
-gsf_mem_dump.ptr is_array="1" no_array_length="1"
-gsf_property_settings_collect_valist hidden="1"
-GSF_META_NAME_* cheader_filename="gsf/gsf-meta-names.h"
-OLE_DEFAULT_BB_SHIFT cheader_filename="gsf/gsf-outfile-ole.h"
-OLE_DEFAULT_SB_SHIFT cheader_filename="gsf/gsf-outfile-ole.h"
-gsf_base64_decode_simple cheader_filename="gsf/gsf-utils.h"
-gsf_base64_decode_step cheader_filename="gsf/gsf-utils.h"
-gsf_base64_encode_close cheader_filename="gsf/gsf-utils.h"
-gsf_base64_encode_step cheader_filename="gsf/gsf-utils.h"
-gsf_doc_meta_dump cheader_filename="gsf/gsf-doc-meta-data.h"
-gsf_error_quark cheader_filename="gsf/gsf-utils.h"
-gsf_extension_pointer cheader_filename="gsf/gsf-utils.h"
-gsf_iconv_close cheader_filename="gsf/gsf-utils.h"
-gsf_init cheader_filename="gsf/gsf-utils.h"
-gsf_init_dynamic cheader_filename="gsf/gsf-utils.h"
-gsf_le_get_double cheader_filename="gsf/gsf-utils.h"
-gsf_le_get_float cheader_filename="gsf/gsf-utils.h"
-gsf_le_get_guint64 cheader_filename="gsf/gsf-utils.h"
-gsf_le_set_double cheader_filename="gsf/gsf-utils.h"
-gsf_le_set_float cheader_filename="gsf/gsf-utils.h"
-gsf_mem_dump cheader_filename="gsf/gsf-utils.h"
-gsf_msole_codepage_to_lid cheader_filename="gsf/gsf-msole-utils.h"
-gsf_msole_iconv_open_codepage_for_export cheader_filename="gsf/gsf-msole-utils.h"
-gsf_msole_iconv_open_codepage_for_import cheader_filename="gsf/gsf-msole-utils.h"
-gsf_msole_iconv_open_codepages_for_export cheader_filename="gsf/gsf-msole-utils.h"
-gsf_msole_iconv_open_for_export cheader_filename="gsf/gsf-msole-utils.h"
-gsf_msole_iconv_open_for_import cheader_filename="gsf/gsf-msole-utils.h"
-gsf_msole_iconv_win_codepage cheader_filename="gsf/gsf-msole-utils.h"
-gsf_msole_inflate cheader_filename="gsf/gsf-msole-utils.h"
-gsf_msole_language_for_lid cheader_filename="gsf/gsf-msole-utils.h"
-gsf_msole_lid_for_language cheader_filename="gsf/gsf-msole-utils.h"
-gsf_msole_lid_to_codepage cheader_filename="gsf/gsf-msole-utils.h"
-gsf_msole_lid_to_codepage_str cheader_filename="gsf/gsf-msole-utils.h"
-gsf_msole_metadata_read cheader_filename="gsf/gsf-msole-utils.h"
-gsf_msole_metadata_write cheader_filename="gsf/gsf-msole-utils.h"
-gsf_open_pkg_error_id cheader_filename="gsf/gsf-open-pkg-utils.h"
-gsf_open_pkg_get_rel_by_id transfer_ownership="1" cheader_filename="gsf/gsf-open-pkg-utils.h"
-gsf_open_pkg_get_rel_by_type transfer_ownership="1" cheader_filename="gsf/gsf-open-pkg-utils.h"
-gsf_open_pkg_lookup_rel_by_id cheader_filename="gsf/gsf-open-pkg-utils.h"
-gsf_open_pkg_lookup_rel_by_type cheader_filename="gsf/gsf-open-pkg-utils.h"
-gsf_open_pkg_open_rel_by_id transfer_ownership="1" cheader_filename="gsf/gsf-open-pkg-utils.h"
-gsf_open_pkg_open_rel_by_type transfer_ownership="1" cheader_filename="gsf/gsf-open-pkg-utils.h"
-gsf_open_pkg_parse_rel_by_id cheader_filename="gsf/gsf-open-pkg-utils.h"
-gsf_opendoc_metadata_read cheader_filename="gsf/gsf-opendoc-utils.h"
-gsf_opendoc_metadata_subtree cheader_filename="gsf/gsf-opendoc-utils.h"
-gsf_opendoc_metadata_write cheader_filename="gsf/gsf-opendoc-utils.h"
-gsf_property_settings_collect cheader_filename="gsf/gsf-utils.h"
-gsf_property_settings_collect.p_params is_array="1" no_array_length="1" 
-gsf_property_settings_collect.p_n_params is_ref="1"
-gsf_property_settings_free cheader_filename="gsf/gsf-utils.h"
-gsf_shutdown cheader_filename="gsf/gsf-utils.h"
-gsf_shutdown_dynamic cheader_filename="gsf/gsf-utils.h"
-gsf_value_get_docprop_varray cheader_filename="gsf/gsf-docprop-vector.h"
-gsf_value_get_docprop_vector cheader_filename="gsf/gsf-docprop-vector.h"
-gsf_value_set_timestamp cheader_filename="gsf/gsf-timestamp.h"
-gsf_xmlDocFormatDump cheader_filename="gsf/gsf-libxml.h"
-gsf_xml_gvalue_from_str cheader_filename="gsf/gsf-libxml.h"
-gsf_xml_parser_context transfer_ownership="1" cheader_filename="gsf/gsf-libxml.h"
diff --git a/vapi/packages/libgsf-1/libgsf-1.namespace b/vapi/packages/libgsf-1/libgsf-1.namespace
deleted file mode 100644 (file)
index 1b2820f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Gsf
\ No newline at end of file