summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2004-07-20 16:14:55 +0000
committerOwen Taylor <otaylor@src.gnome.org>2004-07-20 16:14:55 +0000
commit476dc1d5646b90ed3b9fbe28109da0ca9dd0b3bf (patch)
tree28f496568a1d3f421a6df31ec703121b265a7529
parent4198db0edf7594b8c0840d0b8fb3f5bd5dce3634 (diff)
downloadpango-476dc1d5646b90ed3b9fbe28109da0ca9dd0b3bf.tar.gz
return TRUE for PANGO_SCRIPT_COMMON and PANGO_SCRIPT_INHERITED.
Tue Jul 20 12:10:42 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-script.c (pango_language_includes_script): return TRUE for PANGO_SCRIPT_COMMON and PANGO_SCRIPT_INHERITED.
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-1-105
-rw-r--r--ChangeLog.pre-1-65
-rw-r--r--ChangeLog.pre-1-85
-rw-r--r--pango/pango-script.c3
5 files changed, 23 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c0669b90..02162d92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jul 20 12:10:42 2004 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-script.c (pango_language_includes_script):
+ return TRUE for PANGO_SCRIPT_COMMON and PANGO_SCRIPT_INHERITED.
+
Mon Jul 19 16:48:23 2004 Owen Taylor <otaylor@redhat.com>
* === Released 1.5.1 ===
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index c0669b90..02162d92 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+Tue Jul 20 12:10:42 2004 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-script.c (pango_language_includes_script):
+ return TRUE for PANGO_SCRIPT_COMMON and PANGO_SCRIPT_INHERITED.
+
Mon Jul 19 16:48:23 2004 Owen Taylor <otaylor@redhat.com>
* === Released 1.5.1 ===
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index c0669b90..02162d92 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,8 @@
+Tue Jul 20 12:10:42 2004 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-script.c (pango_language_includes_script):
+ return TRUE for PANGO_SCRIPT_COMMON and PANGO_SCRIPT_INHERITED.
+
Mon Jul 19 16:48:23 2004 Owen Taylor <otaylor@redhat.com>
* === Released 1.5.1 ===
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index c0669b90..02162d92 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,8 @@
+Tue Jul 20 12:10:42 2004 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-script.c (pango_language_includes_script):
+ return TRUE for PANGO_SCRIPT_COMMON and PANGO_SCRIPT_INHERITED.
+
Mon Jul 19 16:48:23 2004 Owen Taylor <otaylor@redhat.com>
* === Released 1.5.1 ===
diff --git a/pango/pango-script.c b/pango/pango-script.c
index 68814984..a1be94e0 100644
--- a/pango/pango-script.c
+++ b/pango/pango-script.c
@@ -415,6 +415,9 @@ pango_language_includes_script (PangoLanguage *language,
g_return_val_if_fail (language != NULL, FALSE);
+ if (!REAL_SCRIPT (script))
+ return TRUE;
+
/* This bsearch could be optimized to occur only once if
* we store the pointer to the PangoScriptForLang in the
* same block as the string value for the PangoLanguage.