[gtk/arnaudb/requires: 4/4] Fix tests with regard to GtkBuilder <requires>.




commit f7de0bc9c8ad60c30527409df286091f64fc229f
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Sat Nov 7 16:13:47 2020 +0100

    Fix tests with regard to GtkBuilder <requires>.

 tests/testheightforwidth.c                                 | 14 +++++++-------
 testsuite/gtk/builder.c                                    |  5 ++---
 testsuite/reftests/animation-direction.ref.ui              |  2 +-
 testsuite/reftests/animation-direction.ui                  |  2 +-
 .../reftests/animation-fill-mode-iteration-count.ref.ui    |  2 +-
 testsuite/reftests/animation-fill-mode-iteration-count.ui  |  2 +-
 .../reftests/border-corner-zero-width-rendering.ref.ui     |  2 +-
 testsuite/reftests/border-corner-zero-width-rendering.ui   |  2 +-
 testsuite/reftests/box-order.ref.ui                        |  2 +-
 testsuite/reftests/box-order.ui                            |  2 +-
 testsuite/reftests/box-shadow-changes-modify-clip.ref.ui   |  2 +-
 testsuite/reftests/box-shadow-changes-modify-clip.ui       |  2 +-
 testsuite/reftests/box-shadow-spread.ref.ui                |  2 +-
 testsuite/reftests/box-shadow-spread.ui                    |  2 +-
 testsuite/reftests/box-shadow-with-blend-mode.ref.ui       |  2 +-
 testsuite/reftests/box-shadow-with-blend-mode.ui           |  2 +-
 testsuite/reftests/css-em-label-size.ref.ui                |  2 +-
 testsuite/reftests/css-em-label-size.ui                    |  2 +-
 testsuite/reftests/css-rem-label-size.ref.ui               |  2 +-
 testsuite/reftests/css-rem-label-size.ui                   |  2 +-
 testsuite/reftests/flipping-icons.ref.ui                   |  2 +-
 testsuite/reftests/flipping-icons.ui                       |  2 +-
 testsuite/reftests/gtk-icontheme-sizing.ref.ui             |  2 +-
 testsuite/reftests/gtk-icontheme-sizing.ui                 |  2 +-
 testsuite/reftests/icon-effect-missing.ref.ui              |  2 +-
 testsuite/reftests/icon-effect-missing.ui                  |  2 +-
 testsuite/reftests/icon-shadow-no-transform.ref.ui         |  2 +-
 testsuite/reftests/icon-shadow-no-transform.ui             |  2 +-
 testsuite/reftests/icon-style-basics.ref.ui                |  2 +-
 testsuite/reftests/icon-style-basics.ui                    |  2 +-
 testsuite/reftests/icon-vfuncs.ref.ui                      |  2 +-
 testsuite/reftests/icon-vfuncs.ui                          |  2 +-
 testsuite/reftests/image-icon-name-use-fallback.ref.ui     |  2 +-
 testsuite/reftests/image-icon-name-use-fallback.ui         |  2 +-
 testsuite/reftests/image-icon-shadow-clipping.ref.ui       |  2 +-
 testsuite/reftests/image-icon-shadow-clipping.ui           |  2 +-
 testsuite/reftests/label-background.ref.ui                 |  2 +-
 testsuite/reftests/label-background.ui                     |  2 +-
 testsuite/reftests/label-box-shadow-clip.ref.ui            |  2 +-
 testsuite/reftests/label-box-shadow-clip.ui                |  2 +-
 testsuite/reftests/label-clipping.ref.ui                   |  2 +-
 testsuite/reftests/label-clipping.ui                       |  2 +-
 .../reftests/label-text-shadow-changes-modify-clip.ref.ui  |  2 +-
 .../reftests/label-text-shadow-changes-modify-clip.ui      |  2 +-
 testsuite/reftests/label-text-shadow-clipping.ref.ui       |  2 +-
 testsuite/reftests/label-text-shadow-clipping.ui           |  2 +-
 testsuite/reftests/letter-spacing.ref.ui                   |  2 +-
 testsuite/reftests/notebook-tab-position.ref.ui            |  2 +-
 testsuite/reftests/notebook-tab-position.ui                |  2 +-
 testsuite/reftests/opacity-initial.ref.ui                  |  2 +-
 testsuite/reftests/opacity-initial.ui                      |  2 +-
 testsuite/reftests/overlay-no-main-widget.ref.ui           |  2 +-
 testsuite/reftests/overlay-no-main-widget.ui               |  2 +-
 testsuite/reftests/pseudoclass-on-box.ref.ui               |  2 +-
 testsuite/reftests/pseudoclass-on-box.ui                   |  2 +-
 testsuite/reftests/pseudoclass-on-parent.ref.ui            |  2 +-
 testsuite/reftests/pseudoclass-on-parent.ui                |  2 +-
 testsuite/reftests/set-default-direction.ref.ui            |  2 +-
 testsuite/reftests/set-default-direction.ui                |  2 +-
 testsuite/reftests/shadow-clip-rounding.ref.ui             |  2 +-
 testsuite/reftests/shadow-clip-rounding.ui                 |  2 +-
 testsuite/reftests/sibling-pseudoclasses.ref.ui            |  2 +-
 testsuite/reftests/sibling-pseudoclasses.ui                |  2 +-
 testsuite/reftests/statusbar-remove-all.ref.ui             |  2 +-
 testsuite/reftests/statusbar-remove-all.ui                 |  2 +-
 testsuite/reftests/style-context-save-inheritance.ref.ui   |  2 +-
 testsuite/reftests/style-context-save-inheritance.ui       |  2 +-
 testsuite/reftests/textview-border-windows.ref.ui          |  2 +-
 testsuite/reftests/textview-border-windows.ui              |  2 +-
 testsuite/reftests/textview-margins.ref.ui                 |  2 +-
 testsuite/reftests/textview-margins.ui                     |  2 +-
 testsuite/reftests/treeview-crash-too-wide.ref.ui          |  2 +-
 testsuite/reftests/treeview-crash-too-wide.ui              |  2 +-
 testsuite/reftests/window-show-contents-on-map.ref.ui      |  2 +-
 testsuite/reftests/window-show-contents-on-map.ui          |  2 +-
 testsuite/tools/simplify-data-3to4/actionbar.expected      |  2 +-
 testsuite/tools/simplify-data-3to4/box.expected            |  2 +-
 testsuite/tools/simplify-data-3to4/fixed.expected          |  2 +-
 testsuite/tools/simplify-data-3to4/overlay.expected        |  2 +-
 testsuite/tools/simplify-data-3to4/paned.expected          |  2 +-
 testsuite/tools/simplify-data-3to4/toolbar.expected        |  2 +-
 81 files changed, 88 insertions(+), 89 deletions(-)
