From 6a994dca8757384e129ec28711e8db1007fb58df Mon Sep 17 00:00:00 2001
From: Nicolas Clapies <nclapies@entrouvert.com>
Date: Thu, 10 Mar 2005 08:11:41 +0000
Subject: resourceId is for LassoResourceID and LassoEncryptedResourceID.

---
 lasso/xml/disco_modify.c | 7 ++-----
 lasso/xml/disco_modify.h | 4 ++--
 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;
-- 
cgit