* change g_list_add* to lasso_list_add*

5 files changed, 21 insertions, 21 deletions

diff --git a/lasso/id-ff/identity.c b/lasso/id-ff/identity.c
index 7d406dbe..77a89f27 100644
--- a/lasso/id-ff/identity.c
+++ b/lasso/id-ff/identity.c
@@ -210,7 +210,7 @@ void add_matching_resource_offering_to_list(char *name, LassoDiscoResourceOfferi
 		( offering->ServiceInstance != NULL && 
 		offering->ServiceInstance->ServiceType != NULL &&
 		strcmp(offering->ServiceInstance->ServiceType, ctx->service_type) == 0)) {
-		g_list_add(ctx->list, offering);
+		lasso_list_add(ctx->list, offering);
 	}
 }
 
diff --git a/lasso/id-wsf/data_service.c b/lasso/id-wsf/data_service.c
index d97c1416..f27aa5ff 100644
--- a/lasso/id-wsf/data_service.c
+++ b/lasso/id-wsf/data_service.c
@@ -768,13 +768,13 @@ lasso_data_service_build_modify_response_msg(LassoDataService *service)
 				/* If we must replace the root element, change it in the xmlDoc */
 				if (node == cur_data) {
 					xmlDocSetRootElement(doc, xmlCopyNode(newNode,1));
-					g_list_add(node_to_free, node);
+					lasso_list_add(node_to_free, node);
 					cur_data = NULL;
 				} else {
 					xmlReplaceNode(node, xmlCopyNode(newNode,1));
 					// Node is a free node now but is still reference by the xpath nodeset
 					// we must wait for the deallocation of the nodeset to free it.
-					g_list_add(node_to_free, node);
+					lasso_list_add(node_to_free, node);
 				}
 			}
 		} else {
diff --git a/lasso/id-wsf/discovery.c b/lasso/id-wsf/discovery.c
index c3d0a08c..6aac00d7 100644
--- a/lasso/id-wsf/discovery.c
+++ b/lasso/id-wsf/discovery.c
@@ -166,7 +166,7 @@ lasso_discovery_build_credential(LassoDiscovery *discovery, const gchar *provide
 
 	/* SubjectConfirmation */
 	subject_confirmation = lasso_saml_subject_confirmation_new();
-	g_list_add(subject_confirmation->ConfirmationMethod, g_strdup(LASSO_SAML_CONFIRMATION_METHOD_HOLDER_OF_KEY));
+	lasso_list_add(subject_confirmation->ConfirmationMethod, g_strdup(LASSO_SAML_CONFIRMATION_METHOD_HOLDER_OF_KEY));
 
 	/* Add public key value in credential */
 	key_info = lasso_discovery_build_key_info_node(discovery, provider->providerID);
@@ -182,7 +182,7 @@ lasso_discovery_build_credential(LassoDiscovery *discovery, const gchar *provide
 	/* Add credential to disco:QueryResponse */
 	response = LASSO_DISCO_QUERY_RESPONSE(profile->response);
 	credentials = lasso_disco_credentials_new();
-	g_list_add(credentials->any, assertion);
+	lasso_list_add(credentials->any, assertion);
 	response->Credentials = credentials;
 
 	return g_strdup(assertion->AssertionID);
@@ -270,7 +270,7 @@ lasso_discovery_add_insert_entry(LassoDiscovery *discovery,
 
 	insertEntry = lasso_disco_insert_entry_new(resourceOffering);
 
-	g_list_add(modify->InsertEntry, insertEntry);
+	lasso_list_add(modify->InsertEntry, insertEntry);
 
 	return insertEntry;
 }
@@ -298,7 +298,7 @@ lasso_discovery_add_remove_entry(LassoDiscovery *discovery,
 	modify = LASSO_DISCO_MODIFY(LASSO_WSF_PROFILE(discovery)->request);
 
 	/* add RemoveEntry */
-	g_list_add(modify->RemoveEntry, lasso_disco_remove_entry_new(entryID));
+	lasso_list_add(modify->RemoveEntry, lasso_disco_remove_entry_new(entryID));
 
 	return 0;
 }
@@ -341,12 +341,12 @@ lasso_discovery_add_requested_service_type(LassoDiscovery *discovery,
 	/* optionals data */
 	if (option != NULL) {
 		opts = lasso_disco_options_new();
-		g_list_add(opts->Option,  (gpointer)option);
+		lasso_list_add(opts->Option,  (gpointer)option);
 		rst->Options = opts;
 	}
 
 	/* add RequestedServiceType */
-	g_list_add(query->RequestedServiceType, rst);
+	lasso_list_add(query->RequestedServiceType, rst);
 
 	return rst;
 }
@@ -556,7 +556,7 @@ lasso_discovery_init_insert(LassoDiscovery *discovery, LassoDiscoResourceOfferin
 	lasso_wsf_profile_set_description(profile, description);
 	assign_resource_id(offering, modify);
 	lasso_node_destroy(LASSO_NODE(offering));
-	g_list_add(modify->InsertEntry, lasso_disco_insert_entry_new(new_offering));
+	lasso_list_add(modify->InsertEntry, lasso_disco_insert_entry_new(new_offering));
 	if (description->Endpoint != NULL) {
 		profile->msg_url = g_strdup(description->Endpoint);
 	} /* TODO: else, description->WsdlURI, get endpoint automatically */
@@ -605,7 +605,7 @@ lasso_discovery_init_remove(LassoDiscovery *discovery, const char *entry_id)
 	/* TODO: EncryptedResourceID support */
 	modify->ResourceID = g_object_ref(offering->ResourceID);
 	lasso_node_destroy(LASSO_NODE(offering));
-	g_list_add(modify->RemoveEntry, lasso_disco_remove_entry_new(entry_id));
+	lasso_list_add(modify->RemoveEntry, lasso_disco_remove_entry_new(entry_id));
 	if (description->Endpoint != NULL) {
 		profile->msg_url = g_strdup(description->Endpoint);
 	} /* TODO: else, description->WsdlURI, get endpoint automatically */
@@ -704,7 +704,7 @@ lasso_discovery_build_modify_response_msg(LassoDiscovery *discovery)
 	response = lasso_disco_modify_response_new(status);
 	profile->response = LASSO_NODE(response);
 	envelope = profile->soap_envelope_response;
-	g_list_add_gobject(envelope->Body->any, response);
+	lasso_list_add_gobject(envelope->Body->any, response);
 
 	/* First verify remove entries are all ok */
 	for (iter = request->RemoveEntry; iter != NULL; iter = g_list_next(iter)) {
@@ -905,7 +905,7 @@ lasso_discovery_build_response_msg(LassoDiscovery *discovery)
 	response->ResourceOffering = offerings;
 	profile->response = LASSO_NODE(response);
 	envelope = profile->soap_envelope_response;
-	g_list_add_gobject(envelope->Body->any, response);
+	lasso_list_add_gobject(envelope->Body->any, response);
 	
 	/* Add needed credentials for offerings */
 	iter = offerings;
@@ -921,7 +921,7 @@ lasso_discovery_build_response_msg(LassoDiscovery *discovery)
 					    iter3->data) == TRUE) {
 					credentialRef = lasso_discovery_build_credential(
 						discovery, NULL);
-					g_list_add(description->CredentialRef, credentialRef);
+					lasso_list_add(description->CredentialRef, credentialRef);
 				}
 				iter3 = g_list_next(iter3);
 			}
@@ -1089,7 +1089,7 @@ lasso_discovery_get_services(LassoDiscovery *discovery)
 			continue;
 		}
 		service = lasso_discovery_build_wsf_profile(discovery, offering);
-		g_list_add(services, service);
+		lasso_list_add(services, service);
 	}
 
 	return services;
