Change the order in which some error conditions are checked to improve

        * glib/gmarkup.c (g_markup_parse_context_parse): Change the
        order in which some error conditions are checked to improve
        error messages. (#69646)

diff --git a/ChangeLog b/ChangeLog
index 6134076..c1c0bc7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-29  Matthias Clasen  <matthiasc@poet.de>
+
+       * glib/gmarkup.c (g_markup_parse_context_parse): Change the
+       order in which some error conditions are checked to improve
+       error messages. (#69646)
+
 Tue Jan 29 15:04:31 2002  Owen Taylor  <otaylor@redhat.com>
 
        * 1.3.13

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 6134076..c1c0bc7 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2002-01-29  Matthias Clasen  <matthiasc@poet.de>
+
+       * glib/gmarkup.c (g_markup_parse_context_parse): Change the
+       order in which some error conditions are checked to improve
+       error messages. (#69646)
+
 Tue Jan 29 15:04:31 2002  Owen Taylor  <otaylor@redhat.com>
 
        * 1.3.13

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6134076..c1c0bc7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2002-01-29  Matthias Clasen  <matthiasc@poet.de>
+
+       * glib/gmarkup.c (g_markup_parse_context_parse): Change the
+       order in which some error conditions are checked to improve
+       error messages. (#69646)
+
 Tue Jan 29 15:04:31 2002  Owen Taylor  <otaylor@redhat.com>
 
        * 1.3.13

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 6134076..c1c0bc7 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2002-01-29  Matthias Clasen  <matthiasc@poet.de>
+
+       * glib/gmarkup.c (g_markup_parse_context_parse): Change the
+       order in which some error conditions are checked to improve
+       error messages. (#69646)
+
 Tue Jan 29 15:04:31 2002  Owen Taylor  <otaylor@redhat.com>
 
        * 1.3.13

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 6134076..c1c0bc7 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2002-01-29  Matthias Clasen  <matthiasc@poet.de>
+
+       * glib/gmarkup.c (g_markup_parse_context_parse): Change the
+       order in which some error conditions are checked to improve
+       error messages. (#69646)
+
 Tue Jan 29 15:04:31 2002  Owen Taylor  <otaylor@redhat.com>
 
        * 1.3.13

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 6134076..c1c0bc7 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2002-01-29  Matthias Clasen  <matthiasc@poet.de>
+
+       * glib/gmarkup.c (g_markup_parse_context_parse): Change the
+       order in which some error conditions are checked to improve
+       error messages. (#69646)
+
 Tue Jan 29 15:04:31 2002  Owen Taylor  <otaylor@redhat.com>
 
        * 1.3.13

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6134076..c1c0bc7 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2002-01-29  Matthias Clasen  <matthiasc@poet.de>
+
+       * glib/gmarkup.c (g_markup_parse_context_parse): Change the
+       order in which some error conditions are checked to improve
+       error messages. (#69646)
+
 Tue Jan 29 15:04:31 2002  Owen Taylor  <otaylor@redhat.com>
 
        * 1.3.13

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6134076..c1c0bc7 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2002-01-29  Matthias Clasen  <matthiasc@poet.de>
+
+       * glib/gmarkup.c (g_markup_parse_context_parse): Change the
+       order in which some error conditions are checked to improve
+       error messages. (#69646)
+
 Tue Jan 29 15:04:31 2002  Owen Taylor  <otaylor@redhat.com>
 
        * 1.3.13

diff --git a/glib/gmarkup.c b/glib/gmarkup.c
index f20ee36..4381bdb 100644 (file)
--- a/glib/gmarkup.c
+++ b/glib/gmarkup.c
@@ -1385,7 +1385,19 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
               close_name = g_string_free (context->partial_chunk, FALSE);
               context->partial_chunk = NULL;
               
-              if (context->tag_stack == NULL)
+              if (*context->iter != '>')
+                {
+                  gchar buf[7];
+                  set_error (context,
+                             error,
+                             G_MARKUP_ERROR_PARSE,
+                             _("'%s' is not a valid character following "
+                               "the close element name '%s'; the allowed "
+                               "character is '>'"),
+                             utf8_str (context->iter, buf),
+                             close_name);
+                }
+              else if (context->tag_stack == NULL)
                 {
                   set_error (context,
                              error,
@@ -1404,18 +1416,6 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
                              close_name,
                              current_element (context));
                 }
-              else if (*context->iter != '>')
-                {
-                  gchar buf[7];
-                  set_error (context,
-                             error,
-                             G_MARKUP_ERROR_PARSE,
-                             _("'%s' is not a valid character following "
-                               "the close element name '%s'; the allowed "
-                               "character is '>'"),
-                             utf8_str (context->iter, buf),
-                             close_name);
-                }
               else
                 {
                   GError *tmp_error;