[evolution/rendering-cleanup: 54/63] gnome-canvas: Remove pangoft2 requirement

[Benjamin Otte <otte src gnome org>]

commit 22e472a175d95de10da38f64765618d43add68ec
Author: Benjamin Otte <otte redhat com>
Date:   Sun Oct 17 15:12:20 2010 +0200

    gnome-canvas: Remove pangoft2 requirement
    
    It's not really necessary to pull in libs for an unused variable, now is
    it?

 configure.ac                       |    2 --
 libgnomecanvas/gnome-canvas-text.c |    6 ------
 2 files changed, 0 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ee7db6d..497abfc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,6 @@ m4_define([glib_minimum_version], [2.25.12])
 m4_define([eds_minimum_version], [evo_version])
 m4_define([gtkhtml_minimum_version], [3.31.90])
 m4_define([gnome_icon_theme_minimum_version], [2.30.2.1])
-m4_define([pangoft2_minimum_version], [1.0.1])		dnl For libgnomecanvas
 m4_define([gconf_minimum_version], [2.0.0])		dnl XXX Just a Guess
 m4_define([libsoup_minimum_version], [2.4.0])		dnl XXX Just a Guess
 m4_define([libxml_minimum_version], [2.7.3])
@@ -309,7 +308,6 @@ PKG_CHECK_MODULES([GNOME_PLATFORM],
 	 $GAIL >= $gail_minimum_version
 	 gconf-2.0 >= gconf_minimum_version
 	 libxml-2.0 >= libxml_minimum_version
-	 pangoft2 >= pangoft2_minimum_version
 	 shared-mime-info >= shared_mime_info_minimum_version
 	 $GNOME_DESKTOP >= $gnome_desktop_minimum_version
 	 $UNIQUE >= $unique_minimum_version])
diff --git a/libgnomecanvas/gnome-canvas-text.c b/libgnomecanvas/gnome-canvas-text.c
index 09c721a..6d5f9a0 100644
--- a/libgnomecanvas/gnome-canvas-text.c
+++ b/libgnomecanvas/gnome-canvas-text.c
@@ -39,7 +39,6 @@
 #include <math.h>
 #include <string.h>
 #include "gnome-canvas-text.h"
-#include <pango/pangoft2.h>
 
 #include "gnome-canvas-util.h"
 #include "gnome-canvas-i18n.h"
@@ -97,7 +96,6 @@ enum {
 
 struct _GnomeCanvasTextPrivate {
 	guint render_dirty : 1;
-	FT_Bitmap bitmap;
 };
 
 static void gnome_canvas_text_class_init (GnomeCanvasTextClass *class);
@@ -533,7 +531,6 @@ gnome_canvas_text_init (GnomeCanvasText *text)
 	text->rise_set      = FALSE;
 
 	text->priv = g_new (GnomeCanvasTextPrivate, 1);
-	text->priv->bitmap.buffer = NULL;
 	text->priv->render_dirty = 1;
 }
 
@@ -565,9 +562,6 @@ gnome_canvas_text_destroy (GnomeCanvasItem *object)
 		pango_attr_list_unref (text->attr_list);
 	text->attr_list = NULL;
 
-	if (text->priv && text->priv->bitmap.buffer) {
-		g_free (text->priv->bitmap.buffer);
-	}
 	g_free (text->priv);
 	text->priv = NULL;