Bug 440603 – Minor ABI change

2007-05-22  Behdad Esfahbod  <behdad@gnome.org>

        Bug 440603 – Minor ABI change

        * pango/pango-language.c (pango_language_includes_script):
        * pango/pango-ot-tag.c (pango_ot_tag_from_language):
        Accept language == NULL as legitimate input.


svn path=/trunk/; revision=2315

3 files changed, 20 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 6278a0b5..0b2c366e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-05-22  Behdad Esfahbod  <behdad@gnome.org>
+
+	Bug 440603 – Minor ABI change
+
+	* pango/pango-language.c (pango_language_includes_script):
+	* pango/pango-ot-tag.c (pango_ot_tag_from_language):
+	Accept language == NULL as legitimate input.
+
 2007-05-20  Richard Hult  <richard@imendio.com>
 
 	* pango/pangocairo-atsuifont.c: (_pango_cairo_atsui_font_new): Improve
diff --git a/pango/pango-language.c b/pango/pango-language.c
index 89518845..a74f666d 100644
--- a/pango/pango-language.c
+++ b/pango/pango-language.c
@@ -415,7 +415,7 @@ script_for_lang_compare (gconstpointer key,
 
 /**
  * pango_language_includes_script:
- * @language: a #PangoLanguage
+ * @language: a #PangoLanguage, or %NULL
  * @script: a #PangoScript
  *
  * Determines if @script is one of the scripts used to
@@ -430,7 +430,8 @@ script_for_lang_compare (gconstpointer key,
  * applications in most circumstances.
  *
  * Return value: %TRUE if @script is one of the scripts used
- * to write @language, or if nothing is known about @language,
+ * to write @language or if nothing is known about @language
+ * (including the case that @language is %NULL),
  * %FALSE otherwise.
  *
  * Since: 1.4
@@ -443,12 +444,10 @@ pango_language_includes_script (PangoLanguage *language,
   unsigned int j;
   const char *lang_str;
 
-  g_return_val_if_fail (language != NULL, FALSE);
-
 #define REAL_SCRIPT(script) \
   ((script) > PANGO_SCRIPT_INHERITED)
 
-  if (!REAL_SCRIPT (script))
+  if (language == NULL || !REAL_SCRIPT (script))
     return TRUE;
 
   lang_str = pango_language_to_string (language);
diff --git a/pango/pango-ot-tag.c b/pango/pango-ot-tag.c
index eb6a19d3..74038b7b 100644
--- a/pango/pango-ot-tag.c
+++ b/pango/pango-ot-tag.c
@@ -99,7 +99,7 @@ static const char ot_scripts[][4] = {
 
 /**
  * pango_ot_tag_from_script:
- * @script: A #PangoScript.
+ * @script: A #PangoScript
  *
  * Finds the OpenType script tag corresponding to @script.
  *
@@ -127,7 +127,7 @@ pango_ot_tag_from_script (PangoScript script)
 
 /**
  * pango_ot_tag_to_script:
- * @script_tag: A #PangoOTTag OpenType script tag.
+ * @script_tag: A #PangoOTTag OpenType script tag
  *
  * Finds the #PangoScript corresponding to @script_tag.
  *
@@ -396,12 +396,13 @@ lang_compare_first_component (gconstpointer pa,
 
 /**
  * pango_ot_tag_from_language:
- * @language: A #PangoLanguage.
+ * @language: A #PangoLanguage, or %NULL
  *
  * Finds the OpenType language-system tag best describing @language.
  *
  * Return value: #PangoOTTag best matching @language or
- * %PANGO_OT_TAG_DEFAULT_LANGUAGE if none found.
+ * %PANGO_OT_TAG_DEFAULT_LANGUAGE if none found or if @language
+ * is %NULL.
  *
  * Since: 1.18
  **/
@@ -411,7 +412,8 @@ pango_ot_tag_from_language (PangoLanguage *language)
   const char *lang_str;
   LangTag *lang_tag;
 
-  g_return_val_if_fail (language != NULL, PANGO_OT_TAG_DEFAULT_LANGUAGE);
+  if (language == NULL)
+    return PANGO_OT_TAG_DEFAULT_LANGUAGE;
 
   lang_str = pango_language_to_string (language);
 
@@ -455,7 +457,7 @@ pango_ot_tag_from_language (PangoLanguage *language)
 
 /**
  * pango_ot_tag_to_language:
- * @language_tag: A #PangoOTTag OpenType language-system tag.
+ * @language_tag: A #PangoOTTag OpenType language-system tag
  *
  * Finds a #PangoLanguage corresponding to @language_tag.
  *