summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lasso/xml/disco_modify.c7
-rw-r--r--lasso/xml/disco_modify.h4
2 files changed, 4 insertions, 7 deletions
diff --git a/lasso/xml/disco_modify.c b/lasso/xml/disco_modify.c
index 6c53be43..a615b1a4 100644
--- a/lasso/xml/disco_modify.c
+++ b/lasso/xml/disco_modify.c
@@ -52,9 +52,7 @@
/*****************************************************************************/
static struct XmlSnippet schema_snippets[] = {
- { "ResourceID", SNIPPET_NODE, G_STRUCT_OFFSET(LassoDiscoModify, ResourceID) },
- { "EncryptedResourceID",
- SNIPPET_NODE, G_STRUCT_OFFSET(LassoDiscoModify, EncryptedResourceID) },
+ { "", SNIPPET_NODE, G_STRUCT_OFFSET(LassoDiscoModify, resourceId) },
{ "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) },
@@ -68,8 +66,7 @@ static struct XmlSnippet schema_snippets[] = {
static void
instance_init(LassoDiscoModify *node)
{
- node->ResourceID = NULL;
- node->EncryptedResourceID = NULL;
+ node->resourceId = NULL;
node->InsertEntry = NULL;
node->RemoveEntry = NULL;
node->id = NULL;
diff --git a/lasso/xml/disco_modify.h b/lasso/xml/disco_modify.h
index f952ee36..c1aa1253 100644
--- a/lasso/xml/disco_modify.h
+++ b/lasso/xml/disco_modify.h
@@ -50,8 +50,8 @@ typedef struct _LassoDiscoModifyClass LassoDiscoModifyClass;
struct _LassoDiscoModify {
LassoNode parent;
- LassoDiscoResourceID *ResourceID;
- LassoDiscoEncryptedResourceID *EncryptedResourceID;
+ /* must be either LassoResourceID or LassoEncryptedResourceID */
+ LassoNode *resourceId;
GList *InsertEntry;
GList *RemoveEntry;