moved soap_envelope_request and soap_envelope_response to ProfilePrivate to avoid ABI breackage

8 files changed, 26 insertions, 41 deletions

diff --git a/lasso/id-ff/profile.c b/lasso/id-ff/profile.c
index 036fdb02..82952472 100644
--- a/lasso/id-ff/profile.c
+++ b/lasso/id-ff/profile.c
@@ -508,13 +508,13 @@ dispose(GObject *object)
 	g_free(profile->private_data->artifact_message);
 	profile->private_data->artifact_message = NULL;
 
-	if (profile->soap_envelope_request != NULL) {
-		lasso_node_destroy(LASSO_NODE(profile->soap_envelope_request));
-		profile->soap_envelope_request = NULL;
+	if (profile->private_data->soap_envelope_request != NULL) {
+		lasso_node_destroy(LASSO_NODE(profile->private_data->soap_envelope_request));
+		profile->private_data->soap_envelope_request = NULL;
 	}
-	if (profile->soap_envelope_response != NULL) {
-		lasso_node_destroy(LASSO_NODE(profile->soap_envelope_response));
-		profile->soap_envelope_response = NULL;
+	if (profile->private_data->soap_envelope_response != NULL) {
+		lasso_node_destroy(LASSO_NODE(profile->private_data->soap_envelope_response));
+		profile->private_data->soap_envelope_response = NULL;
 	}
 
 	G_OBJECT_CLASS(parent_class)->dispose(G_OBJECT(profile));
@@ -539,6 +539,8 @@ instance_init(LassoProfile *profile)
 	profile->private_data->dispose_has_run = FALSE;
 	profile->private_data->artifact = NULL;
 	profile->private_data->artifact_message = NULL;
+	profile->private_data->soap_envelope_request = NULL;
+	profile->private_data->soap_envelope_response = NULL;
 
 	profile->server = NULL;
 	profile->request = NULL;
@@ -552,8 +554,6 @@ instance_init(LassoProfile *profile)
 	profile->identity = NULL;
 	profile->session = NULL;
 	profile->signature_status = 0;
-	profile->soap_envelope_request = NULL;
-	profile->soap_envelope_response = NULL;
 }
 
 static void
diff --git a/lasso/id-ff/profile.h b/lasso/id-ff/profile.h
index cf7bb573..1641f6b1 100644
--- a/lasso/id-ff/profile.h
+++ b/lasso/id-ff/profile.h
@@ -36,7 +36,6 @@ extern "C" {
 
 #include <lasso/xml/samlp_request_abstract.h>
 #include <lasso/xml/samlp_response_abstract.h>
-#include <lasso/xml/soap_envelope.h>
 
 #define LASSO_TYPE_PROFILE (lasso_profile_get_type())
 #define LASSO_PROFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_PROFILE, LassoProfile))
@@ -113,9 +112,6 @@ struct _LassoProfile {
 	LassoHttpMethod http_request_method;
 	gint signature_status;
 
-	LassoSoapEnvelope *soap_envelope_request;
-	LassoSoapEnvelope *soap_envelope_response;
-
 	LassoProfilePrivate *private_data;
 };
 
diff --git a/lasso/id-ff/profileprivate.h b/lasso/id-ff/profileprivate.h
index 663bded0..e96ffbb1 100644
--- a/lasso/id-ff/profileprivate.h
+++ b/lasso/id-ff/profileprivate.h
@@ -32,10 +32,14 @@ extern "C" {
 
 #include <lasso/id-ff/profile.h>
 
+#include <lasso/xml/soap_envelope.h>
+
 struct _LassoProfilePrivate
 {
 	char *artifact;
 	char *artifact_message;
+	LassoSoapEnvelope *soap_envelope_request;
+	LassoSoapEnvelope *soap_envelope_response;
 	gboolean dispose_has_run;
 };
 
diff --git a/lasso/id-wsf-2.0/data_service.c b/lasso/id-wsf-2.0/data_service.c
index 532aef6f..9300d7a3 100644
--- a/lasso/id-wsf-2.0/data_service.c
+++ b/lasso/id-wsf-2.0/data_service.c
@@ -181,7 +181,7 @@ lasso_idwsf2_data_service_parse_query_items(LassoIdWsf2DataService *service)
 	request = LASSO_IDWSF2_DSTREF_QUERY(profile->request);
 
 	/* Response envelope and body */
-	envelope = profile->soap_envelope_response;
+	envelope = profile->private_data->soap_envelope_response;
 	response = lasso_idwsf2_dstref_query_response_new();
 	response->prefixServiceType = g_strdup(request->prefixServiceType);
 	response->hrefServiceType = g_strdup(request->hrefServiceType);
diff --git a/lasso/id-wsf-2.0/discovery.c b/lasso/id-wsf-2.0/discovery.c
index 67ec0afb..eddb2643 100644
--- a/lasso/id-wsf-2.0/discovery.c
+++ b/lasso/id-wsf-2.0/discovery.c
@@ -207,7 +207,7 @@ lasso_idwsf2_discovery_process_metadata_register_msg(LassoIdWsf2Discovery *disco
 		/* XXX : May add secondary status codes here */
 	}
 
-	envelope = profile->soap_envelope_response;
+	envelope = profile->private_data->soap_envelope_response;
 	envelope->Body->any = g_list_append(envelope->Body->any, response);
 
 	return res;
@@ -302,7 +302,7 @@ lasso_idwsf2_discovery_process_metadata_association_add_msg(LassoIdWsf2Discovery
 	/* Build response */
 	response = lasso_idwsf2_disco_svc_md_association_add_response_new();
 
-	envelope = profile->soap_envelope_response;
+	envelope = profile->private_data->soap_envelope_response;
 	envelope->Body->any = g_list_append(envelope->Body->any, response);
 
 	profile->response = LASSO_NODE(response);
@@ -632,7 +632,7 @@ lasso_idwsf2_discovery_build_query_response_eprs(LassoIdWsf2Discovery *discovery
 		/* XXX : May add secondary status codes here */
 	}
 
-	envelope = profile->soap_envelope_response;
+	envelope = profile->private_data->soap_envelope_response;
 	envelope->Body->any = g_list_append(envelope->Body->any, response);
 
 	return res;
diff --git a/lasso/id-wsf-2.0/profile.c b/lasso/id-wsf-2.0/profile.c
index 24c5d28e..0de5b193 100644
--- a/lasso/id-wsf-2.0/profile.c
+++ b/lasso/id-wsf-2.0/profile.c
@@ -94,7 +94,7 @@ lasso_idwsf2_profile_init_soap_request(LassoProfile *profile, LassoNode *request
 	/* Initialise soap envelope */
 	envelope = lasso_idwsf2_profile_build_soap_envelope(NULL,
 		LASSO_PROVIDER(profile->server)->ProviderID);
-	profile->soap_envelope_request = envelope;
+	profile->private_data->soap_envelope_request = envelope;
 
 	/* Add identity token (if it exists in the session) in soap header */
 	assertion = lasso_session_get_assertion_identity_token(session, service_type);
@@ -103,7 +103,7 @@ lasso_idwsf2_profile_init_soap_request(LassoProfile *profile, LassoNode *request
 		wsse_security = lasso_wsse_200401_security_new();
 		wsse_security->any = g_list_append(wsse_security->any, assertion);
 
-		envelope = profile->soap_envelope_request;
+		envelope = profile->private_data->soap_envelope_request;
 		envelope->Header->Other = g_list_append(envelope->Header->Other, wsse_security);
 	}
 	
@@ -119,7 +119,8 @@ lasso_idwsf2_profile_build_request_msg(LassoProfile *profile)
 	g_return_val_if_fail(LASSO_IS_PROFILE(profile),
 			     LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
 
-	profile->msg_body = lasso_node_export_to_xml(LASSO_NODE(profile->soap_envelope_request));
+	profile->msg_body = lasso_node_export_to_xml(LASSO_NODE(
+		profile->private_data->soap_envelope_request));
 
 	return 0;
 }
@@ -144,7 +145,7 @@ lasso_idwsf2_profile_process_soap_request_msg(LassoProfile *profile, const gchar
 	/* Get soap request */
 	envelope = lasso_soap_envelope_new_from_message(message);
 
-	profile->soap_envelope_request = envelope;
+	profile->private_data->soap_envelope_request = envelope;
 
 	if (profile->nameIdentifier != NULL) {
 		lasso_node_destroy(profile->nameIdentifier);
@@ -202,7 +203,7 @@ lasso_idwsf2_profile_process_soap_request_msg(LassoProfile *profile, const gchar
 	/* Set soap response */
 	envelope = lasso_idwsf2_profile_build_soap_envelope(NULL,
 		LASSO_PROVIDER(profile->server)->ProviderID);
-	profile->soap_envelope_response = envelope;
+	profile->private_data->soap_envelope_response = envelope;
 
 	return res;
 }
@@ -213,7 +214,8 @@ lasso_idwsf2_profile_build_response_msg(LassoProfile *profile)
 	g_return_val_if_fail(LASSO_IS_PROFILE(profile),
 		LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
 
-	profile->msg_body = lasso_node_export_to_xml(LASSO_NODE(profile->soap_envelope_response));
+	profile->msg_body = lasso_node_export_to_xml(LASSO_NODE(
+		profile->private_data->soap_envelope_response));
 
 	return 0;
 }
@@ -231,7 +233,7 @@ lasso_idwsf2_profile_process_soap_response_msg(LassoProfile *profile, const gcha
 	/* Get soap response */
 	envelope = lasso_soap_envelope_new_from_message(message);
 
-	profile->soap_envelope_response = envelope;
+	profile->private_data->soap_envelope_response = envelope;
 
 	if (envelope != NULL && envelope->Body != NULL && envelope->Body->any != NULL) {
 		profile->response = LASSO_NODE(envelope->Body->any->data);
diff --git a/lasso/id-wsf-2.0/profile.h b/lasso/id-wsf-2.0/profile.h
index b7d4edb7..53865de0 100644
--- a/lasso/id-wsf-2.0/profile.h
+++ b/lasso/id-wsf-2.0/profile.h
@@ -30,6 +30,7 @@ extern "C" {
 #endif /* __cplusplus */ 
 
 #include <lasso/id-ff/profile.h>
+#include <lasso/id-ff/profileprivate.h>
 
 LASSO_EXPORT gint lasso_idwsf2_profile_init_soap_request(LassoProfile *profile,
 	LassoNode *request, gchar *service_type);
diff --git a/swig/Lasso-wsf2.i b/swig/Lasso-wsf2.i
index fade8610..d73a7192 100644
--- a/swig/Lasso-wsf2.i
+++ b/swig/Lasso-wsf2.i
@@ -88,12 +88,6 @@ typedef struct {
 
 	%newobject server_get;
 	LassoServer *server;
-
-	%newobject soapEnvelopeRequest_get;
-	LassoSoapEnvelope *soapEnvelopeRequest;
-
-	%newobject soapEnvelopeResponse_get;
-	LassoSoapEnvelope *soapEnvelopeResponse;
 	
 	/* Attributes */
 
@@ -244,18 +238,6 @@ typedef struct {
 #define LassoIdWsf2Discovery_set_server(self, value) set_node((gpointer *) &LASSO_PROFILE(self)->server, (value))
 #define LassoIdWsf2Discovery_server_set(self, value) set_node((gpointer *) &LASSO_PROFILE(self)->server, (value))
 
-/* soapEnvelopeRequest */
-#define LassoIdWsf2Discovery_get_soapEnvelopeRequest(self) get_node(LASSO_PROFILE(self)->soap_envelope_request)
-#define LassoIdWsf2Discovery_soapEnvelopeRequest_get(self) get_node(LASSO_PROFILE(self)->soap_envelope_request)
-#define LassoIdWsf2Discovery_set_soapEnvelopeRequest(self, value) set_node((gpointer *) &LASSO_PROFILE(self)->soap_envelope_request, (value))
-#define LassoIdWsf2Discovery_soapEnvelopeRequest_set(self, value) set_node((gpointer *) &LASSO_PROFILE(self)->soap_envelope_request, (value))
-
-/* soapEnvelopeResponse */
-#define LassoIdWsf2Discovery_get_soapEnvelopeResponse(self) get_node(LASSO_PROFILE(self)->soap_envelope_response)
-#define LassoIdWsf2Discovery_soapEnvelopeResponse_get(self) get_node(LASSO_PROFILE(self)->soap_envelope_response)
-#define LassoIdWsf2Discovery_set_soapEnvelopeResponse(self, value) set_node((gpointer *) &LASSO_PROFILE(self)->soap_envelope_response, (value))
-#define LassoIdWsf2Discovery_soapEnvelopeResponse_set(self, value) set_node((gpointer *) &LASSO_PROFILE(self)->soap_envelope_response, (value))
-
 /* Attributes */
 
 /* metadata */