From a827e9222627b0462ae4c6bd063bf922faf4277a Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Mon, 28 Aug 2017 18:58:50 +0200
Subject: GtkBuilder: Prefer "type-func" over "class" when looking for the
 GType

https://bugzilla.gnome.org/show_bug.cgi?id=786932
---
 testsuite/gtk/builder.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'testsuite')

diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c
index 9aad57aa21..339ad110b2 100644
--- a/testsuite/gtk/builder.c
+++ b/testsuite/gtk/builder.c
@@ -762,6 +762,10 @@ test_types (void)
     "  <object type-func=\"gtk_window_get_type\" id=\"window\"/>"
     "</interface>";
   const gchar buffer3[] = 
+    "<interface>"
+    "  <object class=\"XXXInvalidType\" type-func=\"gtk_window_get_type\" id=\"window\"/>"
+    "</interface>";
+  const gchar buffer4[] =
     "<interface>"
     "  <object type-func=\"xxx_invalid_get_type_function\" id=\"window\"/>"
     "</interface>";
@@ -779,10 +783,16 @@ test_types (void)
   g_assert (GTK_IS_WINDOW (window));
   gtk_widget_destroy (GTK_WIDGET (window));
   g_object_unref (builder);
+
+  builder = builder_new_from_string (buffer3, -1, NULL);
+  window = gtk_builder_get_object (builder, "window");
+  g_assert (GTK_IS_WINDOW (window));
+  gtk_widget_destroy (GTK_WIDGET (window));
+  g_object_unref (builder);
   
   error = NULL;
   builder = gtk_builder_new ();
-  gtk_builder_add_from_string (builder, buffer3, -1, &error);
+  gtk_builder_add_from_string (builder, buffer4, -1, &error);
   g_assert_error (error, GTK_BUILDER_ERROR, GTK_BUILDER_ERROR_INVALID_TYPE_FUNCTION);
   g_error_free (error);
   g_object_unref (builder);
-- 
cgit v1.2.1