diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-02-12 22:19:27 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-02-12 22:19:27 +0000 |
| commit | dbc0cf530771402599f8941d461b23b0263eb49a (patch) | |
| tree | 2bf509f6dfcfb8f56cc2c4476d119add2f2e3f1e | |
| parent | 8dc3104e2770f07424a39a824a8960ad5d60dfb3 (diff) | |
| download | pango-dbc0cf530771402599f8941d461b23b0263eb49a.tar.gz | |
Fix bug where language tag changes were not causing the font to be looked
Wed Feb 12 17:09:00 2003 Owen Taylor <otaylor@redhat.com>
* pango/pango-context.c: Fix bug where language
tag changes were not causing the font to be
looked up again. (bugzilla.redhat.com #84034)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 6 | ||||
| -rw-r--r-- | pango/pango-context.c | 9 |
6 files changed, 35 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Wed Feb 12 17:09:00 2003 Owen Taylor <otaylor@redhat.com> + + * 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 <otaylor@redhat.com> * 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 <otaylor@redhat.com> + + * 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 <otaylor@redhat.com> * 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 <otaylor@redhat.com> + + * 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 <otaylor@redhat.com> * 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 <otaylor@redhat.com> + + * 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 <otaylor@redhat.com> * 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 <otaylor@redhat.com> + + * 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 <otaylor@redhat.com> * 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); |