]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
libgsf-1: Update to 1.14.16, regenerate.
authorEvan Nemerson <evan@coeus-group.com>
Thu, 12 Nov 2009 10:12:17 +0000 (02:12 -0800)
committerEvan Nemerson <evan@coeus-group.com>
Fri, 13 Nov 2009 01:02:35 +0000 (17:02 -0800)
Partially fixes bug 600295.

vapi/libgsf-1.deps
vapi/libgsf-1.vapi
vapi/packages/libgsf-1/libgsf-1-custom.vala
vapi/packages/libgsf-1/libgsf-1.deps
vapi/packages/libgsf-1/libgsf-1.gi
vapi/packages/libgsf-1/libgsf-1.metadata

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