summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-1-06
-rw-r--r--ChangeLog.pre-1-106
-rw-r--r--ChangeLog.pre-1-26
-rw-r--r--ChangeLog.pre-1-46
-rw-r--r--ChangeLog.pre-1-66
-rw-r--r--ChangeLog.pre-1-86
-rw-r--r--pango/pango-markup.c4
8 files changed, 44 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 894b8bef..2abdebad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jan 28 20:23:59 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-markup.c (pango_parse_markup): Fix problem
+ with detected root node. (Based on patch from Matthias Clasen,
+ #69600)
+
Mon Jan 28 19:41:20 2002 Owen Taylor <otaylor@redhat.com>
* pango/pango-context.c (pango_context_load_font[set]): Add some
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 894b8bef..2abdebad 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,9 @@
+Mon Jan 28 20:23:59 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-markup.c (pango_parse_markup): Fix problem
+ with detected root node. (Based on patch from Matthias Clasen,
+ #69600)
+
Mon Jan 28 19:41:20 2002 Owen Taylor <otaylor@redhat.com>
* pango/pango-context.c (pango_context_load_font[set]): Add some
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 894b8bef..2abdebad 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,9 @@
+Mon Jan 28 20:23:59 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-markup.c (pango_parse_markup): Fix problem
+ with detected root node. (Based on patch from Matthias Clasen,
+ #69600)
+
Mon Jan 28 19:41:20 2002 Owen Taylor <otaylor@redhat.com>
* pango/pango-context.c (pango_context_load_font[set]): Add some
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 894b8bef..2abdebad 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,9 @@
+Mon Jan 28 20:23:59 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-markup.c (pango_parse_markup): Fix problem
+ with detected root node. (Based on patch from Matthias Clasen,
+ #69600)
+
Mon Jan 28 19:41:20 2002 Owen Taylor <otaylor@redhat.com>
* pango/pango-context.c (pango_context_load_font[set]): Add some
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 894b8bef..2abdebad 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,9 @@
+Mon Jan 28 20:23:59 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-markup.c (pango_parse_markup): Fix problem
+ with detected root node. (Based on patch from Matthias Clasen,
+ #69600)
+
Mon Jan 28 19:41:20 2002 Owen Taylor <otaylor@redhat.com>
* pango/pango-context.c (pango_context_load_font[set]): Add some
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 894b8bef..2abdebad 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,9 @@
+Mon Jan 28 20:23:59 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-markup.c (pango_parse_markup): Fix problem
+ with detected root node. (Based on patch from Matthias Clasen,
+ #69600)
+
Mon Jan 28 19:41:20 2002 Owen Taylor <otaylor@redhat.com>
* pango/pango-context.c (pango_context_load_font[set]): Add some
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 894b8bef..2abdebad 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,9 @@
+Mon Jan 28 20:23:59 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-markup.c (pango_parse_markup): Fix problem
+ with detected root node. (Based on patch from Matthias Clasen,
+ #69600)
+
Mon Jan 28 19:41:20 2002 Owen Taylor <otaylor@redhat.com>
* pango/pango-context.c (pango_context_load_font[set]): Add some
diff --git a/pango/pango-markup.c b/pango/pango-markup.c
index 0ce40c68..b57ee136 100644
--- a/pango/pango-markup.c
+++ b/pango/pango-markup.c
@@ -617,8 +617,8 @@ pango_parse_markup (const char *markup_text,
while (p != end && isspace (*p))
++p;
- if (strncmp (p, "<markup>", end - p) == 0)
- needs_root = FALSE;
+ if (end - p >= 8 && strncmp (p, "<markup>", 8) == 0)
+ needs_root = FALSE;
if (needs_root)
if (!g_markup_parse_context_parse (context,