diff options
| author | Frederic Peters <fpeters@entrouvert.com> | 2004-12-02 14:54:43 +0000 |
|---|---|---|
| committer | Frederic Peters <fpeters@entrouvert.com> | 2004-12-02 14:54:43 +0000 |
| commit | 05577f56728d3fbae3f484e37e1202d6676b38e2 (patch) | |
| tree | 4979b780ebce2fd4eb3a1691661b3ea89402e89e /lasso/xml/saml_subject_confirmation.c | |
| parent | 169b16b94fc7a581b182307a610b91b1d944d0ae (diff) | |
| download | lasso-05577f56728d3fbae3f484e37e1202d6676b38e2.tar.gz lasso-05577f56728d3fbae3f484e37e1202d6676b38e2.tar.xz lasso-05577f56728d3fbae3f484e37e1202d6676b38e2.zip | |
last(?) iteration on XmlSnippet; now attached to classes, get_xmlNode and
init_from_xml are no longer necessary in many cases. Previous XmlSnippet
renamed to XmlSnippetObsolete to keep compatibility (id-wsf classes have not
yet been converted).
Diffstat (limited to 'lasso/xml/saml_subject_confirmation.c')
| -rw-r--r-- | lasso/xml/saml_subject_confirmation.c | 53 |
1 files changed, 13 insertions, 40 deletions
diff --git a/lasso/xml/saml_subject_confirmation.c b/lasso/xml/saml_subject_confirmation.c index c20a66fd..1c530c69 100644 --- a/lasso/xml/saml_subject_confirmation.c +++ b/lasso/xml/saml_subject_confirmation.c @@ -45,43 +45,13 @@ /* private methods */ /*****************************************************************************/ -#define snippets() \ - LassoSamlSubjectConfirmation *confirm = LASSO_SAML_SUBJECT_CONFIRMATION(node); \ - struct XmlSnippet snippets[] = { \ - { "ConfirmationMethod", SNIPPET_CONTENT, \ - (void**)&(confirm->ConfirmationMethod) }, \ - { "SubjectConfirmationData", SNIPPET_CONTENT, \ - (void**)&(confirm->SubjectConfirmationData) }, \ - { NULL, 0, NULL} \ - }; - -static LassoNodeClass *parent_class = NULL; - -static xmlNode* -get_xmlNode(LassoNode *node) -{ - xmlNode *xmlnode; - snippets(); - - xmlnode = xmlNewNode(NULL, "SubjectConfirmation"); - xmlSetNs(xmlnode, xmlNewNs(xmlnode, - LASSO_SAML_ASSERTION_HREF, LASSO_SAML_ASSERTION_PREFIX)); - build_xml_with_snippets(xmlnode, snippets); - - return xmlnode; -} - -static int -init_from_xml(LassoNode *node, xmlNode *xmlnode) -{ - snippets(); - - if (parent_class->init_from_xml(node, xmlnode)) - return -1; - init_xml_with_snippets(xmlnode, snippets); - return 0; -} - +static struct XmlSnippet schema_snippets[] = { + { "ConfirmationMethod", SNIPPET_CONTENT, + G_STRUCT_OFFSET(LassoSamlSubjectConfirmation, ConfirmationMethod) }, + { "SubjectConfirmationData", SNIPPET_CONTENT, + G_STRUCT_OFFSET(LassoSamlSubjectConfirmation, SubjectConfirmationData) }, + { NULL, 0, 0} +}; /*****************************************************************************/ /* instance and class init functions */ @@ -95,9 +65,12 @@ instance_init(LassoSamlSubjectConfirmation *node) static void class_init(LassoSamlSubjectConfirmationClass *klass) { - parent_class = g_type_class_peek_parent(klass); - LASSO_NODE_CLASS(klass)->get_xmlNode = get_xmlNode; - LASSO_NODE_CLASS(klass)->init_from_xml = init_from_xml; + LassoNodeClass *nclass = LASSO_NODE_CLASS(klass); + + nclass->node_data = g_new0(LassoNodeClassData, 1); + lasso_node_class_set_nodename(nclass, "SubjectStatement"); + lasso_node_class_set_ns(nclass, LASSO_SAML_ASSERTION_HREF, LASSO_SAML_ASSERTION_PREFIX); + lasso_node_class_add_snippets(nclass, schema_snippets); } GType |