Moved SWIG constructors and destructors from Lasso.c to Lasso.i.

2 files changed, 50 insertions, 127 deletions

diff --git a/swig/Lasso.c b/swig/Lasso.c
index c2642475..3ebf0666 100644
--- a/swig/Lasso.c
+++ b/swig/Lasso.c
@@ -38,55 +38,6 @@
 
 
 /***********************************************************************
- * Server
- ***********************************************************************/
-
-
-LassoServer *new_LassoServer(gchar *metadata, gchar *public_key, gchar *private_key,
-			     gchar *certificate, lassoSignatureMethod signature_method)
-{
-	return lasso_server_new(metadata, public_key, private_key, certificate, signature_method);
-}
-
-void delete_LassoServer(LassoServer *server)
-{
-	lasso_server_destroy(server);
-}
-
-
-/***********************************************************************
- * Identity
- ***********************************************************************/
-
-
-LassoIdentity *new_LassoIdentity()
-{
-	return lasso_identity_new();
-}
-
-void delete_LassoIdentity(LassoIdentity *identity)
-{
-	lasso_identity_destroy(identity);
-}
-
-
-/***********************************************************************
- * Session
- ***********************************************************************/
-
-
-LassoSession *new_LassoSession()
-{
-	return lasso_session_new();
-}
-
-void delete_LassoSession(LassoSession *session)
-{
-	lasso_session_destroy(session);
-}
-
-
-/***********************************************************************
  * Profile
  ***********************************************************************/
 
@@ -122,67 +73,3 @@ LassoResponse* lasso_profile_get_response_ref(LassoProfile *profile)
 	else
 		return NULL;
 }
-
-
-/***********************************************************************
- * Defederation
- ***********************************************************************/
-
-
-LassoDefederation *new_LassoDefederation(LassoServer *server, lassoProviderType provider_type)
-{
-	return lasso_defederation_new(server, provider_type);
-}
-
-void delete_LassoDefederation(LassoDefederation *defederation)
-{
-	lasso_defederation_destroy(defederation);
-}
-
-
-/***********************************************************************
- * Login
- ***********************************************************************/
-
-
-LassoLogin *new_LassoLogin(LassoServer *server)
-{
-	return lasso_login_new(server);
-}
-
-void delete_LassoLogin(LassoLogin *login)
-{
-	lasso_login_destroy(login);
-}
-
-
-/***********************************************************************
- * Logout
- ***********************************************************************/
-
-
-LassoLogout *new_LassoLogout(LassoServer *server, lassoProviderType provider_type)
-{
-	return lasso_logout_new(server, provider_type);
-}
-
-void delete_LassoLogout(LassoLogout *logout)
-{
-	lasso_logout_destroy(logout);
-}
-
-
-/***********************************************************************
- * Lecp
- ***********************************************************************/
-
-
-LassoLecp *new_LassoLecp(LassoServer *server)
-{
-	return lasso_lecp_new(server);
-}
-
-void delete_LassoLecp(LassoLecp *lecp)
-{
-	lasso_lecp_destroy(lecp);
-}
diff --git a/swig/Lasso.i b/swig/Lasso.i
index e0096a3e..ee489b8e 100644
--- a/swig/Lasso.i
+++ b/swig/Lasso.i
@@ -366,8 +366,14 @@ typedef struct {
 
 	%extend {
 		LassoServer(gchar *metadata, gchar *public_key, gchar *private_key,
-			    gchar *certificate, lassoSignatureMethod signature_method);
-		~LassoServer();
+			    gchar *certificate, lassoSignatureMethod signature_method) {
+			return lasso_server_new(metadata, public_key, private_key, certificate,
+						signature_method);
+		}
+
+		~LassoServer() {
+			lasso_server_destroy(self);
+		}
 	}
 } LassoServer;
 
@@ -405,8 +411,13 @@ typedef struct {
 	gboolean is_dirty;
 
 	%extend {
-		LassoIdentity();
-		~LassoIdentity();
+		LassoIdentity() {
+			return lasso_identity_new();
+		}
+
+		~LassoIdentity() {
+			lasso_identity_destroy(self);
+		}
 	}
 } LassoIdentity;
 
@@ -440,8 +451,13 @@ typedef struct {
 	gboolean is_dirty;
 
 	%extend {
-		LassoSession();
-		~LassoSession();
+		LassoSession() {
+			return lasso_session_new();
+		}
+
+		~LassoSession() {
+			lasso_session_destroy(self);
+		}
 	}
 } LassoSession;
 
@@ -532,8 +548,13 @@ typedef struct {
 	LassoProfile parent;
 
 	%extend {
-		LassoDefederation(LassoServer *server, lassoProviderType provider_type);
-		~LassoDefederation();
+		LassoDefederation(LassoServer *server, lassoProviderType provider_type) {
+			return lasso_defederation_new(server, provider_type);
+		}
+
+		~LassoDefederation() {
+			lasso_defederation_destroy(self);
+		}
 	}
 } LassoDefederation;
 
@@ -572,8 +593,13 @@ typedef struct {
 	gchar *response_dump;
 
 	%extend {
-		LassoLogin(LassoServer *server);
-		~LassoLogin();
+		LassoLogin(LassoServer *server) {
+			return lasso_login_new(server);
+		}
+
+		~LassoLogin() {
+			lasso_login_destroy(self);
+		}
 	}
 } LassoLogin;
 
@@ -635,8 +661,13 @@ typedef struct {
 	LassoProfile parent;
 
 	%extend {
-		LassoLogout(LassoServer *server, lassoProviderType provider_type);
-		~LassoLogout();
+		LassoLogout(LassoServer *server, lassoProviderType provider_type) {
+			return lasso_logout_new(server, provider_type);
+		}
+
+		~LassoLogout() {
+			lasso_logout_destroy(self);
+		}
 	}
 } LassoLogout;
 
@@ -678,8 +709,13 @@ typedef struct {
 	LassoLogin parent;
 
 	%extend {
-		LassoLecp(LassoServer *server);
-		~LassoLecp();
+		LassoLecp(LassoServer *server) {
+			return lasso_lecp_new(server);
+		}
+
+		~LassoLecp() {
+			lasso_lecp_destroy(self);
+		}
 	}
 } LassoLecp;