libgsf-1: Fix type_id to match the unusual libgsf convention

Fixes bug 688851.

1 files changed, 31 insertions, 31 deletions

diff --git a/vapi/libgsf-1.vapi b/vapi/libgsf-1.vapi
index d67d5be8e..b6663986b 100644
--- a/vapi/libgsf-1.vapi
+++ b/vapi/libgsf-1.vapi
@@ -1,14 +1,14 @@
 /* libgsf-1.vapi generated by vapigen, do not modify. */
 
 namespace Gsf {
-	[CCode (cheader_filename = "gsf/gsf-blob.h")]
+	[CCode (cheader_filename = "gsf/gsf-blob.h", type_id = "GSF_BLOB_TYPE")]
 	public class Blob : GLib.Object {
 		[CCode (has_construct_function = false)]
 		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")]
+	[CCode (cheader_filename = "gsf/gsf-clip-data.h", type_id = "GSF_CLIP_DATA_TYPE")]
 	public class ClipData : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public ClipData (Gsf.ClipFormat format, Gsf.Blob data_blob);
@@ -17,7 +17,7 @@ namespace Gsf {
 		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")]
+	[CCode (cheader_filename = "gsf/gsf-doc-meta-data.h", type_id = "GSF_DOC_META_DATA_TYPE")]
 	public class DocMetaData : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public DocMetaData ();
@@ -42,7 +42,7 @@ namespace Gsf {
 		public void set_val (owned GLib.Value val);
 		public GLib.Value swap_val (GLib.Value val);
 	}
-	[CCode (cheader_filename = "gsf/gsf-docprop-vector.h")]
+	[CCode (cheader_filename = "gsf/gsf-docprop-vector.h", type_id = "GSF_DOC_PROP_VECTOR_TYPE")]
 	public class DocPropVector : GLib.Object {
 		[CCode (cname = "gsf_docprop_vector_new", has_construct_function = false)]
 		public DocPropVector ();
@@ -51,7 +51,7 @@ namespace Gsf {
 		[CCode (cname = "gsf_docprop_vector_as_string")]
 		public string as_string ();
 	}
-	[CCode (cheader_filename = "gsf/gsf-infile-impl.h")]
+	[CCode (cheader_filename = "gsf/gsf-infile-impl.h", type_id = "GSF_INFILE_TYPE")]
 	public class Infile : Gsf.Input {
 		[CCode (has_construct_function = false)]
 		protected Infile ();
@@ -63,21 +63,21 @@ namespace Gsf {
 		public virtual unowned string? name_by_index (int i);
 		public virtual int num_children ();
 	}
-	[CCode (cheader_filename = "gsf/gsf-infile-msole.h")]
+	[CCode (cheader_filename = "gsf/gsf-infile-msole.h", type_id = "GSF_INFILE_MSOLE_TYPE")]
 	public class InfileMSOle : Gsf.Infile {
 		[CCode (cname = "gsf_infile_msole_new", 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);
 	}
-	[CCode (cheader_filename = "gsf/gsf-infile-msvba.h")]
+	[CCode (cheader_filename = "gsf/gsf-infile-msvba.h", type_id = "GSF_INFILE_MSVBA_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 ();
 	}
-	[CCode (cheader_filename = "gsf/gsf-infile-stdio.h")]
+	[CCode (cheader_filename = "gsf/gsf-infile-stdio.h", type_id = "GSF_INFILE_STDIO_TYPE")]
 	public class InfileStdio : Gsf.Infile {
 		[CCode (has_construct_function = false, type = "GsfInfile*")]
 		public InfileStdio (string root) throws GLib.Error;
@@ -89,7 +89,7 @@ namespace Gsf {
 		[NoAccessorMethod]
 		public Gsf.Input source { owned get; construct; }
 	}
-	[CCode (cheader_filename = "gsf/gsf-infile-zip.h")]
+	[CCode (cheader_filename = "gsf/gsf-infile-zip.h", type_id = "GSF_INFILE_GZIP_TYPE")]
 	public class InfileZip : Gsf.Infile {
 		[CCode (has_construct_function = false, type = "GsfInfile*")]
 		public InfileZip (Gsf.Input source) throws GLib.Error;
@@ -99,7 +99,7 @@ namespace Gsf {
 		[NoAccessorMethod]
 		public Gsf.Input source { owned get; construct; }
 	}
-	[CCode (cheader_filename = "gsf/gsf-input-impl.h")]
+	[CCode (cheader_filename = "gsf/gsf-input-impl.h", type_id = "GSF_INPUT_TYPE")]
 	public class Input : GLib.Object {
 		public Gsf.off_t cur_offset;
 		[CCode (has_construct_function = false)]
@@ -139,7 +139,7 @@ namespace Gsf {
 		[NoAccessorMethod]
 		public int64 position { get; }
 	}
-	[CCode (cheader_filename = "gsf/gsf-input-gzip.h")]
+	[CCode (cheader_filename = "gsf/gsf-input-gzip.h", type_id = "GSF_INPUT_GZIP_TYPE")]
 	public class InputGZip : Gsf.Input {
 		[CCode (has_construct_function = false, type = "GsfInput*")]
 		public InputGZip (Gsf.Input source) throws GLib.Error;
@@ -159,7 +159,7 @@ 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")]
+	[CCode (cheader_filename = "gsf/gsf-input-http.h", type_id = "GSF_INPUT_HTTP_TYPE")]
 	public class InputHTTP : Gsf.Input {
 		[CCode (has_construct_function = false, type = "GsfInput*")]
 		public InputHTTP (string url) throws GLib.Error;
@@ -168,7 +168,7 @@ namespace Gsf {
 		public string content_type { get; construct; }
 		public string url { get; construct; }
 	}
-	[CCode (cheader_filename = "gsf/gsf-input-memory.h")]
+	[CCode (cheader_filename = "gsf/gsf-input-memory.h", type_id = "GSF_INPUT_MEMORY_TYPE")]
 	public class InputMemory : Gsf.Input {
 		[CCode (has_construct_function = false, type = "GsfInput*")]
 		public InputMemory (uchar buf, Gsf.off_t length, bool needs_free);
@@ -179,19 +179,19 @@ namespace Gsf {
 		[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")]
+	[CCode (cheader_filename = "gsf/gsf-input-proxy.h", type_id = "GSF_INPUT_PROXY_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")]
+	[CCode (cheader_filename = "gsf/gsf-input-stdio.h", type_id = "GSF_INPUT_STDIO_TYPE")]
 	public class InputStdio : Gsf.Input {
 		[CCode (has_construct_function = false, type = "GsfInput*")]
 		public InputStdio (string filename) throws GLib.Error;
 	}
-	[CCode (cheader_filename = "gsf/gsf-input-textline.h")]
+	[CCode (cheader_filename = "gsf/gsf-input-textline.h", type_id = "GSF_INPUT_TEXTLINE_TYPE")]
 	public class InputTextline : Gsf.Input {
 		[CCode (has_construct_function = false, type = "GsfInput*")]
 		public InputTextline (Gsf.Input source);
@@ -217,7 +217,7 @@ namespace Gsf {
 		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")]
+	[CCode (cheader_filename = "gsf/gsf-outfile-msole.h", type_id = "GSF_OUTFILE_MSOLE_TYPE")]
 	public class OutfileMSOle : Gsf.Outfile {
 		[CCode (cname = "gsf_outfile_msole_new", has_construct_function = false, type = "GsfOutfile*")]
 		public OutfileMSOle (Gsf.Output sink);
@@ -242,14 +242,14 @@ namespace Gsf {
 		[NoAccessorMethod]
 		public Gsf.Outfile sink { owned get; construct; }
 	}
-	[CCode (cheader_filename = "gsf/gsf-outfile-stdio.h")]
+	[CCode (cheader_filename = "gsf/gsf-outfile-stdio.h", type_id = "GSF_OUTFILE_STDIO_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")]
+	[CCode (cheader_filename = "gsf/gsf-outfile-zip.h", type_id = "GSF_OUTFILE_ZIP_TYPE")]
 	public class OutfileZip : Gsf.Outfile {
 		[CCode (has_construct_function = false, type = "GsfOutfile*")]
 		public OutfileZip (Gsf.Output sink) throws GLib.Error;
@@ -261,7 +261,7 @@ namespace Gsf {
 		[NoAccessorMethod]
 		public Gsf.Output sink { owned get; construct; }
 	}
-	[CCode (cheader_filename = "gsf/gsf-output-impl.h")]
+	[CCode (cheader_filename = "gsf/gsf-output-impl.h", type_id = "GSF_OUTPUT_TYPE")]
 	public class Output : GLib.Object {
 		public Gsf.off_t cur_offset;
 		public Gsf.off_t cur_size;
@@ -298,12 +298,12 @@ namespace Gsf {
 		[NoAccessorMethod]
 		public int64 position { get; }
 	}
-	[CCode (cheader_filename = "gsf/gsf-output-bzip.h")]
+	[CCode (cheader_filename = "gsf/gsf-output-bzip.h", type_id = "GSF_OUTPUT_BZIP_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")]
+	[CCode (cheader_filename = "gsf/gsf-output-csv.h", type_id = "GSF_OUTPUT_CSV_TYPE")]
 	public class OutputCsv : Gsf.Output {
 		public weak GLib.StringBuilder buf;
 		public size_t eol_len;
@@ -329,7 +329,7 @@ namespace Gsf {
 		[NoAccessorMethod]
 		public Gsf.Output sink { owned get; set; }
 	}
-	[CCode (cheader_filename = "gsf/gsf-output-gzip.h")]
+	[CCode (cheader_filename = "gsf/gsf-output-gzip.h", type_id = "GSF_OUTPUT_GZIP_TYPE")]
 	public class OutputGZip : Gsf.Output {
 		[CCode (has_construct_function = false, type = "GsfOutput*")]
 		public OutputGZip (Gsf.Output sink) throws GLib.Error;
@@ -338,7 +338,7 @@ namespace Gsf {
 		[NoAccessorMethod]
 		public Gsf.Output sink { owned get; construct; }
 	}
-	[CCode (cheader_filename = "gsf/gsf-output-gio.h")]
+	[CCode (cheader_filename = "gsf/gsf-output-gio.h", type_id = "GSF_OUTPUT_GIO_TYPE")]
 	public class OutputGio : Gsf.Output {
 		[CCode (has_construct_function = false, type = "GsfOutput*")]
 		public OutputGio (GLib.File file);
@@ -347,12 +347,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")]
+	[CCode (cheader_filename = "gsf/gsf-output-iochannel.h", type_id = "GSF_OUTPUT_IOCHANNEL_TYPE")]
 	public class OutputIOChannel : Gsf.Output {
 		[CCode (cname = "gsf_output_iochannel_new", has_construct_function = false, type = "GsfOutput*")]
 		public OutputIOChannel (GLib.IOChannel channel);
 	}
-	[CCode (cheader_filename = "gsf/gsf-output-iconv.h")]
+	[CCode (cheader_filename = "gsf/gsf-output-iconv.h", type_id = "GSF_OUTPUT_ICONV_TYPE")]
 	public class OutputIconv : Gsf.Output {
 		[CCode (has_construct_function = false, type = "GsfOutput*")]
 		public OutputIconv (Gsf.Output sink, string dst, string src);
@@ -365,21 +365,21 @@ namespace Gsf {
 		[NoAccessorMethod]
 		public Gsf.Output sink { owned get; construct; }
 	}
-	[CCode (cheader_filename = "gsf/gsf-output-memory.h")]
+	[CCode (cheader_filename = "gsf/gsf-output-memory.h", type_id = "GSF_OUTPUT_MEMORY_TYPE")]
 	public class OutputMemory : Gsf.Output {
 		[CCode (has_construct_function = false, type = "GsfOutput*")]
 		public OutputMemory ();
 		[CCode (array_length = false)]
 		public unowned uchar[] get_bytes ();
 	}
-	[CCode (cheader_filename = "gsf/gsf-output-stdio.h")]
+	[CCode (cheader_filename = "gsf/gsf-output-stdio.h", type_id = "GSF_OUTPUT_STDIO_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.full (string filename, ...) throws GLib.Error;
 	}
-	[CCode (cheader_filename = "gsf/gsf-infile-msvba.h")]
+	[CCode (cheader_filename = "gsf/gsf-infile-msvba.h", type_id = "GSF_SHARED_MEMORY_TYPE")]
 	public class SharedMemory : GLib.Object {
 		public void* buf;
 		public bool needs_free;
@@ -389,7 +389,7 @@ namespace Gsf {
 		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")]
+	[CCode (cheader_filename = "gsf/gsf-structured-blob.h", type_id = "GSF_STRUCTURED_BLOB_TYPE")]
 	public class StructuredBlob : Gsf.Infile {
 		[CCode (has_construct_function = false)]
 		protected StructuredBlob ();
@@ -459,7 +459,7 @@ namespace Gsf {
 		public weak GLib.Callback start;
 		public void* user_data;
 	}
-	[CCode (cheader_filename = "gsf/gsf-libxml.h")]
+	[CCode (cheader_filename = "gsf/gsf-libxml.h", type_id = "GSF_XML_OUT_TYPE")]
 	public class XMLOut : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public XMLOut (Gsf.Output output);