diff --git a/lasso/id-wsf/wsf_profile.c b/lasso/id-wsf/wsf_profile.c
index ad0c54d0..7a5c5539 100644
--- a/lasso/id-wsf/wsf_profile.c
+++ b/lasso/id-wsf/wsf_profile.c
@@ -122,13 +122,13 @@ lasso_wsf_profile_comply_with_saml_authentication(LassoWsfProfile *profile)
 		char *ref = (char*)credentialRefs->data;
 		xmlNode *assertion = lasso_session_get_assertion_by_id(session, ref);
 		if (assertion) {
-			g_list_add(wsse_security->any, assertion);
+			lasso_list_add(wsse_security->any, assertion);
 		}
 		credentialRefs = g_list_next(credentialRefs);
 	}
 	soap = profile->soap_envelope_request;
 	header = soap->Header;
-	g_list_add_gobject(header->Other, wsse_security);
+	lasso_list_add_gobject(header->Other, wsse_security);
 	wsse_security = NULL;
 exit:
 	if (wsse_security) {
@@ -637,7 +637,7 @@ lasso_wsf_profile_init_soap_request(LassoWsfProfile *profile, LassoNode *request
 	}
 	envelope = lasso_wsf_profile_build_soap_envelope_internal(NULL, providerID);
 	profile->soap_envelope_request = envelope;
-	g_list_add_gobject(envelope->Body->any, request);
+	lasso_list_add_gobject(envelope->Body->any, request);
 	lasso_assign_gobject(profile->request, request);
 	return lasso_wsf_profile_comply_with_security_mechanism(profile);
 }
diff --git a/lasso/utils.h b/lasso/utils.h
index d20926f7..8f897c6f 100644
--- a/lasso/utils.h
+++ b/lasso/utils.h
@@ -51,15 +51,15 @@
 			g_object_unref(dest); \
 		dest = (void*)(src); \
 	}
-#define g_list_add_gobject(dest, src) \
+#define lasso_list_add_gobject(dest, src) \
 	{ \
 		dest = g_list_append(dest, g_object_ref(src)); \
 	}
-#define g_list_add_new_gobject(dest, src) \
+#define lasso_list_add_new_gobject(dest, src) \
 	{ \
 		dest = g_list_append(dest, src); \
 	}
-#define g_list_add(dest, src) \
+#define lasso_list_add(dest, src) \
 	{ \
 		dest = g_list_append(dest, src); \
 	}