diff options
| author | Juan Pablo Ugarte <juanpablougarte@gmai.com> | 2013-01-31 17:19:34 +0100 |
|---|---|---|
| committer | Juan Pablo Ugarte <juanpablougarte@gmai.com> | 2013-01-31 17:19:34 +0100 |
| commit | 18483ff464ae3d93971ad45d26cba30c97d9d9b1 (patch) | |
| tree | 2e55057076f1af0acbaaa1d7b9fd88580b4e729c | |
| parent | 6552f5f48d02bfab7e7624970c3dd623511dabea (diff) | |
| download | glade-18483ff464ae3d93971ad45d26cba30c97d9d9b1.tar.gz | |
Replaced GLADE_XML_TAG_TEMPLATE with GLADE_XML_TAG_EXTERNAL_OBJECT
| -rw-r--r-- | gladeui/glade-composite-template.c | 2 | ||||
| -rw-r--r-- | gladeui/glade-project.c | 4 | ||||
| -rw-r--r-- | gladeui/glade-property.c | 2 | ||||
| -rw-r--r-- | gladeui/glade-widget.c | 4 | ||||
| -rw-r--r-- | gladeui/glade-xml-utils.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/gladeui/glade-composite-template.c b/gladeui/glade-composite-template.c index 81ede79a..6de6539f 100644 --- a/gladeui/glade-composite-template.c +++ b/gladeui/glade-composite-template.c @@ -44,7 +44,7 @@ start_element (GMarkupParseContext *context, { ParseData *state = user_data; - if (g_strcmp0 (element_name, "template") == 0) + if (g_strcmp0 (element_name, GLADE_XML_TAG_EXTERNAL_OBJECT) == 0) { gint i; diff --git a/gladeui/glade-project.c b/gladeui/glade-project.c index e9aa1813..436f06c5 100644 --- a/gladeui/glade-project.c +++ b/gladeui/glade-project.c @@ -1443,7 +1443,7 @@ glade_project_count_xml_objects (GladeProject *project, node; node = glade_xml_node_next (node)) { if (glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE)) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_EXTERNAL_OBJECT)) count = glade_project_count_xml_objects (project, node, ++count); else if (glade_xml_node_verify_silent (node, GLADE_XML_TAG_CHILD)) count = glade_project_count_xml_objects (project, node, count); @@ -1625,7 +1625,7 @@ glade_project_load_internal (GladeProject *project) { /* Skip "requires" tags */ if (!glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) && - !glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE)) + !glade_xml_node_verify_silent (node, GLADE_XML_TAG_EXTERNAL_OBJECT)) continue; if ((widget = glade_widget_read (project, NULL, node, NULL)) != NULL) diff --git a/gladeui/glade-property.c b/gladeui/glade-property.c index ccdf95f6..4d6ee0b3 100644 --- a/gladeui/glade-property.c +++ b/gladeui/glade-property.c @@ -1171,7 +1171,7 @@ glade_property_write (GladeProperty * property, /* This code should work the same for <packing>, <widget> and <template> */ if (!(glade_xml_node_verify_silent (node, GLADE_XML_TAG_PACKING) || glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET) || - glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE))) + glade_xml_node_verify_silent (node, GLADE_XML_TAG_EXTERNAL_OBJECT))) return; /* Skip properties that are default by original pspec default diff --git a/gladeui/glade-widget.c b/gladeui/glade-widget.c index 405856c3..9c64081c 100644 --- a/gladeui/glade-widget.c +++ b/gladeui/glade-widget.c @@ -3788,7 +3788,7 @@ glade_widget_read (GladeProject * project, if (glade_project_load_cancelled (project)) return NULL; - is_tmpl = (parent == NULL && glade_xml_node_verify_silent (node, GLADE_XML_TAG_TEMPLATE)); + is_tmpl = (parent == NULL && glade_xml_node_verify_silent (node, GLADE_XML_TAG_EXTERNAL_OBJECT)); if (!is_tmpl && !glade_xml_node_verify_silent (node, GLADE_XML_TAG_WIDGET)) return NULL; @@ -3997,7 +3997,7 @@ glade_widget_write (GladeWidget * widget, return; } - widget_node = glade_xml_node_new (context, (tmpl) ? GLADE_XML_TAG_TEMPLATE : GLADE_XML_TAG_WIDGET); + widget_node = glade_xml_node_new (context, (tmpl) ? GLADE_XML_TAG_EXTERNAL_OBJECT : GLADE_XML_TAG_WIDGET); glade_xml_node_append_child (node, widget_node); /* Set class and id */ diff --git a/gladeui/glade-xml-utils.h b/gladeui/glade-xml-utils.h index ff9b6760..33a0c997 100644 --- a/gladeui/glade-xml-utils.h +++ b/gladeui/glade-xml-utils.h @@ -36,7 +36,7 @@ typedef struct _GladeProject GladeProject; /* Used for catalog tags and attributes */ #define GLADE_XML_TAG_PROJECT "interface" #define GLADE_XML_TAG_WIDGET "object" -#define GLADE_XML_TAG_TEMPLATE "template" +#define GLADE_XML_TAG_EXTERNAL_OBJECT "external-object" #define GLADE_XML_TAG_VERSION "version" #define GLADE_XML_TAG_REQUIRES "requires" |