From 34693bbab4635c333b53583eb87ae981eab6797f Mon Sep 17 00:00:00 2001
From: Frederic Peters <fpeters@entrouvert.com>
Date: Thu, 30 Dec 2004 11:05:26 +0000
Subject: Moved #LassoSession private functions (limited to Lasso internal use)
 to a new sessionprivate.h file.

---
 lasso/id-ff/Makefile.am      |  5 ++++
 lasso/id-ff/login.c          |  2 ++
 lasso/id-ff/logout.c         |  1 +
 lasso/id-ff/session.c        |  1 +
 lasso/id-ff/session.h        | 21 +----------------
 lasso/id-ff/sessionprivate.h | 54 ++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 64 insertions(+), 20 deletions(-)
 create mode 100644 lasso/id-ff/sessionprivate.h

diff --git a/lasso/id-ff/Makefile.am b/lasso/id-ff/Makefile.am
index 42e0b045..945c918e 100644
--- a/lasso/id-ff/Makefile.am
+++ b/lasso/id-ff/Makefile.am
@@ -23,6 +23,9 @@ liblasso_id_ff_la_SOURCES = \
 	service.c \
 	session.c
 
+lasso_private_h_sources = \
+	sessionprivate.h
+
 liblassoinclude_HEADERS = \
 	defederation.h \
 	federation.h \
@@ -37,3 +40,5 @@ liblassoinclude_HEADERS = \
 	server.h \
 	service.h \
 	session.h
+
+EXTRA_DIST = $(lasso_private_h_sources)
diff --git a/lasso/id-ff/login.c b/lasso/id-ff/login.c
index d3229a68..4ce8e4a6 100644
--- a/lasso/id-ff/login.c
+++ b/lasso/id-ff/login.c
@@ -32,6 +32,8 @@
 #include <lasso/id-ff/login.h>
 #include <lasso/id-ff/provider.h>
 
+#include <lasso/id-ff/sessionprivate.h>
+
 
 struct _LassoLoginPrivate
 {
diff --git a/lasso/id-ff/logout.c b/lasso/id-ff/logout.c
index 3628a11f..ce8b89b1 100644
--- a/lasso/id-ff/logout.c
+++ b/lasso/id-ff/logout.c
@@ -24,6 +24,7 @@
  */
 
 #include <lasso/id-ff/logout.h>
+#include <lasso/id-ff/sessionprivate.h>
 
 struct _LassoLogoutPrivate
 {
diff --git a/lasso/id-ff/session.c b/lasso/id-ff/session.c
index 5d3bda02..71c1d833 100644
--- a/lasso/id-ff/session.c
+++ b/lasso/id-ff/session.c
@@ -24,6 +24,7 @@
  */
 
 #include <lasso/id-ff/session.h>
+#include <lasso/id-ff/sessionprivate.h>
 
 struct _LassoSessionPrivate
 {
diff --git a/lasso/id-ff/session.h b/lasso/id-ff/session.h
index e2616ec1..687f84d1 100644
--- a/lasso/id-ff/session.h
+++ b/lasso/id-ff/session.h
@@ -31,8 +31,6 @@ extern "C" {
 #endif /* __cplusplus */ 
 
 #include <lasso/xml/xml.h>
-#include <lasso/xml/lib_assertion.h>
-#include <lasso/xml/samlp_status.h>
 
 #define LASSO_TYPE_SESSION (lasso_session_get_type())
 #define LASSO_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SESSION, LassoSession))
@@ -64,28 +62,11 @@ struct _LassoSessionClass {
 LASSO_EXPORT GType lasso_session_get_type(void);
 
 LASSO_EXPORT LassoSession* lasso_session_new(void);
-
 LASSO_EXPORT LassoSession* lasso_session_new_from_dump(const gchar *dump);
-
-LASSO_EXPORT gint lasso_session_add_assertion(LassoSession *session,
-		char *providerID, LassoSamlAssertion *assertion);
-
 LASSO_EXPORT gchar* lasso_session_dump(LassoSession *session);
-
-LASSO_EXPORT LassoSamlAssertion* lasso_session_get_assertion(
-		LassoSession *session, gchar *providerID);
-
-LASSO_EXPORT gchar* lasso_session_get_provider_index(LassoSession *session, gint index);
-
-LASSO_EXPORT gint lasso_session_remove_assertion(LassoSession *session, gchar *providerID);
-
 LASSO_EXPORT void lasso_session_destroy(LassoSession *session);
 
-gint lasso_session_add_status(LassoSession *session,
-		char *providerID, LassoSamlpStatus *authn_response);
-LassoSamlpStatus* lasso_session_get_status(LassoSession *session, gchar *providerID);
-gint lasso_session_remove_status(LassoSession *session, gchar *providerID);
-
+LASSO_EXPORT gchar* lasso_session_get_provider_index(LassoSession *session, gint index);
 LASSO_EXPORT gboolean lasso_session_is_empty(LassoSession *session);
 
 #ifdef __cplusplus
diff --git a/lasso/id-ff/sessionprivate.h b/lasso/id-ff/sessionprivate.h
new file mode 100644
index 00000000..93e92008
--- /dev/null
+++ b/lasso/id-ff/sessionprivate.h
@@ -0,0 +1,54 @@
+/* $Id$ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: Nicolas Clapies <nclapies@entrouvert.com>
+ *          Valery Febvre <vfebvre@easter-eggs.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_SESSION_PRIVATE_H__
+#define __LASSO_SESSION_PRIVATE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */ 
+
+#include <lasso/xml/lib_assertion.h>
+#include <lasso/xml/samlp_status.h>
+#include <lasso/id-ff/session.h>
+
+gint lasso_session_add_assertion(LassoSession *session,
+		char *providerID, LassoSamlAssertion *assertion);
+gint lasso_session_add_status(LassoSession *session,
+		char *providerID, LassoSamlpStatus *authn_response);
+
+LassoSamlAssertion* lasso_session_get_assertion(
+		LassoSession *session, gchar *providerID);
+LassoSamlpStatus* lasso_session_get_status(
+		LassoSession *session, gchar *providerID);
+
+gint lasso_session_remove_status(LassoSession *session, gchar *providerID);
+gint lasso_session_remove_assertion(LassoSession *session, gchar *providerID);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_SESSION_PRIVATE_H__ */
-- 
cgit