[gtk+] Adjust tests

[Matthias Clasen <matthiasc src gnome org>]

commit f06cd304bd228e7ac2a05a81438b804daa1e794f
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Apr 29 23:55:59 2015 -0400

    Adjust tests

 testsuite/gtk/builder.c                |    2 +-
 testsuite/gtk/ui/celllayout5.expected  |    2 +-
 testsuite/gtk/ui/dialog5.expected      |    2 +-
 testsuite/gtk/ui/filefilter10.expected |    2 +-
 testsuite/gtk/ui/infobar5.expected     |    2 +-
 testsuite/gtk/ui/label5.expected       |    2 +-
 testsuite/gtk/ui/levelbar6.expected    |    2 +-
 testsuite/gtk/ui/scale7.expected       |    2 +-
 testsuite/gtk/ui/test1.expected        |    2 +-
 testsuite/gtk/ui/test2.expected        |    4 ++--
 testsuite/gtk/ui/test4.expected        |    2 +-
 testsuite/gtk/ui/test6.expected        |    2 +-
 testsuite/gtk/ui/test7.expected        |    2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c
index 6e727f1..9aad57a 100644
--- a/testsuite/gtk/builder.c
+++ b/testsuite/gtk/builder.c
@@ -82,7 +82,7 @@ test_parser (void)
   
   error = NULL;
   gtk_builder_add_from_string (builder, "<interface invalid=\"X\"/>", -1, &error);
-  g_assert_error (error, GTK_BUILDER_ERROR, GTK_BUILDER_ERROR_INVALID_ATTRIBUTE);
+  g_assert_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE);
   g_error_free (error);
 
   error = NULL;
diff --git a/testsuite/gtk/ui/celllayout5.expected b/testsuite/gtk/ui/celllayout5.expected
index 027a052..e47a1a9 100644
--- a/testsuite/gtk/ui/celllayout5.expected
+++ b/testsuite/gtk/ui/celllayout5.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 1
-Unhandled tag: <warbl>
+<input>:9:15 Unhandled tag: <warbl>
diff --git a/testsuite/gtk/ui/dialog5.expected b/testsuite/gtk/ui/dialog5.expected
index 027a052..3a72c79 100644
--- a/testsuite/gtk/ui/dialog5.expected
+++ b/testsuite/gtk/ui/dialog5.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 1
-Unhandled tag: <warbl>
+<input>:11:13 Unhandled tag: <warbl>
diff --git a/testsuite/gtk/ui/filefilter10.expected b/testsuite/gtk/ui/filefilter10.expected
index 027a052..6219088 100644
--- a/testsuite/gtk/ui/filefilter10.expected
+++ b/testsuite/gtk/ui/filefilter10.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 1
-Unhandled tag: <warbl>
+<input>:4:13 Unhandled tag: <warbl>
diff --git a/testsuite/gtk/ui/infobar5.expected b/testsuite/gtk/ui/infobar5.expected
index 65dee44..f1a9ff9 100644
--- a/testsuite/gtk/ui/infobar5.expected
+++ b/testsuite/gtk/ui/infobar5.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 1
-Unhandled tag: <worbl>
+<input>:9:13 Unhandled tag: <worbl>
diff --git a/testsuite/gtk/ui/label5.expected b/testsuite/gtk/ui/label5.expected
index 027a052..40c5dbc 100644
--- a/testsuite/gtk/ui/label5.expected
+++ b/testsuite/gtk/ui/label5.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 1
-Unhandled tag: <warbl>
+<input>:6:13 Unhandled tag: <warbl>
diff --git a/testsuite/gtk/ui/levelbar6.expected b/testsuite/gtk/ui/levelbar6.expected
index 027a052..40c5dbc 100644
--- a/testsuite/gtk/ui/levelbar6.expected
+++ b/testsuite/gtk/ui/levelbar6.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 1
-Unhandled tag: <warbl>
+<input>:6:13 Unhandled tag: <warbl>
diff --git a/testsuite/gtk/ui/scale7.expected b/testsuite/gtk/ui/scale7.expected
index 7661a45..fa79467 100644
--- a/testsuite/gtk/ui/scale7.expected
+++ b/testsuite/gtk/ui/scale7.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 1
-Unhandled tag: <foo>
+<input>:6:11 Unhandled tag: <foo>
diff --git a/testsuite/gtk/ui/test1.expected b/testsuite/gtk/ui/test1.expected
index dcfceae..4db4708 100644
--- a/testsuite/gtk/ui/test1.expected
+++ b/testsuite/gtk/ui/test1.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 1
-Unhandled tag: <style>
+<input>:4:11 Unhandled tag: <style>
diff --git a/testsuite/gtk/ui/test2.expected b/testsuite/gtk/ui/test2.expected
index 871e994..2f800fa 100644
--- a/testsuite/gtk/ui/test2.expected
+++ b/testsuite/gtk/ui/test2.expected
@@ -1,2 +1,2 @@
-ERROR: gtk-builder-error-quark 3
-<input>:3:1 'get-type' is not a valid attribute of <object>
+ERROR: g-markup-error-quark 4
+.:3:1 attribute 'get-type' invalid for element 'object'
diff --git a/testsuite/gtk/ui/test4.expected b/testsuite/gtk/ui/test4.expected
index 45d5b67..69e96d9 100644
--- a/testsuite/gtk/ui/test4.expected
+++ b/testsuite/gtk/ui/test4.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 1
-Unhandled tag: <random>
+<input>:3:43 Unhandled tag: <random>
diff --git a/testsuite/gtk/ui/test6.expected b/testsuite/gtk/ui/test6.expected
index 2acd0d0..20d6002 100644
--- a/testsuite/gtk/ui/test6.expected
+++ b/testsuite/gtk/ui/test6.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 8
-Duplicate object ID 'foo' on line 5 (previously on line 3)
+.:5:1 Duplicate object ID 'foo' (previously on line 3)
diff --git a/testsuite/gtk/ui/test7.expected b/testsuite/gtk/ui/test7.expected
index df08169..8f0795b 100644
--- a/testsuite/gtk/ui/test7.expected
+++ b/testsuite/gtk/ui/test7.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 4
-<input>:4:1 'object' is not a valid tag here
+<input>:4:1 <object> is not a valid tag here