Removed ResourceOffering and ResourceIDGroup class's attributes. Only keep data and queryItem attributes. Removed old unused private methods (dispose() and finalize() )

2 files changed, 13 insertions, 57 deletions

diff --git a/lasso/id-wsf/abstract_service.c b/lasso/id-wsf/abstract_service.c
index f6d66d7d..9faf9eaf 100644
--- a/lasso/id-wsf/abstract_service.c
+++ b/lasso/id-wsf/abstract_service.c
@@ -23,19 +23,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <lasso/xml/dst_query.h>
-#include <lasso/xml/dst_query_response.h>
 #include <lasso/id-wsf/abstract_service.h>
 
-struct _LassoAbstractServicePrivate
-{
-	gboolean dispose_has_run;
-};
-
-/*****************************************************************************/
-/* public methods                                                            */
-/*****************************************************************************/
-
 /*****************************************************************************/
 /* private methods                                                           */
 /*****************************************************************************/
@@ -43,55 +32,19 @@ struct _LassoAbstractServicePrivate
 static LassoAbstractServiceClass *parent_class = NULL;
 
 /*****************************************************************************/
-/* overridden parent class methods                                           */
-/*****************************************************************************/
-
-static void
-dispose(GObject *object)
-{
-	LassoAbstractService *service = LASSO_ABSTRACT_SERVICE(object);
-
-	if (service->private_data->dispose_has_run) {
-		return;
-	}
-	service->private_data->dispose_has_run = TRUE;
-
-	debug("LassoAbstractService object 0x%x disposed ...", service);
-
-	G_OBJECT_CLASS(parent_class)->dispose(G_OBJECT(service));
-}
-
-static void
-finalize(GObject *object)
-{
-	LassoAbstractService *service = LASSO_ABSTRACT_SERVICE(object);
-
-	debug("LassoAbstractService object 0x%x finalized ...", object);
-
-	g_free(service->private_data);
-
-	G_OBJECT_CLASS(parent_class)->finalize(object);
-}
-
-/*****************************************************************************/
 /* instance and class init functions                                         */
 /*****************************************************************************/
 
 static void
 instance_init(LassoAbstractService *service)
 {
-	service->private_data = g_new(LassoAbstractServicePrivate, 1);
-	service->private_data->dispose_has_run = FALSE;
 
 }
 
 static void
 class_init(LassoAbstractServiceClass *klass)
 {
-	parent_class = g_type_class_peek_parent(klass);
 
-	G_OBJECT_CLASS(klass)->dispose = dispose;
-	G_OBJECT_CLASS(klass)->finalize = finalize;
 }
 
 GType
@@ -123,7 +76,7 @@ lasso_abstract_service_new(LassoServer *server)
 {
 	LassoAbstractService *service = NULL;
 
-	g_return_val_if_fail(server != NULL, NULL);
+	g_return_val_if_fail(LASSO_IS_SERVER(server) == TRUE, NULL);
 
 	service = g_object_new(LASSO_TYPE_ABSTRACT_SERVICE, NULL);
 
diff --git a/lasso/id-wsf/abstract_service.h b/lasso/id-wsf/abstract_service.h
index 1e16849a..4b67efb6 100644
--- a/lasso/id-wsf/abstract_service.h
+++ b/lasso/id-wsf/abstract_service.h
@@ -32,9 +32,8 @@ extern "C" {
 #endif /* __cplusplus */ 
 
 #include <lasso/id-wsf/wsf_profile.h>
-#include <lasso/xml/disco_resource_offering.h>
-#include <lasso/xml/dst_query_item.h>
-#include <lasso/xml/disco_resource_id_group.h>
+#include <lasso/xml/disco_resource_id.h>
+#include <lasso/xml/disco_encrypted_resource_id.h>
 
 #define LASSO_TYPE_ABSTRACT_SERVICE (lasso_abstract_service_get_type())
 #define LASSO_ABSTRACT_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
@@ -55,14 +54,16 @@ typedef struct _LassoAbstractServicePrivate LassoAbstractServicePrivate;
 struct _LassoAbstractService {
 	LassoWsfProfile parent;
 
-	LassoDiscoResourceOffering *ResourceOffering;
+	/* ResourceID / EncryptedResourceID being used when processing request message */
+	LassoDiscoResourceID *ResourceID;
+	LassoDiscoEncryptedResourceID *EncryptedResourceID;
 
-	LassoDiscoResourceIDGroup *ResourceIDGroup;
+	/* Data being used when processing a query response message */
+	GList *data;
+	
+	/* QueryItem being used when processing a query request message */
+	GList *queryItem;
 
-	GList *Data;
-	GList *QueryItem;
-
-	LassoAbstractServicePrivate *private_data;
 };
 
 struct _LassoAbstractServiceClass {
@@ -72,6 +73,8 @@ struct _LassoAbstractServiceClass {
 
 LASSO_EXPORT GType lasso_abstract_service_get_type(void);
 
+LASSO_EXPORT gint lasso_abstract_service_build_request_msg(LassoAbstractService *service);
+
 LASSO_EXPORT LassoAbstractService* lasso_abstract_service_new(LassoServer *server);
 
 #ifdef __cplusplus