removed lasso_federation_set_local_name_identifier and

lasso_federation_set_remote_name_identifier; they were no longer necessary.

4 files changed, 6 insertions, 43 deletions

diff --git a/docs/reference/lasso-sections.txt b/docs/reference/lasso-sections.txt
index 041cf219..f022bddd 100644
--- a/docs/reference/lasso-sections.txt
+++ b/docs/reference/lasso-sections.txt
@@ -97,8 +97,6 @@ LassoFederation
 lasso_federation_new
 lasso_federation_destroy
 lasso_federation_build_local_name_identifier
-lasso_federation_set_local_name_identifier
-lasso_federation_set_remote_name_identifier
 lasso_federation_verify_name_identifier
 <SUBSECTION Standard>
 LASSO_FEDERATION
diff --git a/lasso/id-ff/federation.c b/lasso/id-ff/federation.c
index 06a1d37f..a5392278 100644
--- a/lasso/id-ff/federation.c
+++ b/lasso/id-ff/federation.c
@@ -77,40 +77,6 @@ lasso_federation_build_local_name_identifier(LassoFederation *federation,
 }
 
 /**
- * lasso_federation_set_local_name_identifier:
- * @federation: a #LassoFederation
- * @name_identifier: the #LassoSamlNameIdentifier
- *
- * Sets local name identifier to @name_identifier.  Caller keeps ownership of
- * @name_identifier.
- **/
-void
-lasso_federation_set_local_name_identifier(LassoFederation *federation,
-		LassoSamlNameIdentifier *name_identifier)
-{
-	if (federation->local_nameIdentifier)
-		lasso_node_destroy(LASSO_NODE(federation->local_nameIdentifier));
-	federation->local_nameIdentifier = g_object_ref(name_identifier);
-}
-
-/**
- * lasso_federation_set_remote_name_identifier:
- * @federation: a #LassoFederation
- * @name_identifier: the #LassoSamlNameIdentifier
- *
- * Sets remote name identifier to @name_identifier.  Caller keeps ownership of
- * @name_identifier
- **/
-void
-lasso_federation_set_remote_name_identifier(LassoFederation *federation,
-		LassoSamlNameIdentifier *name_identifier)
-{
-	if (federation->remote_nameIdentifier)
-		lasso_node_destroy(LASSO_NODE(federation->remote_nameIdentifier));
-	federation->remote_nameIdentifier = g_object_ref(name_identifier);
-}
-
-/**
  * lasso_federation_destroy:
  * @federation: a #LassoFederation
  *
diff --git a/lasso/id-ff/federation.h b/lasso/id-ff/federation.h
index 35aaa3f1..0464a49d 100644
--- a/lasso/id-ff/federation.h
+++ b/lasso/id-ff/federation.h
@@ -71,11 +71,6 @@ LASSO_EXPORT LassoFederation* lasso_federation_new(gchar *remote_providerID);
 LASSO_EXPORT void lasso_federation_build_local_name_identifier(LassoFederation *federation,
 		const gchar *nameQualifier, const gchar *format, const gchar *content);
 
-LASSO_EXPORT void lasso_federation_set_local_name_identifier(LassoFederation *federation,
-		LassoSamlNameIdentifier *name_identifier);
-LASSO_EXPORT void lasso_federation_set_remote_name_identifier(LassoFederation *federation,
-		LassoSamlNameIdentifier *name_identifier);
-
 LASSO_EXPORT void lasso_federation_destroy(LassoFederation *federation);
 
 LASSO_EXPORT gboolean lasso_federation_verify_name_identifier(
diff --git a/lasso/id-ff/name_registration.c b/lasso/id-ff/name_registration.c
index e5ceb530..14f3950d 100644
--- a/lasso/id-ff/name_registration.c
+++ b/lasso/id-ff/name_registration.c
@@ -430,7 +430,9 @@ lasso_name_registration_process_response_msg(LassoNameRegistration *name_registr
 		return LASSO_ERROR_UNDEFINED;
 	}
 
-	lasso_federation_set_local_name_identifier(federation, nameIdentifier);
+	if (federation->local_nameIdentifier)
+		lasso_node_destroy(LASSO_NODE(federation->local_nameIdentifier));
+	federation->local_nameIdentifier = g_object_ref(nameIdentifier);
 	profile->identity->is_dirty = TRUE;
 
 	/* set the relay state */
@@ -515,7 +517,9 @@ lasso_name_registration_validate_request(LassoNameRegistration *name_registratio
 		return LASSO_ERROR_UNDEFINED;
 	}
 
-	lasso_federation_set_remote_name_identifier(federation, providedNameIdentifier);
+	if (federation->remote_nameIdentifier)
+		lasso_node_destroy(LASSO_NODE(federation->remote_nameIdentifier));
+	federation->remote_nameIdentifier = g_object_ref(providedNameIdentifier);
 	profile->identity->is_dirty = TRUE;
 
 	return 0;