diff options
| author | Benjamin Otte <otte@redhat.com> | 2010-10-17 21:12:20 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-10-30 01:50:01 +0800 |
| commit | 95c852e0b3ed530a5a854a87588214b1d2b6240b (patch) | |
| tree | 7f9220e87b0f21637a9b770c3ae6b2d939557b47 | |
| parent | 71b63cbbd643ceb1eab36714f5c8883f494d15e0 (diff) | |
| download | gsoc2013-evolution-95c852e0b3ed530a5a854a87588214b1d2b6240b.tar gsoc2013-evolution-95c852e0b3ed530a5a854a87588214b1d2b6240b.tar.gz gsoc2013-evolution-95c852e0b3ed530a5a854a87588214b1d2b6240b.tar.bz2 gsoc2013-evolution-95c852e0b3ed530a5a854a87588214b1d2b6240b.tar.lz gsoc2013-evolution-95c852e0b3ed530a5a854a87588214b1d2b6240b.tar.xz gsoc2013-evolution-95c852e0b3ed530a5a854a87588214b1d2b6240b.tar.zst gsoc2013-evolution-95c852e0b3ed530a5a854a87588214b1d2b6240b.zip | |
gnome-canvas: Remove pangoft2 requirement
It's not really necessary to pull in libs for an unused variable, now is
it?
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | libgnomecanvas/gnome-canvas-text.c | 6 |
2 files changed, 0 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 6a07a21d68..a7a95cfb9e 100644 --- a/configure.ac +++ b/configure.ac @@ -39,7 +39,6 @@ m4_define([glib_minimum_version], [2.26.0]) 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]) @@ -308,7 +307,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 86c09eddaa..a59544f36c 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" @@ -96,7 +95,6 @@ enum { struct _GnomeCanvasTextPrivate { guint render_dirty : 1; - FT_Bitmap bitmap; }; static void gnome_canvas_text_class_init (GnomeCanvasTextClass *class); @@ -524,7 +522,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; } @@ -556,9 +553,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; |