3 #define moved from .h to .c

2 files changed, 8 insertions, 5 deletions

diff --git a/lasso/Attic/protocols/provider.c b/lasso/Attic/protocols/provider.c
index 9d8d51fd..97722daa 100644
--- a/lasso/Attic/protocols/provider.c
+++ b/lasso/Attic/protocols/provider.c
@@ -24,6 +24,10 @@
 
 #include <lasso/protocols/provider.h>
 
+#define LASSO_PROVIDER_NODE                "LassoProvider"
+#define LASSO_PROVIDER_PUBLIC_KEY_NODE     "PublicKey"
+#define LASSO_PROVIDER_CA_CERTIFICATE_NODE "CaCertificate"
+
 struct _LassoProviderPrivate
 {
   gboolean dispose_has_run;
@@ -287,7 +291,10 @@ lasso_provider_new_metadata_filename(gchar *metadata_filename)
   doc = xmlParseFile(metadata_filename);
   root = xmlCopyNode(xmlDocGetRootElement(doc), 1);
   xmlFreeDoc(doc);
-  provider->metadata = lasso_node_new_from_xmlNode(root);
+  
+  provider->metadata = lasso_node_new();
+  LASSO_NODE_GET_CLASS(provider->metadata)->set_xmlNode(provider->metadata, root);
+  //provider->metadata = lasso_node_new_from_xmlNode(root);
 
   return(provider);
 }
diff --git a/lasso/Attic/protocols/provider.h b/lasso/Attic/protocols/provider.h
index f205ad51..1d5a0b3a 100644
--- a/lasso/Attic/protocols/provider.h
+++ b/lasso/Attic/protocols/provider.h
@@ -38,10 +38,6 @@ extern "C" {
 #define LASSP_IS_PROVIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_PROVIDER))
 #define LASSO_PROVIDER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_PROVIDER, LassoProviderClass)) 
 
-#define LASSO_PROVIDER_NODE                "LassoProvider"
-#define LASSO_PROVIDER_PUBLIC_KEY_NODE     "PublicKey"
-#define LASSO_PROVIDER_CA_CERTIFICATE_NODE "CaCertificate"
-
 typedef struct _LassoProvider LassoProvider;
 typedef struct _LassoProviderClass LassoProviderClass;
 typedef struct _LassoProviderPrivate LassoProviderPrivate;