*** empty log message ***

4 files changed, 16 insertions, 7 deletions

diff --git a/lasso/Attic/protocols/provider.c b/lasso/Attic/protocols/provider.c
index 7471d429..39558158 100644
--- a/lasso/Attic/protocols/provider.c
+++ b/lasso/Attic/protocols/provider.c
@@ -166,7 +166,6 @@ lasso_provider_dispose(LassoProvider *provider)
   debug(INFO, "Provider object 0x%x disposed ...\n", provider);
 
   /* unref reference counted objects */
-  /* we don't have any here */
   lasso_node_destroy(provider->metadata);
 
   parent_class->dispose(G_OBJECT(provider));
diff --git a/lasso/id-ff/profile_context.c b/lasso/id-ff/profile_context.c
index 43ae9dac..003a1fbc 100644
--- a/lasso/id-ff/profile_context.c
+++ b/lasso/id-ff/profile_context.c
@@ -132,7 +132,6 @@ lasso_profile_context_dispose(LassoProfileContext *ctx)
   debug(INFO, "ProfileContext object 0x%x disposed ...\n", ctx);
 
   /* unref reference counted objects */
-  /* we don't have any here */
   lasso_node_destroy(ctx->request);
   lasso_node_destroy(ctx->response);
   /* BEWARE: server and user shouldn't be destroyed */
diff --git a/lasso/id-ff/server.c b/lasso/id-ff/server.c
index 2091e706..34c8bcd4 100644
--- a/lasso/id-ff/server.c
+++ b/lasso/id-ff/server.c
@@ -149,6 +149,12 @@ lasso_server_get_provider(LassoServer *server,
 static void
 lasso_server_dispose(LassoServer *server)
 {
+/*   /\* No idea how to access to ->private->dispose_has_run *\/ */
+/*   if (server->private->dispose_has_run) { */
+/*     return; */
+/*   } */
+/*   server->private->dispose_has_run = TRUE; */
+
   debug(INFO, "Server object 0x%x finalized ...\n", server);
 
   /* TODO destroy the providers */
@@ -186,7 +192,7 @@ lasso_server_class_init(LassoServerClass *class) {
   
   parent_class = g_type_class_peek_parent(class);
   /* override parent class methods */
-  gobject_class->dispose  = (void *)lasso_server_dispose;
+  //gobject_class->dispose  = (void *)lasso_server_dispose;
   gobject_class->finalize = (void *)lasso_server_finalize;
 }
 
diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c
index 71c43b41..d4ff74f1 100644
--- a/lasso/xml/xml.c
+++ b/lasso/xml/xml.c
@@ -32,6 +32,8 @@ struct _LassoNodePrivate
   xmlNodePtr node;
 };
 
+static GObjectClass *parent_class = NULL;
+
 /*****************************************************************************/
 /* virtual public methods                                                    */
 /*****************************************************************************/
@@ -1255,17 +1257,17 @@ lasso_node_dispose(LassoNode *node)
   }
   node->private->dispose_has_run = TRUE;
 
+  debug(INFO, "%s 0x%x disposed ...\n", lasso_node_get_name(node), node);
+
   /* unref reference counted objects */
   /* we don't have any here */
-  debug(INFO, "%s 0x%x disposed ...\n", lasso_node_get_name(node), node);
+
+  parent_class->dispose(G_OBJECT(node));
 }
 
 static void
 lasso_node_finalize(LassoNode *node)
 {
-  gint i;
-  LassoNode *child;
-
   debug(INFO, "%s 0x%x finalized ...\n", lasso_node_get_name(node), node);
   
   if (node->private->node_is_weak_ref == FALSE) {
@@ -1274,6 +1276,8 @@ lasso_node_finalize(LassoNode *node)
   }
 
   g_free (node->private);
+
+  parent_class->finalize(G_OBJECT(node));
 }
 
 /*****************************************************************************/
@@ -1296,6 +1300,7 @@ lasso_node_class_init(LassoNodeClass *class)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS(class);
   
+  parent_class = g_type_class_peek_parent(class);
   /* virtual public methods */
   class->copy              = lasso_node_impl_copy;
   class->destroy           = lasso_node_impl_destroy;