* lasso/id-wsf/discovery.c:

  (lasso_discovery_build_credential, lasso_discovery_add_remove_entry,
  lasso_discovery_add_requested_service_type) use macro g_list_add, to reduce
  code size.

1 files changed, 13 insertions, 29 deletions

diff --git a/lasso/id-wsf/discovery.c b/lasso/id-wsf/discovery.c
index 24867ac6..c8acee6f 100644
--- a/lasso/id-wsf/discovery.c
+++ b/lasso/id-wsf/discovery.c
@@ -165,9 +165,7 @@ lasso_discovery_build_credential(LassoDiscovery *discovery, const gchar *provide
 
 	/* SubjectConfirmation */
 	subject_confirmation = lasso_saml_subject_confirmation_new();
-	subject_confirmation->ConfirmationMethod =
-		g_list_append(subject_confirmation->ConfirmationMethod,
-			g_strdup(LASSO_SAML_CONFIRMATION_METHOD_HOLDER_OF_KEY));
+	g_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);
@@ -183,7 +181,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();
-	credentials->any = g_list_append(credentials->any, LASSO_NODE(assertion));
+	g_list_add(credentials->any, assertion);
 	response->Credentials = credentials;
 
 	return g_strdup(assertion->AssertionID);
@@ -299,8 +297,7 @@ lasso_discovery_add_remove_entry(LassoDiscovery *discovery,
 	modify = LASSO_DISCO_MODIFY(LASSO_WSF_PROFILE(discovery)->request);
 
 	/* add RemoveEntry */
-	modify->RemoveEntry = g_list_append(modify->RemoveEntry,
-		lasso_disco_remove_entry_new(entryID));
+	g_list_add(modify->RemoveEntry, lasso_disco_remove_entry_new(entryID));
 
 	return 0;
 }
@@ -343,12 +340,12 @@ lasso_discovery_add_requested_service_type(LassoDiscovery *discovery,
 	/* optionals data */
 	if (option != NULL) {
 		opts = lasso_disco_options_new();
-		opts->Option = g_list_append(opts->Option, (gpointer)option);
+		g_list_add(opts->Option,  (gpointer)option);
 		rst->Options = opts;
 	}
 
 	/* add RequestedServiceType */
-	query->RequestedServiceType = g_list_append(query->RequestedServiceType, (gpointer)rst);
+	g_list_add(query->RequestedServiceType, rst);
 
 	return rst;
 }
@@ -488,6 +485,7 @@ lasso_discovery_init_query(LassoDiscovery *discovery, const gchar *security_mech
 	profile = LASSO_WSF_PROFILE(discovery);
 
 	query = lasso_disco_query_new();
+	/* Create SOAP envelope and set profile->request */
 	lasso_wsf_profile_init_soap_request(profile, LASSO_NODE(query));
 
 	/* FIXME: we should not get it automatically,
@@ -503,8 +501,6 @@ lasso_discovery_init_query(LassoDiscovery *discovery, const gchar *security_mech
 	if (ret)
 		goto exit;
 	assign_resource_id(offering, query);
-	g_assign_gobject(profile->request, LASSO_NODE(query));
-
 	description = lasso_wsf_profile_get_description(&discovery->parent);
 	if (description->Endpoint != NULL) {
 		g_assign_string(profile->msg_url, description->Endpoint);
@@ -541,7 +537,6 @@ lasso_discovery_init_insert(LassoDiscovery *discovery, LassoDiscoResourceOfferin
 	     LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
 
 	profile = LASSO_WSF_PROFILE(discovery);
-
 	modify = lasso_disco_modify_new();
 	lasso_wsf_profile_init_soap_request(profile, LASSO_NODE(modify));
 
@@ -559,15 +554,10 @@ lasso_discovery_init_insert(LassoDiscovery *discovery, LassoDiscoResourceOfferin
 		return LASSO_PROFILE_ERROR_MISSING_SERVICE_DESCRIPTION;
 	}
 	lasso_wsf_profile_set_description(profile, description);
-
 	/* TODO: EncryptedResourceID support */
 	assign_resource_id(offering, modify);
 	lasso_node_destroy(LASSO_NODE(offering));
-
-	modify->InsertEntry = g_list_append(modify->InsertEntry,
-			lasso_disco_insert_entry_new(new_offering));
-	profile->request = LASSO_NODE(modify);
-
+	g_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 */
@@ -615,12 +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));
-
-	modify->RemoveEntry = g_list_append(modify->RemoveEntry,
-			lasso_disco_remove_entry_new(entry_id));
-
-	profile->request = LASSO_NODE(modify);
-
+	g_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 */
@@ -719,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;
-	envelope->Body->any = g_list_append(envelope->Body->any, response);
+	g_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)) {
@@ -920,7 +905,7 @@ lasso_discovery_build_response_msg(LassoDiscovery *discovery)
 	response->ResourceOffering = offerings;
 	profile->response = LASSO_NODE(response);
 	envelope = profile->soap_envelope_response;
-	envelope->Body->any = g_list_append(envelope->Body->any, response);
+	g_list_add_gobject(envelope->Body->any, response);
 	
 	/* Add needed credentials for offerings */
 	iter = offerings;
@@ -936,8 +921,7 @@ lasso_discovery_build_response_msg(LassoDiscovery *discovery)
 					    iter3->data) == TRUE) {
 					credentialRef = lasso_discovery_build_credential(
 						discovery, NULL);
-					description->CredentialRef = g_list_append(
-						description->CredentialRef, credentialRef);
+					g_list_add(description->CredentialRef, credentialRef);
 				}
 				iter3 = g_list_next(iter3);
 			}
@@ -1105,7 +1089,7 @@ lasso_discovery_get_services(LassoDiscovery *discovery)
 			continue;
 		}
 		service = lasso_discovery_build_wsf_profile(discovery, offering);
-		services = g_list_append(services, service);
+		g_list_add(services, service);
 	}
 
 	return services;
@@ -1307,7 +1291,7 @@ lasso_discovery_build_wsf_profile(LassoDiscovery *discovery, LassoDiscoResourceO
 		message(G_LOG_LEVEL_WARNING, "No constructor registered for service type: %s", service_type);
 		a_wsf_profile = LASSO_WSF_PROFILE(lasso_data_service_new_full(server, offering));
 	}
-	a_wsf_profile->session = g_object_ref(discovery->parent.session);
+	g_assign_gobject(a_wsf_profile->session, discovery->parent.session);
 
 	return a_wsf_profile;
 }