From 48c98597fb8bc2b779500670d20486855681b202 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 23 May 2007 22:16:16 +0000 Subject: =?UTF-8?q?Part=20of=20Bug=20440603=20=E2=80=93=20Minor=20ABI=20ch?= =?UTF-8?q?ange?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2007-05-23 Behdad Esfahbod Part of Bug 440603 – Minor ABI change * pango/pango-context.c (pango_context_init), (pango_context_set_language), (pango_context_get_language): Make itemization use pango_language_get_default() if context has no language set on it. Ditto for pango_context_get_metrics() if both input language and context language are NULL. svn path=/trunk/; revision=2317 --- ChangeLog | 10 ++++++++++ pango/pango-context.c | 12 +++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index db4ff89b..5603d4c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-05-23 Behdad Esfahbod + + Part of Bug 440603 – Minor ABI change + + * pango/pango-context.c (pango_context_init), + (pango_context_set_language), (pango_context_get_language): + Make itemization use pango_language_get_default() if context has no + language set on it. Ditto for pango_context_get_metrics() if both + input language and context language are NULL. + 2007-05-22 Behdad Esfahbod * pango-view/Makefile.am: diff --git a/pango/pango-context.c b/pango/pango-context.c index ff667b14..6f588191 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -34,6 +34,7 @@ struct _PangoContext { GObject parent_instance; + PangoLanguage *set_language; PangoLanguage *language; PangoDirection base_dir; PangoGravity base_gravity; @@ -64,7 +65,8 @@ pango_context_init (PangoContext *context) context->resolved_gravity = context->base_gravity = PANGO_GRAVITY_SOUTH; context->gravity_hint = PANGO_GRAVITY_HINT_NATURAL; - context->language = NULL; + context->set_language = NULL; + context->language = pango_language_get_default (); context->font_map = NULL; context->font_desc = pango_font_description_new (); @@ -363,7 +365,11 @@ pango_context_set_language (PangoContext *context, { g_return_if_fail (context != NULL); - context->language = language; + context->set_language = language; + if (language) + context->language = language; + else + context->language = pango_language_get_default (); } /** @@ -379,7 +385,7 @@ pango_context_get_language (PangoContext *context) { g_return_val_if_fail (context != NULL, NULL); - return context->language; + return context->set_language; } /** -- cgit v1.2.1