Don't g_return if text == NULL and length == 0.

2006-06-02  Behdad Esfahbod  <behdad@gnome.org>

        * pango/pango-utils.c (pango_find_base_dir): Don't g_return if text ==
        NULL and length == 0.

diff --git a/ChangeLog b/ChangeLog
index efeb351..3972205 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-02  Behdad Esfahbod  <behdad@gnome.org>
+
+       * pango/pango-utils.c (pango_find_base_dir): Don't g_return if text ==
+       NULL and length == 0.
+
 2006-05-31  Behdad Esfahbod  <behdad@gnome.org>
 
        Bug 341138 – Using TTC font, Gtk2 programs begin to eating big memory

diff --git a/pango/pango-utils.c b/pango/pango-utils.c
index 2fc96f8..5094f08 100644 (file)
--- a/pango/pango-utils.c
+++ b/pango/pango-utils.c
@@ -1755,7 +1755,7 @@ pango_find_base_dir (const gchar *text,
   PangoDirection dir = PANGO_DIRECTION_NEUTRAL;
   const gchar *p;
 
-  g_return_val_if_fail (text != NULL, PANGO_DIRECTION_NEUTRAL);
+  g_return_val_if_fail (text != NULL || length == 0, PANGO_DIRECTION_NEUTRAL);
 
   p = text;
   while ((length < 0 || p < text + length) && *p)