[glib/wip/otte/interface-types: 446/448] Apply 6 suggestion(s) to 4 file(s)

[Matthias Clasen <matthiasc src gnome org>]

commit ff73ea9552a673e3d7dc21561524ef16a01d912c
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Oct 22 16:44:54 2020 +0000

    Apply 6 suggestion(s) to 4 file(s)

 gobject/gtype.c             | 4 ++--
 gobject/gtype.h             | 2 +-
 gobject/tests/threadtests.c | 2 +-
 gobject/tests/type.c        | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gobject/gtype.c b/gobject/gtype.c
index 236e55667..9cbfc58e6 100644
--- a/gobject/gtype.c
+++ b/gobject/gtype.c
@@ -1698,9 +1698,9 @@ g_type_interface_prerequisites (GType  interface_type,
  * If the interface type has no instantiable prerequisite,
  * G_TYPE_INVALID is returned.
  *
- * Since: 2.66
+ * Since: 2.68
  *
- * Returns: the instantiable prerequisite type or G_TYPE_INVALID if none
+ * Returns: the instantiable prerequisite type or %G_TYPE_INVALID if none
  **/
 GType
 g_type_interface_instantiable_prerequisite (GType interface_type)
diff --git a/gobject/gtype.h b/gobject/gtype.h
index d9619c6ff..cdeba0a22 100644
--- a/gobject/gtype.h
+++ b/gobject/gtype.h
@@ -1300,7 +1300,7 @@ void  g_type_interface_add_prerequisite (GType                         interface_type,
 GLIB_AVAILABLE_IN_ALL
 GType*g_type_interface_prerequisites    (GType                       interface_type,
                                         guint                      *n_prerequisites);
-GLIB_AVAILABLE_IN_2_66
+GLIB_AVAILABLE_IN_2_68
 GType g_type_interface_instantiable_prerequisite
                                         (GType                       interface_type);
 GLIB_DEPRECATED_IN_2_58
diff --git a/gobject/tests/threadtests.c b/gobject/tests/threadtests.c
index ba839dbf2..e341a9d67 100644
--- a/gobject/tests/threadtests.c
+++ b/gobject/tests/threadtests.c
@@ -159,7 +159,7 @@ static void
 prop_tester_init (PropTester* t)
 {
   if (t->name == NULL)
-    { } /* neds unit test framework initialization: g_test_bug ("race initializing properties"); */
+    { } /* needs unit test framework initialization: g_test_bug ("race initializing properties"); */
 }
 static void
 prop_tester_set_property (GObject        *object,
diff --git a/gobject/tests/type.c b/gobject/tests/type.c
index ba4b70a23..9d26d5a4f 100644
--- a/gobject/tests/type.c
+++ b/gobject/tests/type.c
@@ -89,8 +89,8 @@ test_interface_prerequisite (void)
 
   g_free (prereqs);
 
-  g_assert (g_type_interface_instantiable_prerequisite (baa_get_type ()) == G_TYPE_INVALID);
-  g_assert (g_type_interface_instantiable_prerequisite (boo_get_type ()) == G_TYPE_INVALID);
+  g_assert_cmpint (g_type_interface_instantiable_prerequisite (baa_get_type ()), ==, G_TYPE_INVALID);
+  g_assert_cmpint (g_type_interface_instantiable_prerequisite (boo_get_type ()), ==, G_TYPE_INVALID);
 }
 
 typedef struct {