dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

depend on pango 1.18 

2007-11-11  Michael Natterer  <mitch@gimp.org>

	* configure.in: depend on pango 1.18

	* app/text/gimpfontlist.c (gimp_font_list_add_font): remove
	workaround for old pango appending "Non-Rotated" to font names.


svn path=/trunk/; revision=24118
This commit is contained in:
Michael Natterer 2007-11-11 12:48:42 +00:00 committed by Michael Natterer
parent 6087b86675
commit 222d3349e6
3 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-11-11 Michael Natterer <mitch@gimp.org>
* configure.in: depend on pango 1.18
* app/text/gimpfontlist.c (gimp_font_list_add_font): remove
workaround for old pango appending "Non-Rotated" to font names.
2007-11-11 Martin Nordholts <martinn@svn.gnome.org>
* app/tools/gimprectangleselecttool.[ch]: Don't expose private

21
app/text/gimpfontlist.c
View File

@ -147,40 +147,29 @@ gimp_font_list_add_font (GimpFontList *list,
PangoContext *context,
PangoFontDescription *desc)
{
GimpFont *font;
gchar *name;
gsize len;
if (! desc)
return;
name = font_desc_to_string (desc);
len = strlen (name);
if (! g_utf8_validate (name, len, NULL))
if (g_utf8_validate (name, -1, NULL))
{
g_free (name);
return;
}
#ifdef __GNUC__
#warning remove this as soon as we depend on Pango 1.16.5
#endif
if (g_str_has_suffix (name, " Not-Rotated"))
name[len - strlen (" Not-Rotated")] = '\0';
GimpFont *font;
font = g_object_new (GIMP_TYPE_FONT,
"name", name,
"pango-context", context,
NULL);
g_free (name);
gimp_container_add (GIMP_CONTAINER (list), GIMP_OBJECT (font));
g_object_unref (font);
}
g_free (name);
}
#ifdef USE_FONTCONFIG_DIRECTLY
/* We're really chummy here with the implementation. Oh well. */

2
configure.in
View File

@ -43,7 +43,7 @@ m4_define([gimp_full_name], [GNU Image Manipulation Program])
m4_define([glib_required_version], [2.14.1])
m4_define([gtk_required_version], [2.12.0])
m4_define([gdk_pixbuf_required_version], [gtk_required_version])
m4_define([pangoft2_required_version], [1.12.2])
m4_define([pangoft2_required_version], [1.18.0])
m4_define([fontconfig_required_version], [2.2.0])
m4_define([gtkdoc_required_version], [1.0])
m4_define([gtkhtml2_required_version], [2.0.0])