Fix the query question for vbox and hbox.

This commit is contained in:
Paolo Borelli 2003-11-18 18:30:57 +00:00
parent ef1f8c0f8b
commit 554b1a3ac3
2 changed files with 12 additions and 22 deletions

View File

@ -1,6 +1,7 @@
2003-11-18 Paolo Borelli <pborelli@katamail.com> 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> 2003-11-14 Paolo Borelli <pborelli@katamail.com>

View File

@ -68,7 +68,8 @@ glade_property_type_str_to_enum (const gchar *str)
gchar * gchar *
glade_property_type_enum_to_string (GladePropertyType type) glade_property_type_enum_to_string (GladePropertyType type)
{ {
switch (type) { switch (type)
{
case GLADE_PROPERTY_TYPE_STRING: case GLADE_PROPERTY_TYPE_STRING:
return GLADE_TAG_STRING; return GLADE_TAG_STRING;
case GLADE_PROPERTY_TYPE_BOOLEAN: case GLADE_PROPERTY_TYPE_BOOLEAN:
@ -96,17 +97,6 @@ glade_property_type_enum_to_string (GladePropertyType type)
return NULL; return NULL;
} }
static GladePropertyQuery *
glade_property_query_new (void)
{
GladePropertyQuery *query;
query = g_new0 (GladePropertyQuery, 1);
query->question = NULL;
return query;
}
static GladePropertyQuery * static GladePropertyQuery *
glade_query_new_from_node (GladeXmlNode *node) 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)) if (!glade_xml_node_verify (node, GLADE_TAG_QUERY))
return NULL; return NULL;
query = glade_property_query_new (); query = g_new0 (GladePropertyQuery, 1);
query->question = glade_xml_get_value_string_required (node, GLADE_TAG_QUESTION, NULL);
query->question = glade_xml_get_value_string_required (node, GLADE_TAG_QUESTION, NULL);
if (!query->question) if (!query->question)
return NULL; return NULL;
return query; return query;
} }
static GladePropertyQuery * static GladePropertyQuery *
glade_property_query_clone (GladePropertyQuery *query) glade_property_query_clone (GladePropertyQuery *query)
{ {
GladePropertyQuery *clon; GladePropertyQuery *clone;
g_return_val_if_fail (query != NULL, NULL); g_return_val_if_fail (query != NULL, NULL);
g_return_val_if_fail (query->question != NULL, NULL);
clon = glade_property_query_new (); clone = g_new0 (GladePropertyQuery, 1);
clon->question = g_strdup (clon->question); clone->question = g_strdup (query->question);
return clon; return clone;
} }
static void static void