From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 22 Dec 2011 18:57:43 +0000 (+0100)
Subject: cogl-1.0: Use cogl-pango/cogl-pango.h header for pango symbols
X-Git-Tag: 0.15.1~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e9b10fb56d66f922884f495c04264475c34e58e;p=thirdparty%2Fvala.git

cogl-1.0: Use cogl-pango/cogl-pango.h header for pango symbols

Fixes bug 665953.
---

diff --git a/vapi/cogl-1.0.vapi b/vapi/cogl-1.0.vapi
index 8e63d355c..1941fb821 100644
--- a/vapi/cogl-1.0.vapi
+++ b/vapi/cogl-1.0.vapi
@@ -136,7 +136,7 @@ namespace Cogl {
 		[CCode (cname = "cogl_offscreen_new_to_texture", has_construct_function = false, type = "CoglHandle*")]
 		public Offscreen.to_texture (Cogl.Texture handle);
 	}
-	[CCode (cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl-pango/cogl-pango.h")]
 	[Compact]
 	public class PangoFontMap {
 		[CCode (has_construct_function = false, type = "PangoFontMap*")]
@@ -148,11 +148,11 @@ namespace Cogl {
 		public void set_resolution (double dpi);
 		public void set_use_mipmapping (bool value);
 	}
-	[CCode (cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl-pango/cogl-pango.h")]
 	[Compact]
 	public class PangoRenderer {
 	}
-	[CCode (cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl-pango/cogl-pango.h")]
 	[Compact]
 	public class PangoRendererClass {
 	}
@@ -723,13 +723,13 @@ namespace Cogl {
 	public static bool is_vertex_buffer_indices (Cogl.Bitmap handle);
 	[CCode (cheader_filename = "cogl/cogl.h")]
 	public static void ortho (float left, float right, float bottom, float top, float near, float far);
-	[CCode (cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl-pango/cogl-pango.h")]
 	public static void pango_ensure_glyph_cache_for_layout (Pango.Layout layout);
-	[CCode (cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl-pango/cogl-pango.h")]
 	public static void pango_render_layout (Pango.Layout layout, int x, int y, Cogl.Color color, int flags);
-	[CCode (cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl-pango/cogl-pango.h")]
 	public static void pango_render_layout_line (Pango.LayoutLine line, int x, int y, Cogl.Color color);
-	[CCode (cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl-pango/cogl-pango.h")]
 	public static void pango_render_layout_subpixel (Pango.Layout layout, int x, int y, Cogl.Color color, int flags);
 	[CCode (cheader_filename = "cogl/cogl.h")]
 	public static void perspective (float fovy, float aspect, float z_near, float z_far);
diff --git a/vapi/packages/cogl-1.0/cogl-1.0.metadata b/vapi/packages/cogl-1.0/cogl-1.0.metadata
index 2ca1167fd..a4ec28356 100644
--- a/vapi/packages/cogl-1.0/cogl-1.0.metadata
+++ b/vapi/packages/cogl-1.0/cogl-1.0.metadata
@@ -46,6 +46,10 @@ cogl_matrix_init_from_array hidden="1"
 cogl_matrix_init_identity hidden="1"
 cogl_matrix_transform_point.* is_ref="1"
 
+CoglPango* cheader_filename="cogl-pango/cogl-pango.h"
+cogl_pango_ensure_glyph_cache_for_layout cheader_filename="cogl-pango/cogl-pango.h"
+cogl_pango_render_* cheader_filename="cogl-pango/cogl-pango.h"
+
 cogl_pop_draw_buffer hidden="1"
 cogl_push_draw_buffer hidden="1"