---
diff --git a/tests/testheightforwidth.c b/tests/testheightforwidth.c
index 6f78af2d47..a6b79357fc 100644
--- a/tests/testheightforwidth.c
+++ b/tests/testheightforwidth.c
@@ -37,7 +37,7 @@ static TestInterface interfaces[] = {
     "Ellipsizing Labels",
     "Demonstrates how labels will request a natural size in a horizontal space",
     "<interface>"
-    "  <requires lib=\"gtk+\" version=\"3.22\"/>"
+    "  <requires lib=\"gtk\" version=\"3.99\"/>"
     "  <!-- interface-naming-policy project-wide -->"
     "  <object class=\"GtkWindow\" id=\"window\">"
     "    <property name=\"default_width\">450</property>"
@@ -86,7 +86,7 @@ static TestInterface interfaces[] = {
     "Wrapping Label",
     "Demonstrates how a wrapping label can require a height contextual to its allocated width",
     "<interface>"
-    "  <requires lib=\"gtk+\" version=\"3.22\"/>"
+    "  <requires lib=\"gtk\" version=\"3.99\"/>"
     "  <!-- interface-naming-policy project-wide -->"
     "  <object class=\"GtkWindow\" id=\"window\">"
     "    <property name=\"default_width\">300</property>"
@@ -162,7 +162,7 @@ static TestInterface interfaces[] = {
     "Horizontal Box",
     "Demonstrates how a horizontal box can calculate the collective height for an allocated width",
     "<interface>"
-    "  <requires lib=\"gtk+\" version=\"3.22\"/>"
+    "  <requires lib=\"gtk\" version=\"3.99\"/>"
     "  <!-- interface-naming-policy project-wide -->"
     "  <object class=\"GtkWindow\" id=\"window\">"
     "    <property name=\"default_height\">200</property>"
@@ -240,7 +240,7 @@ static TestInterface interfaces[] = {
     "This test demonstrates how \"width-chars\" and \"max-width-chars\" can be used "
     "to effect minimum and natural widths in wrapping labels.",
     "<interface>"
-    "  <requires lib=\"gtk+\" version=\"3.22\"/>"
+    "  <requires lib=\"gtk\" version=\"3.99\"/>"
     "  <!-- interface-naming-policy project-wide -->"
     "  <object class=\"GtkWindow\" id=\"window\">"
     "    <property name=\"default_width\">900</property>"
@@ -334,7 +334,7 @@ static TestInterface interfaces[] = {
     "and also trade height for width.",
     "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
     "<interface>"
-    "  <requires lib=\"gtk+\" version=\"3.22\"/>"
+    "  <requires lib=\"gtk\" version=\"3.99\"/>"
     "  <!-- interface-naming-policy project-wide -->"
     "  <object class=\"GtkWindow\" id=\"window\">"
     "    <property name=\"default_width\">500</property>"
@@ -394,7 +394,7 @@ static TestInterface interfaces[] = {
     "and also trade height for width.",
     "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
     "<interface>"
-    "  <requires lib=\"gtk+\" version=\"3.22\"/>"
+    "  <requires lib=\"gtk\" version=\"3.99\"/>"
     "  <!-- interface-naming-policy project-wide -->"
     "  <object class=\"GtkWindow\" id=\"window\">"
     "    <property name=\"default_width\">400</property>"
@@ -427,7 +427,7 @@ static TestInterface interfaces[] = {
     "This test shows wrapping and ellipsizing text in combo boxes (and consequently in menu items).",
     "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
     "<interface>"
-    "  <requires lib=\"gtk+\" version=\"3.22\"/>"
+    "  <requires lib=\"gtk\" version=\"3.99\"/>"
     "  <!-- interface-naming-policy project-wide -->"
     "  <object class=\"GtkWindow\" id=\"window\">"
     "    <property name=\"default_width\">600</property>"
diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c
index d57b676d56..88e25e7229 100644
--- a/testsuite/gtk/builder.c
+++ b/testsuite/gtk/builder.c
@@ -1829,7 +1829,7 @@ test_requires (void)
   char       *buffer;
   const char buffer_fmt[] =
     "<interface>"
-    "  <requires lib=\"gtk+\" version=\"%d.%d\"/>"
+    "  <requires lib=\"gtk\" version=\"%d.%d\"/>"
     "</interface>";
 
   buffer = g_strdup_printf (buffer_fmt, GTK_MAJOR_VERSION, GTK_MINOR_VERSION + 1);
@@ -2307,9 +2307,8 @@ test_anaconda_signal (void)
   GtkBuilder *builder;
   const char buffer[] = 
     "<?xml version='1.0' encoding='UTF-8'?>"
-    "<!-- Generated with glade 3.18.3 -->"
     "<interface>"
-    "  <requires lib='gtk+' version='3.12'/>"
+    "  <requires lib='gtk' version='3.99'/>"
     "  <object class='GtkListStore' id='liststore1'>"
     "    <columns>"
     "      <!-- column-name use -->"
diff --git a/testsuite/reftests/animation-direction.ref.ui b/testsuite/reftests/animation-direction.ref.ui
index 5c2f97aaef..a063b1c6e5 100644
--- a/testsuite/reftests/animation-direction.ref.ui
+++ b/testsuite/reftests/animation-direction.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/animation-direction.ui b/testsuite/reftests/animation-direction.ui
index bf4e6cb43e..c9bfd74165 100644
--- a/testsuite/reftests/animation-direction.ui
+++ b/testsuite/reftests/animation-direction.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/animation-fill-mode-iteration-count.ref.ui 
b/testsuite/reftests/animation-fill-mode-iteration-count.ref.ui
index 1287c040c3..05b6f89d12 100644
--- a/testsuite/reftests/animation-fill-mode-iteration-count.ref.ui
+++ b/testsuite/reftests/animation-fill-mode-iteration-count.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.16"/>
+  <requires lib="gtk" version="3.16"/>
   <object class="GtkWindow" id="window1">
     <child>
       <object class="GtkGrid" id="grid1">
diff --git a/testsuite/reftests/animation-fill-mode-iteration-count.ui 
b/testsuite/reftests/animation-fill-mode-iteration-count.ui
index 4b58c08af1..9be4fb3a10 100644
--- a/testsuite/reftests/animation-fill-mode-iteration-count.ui
+++ b/testsuite/reftests/animation-fill-mode-iteration-count.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.16"/>
+  <requires lib="gtk" version="3.16"/>
   <object class="GtkWindow" id="window1">
     <child>
       <object class="GtkGrid" id="grid1">
diff --git a/testsuite/reftests/border-corner-zero-width-rendering.ref.ui 
b/testsuite/reftests/border-corner-zero-width-rendering.ref.ui
index 2b111b6855..f5e20bd588 100644
--- a/testsuite/reftests/border-corner-zero-width-rendering.ref.ui
+++ b/testsuite/reftests/border-corner-zero-width-rendering.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/border-corner-zero-width-rendering.ui 
b/testsuite/reftests/border-corner-zero-width-rendering.ui
index 21c1f7e72d..f0347c5c40 100644
--- a/testsuite/reftests/border-corner-zero-width-rendering.ui
+++ b/testsuite/reftests/border-corner-zero-width-rendering.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/box-order.ref.ui b/testsuite/reftests/box-order.ref.ui
index 5cf8975e94..c9f791c2e2 100644
--- a/testsuite/reftests/box-order.ref.ui
+++ b/testsuite/reftests/box-order.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/box-order.ui b/testsuite/reftests/box-order.ui
index 1e1f18b07b..540d61a3c1 100644
--- a/testsuite/reftests/box-order.ui
+++ b/testsuite/reftests/box-order.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/box-shadow-changes-modify-clip.ref.ui 
b/testsuite/reftests/box-shadow-changes-modify-clip.ref.ui
index fbcf495923..5ba631adb1 100644
--- a/testsuite/reftests/box-shadow-changes-modify-clip.ref.ui
+++ b/testsuite/reftests/box-shadow-changes-modify-clip.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>
diff --git a/testsuite/reftests/box-shadow-changes-modify-clip.ui 
b/testsuite/reftests/box-shadow-changes-modify-clip.ui
index 0913545288..b5256033c1 100644
--- a/testsuite/reftests/box-shadow-changes-modify-clip.ui
+++ b/testsuite/reftests/box-shadow-changes-modify-clip.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>
diff --git a/testsuite/reftests/box-shadow-spread.ref.ui b/testsuite/reftests/box-shadow-spread.ref.ui
index 0303ab9ebb..1b77f6e34d 100644
--- a/testsuite/reftests/box-shadow-spread.ref.ui
+++ b/testsuite/reftests/box-shadow-spread.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
diff --git a/testsuite/reftests/box-shadow-spread.ui b/testsuite/reftests/box-shadow-spread.ui
index 216df0d516..fb9e974b71 100644
--- a/testsuite/reftests/box-shadow-spread.ui
+++ b/testsuite/reftests/box-shadow-spread.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
diff --git a/testsuite/reftests/box-shadow-with-blend-mode.ref.ui 
b/testsuite/reftests/box-shadow-with-blend-mode.ref.ui
index a553811ca6..f23658f21e 100644
--- a/testsuite/reftests/box-shadow-with-blend-mode.ref.ui
+++ b/testsuite/reftests/box-shadow-with-blend-mode.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.16"/>
+  <requires lib="gtk" version="3.16"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/box-shadow-with-blend-mode.ui 
b/testsuite/reftests/box-shadow-with-blend-mode.ui
index b53fad608e..901343a6d7 100644
--- a/testsuite/reftests/box-shadow-with-blend-mode.ui
+++ b/testsuite/reftests/box-shadow-with-blend-mode.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.16"/>
+  <requires lib="gtk" version="3.16"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/css-em-label-size.ref.ui b/testsuite/reftests/css-em-label-size.ref.ui
index 85f4f83069..da39cbbc38 100644
--- a/testsuite/reftests/css-em-label-size.ref.ui
+++ b/testsuite/reftests/css-em-label-size.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.20"/>
+  <requires lib="gtk" version="3.20"/>
   <object class="GtkWindow">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/css-em-label-size.ui b/testsuite/reftests/css-em-label-size.ui
index fa89508222..f9645bb494 100644
--- a/testsuite/reftests/css-em-label-size.ui
+++ b/testsuite/reftests/css-em-label-size.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.20"/>
+  <requires lib="gtk" version="3.20"/>
   <object class="GtkWindow">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/css-rem-label-size.ref.ui b/testsuite/reftests/css-rem-label-size.ref.ui
index 85fe92601c..d87f5c4d6a 100644
--- a/testsuite/reftests/css-rem-label-size.ref.ui
+++ b/testsuite/reftests/css-rem-label-size.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.20"/>
+  <requires lib="gtk" version="3.20"/>
   <object class="GtkWindow">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/css-rem-label-size.ui b/testsuite/reftests/css-rem-label-size.ui
index b3579624e8..8ce8de1bc4 100644
--- a/testsuite/reftests/css-rem-label-size.ui
+++ b/testsuite/reftests/css-rem-label-size.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.20"/>
+  <requires lib="gtk" version="3.20"/>
   <object class="GtkWindow">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/flipping-icons.ref.ui b/testsuite/reftests/flipping-icons.ref.ui
index 4116f12838..c5c1a6a3a3 100644
--- a/testsuite/reftests/flipping-icons.ref.ui
+++ b/testsuite/reftests/flipping-icons.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/flipping-icons.ui b/testsuite/reftests/flipping-icons.ui
index 688c1495bd..6b29bdd365 100644
--- a/testsuite/reftests/flipping-icons.ui
+++ b/testsuite/reftests/flipping-icons.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <signal name="map" handler="reftest:switch_default_direction" swapped="no"/>
diff --git a/testsuite/reftests/gtk-icontheme-sizing.ref.ui b/testsuite/reftests/gtk-icontheme-sizing.ref.ui
index 800b02e63d..25cfdc0cde 100644
--- a/testsuite/reftests/gtk-icontheme-sizing.ref.ui
+++ b/testsuite/reftests/gtk-icontheme-sizing.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/gtk-icontheme-sizing.ui b/testsuite/reftests/gtk-icontheme-sizing.ui
index 714c9cee82..0402f29e56 100644
--- a/testsuite/reftests/gtk-icontheme-sizing.ui
+++ b/testsuite/reftests/gtk-icontheme-sizing.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
diff --git a/testsuite/reftests/icon-effect-missing.ref.ui b/testsuite/reftests/icon-effect-missing.ref.ui
index ee9b2657c7..ef72d2e814 100644
--- a/testsuite/reftests/icon-effect-missing.ref.ui
+++ b/testsuite/reftests/icon-effect-missing.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.16"/>
+  <requires lib="gtk" version="3.16"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/icon-effect-missing.ui b/testsuite/reftests/icon-effect-missing.ui
index 7d77f96e2f..0c77e67a49 100644
--- a/testsuite/reftests/icon-effect-missing.ui
+++ b/testsuite/reftests/icon-effect-missing.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.16"/>
+  <requires lib="gtk" version="3.16"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/icon-shadow-no-transform.ref.ui 
b/testsuite/reftests/icon-shadow-no-transform.ref.ui
index 51ecb0a95d..1662810a6b 100644
--- a/testsuite/reftests/icon-shadow-no-transform.ref.ui
+++ b/testsuite/reftests/icon-shadow-no-transform.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/icon-shadow-no-transform.ui b/testsuite/reftests/icon-shadow-no-transform.ui
index 3c4b93831f..2a2304de0d 100644
--- a/testsuite/reftests/icon-shadow-no-transform.ui
+++ b/testsuite/reftests/icon-shadow-no-transform.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/icon-style-basics.ref.ui b/testsuite/reftests/icon-style-basics.ref.ui
index 55301e93e4..14909e7725 100644
--- a/testsuite/reftests/icon-style-basics.ref.ui
+++ b/testsuite/reftests/icon-style-basics.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkListStore" id="liststore1">
     <columns>
       <column type="gchararray"/>
diff --git a/testsuite/reftests/icon-style-basics.ui b/testsuite/reftests/icon-style-basics.ui
index 0b79f497c9..96635da0ca 100644
--- a/testsuite/reftests/icon-style-basics.ui
+++ b/testsuite/reftests/icon-style-basics.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkListStore" id="liststore1">
     <columns>
       <column type="gchararray"/>
diff --git a/testsuite/reftests/icon-vfuncs.ref.ui b/testsuite/reftests/icon-vfuncs.ref.ui
index 4d625e9945..9dc5ab868f 100644
--- a/testsuite/reftests/icon-vfuncs.ref.ui
+++ b/testsuite/reftests/icon-vfuncs.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <child>
       <object class="GtkGrid" id="grid1">
diff --git a/testsuite/reftests/icon-vfuncs.ui b/testsuite/reftests/icon-vfuncs.ui
index 1d7bd31bbe..4418843600 100644
--- a/testsuite/reftests/icon-vfuncs.ui
+++ b/testsuite/reftests/icon-vfuncs.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <child>
       <object class="GtkGrid" id="grid1">
diff --git a/testsuite/reftests/image-icon-name-use-fallback.ref.ui 
b/testsuite/reftests/image-icon-name-use-fallback.ref.ui
index 49815a302a..61b4d81864 100644
--- a/testsuite/reftests/image-icon-name-use-fallback.ref.ui
+++ b/testsuite/reftests/image-icon-name-use-fallback.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.10"/>
+  <requires lib="gtk" version="3.10"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/image-icon-name-use-fallback.ui 
b/testsuite/reftests/image-icon-name-use-fallback.ui
index b353ed4721..d7db5642d3 100644
--- a/testsuite/reftests/image-icon-name-use-fallback.ui
+++ b/testsuite/reftests/image-icon-name-use-fallback.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.10"/>
+  <requires lib="gtk" version="3.10"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/image-icon-shadow-clipping.ref.ui 
b/testsuite/reftests/image-icon-shadow-clipping.ref.ui
index 36813408f9..4b31d9a118 100644
--- a/testsuite/reftests/image-icon-shadow-clipping.ref.ui
+++ b/testsuite/reftests/image-icon-shadow-clipping.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
diff --git a/testsuite/reftests/image-icon-shadow-clipping.ui 
b/testsuite/reftests/image-icon-shadow-clipping.ui
index fa151544fa..e522387360 100644
--- a/testsuite/reftests/image-icon-shadow-clipping.ui
+++ b/testsuite/reftests/image-icon-shadow-clipping.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
diff --git a/testsuite/reftests/label-background.ref.ui b/testsuite/reftests/label-background.ref.ui
index e6a46ecbb8..510f7bfb30 100644
--- a/testsuite/reftests/label-background.ref.ui
+++ b/testsuite/reftests/label-background.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/label-background.ui b/testsuite/reftests/label-background.ui
index e2665bd2eb..88e44a4187 100644
--- a/testsuite/reftests/label-background.ui
+++ b/testsuite/reftests/label-background.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/label-box-shadow-clip.ref.ui b/testsuite/reftests/label-box-shadow-clip.ref.ui
index b6b0b04041..ff9d0e22cf 100644
--- a/testsuite/reftests/label-box-shadow-clip.ref.ui
+++ b/testsuite/reftests/label-box-shadow-clip.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
diff --git a/testsuite/reftests/label-box-shadow-clip.ui b/testsuite/reftests/label-box-shadow-clip.ui
index 0047f8c25e..6aac63068b 100644
--- a/testsuite/reftests/label-box-shadow-clip.ui
+++ b/testsuite/reftests/label-box-shadow-clip.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
diff --git a/testsuite/reftests/label-clipping.ref.ui b/testsuite/reftests/label-clipping.ref.ui
index 83db896757..16d59f209e 100644
--- a/testsuite/reftests/label-clipping.ref.ui
+++ b/testsuite/reftests/label-clipping.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="decorated">0</property>
diff --git a/testsuite/reftests/label-clipping.ui b/testsuite/reftests/label-clipping.ui
index 45c6ca8138..50e40b0b59 100644
--- a/testsuite/reftests/label-clipping.ui
+++ b/testsuite/reftests/label-clipping.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="decorated">0</property>
diff --git a/testsuite/reftests/label-text-shadow-changes-modify-clip.ref.ui 
b/testsuite/reftests/label-text-shadow-changes-modify-clip.ref.ui
index 73b8efb450..efc0adc071 100644
--- a/testsuite/reftests/label-text-shadow-changes-modify-clip.ref.ui
+++ b/testsuite/reftests/label-text-shadow-changes-modify-clip.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>
diff --git a/testsuite/reftests/label-text-shadow-changes-modify-clip.ui 
b/testsuite/reftests/label-text-shadow-changes-modify-clip.ui
index 0913545288..b5256033c1 100644
--- a/testsuite/reftests/label-text-shadow-changes-modify-clip.ui
+++ b/testsuite/reftests/label-text-shadow-changes-modify-clip.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>
diff --git a/testsuite/reftests/label-text-shadow-clipping.ref.ui 
b/testsuite/reftests/label-text-shadow-clipping.ref.ui
index 2d15374f73..223e9fe609 100644
--- a/testsuite/reftests/label-text-shadow-clipping.ref.ui
+++ b/testsuite/reftests/label-text-shadow-clipping.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>
diff --git a/testsuite/reftests/label-text-shadow-clipping.ui 
b/testsuite/reftests/label-text-shadow-clipping.ui
index 5b581f8277..f40d4dc6a8 100644
--- a/testsuite/reftests/label-text-shadow-clipping.ui
+++ b/testsuite/reftests/label-text-shadow-clipping.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>
diff --git a/testsuite/reftests/letter-spacing.ref.ui b/testsuite/reftests/letter-spacing.ref.ui
index dbd264b6ed..c66515c400 100644
--- a/testsuite/reftests/letter-spacing.ref.ui
+++ b/testsuite/reftests/letter-spacing.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.0"/>
+  <requires lib="gtk" version="3.0"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/notebook-tab-position.ref.ui b/testsuite/reftests/notebook-tab-position.ref.ui
index b8b636f935..05d46b19ed 100644
--- a/testsuite/reftests/notebook-tab-position.ref.ui
+++ b/testsuite/reftests/notebook-tab-position.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/notebook-tab-position.ui b/testsuite/reftests/notebook-tab-position.ui
index c164a20961..eb1b5e8c49 100644
--- a/testsuite/reftests/notebook-tab-position.ui
+++ b/testsuite/reftests/notebook-tab-position.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/opacity-initial.ref.ui b/testsuite/reftests/opacity-initial.ref.ui
index 32b8fc9bb5..a981ad3770 100644
--- a/testsuite/reftests/opacity-initial.ref.ui
+++ b/testsuite/reftests/opacity-initial.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">200</property>
     <property name="height_request">100</property>
diff --git a/testsuite/reftests/opacity-initial.ui b/testsuite/reftests/opacity-initial.ui
index e3116565b2..8c7d742755 100644
--- a/testsuite/reftests/opacity-initial.ui
+++ b/testsuite/reftests/opacity-initial.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">200</property>
     <property name="height_request">100</property>
diff --git a/testsuite/reftests/overlay-no-main-widget.ref.ui 
b/testsuite/reftests/overlay-no-main-widget.ref.ui
index 8327429142..b80fd216fd 100644
--- a/testsuite/reftests/overlay-no-main-widget.ref.ui
+++ b/testsuite/reftests/overlay-no-main-widget.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <child>
       <object class="GtkOverlay" id="overlay1">
diff --git a/testsuite/reftests/overlay-no-main-widget.ui b/testsuite/reftests/overlay-no-main-widget.ui
index eaca0f2d0f..d4ccf93ed0 100644
--- a/testsuite/reftests/overlay-no-main-widget.ui
+++ b/testsuite/reftests/overlay-no-main-widget.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <child>
       <object class="GtkOverlay" id="overlay1">
diff --git a/testsuite/reftests/pseudoclass-on-box.ref.ui b/testsuite/reftests/pseudoclass-on-box.ref.ui
index 375e83f54c..89d8b55d3e 100644
--- a/testsuite/reftests/pseudoclass-on-box.ref.ui
+++ b/testsuite/reftests/pseudoclass-on-box.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/pseudoclass-on-box.ui b/testsuite/reftests/pseudoclass-on-box.ui
index e16fdf911e..b5edee7def 100644
--- a/testsuite/reftests/pseudoclass-on-box.ui
+++ b/testsuite/reftests/pseudoclass-on-box.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/pseudoclass-on-parent.ref.ui b/testsuite/reftests/pseudoclass-on-parent.ref.ui
index c9933fda8e..b6374178a9 100644
--- a/testsuite/reftests/pseudoclass-on-parent.ref.ui
+++ b/testsuite/reftests/pseudoclass-on-parent.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/pseudoclass-on-parent.ui b/testsuite/reftests/pseudoclass-on-parent.ui
index beccde56d0..2d6e90a0f5 100644
--- a/testsuite/reftests/pseudoclass-on-parent.ui
+++ b/testsuite/reftests/pseudoclass-on-parent.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/set-default-direction.ref.ui b/testsuite/reftests/set-default-direction.ref.ui
index d54ff23ba8..d716864ca9 100644
--- a/testsuite/reftests/set-default-direction.ref.ui
+++ b/testsuite/reftests/set-default-direction.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <signal name="realize" handler="reftest:switch_default_direction" after="yes" swapped="no"/>
diff --git a/testsuite/reftests/set-default-direction.ui b/testsuite/reftests/set-default-direction.ui
index 80a013e57d..5e6b004645 100644
--- a/testsuite/reftests/set-default-direction.ui
+++ b/testsuite/reftests/set-default-direction.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <signal name="map" handler="reftest:switch_default_direction" swapped="no"/>
diff --git a/testsuite/reftests/shadow-clip-rounding.ref.ui b/testsuite/reftests/shadow-clip-rounding.ref.ui
index b6b0b04041..ff9d0e22cf 100644
--- a/testsuite/reftests/shadow-clip-rounding.ref.ui
+++ b/testsuite/reftests/shadow-clip-rounding.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
diff --git a/testsuite/reftests/shadow-clip-rounding.ui b/testsuite/reftests/shadow-clip-rounding.ui
index 0047f8c25e..6aac63068b 100644
--- a/testsuite/reftests/shadow-clip-rounding.ui
+++ b/testsuite/reftests/shadow-clip-rounding.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
diff --git a/testsuite/reftests/sibling-pseudoclasses.ref.ui b/testsuite/reftests/sibling-pseudoclasses.ref.ui
index 0ec480703a..8ab7a1a3c6 100644
--- a/testsuite/reftests/sibling-pseudoclasses.ref.ui
+++ b/testsuite/reftests/sibling-pseudoclasses.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <child>
       <object class="GtkBox" id="box1">
diff --git a/testsuite/reftests/sibling-pseudoclasses.ui b/testsuite/reftests/sibling-pseudoclasses.ui
index f22e0cc63f..9d97a17508 100644
--- a/testsuite/reftests/sibling-pseudoclasses.ui
+++ b/testsuite/reftests/sibling-pseudoclasses.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <child>
       <object class="GtkBox" id="box1">
diff --git a/testsuite/reftests/statusbar-remove-all.ref.ui b/testsuite/reftests/statusbar-remove-all.ref.ui
index 6bda5b3922..3d42c2ac9e 100644
--- a/testsuite/reftests/statusbar-remove-all.ref.ui
+++ b/testsuite/reftests/statusbar-remove-all.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/statusbar-remove-all.ui b/testsuite/reftests/statusbar-remove-all.ui
index 0baf34621e..150ea55fc8 100644
--- a/testsuite/reftests/statusbar-remove-all.ui
+++ b/testsuite/reftests/statusbar-remove-all.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/style-context-save-inheritance.ref.ui 
b/testsuite/reftests/style-context-save-inheritance.ref.ui
index d3745e4bd7..26d34cef95 100644
--- a/testsuite/reftests/style-context-save-inheritance.ref.ui
+++ b/testsuite/reftests/style-context-save-inheritance.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/style-context-save-inheritance.ui 
b/testsuite/reftests/style-context-save-inheritance.ui
index c058490869..bd450ff7d2 100644
--- a/testsuite/reftests/style-context-save-inheritance.ui
+++ b/testsuite/reftests/style-context-save-inheritance.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/textview-border-windows.ref.ui 
b/testsuite/reftests/textview-border-windows.ref.ui
index 1bb083dad4..ddd5064a78 100644
--- a/testsuite/reftests/textview-border-windows.ref.ui
+++ b/testsuite/reftests/textview-border-windows.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.0"/>
+  <requires lib="gtk" version="3.0"/>
   <object class="GtkWindow" id="window">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/textview-border-windows.ui b/testsuite/reftests/textview-border-windows.ui
index dc51f0091e..69d0142e91 100644
--- a/testsuite/reftests/textview-border-windows.ui
+++ b/testsuite/reftests/textview-border-windows.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.0"/>
+  <requires lib="gtk" version="3.0"/>
   <object class="GtkWindow" id="window">
     <property name="decorated">0</property>
     <child>
diff --git a/testsuite/reftests/textview-margins.ref.ui b/testsuite/reftests/textview-margins.ref.ui
index 190201d3a5..8d455b11c5 100644
--- a/testsuite/reftests/textview-margins.ref.ui
+++ b/testsuite/reftests/textview-margins.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.0"/>
+  <requires lib="gtk" version="3.0"/>
   <object class="GtkTextBuffer" id="textbuffer1">
     <property name="text" translatable="yes">Lorem ipsum dolor sit amet, consectetur adipisci elit, sed 
eiusmod tempor incidunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation 
ullamco laboris nisi ut aliquid ex ea commodi consequat. Quis aute iure reprehenderit in voluptate velit esse 
cillum dolore eu fugiat nulla pariatur. Excepteur sint obcaecat cupiditat non proident, sunt in culpa qui 
officia deserunt mollit anim id est laborum</property>
   </object>
diff --git a/testsuite/reftests/textview-margins.ui b/testsuite/reftests/textview-margins.ui
index 93dd2ab9c2..6403d040da 100644
--- a/testsuite/reftests/textview-margins.ui
+++ b/testsuite/reftests/textview-margins.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.0"/>
+  <requires lib="gtk" version="3.0"/>
   <object class="GtkTextBuffer" id="textbuffer1">
     <property name="text" translatable="yes">Lorem ipsum dolor sit amet, consectetur adipisci elit, sed 
eiusmod tempor incidunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation 
ullamco laboris nisi ut aliquid ex ea commodi consequat. Quis aute iure reprehenderit in voluptate velit esse 
cillum dolore eu fugiat nulla pariatur. Excepteur sint obcaecat cupiditat non proident, sunt in culpa qui 
officia deserunt mollit anim id est laborum</property>
   </object>
diff --git a/testsuite/reftests/treeview-crash-too-wide.ref.ui 
b/testsuite/reftests/treeview-crash-too-wide.ref.ui
index ad9eb85c61..33825a95db 100644
--- a/testsuite/reftests/treeview-crash-too-wide.ref.ui
+++ b/testsuite/reftests/treeview-crash-too-wide.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkListStore" id="liststore1">
     <columns>
       <column type="gchararray"/>
diff --git a/testsuite/reftests/treeview-crash-too-wide.ui b/testsuite/reftests/treeview-crash-too-wide.ui
index ad9eb85c61..33825a95db 100644
--- a/testsuite/reftests/treeview-crash-too-wide.ui
+++ b/testsuite/reftests/treeview-crash-too-wide.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkListStore" id="liststore1">
     <columns>
       <column type="gchararray"/>
diff --git a/testsuite/reftests/window-show-contents-on-map.ref.ui 
b/testsuite/reftests/window-show-contents-on-map.ref.ui
index d074202b08..1cc91f827e 100644
--- a/testsuite/reftests/window-show-contents-on-map.ref.ui
+++ b/testsuite/reftests/window-show-contents-on-map.ref.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">200</property>
     <property name="height_request">200</property>
diff --git a/testsuite/reftests/window-show-contents-on-map.ui 
b/testsuite/reftests/window-show-contents-on-map.ui
index ec617ace22..22d773b79f 100644
--- a/testsuite/reftests/window-show-contents-on-map.ui
+++ b/testsuite/reftests/window-show-contents-on-map.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="decorated">0</property>
     <signal name="map" handler="gtk_widget_show" object="label1" after="yes" swapped="yes"/>
diff --git a/testsuite/tools/simplify-data-3to4/actionbar.expected 
b/testsuite/tools/simplify-data-3to4/actionbar.expected
index a063c7f2b6..8afe4c83fe 100644
--- a/testsuite/tools/simplify-data-3to4/actionbar.expected
+++ b/testsuite/tools/simplify-data-3to4/actionbar.expected
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.0"/>
+  <requires lib="gtk" version="3.0"/>
   <object class="GtkActionBar">
     <property name="visible">0</property>
     <child type="start">
diff --git a/testsuite/tools/simplify-data-3to4/box.expected b/testsuite/tools/simplify-data-3to4/box.expected
index 9f62a3b09e..6f0d194bc8 100644
--- a/testsuite/tools/simplify-data-3to4/box.expected
+++ b/testsuite/tools/simplify-data-3to4/box.expected
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.0"/>
+  <requires lib="gtk" version="3.0"/>
   <object class="GtkWindow">
     <property name="child">
       <object class="GtkBox">
diff --git a/testsuite/tools/simplify-data-3to4/fixed.expected 
b/testsuite/tools/simplify-data-3to4/fixed.expected
index 74953b12c6..2b18a84b1b 100644
--- a/testsuite/tools/simplify-data-3to4/fixed.expected
+++ b/testsuite/tools/simplify-data-3to4/fixed.expected
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.0"/>
+  <requires lib="gtk" version="3.0"/>
   <object class="GtkFixed">
     <child>
       <object class="GtkButton" id="button">
diff --git a/testsuite/tools/simplify-data-3to4/overlay.expected 
b/testsuite/tools/simplify-data-3to4/overlay.expected
index 67e6ccade1..a37d2ab8b5 100644
--- a/testsuite/tools/simplify-data-3to4/overlay.expected
+++ b/testsuite/tools/simplify-data-3to4/overlay.expected
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.0"/>
+  <requires lib="gtk" version="3.0"/>
   <object class="GtkOverlay">
     <child type="overlay">
       <object class="GtkButton" id="button">
diff --git a/testsuite/tools/simplify-data-3to4/paned.expected 
b/testsuite/tools/simplify-data-3to4/paned.expected
index a1acaae442..a868fd2fd4 100644
--- a/testsuite/tools/simplify-data-3to4/paned.expected
+++ b/testsuite/tools/simplify-data-3to4/paned.expected
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.0"/>
+  <requires lib="gtk" version="3.0"/>
   <object class="GtkPaned">
     <property name="resize-end-child">0</property>
     <property name="shrink-start-child">0</property>
diff --git a/testsuite/tools/simplify-data-3to4/toolbar.expected 
b/testsuite/tools/simplify-data-3to4/toolbar.expected
index fa090a9284..8fa1e1edfc 100644
--- a/testsuite/tools/simplify-data-3to4/toolbar.expected
+++ b/testsuite/tools/simplify-data-3to4/toolbar.expected
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.0"/>
+  <requires lib="gtk" version="3.0"/>
   <object class="GtkBox">
     <style>
       <class name="toolbar"/>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]