[gexiv2] vapi: Fix compatiblity with Shotwell

[Jens Georg <jensgeorg src gnome org>]

commit 63b68ab3850a77b2a1acd84c7f3dd53881974df3
Author: Jens Georg <mail jensge org>
Date:   Sun Jul 17 23:04:18 2016 +0200

    vapi: Fix compatiblity with Shotwell
    
    Signed-off-by: Jens Georg <mail jensge org>

 Makefile.am               |    4 ++--
 gexiv2.vapi               |    8 ++++----
 vapi/GExiv2-0.10.metadata |    2 ++
 vapi/gexiv2-custom.vala   |    4 ++++
 4 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 79a34b7..072d21d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,11 +41,11 @@ vapi: gexiv2.vapi
 gexiv2.vapi: gexiv2_vapi.stamp
        @true
 
-gexiv2_vapi.stamp: $(top_builddir)/GExiv2-0.10.gir $(top_srcdir)/vapi/GExiv2-0.10.metadata
+gexiv2_vapi.stamp: $(top_builddir)/GExiv2-0.10.gir $(top_srcdir)/vapi/GExiv2-0.10.metadata 
$(top_srcdir)/vapi/gexiv2-custom.vala
        rm -f $(@F)
        $(AM_V_GEN)$(VAPIGEN) --metadatadir=$(top_srcdir)/vapi \
                              --library=gexiv2 \
-                             $(top_builddir)/GExiv2-0.10.gir
+                             $(top_builddir)/GExiv2-0.10.gir $(srcdir)/vapi/gexiv2-custom.vala
        echo timestmap > $(@F)
 
 dist_vapi_DATA = gexiv2.vapi
diff --git a/gexiv2.vapi b/gexiv2.vapi
index 696cca9..c316174 100644
--- a/gexiv2.vapi
+++ b/gexiv2.vapi
@@ -1,8 +1,8 @@
-/* gexiv2.vapi generated by vapigen-0.32, do not modify. */
+/* gexiv2.vapi generated by vapigen-0.34, do not modify. */
 
 [CCode (cprefix = "GExiv2", gir_namespace = "GExiv2", gir_version = "0.10", lower_case_cprefix = "gexiv2_")]
 namespace GExiv2 {
-       [CCode (cheader_filename = "gexiv2/gexiv2.h", type_id = "gexiv2_metadata_get_type ()")]
+       [CCode (cheader_filename = "gexiv2/gexiv2.h")]
        public class Metadata : GLib.Object {
                [CCode (has_construct_function = false)]
                public Metadata ();
@@ -14,7 +14,7 @@ namespace GExiv2 {
                public void clear_xmp ();
                public void delete_gps_info ();
                public void erase_exif_thumbnail ();
-               public bool from_app1_segment ([CCode (array_length_cname = "n_data", array_length_pos = 1.1, 
array_length_type = "glong")] uint8[] data) throws GLib.Error;
+               public bool from_app1_segment ([CCode (array_length = false)] uchar[] data, long n_data) 
throws GLib.Error;
                public string? generate_xmp_packet (GExiv2.XmpFormatFlags xmp_format_flags, uint32 padding);
                public string? get_comment ();
                public bool get_exif_tag_rational (string tag, out int nom, out int den);
@@ -62,7 +62,7 @@ namespace GExiv2 {
                public static bool is_exif_tag (string tag);
                public static bool is_iptc_tag (string tag);
                public static bool is_xmp_tag (string tag);
-               public bool open_buf ([CCode (array_length_cname = "n_data", array_length_pos = 1.1, 
array_length_type = "glong")] uint8[] data) throws GLib.Error;
+               public bool open_buf ([CCode (array_length = false)] uchar[] data, long n_data) throws 
GLib.Error;
                public bool open_path (string path) throws GLib.Error;
                public static bool register_xmp_namespace (string name, string prefix);
                public bool save_file (string path) throws GLib.Error;
diff --git a/vapi/GExiv2-0.10.metadata b/vapi/GExiv2-0.10.metadata
index 8660a85..33557cc 100644
--- a/vapi/GExiv2-0.10.metadata
+++ b/vapi/GExiv2-0.10.metadata
@@ -1,6 +1,8 @@
 GExiv2 cheader_filename="gexiv2/gexiv2.h"
 
 Metadata
+    .from_app1_segment skip
+    .open_buf skip
     .free skip
 
 PreviewImage
diff --git a/vapi/gexiv2-custom.vala b/vapi/gexiv2-custom.vala
new file mode 100644
index 0000000..74738af
--- /dev/null
+++ b/vapi/gexiv2-custom.vala
@@ -0,0 +1,4 @@
+public class GExiv2.Metadata : GLib.Object {
+               public bool from_app1_segment ([CCode (array_length = false)] uchar[] data, long n_data) 
throws GLib.Error;
+               public bool open_buf ([CCode (array_length = false)] uchar[] data, long n_data) throws 
GLib.Error;
+}