Remove some conditionalization on (md->text == NULL) that is no longer

Fri Apr 20 11:38:46 2001  Owen Taylor  <otaylor@redhat.com>

	* pango/pango-markup.c (pango_parse_markup): Remove some
	conditionalization on (md->text == NULL) that is no
	longer needed with the last change.

8 files changed, 45 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 156b0d58..48441d7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Apr 20 11:38:46 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-markup.c (pango_parse_markup): Remove some 
+	conditionalization on (md->text == NULL) that is no
+	longer needed with the last change.
+
 2001-04-20  Anders Carlsson  <andersca@codefactory.se>
 
 	* pango/pango-markup.c (pango_parse_markup): Discard the parsed text if
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 156b0d58..48441d7f 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,9 @@
+Fri Apr 20 11:38:46 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-markup.c (pango_parse_markup): Remove some 
+	conditionalization on (md->text == NULL) that is no
+	longer needed with the last change.
+
 2001-04-20  Anders Carlsson  <andersca@codefactory.se>
 
 	* pango/pango-markup.c (pango_parse_markup): Discard the parsed text if
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 156b0d58..48441d7f 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,9 @@
+Fri Apr 20 11:38:46 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-markup.c (pango_parse_markup): Remove some 
+	conditionalization on (md->text == NULL) that is no
+	longer needed with the last change.
+
 2001-04-20  Anders Carlsson  <andersca@codefactory.se>
 
 	* pango/pango-markup.c (pango_parse_markup): Discard the parsed text if
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 156b0d58..48441d7f 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,9 @@
+Fri Apr 20 11:38:46 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-markup.c (pango_parse_markup): Remove some 
+	conditionalization on (md->text == NULL) that is no
+	longer needed with the last change.
+
 2001-04-20  Anders Carlsson  <andersca@codefactory.se>
 
 	* pango/pango-markup.c (pango_parse_markup): Discard the parsed text if
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 156b0d58..48441d7f 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,9 @@
+Fri Apr 20 11:38:46 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-markup.c (pango_parse_markup): Remove some 
+	conditionalization on (md->text == NULL) that is no
+	longer needed with the last change.
+
 2001-04-20  Anders Carlsson  <andersca@codefactory.se>
 
 	* pango/pango-markup.c (pango_parse_markup): Discard the parsed text if
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 156b0d58..48441d7f 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,9 @@
+Fri Apr 20 11:38:46 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-markup.c (pango_parse_markup): Remove some 
+	conditionalization on (md->text == NULL) that is no
+	longer needed with the last change.
+
 2001-04-20  Anders Carlsson  <andersca@codefactory.se>
 
 	* pango/pango-markup.c (pango_parse_markup): Discard the parsed text if
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 156b0d58..48441d7f 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,9 @@
+Fri Apr 20 11:38:46 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-markup.c (pango_parse_markup): Remove some 
+	conditionalization on (md->text == NULL) that is no
+	longer needed with the last change.
+
 2001-04-20  Anders Carlsson  <andersca@codefactory.se>
 
 	* pango/pango-markup.c (pango_parse_markup): Discard the parsed text if
diff --git a/pango/pango-markup.c b/pango/pango-markup.c
index 97fb421a..9e6acd27 100644
--- a/pango/pango-markup.c
+++ b/pango/pango-markup.c
@@ -433,8 +433,7 @@ text_handler           (GMarkupParseContext *context,
       
       md->index += text_len;
       
-      if (md->text)
-        g_string_append_len (md->text, text, text_len);
+      g_string_append_len (md->text, text, text_len);
     }
   else
     {
@@ -694,9 +693,8 @@ pango_parse_markup (const char                 *markup_text,
   g_slist_free (md->tag_stack);
   g_slist_foreach (md->to_apply, (GFunc) pango_attribute_destroy, NULL);
   g_slist_free (md->to_apply);
-
-  if (md->text)
-    g_string_free (md->text, TRUE);
+  g_string_free (md->text, TRUE);
+  
   if (md->attr_list)
     pango_attr_list_unref (md->attr_list);