From 47ceb34ba914efde2621c05ff9776ed74e7f33ad Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@linux.intel.com>
Date: Wed, 27 Oct 2010 12:43:36 +0100
Subject: [PATCH] pango: Use CoglMaterial type for materials

Instead of using the CoglHandle type for material variables this updates
the pango code to use CoglMaterial * instead. CoglHandle is the old
typename which is being phased out of the API.
---
 pango/cogl-pango-display-list.c | 6 +++---
 pango/cogl-pango-display-list.h | 4 ++--
 pango/cogl-pango-render.c       | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pango/cogl-pango-display-list.c b/pango/cogl-pango-display-list.c
index 7d1932662..6f78796f9 100644
--- a/pango/cogl-pango-display-list.c
+++ b/pango/cogl-pango-display-list.c
@@ -309,7 +309,7 @@ emit_vertex_buffer_geometry (CoglPangoDisplayListNode *node)
 }
 
 static void
-_cogl_pango_display_list_render_texture (CoglHandle material,
+_cogl_pango_display_list_render_texture (CoglMaterial *material,
                                          const CoglColor *color,
                                          CoglPangoDisplayListNode *node)
 {
@@ -336,8 +336,8 @@ _cogl_pango_display_list_render_texture (CoglHandle material,
 void
 _cogl_pango_display_list_render (CoglPangoDisplayList *dl,
                                  const CoglColor *color,
-                                 CoglHandle glyph_material,
-                                 CoglHandle solid_material)
+                                 CoglMaterial *glyph_material,
+                                 CoglMaterial *solid_material)
 {
   GSList *l;
 
diff --git a/pango/cogl-pango-display-list.h b/pango/cogl-pango-display-list.h
index 6971b7e40..3079bf137 100644
--- a/pango/cogl-pango-display-list.h
+++ b/pango/cogl-pango-display-list.h
@@ -58,8 +58,8 @@ void _cogl_pango_display_list_add_trapezoid (CoglPangoDisplayList *dl,
 
 void _cogl_pango_display_list_render (CoglPangoDisplayList *dl,
                                       const CoglColor *color,
-                                      CoglHandle glyph_material,
-                                      CoglHandle solid_material);
+                                      CoglMaterial *glyph_material,
+                                      CoglMaterial *solid_material);
 
 void _cogl_pango_display_list_clear (CoglPangoDisplayList *dl);
 
diff --git a/pango/cogl-pango-render.c b/pango/cogl-pango-render.c
index 606840432..a56c19998 100644
--- a/pango/cogl-pango-render.c
+++ b/pango/cogl-pango-render.c
@@ -44,9 +44,9 @@ struct _CoglPangoRenderer
   PangoRenderer parent_instance;
 
   /* The material used to texture from the glyph cache with */
-  CoglHandle glyph_material;
+  CoglMaterial *glyph_material;
   /* The material used for solid fills. (boxes, rectangles + trapezoids) */
-  CoglHandle solid_material;
+  CoglMaterial *solid_material;
 
   /* Caches of glyphs as textures */
   CoglPangoGlyphCache *glyph_cache;