From 9a2a18ddd107370adbe4194e19cda136c1e507f4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Sat, 30 Apr 2011 03:19:10 +0100
Subject: [PATCH] Use G_DEFINE_INTERFACE in PangoCairoFont

---
 pango/pangocairo-font.c | 34 ++++++----------------------------
 1 file changed, 6 insertions(+), 28 deletions(-)

diff --git a/pango/pangocairo-font.c b/pango/pangocairo-font.c
index df0a777..8dc8df0 100644
--- a/pango/pangocairo-font.c
+++ b/pango/pangocairo-font.c
@@ -34,37 +34,15 @@
     G_STRUCT_MEMBER_P (font,			\
     PANGO_CAIRO_FONT_GET_IFACE(PANGO_CAIRO_FONT(font))->cf_priv_offset)))
 
-GType
-pango_cairo_font_get_type (void)
-{
-  static GType cairo_font_type = 0;
-
-  if (! cairo_font_type)
-    {
-      const GTypeInfo cairo_font_info =
-      {
-	sizeof (PangoCairoFontIface), /* class_size */
-	NULL,           /* base_init */
-	NULL,		/* base_finalize */
-	NULL,
-	NULL,		/* class_finalize */
-	NULL,		/* class_data */
-	0,
-	0,
-	NULL,
-	NULL
-      };
-
-      cairo_font_type =
-	g_type_register_static (G_TYPE_INTERFACE, I_("PangoCairoFont"),
-				&cairo_font_info, 0);
-
-      g_type_interface_add_prerequisite (cairo_font_type, PANGO_TYPE_FONT);
-    }
+typedef PangoCairoFontIface PangoCairoFontInterface;
+G_DEFINE_INTERFACE (PangoCairoFont, pango_cairo_font, PANGO_TYPE_FONT)
 
-  return cairo_font_type;
+static void
+pango_cairo_font_default_init (PangoCairoFontIface *iface)
+{
 }
 
+
 static PangoCairoFontPrivateScaledFontData *
 _pango_cairo_font_private_scaled_font_data_create (void)
 {
-- 
2.7.4