Blob Blame History Raw
From 6de6656d1f8d762093fe9d73f2713380573b9e39 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 30 May 2014 12:39:07 -0400
Subject: [PATCH] GtkBuilder: Ensure types are fully initialized

Just calling get_type() does not ensure that the signals, properties
and everything else gets set up properly. Ensure it is, by calling
g_type_class_ref() before using the type. This fixes the testcase
added in the previous commit.
---
 gtk/gtkbuilder.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index f6e5c52..60927df 100644
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -2275,10 +2275,17 @@ GType
 gtk_builder_get_type_from_name (GtkBuilder  *builder, 
                                 const gchar *type_name)
 {
+  GType type;
+
   g_return_val_if_fail (GTK_IS_BUILDER (builder), G_TYPE_INVALID);
   g_return_val_if_fail (type_name != NULL, G_TYPE_INVALID);
 
-  return GTK_BUILDER_GET_CLASS (builder)->get_type_from_name (builder, type_name);
+  type = GTK_BUILDER_GET_CLASS (builder)->get_type_from_name (builder, type_name);
+
+  if (G_TYPE_IS_CLASSED (type))
+    g_type_class_unref (g_type_class_ref (type));
+
+  return type;
 }
 
 GQuark
-- 
2.0.0