summaryrefslogtreecommitdiffstats
path: root/lasso/xml/disco_modify.c
diff options
context:
space:
mode:
Diffstat (limited to 'lasso/xml/disco_modify.c')
-rw-r--r--lasso/xml/disco_modify.c21
1 files changed, 15 insertions, 6 deletions
diff --git a/lasso/xml/disco_modify.c b/lasso/xml/disco_modify.c
index 8edc9862..2e389d6f 100644
--- a/lasso/xml/disco_modify.c
+++ b/lasso/xml/disco_modify.c
@@ -37,6 +37,15 @@
* </xs:sequence>
* <xs:attribute name="id" type="xs:ID" use="optional"/>
* </xs:complexType>
+ *
+ * <xs:group name="ResourceIDGroup">
+ * <xs:sequence>
+ * <xs:choice minOccurs="0" maxOccurs="1">
+ * <xs:element ref="ResourceID"/>
+ * <xs:element ref="EncryptedResourceID"/>
+ * </xs:choice>
+ * </xs:sequence>
+ * </xs:group>
*/
/*****************************************************************************/
@@ -44,7 +53,9 @@
/*****************************************************************************/
static struct XmlSnippet schema_snippets[] = {
- { "ResourceIDGroup", SNIPPET_NODE, G_STRUCT_OFFSET(LassoDiscoModify, ResourceIDGroup) },
+ { "ResourceID", SNIPPET_NODE, G_STRUCT_OFFSET(LassoDiscoModify, ResourceID) },
+ { "EncryptedResourceID",
+ SNIPPET_NODE, G_STRUCT_OFFSET(LassoDiscoModify, EncryptedResourceID) },
{ "InsertEntry", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoDiscoModify, InsertEntry) },
{ "RemoveEntry", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoDiscoModify, RemoveEntry) },
{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDiscoModify, id) },
@@ -58,7 +69,8 @@ static struct XmlSnippet schema_snippets[] = {
static void
instance_init(LassoDiscoModify *node)
{
- node->ResourceIDGroup = NULL;
+ node->ResourceID = NULL;
+ node->EncryptedResourceID = NULL;
node->InsertEntry = NULL;
node->RemoveEntry = NULL;
node->id = NULL;
@@ -100,15 +112,12 @@ lasso_disco_modify_get_type()
}
LassoDiscoModify*
-lasso_disco_modify_new(LassoDiscoResourceIDGroup *resourceIDGroup)
+lasso_disco_modify_new()
{
LassoDiscoModify *node;
node = g_object_new(LASSO_TYPE_DISCO_MODIFY, NULL);
- /* FIXME : should ResourceIDGroup be a copy */
- node->ResourceIDGroup = resourceIDGroup;
-
return node;
}