From dbc0cf530771402599f8941d461b23b0263eb49a Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 12 Feb 2003 22:19:27 +0000 Subject: Fix bug where language tag changes were not causing the font to be looked Wed Feb 12 17:09:00 2003 Owen Taylor * pango/pango-context.c: Fix bug where language tag changes were not causing the font to be looked up again. (bugzilla.redhat.com #84034) --- ChangeLog | 6 ++++++ ChangeLog.pre-1-10 | 6 ++++++ ChangeLog.pre-1-4 | 6 ++++++ ChangeLog.pre-1-6 | 6 ++++++ ChangeLog.pre-1-8 | 6 ++++++ pango/pango-context.c | 9 +++++---- 6 files changed, 35 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a02d897..95b552e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Feb 12 17:09:00 2003 Owen Taylor + + * pango/pango-context.c: Fix bug where language + tag changes were not causing the font to be + looked up again. (bugzilla.redhat.com #84034) + Wed Feb 12 16:48:46 2003 Owen Taylor * pango/pango-layout.c (pango_layout_set_text): diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 5a02d897..95b552e5 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +Wed Feb 12 17:09:00 2003 Owen Taylor + + * pango/pango-context.c: Fix bug where language + tag changes were not causing the font to be + looked up again. (bugzilla.redhat.com #84034) + Wed Feb 12 16:48:46 2003 Owen Taylor * pango/pango-layout.c (pango_layout_set_text): diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 5a02d897..95b552e5 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,9 @@ +Wed Feb 12 17:09:00 2003 Owen Taylor + + * pango/pango-context.c: Fix bug where language + tag changes were not causing the font to be + looked up again. (bugzilla.redhat.com #84034) + Wed Feb 12 16:48:46 2003 Owen Taylor * pango/pango-layout.c (pango_layout_set_text): diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 5a02d897..95b552e5 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,9 @@ +Wed Feb 12 17:09:00 2003 Owen Taylor + + * pango/pango-context.c: Fix bug where language + tag changes were not causing the font to be + looked up again. (bugzilla.redhat.com #84034) + Wed Feb 12 16:48:46 2003 Owen Taylor * pango/pango-layout.c (pango_layout_set_text): diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 5a02d897..95b552e5 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +Wed Feb 12 17:09:00 2003 Owen Taylor + + * pango/pango-context.c: Fix bug where language + tag changes were not causing the font to be + looked up again. (bugzilla.redhat.com #84034) + Wed Feb 12 16:48:46 2003 Owen Taylor * pango/pango-layout.c (pango_layout_set_text): diff --git a/pango/pango-context.c b/pango/pango-context.c index 7ed5b5ef..3a5d84f1 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -637,8 +637,6 @@ add_engines (PangoContext *context, static guint engine_type_id = 0; static guint render_type_id = 0; - language = next_language; - if (engine_type_id == 0) { engine_type_id = g_quark_from_static_string (PANGO_ENGINE_TYPE_LANG); @@ -649,11 +647,14 @@ add_engines (PangoContext *context, engine_type_id, render_type_id); } - if (i == 0 || !pango_font_description_equal (current_desc, next_desc)) + if (i == 0 || + language != next_language || + !pango_font_description_equal (current_desc, next_desc)) { pango_font_description_free (current_desc); current_desc = next_desc; - + language = next_language; + if (current_fonts) g_object_unref (current_fonts); -- cgit v1.2.1