diff --git a/ChangeLog b/ChangeLog
index e911ba65..db674487 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2003-11-18  Paolo Borelli  <pborelli@katamail.com>
 
-	* src/glade-widget-class.c: simplify marge_with_parent.
+	* src/glade-widget-class.c: simplify glade_widget_class_merge.
+	* src/glade-property-class.c: fix query->question cloning.
 
 2003-11-14  Paolo Borelli  <pborelli@katamail.com>
 
diff --git a/src/glade-property-class.c b/src/glade-property-class.c
index 74f0ffc3..658a013f 100644
--- a/src/glade-property-class.c
+++ b/src/glade-property-class.c
@@ -68,7 +68,8 @@ glade_property_type_str_to_enum (const gchar *str)
 gchar *
 glade_property_type_enum_to_string (GladePropertyType type)
 {
-	switch (type) {
+	switch (type)
+	{
 	case GLADE_PROPERTY_TYPE_STRING:
 		return GLADE_TAG_STRING;
 	case GLADE_PROPERTY_TYPE_BOOLEAN:
@@ -96,17 +97,6 @@ glade_property_type_enum_to_string (GladePropertyType type)
 	return NULL;
 }
 
-static GladePropertyQuery *
-glade_property_query_new (void)
-{
-	GladePropertyQuery *query;
-
-	query = g_new0 (GladePropertyQuery, 1);
-	query->question = NULL;
-
-	return query;
-}
-
 static GladePropertyQuery *
 glade_query_new_from_node (GladeXmlNode *node)
 {
@@ -115,27 +105,26 @@ glade_query_new_from_node (GladeXmlNode *node)
 	if (!glade_xml_node_verify (node, GLADE_TAG_QUERY))
 		return NULL;
 
-	query = glade_property_query_new ();
-
-	query->question     = glade_xml_get_value_string_required (node, GLADE_TAG_QUESTION, NULL);
-
+	query = g_new0 (GladePropertyQuery, 1);
+	query->question = glade_xml_get_value_string_required (node, GLADE_TAG_QUESTION, NULL);
 	if (!query->question)
 		return NULL;
 
-	return query;	
+	return query;
 }
 
 static GladePropertyQuery *
 glade_property_query_clone (GladePropertyQuery *query)
 {
-	GladePropertyQuery *clon;
+	GladePropertyQuery *clone;
 
 	g_return_val_if_fail (query != NULL, NULL);
+	g_return_val_if_fail (query->question != NULL, NULL);
 
-	clon = glade_property_query_new ();
-	clon->question = g_strdup (clon->question);
+	clone = g_new0 (GladePropertyQuery, 1);
+	clone->question = g_strdup (query->question);
 
-	return clon;
+	return clone;
 }
 
 static void