vapi: Regenerate for GIR-based bindings to update prefix handling

diff --git a/vapi/pangocairo.vapi b/vapi/pangocairo.vapi
index 524ecc3a65b93bb06fb5092636f7c1027b18dad6..3a4e2ee0079649e06fee3b3c9d4f63dbd88cf98c 100644 (file)
--- a/vapi/pangocairo.vapi
+++ b/vapi/pangocairo.vapi
@@ -2,27 +2,36 @@
 
 [CCode (cprefix = "Pango", gir_namespace = "PangoCairo", gir_version = "1.0", lower_case_cprefix = "pango_")]
 namespace Pango {
-       [CCode (cheader_filename = "pango/pangocairo.h", type_id = "pango_cairo_font_get_type ()")]
+       [CCode (cheader_filename = "pango/pangocairo.h", lower_case_cprefix = "pango_font_", type_id = "pango_cairo_font_get_type ()")]
        [GIR (name = "Font")]
        [Version (since = "1.18")]
        public interface CairoFont : Pango.Font {
+               [CCode (cname = "pango_cairo_font_get_scaled_font")]
                public unowned Cairo.ScaledFont? get_scaled_font ();
        }
-       [CCode (cheader_filename = "pango/pangocairo.h", type_id = "pango_cairo_font_map_get_type ()")]
+       [CCode (cheader_filename = "pango/pangocairo.h", lower_case_cprefix = "pango_font_map_", type_id = "pango_cairo_font_map_get_type ()")]
        [GIR (name = "FontMap")]
        [Version (since = "1.10")]
        public interface CairoFontMap : Pango.FontMap {
+               [CCode (cname = "pango_cairo_font_map_create_context")]
                [Version (deprecated = true, deprecated_since = "1.22", since = "1.10")]
                public unowned Pango.Context create_context ();
+               [CCode (cname = "pango_cairo_font_map_get_default")]
                public static unowned Pango.FontMap get_default ();
+               [CCode (cname = "pango_cairo_font_map_get_font_type")]
                [Version (since = "1.18")]
                public Cairo.FontType get_font_type ();
+               [CCode (cname = "pango_cairo_font_map_get_resolution")]
                public double get_resolution ();
+               [CCode (cname = "pango_cairo_font_map_new")]
                public static Pango.FontMap @new ();
+               [CCode (cname = "pango_cairo_font_map_new_for_font_type")]
                [Version (since = "1.18")]
                public static Pango.FontMap? new_for_font_type (Cairo.FontType fonttype);
+               [CCode (cname = "pango_cairo_font_map_set_default")]
                [Version (since = "1.22")]
                public static void set_default (Pango.CairoFontMap? fontmap);
+               [CCode (cname = "pango_cairo_font_map_set_resolution")]
                public void set_resolution (double dpi);
        }
        [CCode (cheader_filename = "pango/pangocairo.h", instance_pos = 3.9)]

diff --git a/vapi/rest-extras-1.0.vapi b/vapi/rest-extras-1.0.vapi
index be99f0757fbf0fe5ceb099bbf3e774124de849aa..0c641511554d71dab89a6267632133e76ca0bc61 100644 (file)
--- a/vapi/rest-extras-1.0.vapi
+++ b/vapi/rest-extras-1.0.vapi
@@ -2,7 +2,7 @@
 
 [CCode (cprefix = "Rest", gir_namespace = "RestExtras", gir_version = "1.0", lower_case_cprefix = "rest_")]
 namespace Rest {
-       [CCode (cheader_filename = "rest-extras/flickr-proxy.h", cname = "FlickrProxy", lower_case_cprefix = "rest_extras_flickr_proxy_", type_id = "flickr_proxy_get_type ()")]
+       [CCode (cheader_filename = "rest-extras/flickr-proxy.h", cname = "FlickrProxy", type_id = "flickr_proxy_get_type ()")]
        public class FlickrProxy : Rest.Proxy {
                [CCode (cname = "flickr_proxy_new", has_construct_function = false, type = "RestProxy*")]
                public FlickrProxy (string api_key, string shared_secret);
@@ -33,14 +33,14 @@ namespace Rest {
                [NoAccessorMethod]
                public string token { owned get; set; }
        }
-       [CCode (cheader_filename = "rest-extras/flickr-proxy-call.h", cname = "FlickrProxyCall", lower_case_cprefix = "rest_extras_flickr_proxy_call_", type_id = "flickr_proxy_call_get_type ()")]
+       [CCode (cheader_filename = "rest-extras/flickr-proxy-call.h", cname = "FlickrProxyCall", type_id = "flickr_proxy_call_get_type ()")]
        public class FlickrProxyCall : Rest.ProxyCall {
                [CCode (has_construct_function = false)]
                protected FlickrProxyCall ();
                [NoAccessorMethod]
                public bool upload { construct; }
        }
-       [CCode (cheader_filename = "rest-extras/lastfm-proxy.h", cname = "LastfmProxy", lower_case_cprefix = "rest_extras_lastfm_proxy_", type_id = "lastfm_proxy_get_type ()")]
+       [CCode (cheader_filename = "rest-extras/lastfm-proxy.h", cname = "LastfmProxy", type_id = "lastfm_proxy_get_type ()")]
        public class LastfmProxy : Rest.Proxy {
                [CCode (cname = "lastfm_proxy_new", has_construct_function = false, type = "RestProxy*")]
                public LastfmProxy (string api_key, string secret);
@@ -67,12 +67,12 @@ namespace Rest {
                [NoAccessorMethod]
                public string session_key { owned get; set; }
        }
-       [CCode (cheader_filename = "rest-extras/lastfm-proxy-call.h", cname = "LastfmProxyCall", lower_case_cprefix = "rest_extras_lastfm_proxy_call_", type_id = "lastfm_proxy_call_get_type ()")]
+       [CCode (cheader_filename = "rest-extras/lastfm-proxy-call.h", cname = "LastfmProxyCall", type_id = "lastfm_proxy_call_get_type ()")]
        public class LastfmProxyCall : Rest.ProxyCall {
                [CCode (has_construct_function = false)]
                protected LastfmProxyCall ();
        }
-       [CCode (cheader_filename = "rest-extras/youtube-proxy.h", cname = "YoutubeProxy", lower_case_cprefix = "rest_extras_youtube_proxy_", type_id = "youtube_proxy_get_type ()")]
+       [CCode (cheader_filename = "rest-extras/youtube-proxy.h", cname = "YoutubeProxy", type_id = "youtube_proxy_get_type ()")]
        public class YoutubeProxy : Rest.Proxy {
                [CCode (cname = "youtube_proxy_new", has_construct_function = false, type = "RestProxy*")]
                public YoutubeProxy (string developer_key);