summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2003-02-12 22:16:11 +0000
committerOwen Taylor <otaylor@src.gnome.org>2003-02-12 22:16:11 +0000
commit40d4e2c55eb7ec4de5156dd26d5b6e1ff71fd7b6 (patch)
treec89a7a594b73ea146a191d38e2c7f2cf3b96799e
parent9c0b83ce9873de6cff41134c79fb9c2489a299c3 (diff)
downloadpango-40d4e2c55eb7ec4de5156dd26d5b6e1ff71fd7b6.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--ChangeLog6
-rw-r--r--ChangeLog.pre-1-106
-rw-r--r--ChangeLog.pre-1-46
-rw-r--r--ChangeLog.pre-1-66
-rw-r--r--ChangeLog.pre-1-86
-rw-r--r--README2
-rw-r--r--pango/pango-context.c9
7 files changed, 36 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 127f471c..c981d213 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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:59:23 2003 Owen Taylor <otaylor@redhat.com>
* configure.in pango/opentype/fterrcompat.h README:
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 127f471c..c981d213 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:59:23 2003 Owen Taylor <otaylor@redhat.com>
* configure.in pango/opentype/fterrcompat.h README:
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 127f471c..c981d213 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:59:23 2003 Owen Taylor <otaylor@redhat.com>
* configure.in pango/opentype/fterrcompat.h README:
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 127f471c..c981d213 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:59:23 2003 Owen Taylor <otaylor@redhat.com>
* configure.in pango/opentype/fterrcompat.h README:
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 127f471c..c981d213 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:59:23 2003 Owen Taylor <otaylor@redhat.com>
* configure.in pango/opentype/fterrcompat.h README:
diff --git a/README b/README
index 54e55ff6..64b48fb0 100644
--- a/README
+++ b/README
@@ -44,7 +44,7 @@ Pango-1.2 requires version 2 of Xft.
Both Xft and the optional PangoFT2 backend look up fonts via
the fontconfig library, available along with Xft in the
'fcpackage' tarball from http://keithp.com/fonts. They
-also require at least version 2.0.1 of the FreeType
+also require at least version 2.0.9 of the FreeType
library. (http://www.freetype.org)
After installing fontconfig, it may be necessary to edit
diff --git a/pango/pango-context.c b/pango/pango-context.c
index b2970034..a589cbe9 100644
--- a/pango/pango-context.c
+++ b/pango/pango-context.c
@@ -639,8 +639,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);
@@ -651,11 +649,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);