Handle text == NULL, length == 0 again.

Fri Aug 24 12:21:50 2001  Owen Taylor  <otaylor@redhat.com>

	* pango/pango-layout.c (pango_layout_set_text): Handle
	text == NULL, length == 0 again.

8 files changed, 43 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 7b1c2478..5622cb3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Aug 24 12:21:50 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_set_text): Handle
+	text == NULL, length == 0 again.
+
 Thu Aug 23 19:44:34 2001  Tim Janik  <timj@gtk.org>
 
 	* pango/pango-layout.c (pango_layout_check_lines): pass ""
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 7b1c2478..5622cb3f 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,8 @@
+Fri Aug 24 12:21:50 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_set_text): Handle
+	text == NULL, length == 0 again.
+
 Thu Aug 23 19:44:34 2001  Tim Janik  <timj@gtk.org>
 
 	* pango/pango-layout.c (pango_layout_check_lines): pass ""
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 7b1c2478..5622cb3f 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+Fri Aug 24 12:21:50 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_set_text): Handle
+	text == NULL, length == 0 again.
+
 Thu Aug 23 19:44:34 2001  Tim Janik  <timj@gtk.org>
 
 	* pango/pango-layout.c (pango_layout_check_lines): pass ""
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 7b1c2478..5622cb3f 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,8 @@
+Fri Aug 24 12:21:50 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_set_text): Handle
+	text == NULL, length == 0 again.
+
 Thu Aug 23 19:44:34 2001  Tim Janik  <timj@gtk.org>
 
 	* pango/pango-layout.c (pango_layout_check_lines): pass ""
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 7b1c2478..5622cb3f 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,8 @@
+Fri Aug 24 12:21:50 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_set_text): Handle
+	text == NULL, length == 0 again.
+
 Thu Aug 23 19:44:34 2001  Tim Janik  <timj@gtk.org>
 
 	* pango/pango-layout.c (pango_layout_check_lines): pass ""
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 7b1c2478..5622cb3f 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,8 @@
+Fri Aug 24 12:21:50 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_set_text): Handle
+	text == NULL, length == 0 again.
+
 Thu Aug 23 19:44:34 2001  Tim Janik  <timj@gtk.org>
 
 	* pango/pango-layout.c (pango_layout_check_lines): pass ""
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 7b1c2478..5622cb3f 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,8 @@
+Fri Aug 24 12:21:50 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-layout.c (pango_layout_set_text): Handle
+	text == NULL, length == 0 again.
+
 Thu Aug 23 19:44:34 2001  Tim Janik  <timj@gtk.org>
 
 	* pango/pango-layout.c (pango_layout_check_lines): pass ""
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 82e97e9c..40e6fad1 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -725,11 +725,14 @@ pango_layout_set_text (PangoLayout *layout,
   g_return_if_fail (layout != NULL);
   g_return_if_fail (length == 0 || text != NULL);
 
-  if (!g_utf8_validate (text, length, &end))
-    g_warning ("Invalid UTF8 string passed to pango_layout_set_text()");
+  if (length != 0)
+    {
+      if (!g_utf8_validate (text, length, &end))
+	g_warning ("Invalid UTF8 string passed to pango_layout_set_text()");
+      
+      length = end - text;
+    }
   
-  length = end - text;
-
   if (layout->text)
     g_free (layout->text);
 
@@ -2775,7 +2778,7 @@ pango_layout_check_lines (PangoLayout *layout)
    * is non-NULL even if it is zero length
    */
   if (!layout->text)
-    pango_layout_set_text (layout, "", 0);
+    pango_layout_set_text (layout, NULL, 0);
 
   attrs = pango_layout_get_effective_attributes (layout);
   iter = pango_attr_list_get_iterator (attrs);