summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValery Febvre <vfebvre at easter-eggs.com>2004-07-12 22:14:08 +0000
committerValery Febvre <vfebvre at easter-eggs.com>2004-07-12 22:14:08 +0000
commit1431f295228ebe60ddf1a8dd4f3354e6bc7e8a02 (patch)
tree369c1b7a2005d90010288bc1066fc07c5ee64f68
parent94844c3a81aea4124c45f8461bf9405c626d3d15 (diff)
downloadlasso-1431f295228ebe60ddf1a8dd4f3354e6bc7e8a02.tar.gz
lasso-1431f295228ebe60ddf1a8dd4f3354e6bc7e8a02.tar.xz
lasso-1431f295228ebe60ddf1a8dd4f3354e6bc7e8a02.zip
*** empty log message ***
-rw-r--r--lasso/id-ff/server.c5
-rw-r--r--lasso/xml/xml.c7
2 files changed, 9 insertions, 3 deletions
diff --git a/lasso/id-ff/server.c b/lasso/id-ff/server.c
index 0c130dad..58b5512c 100644
--- a/lasso/id-ff/server.c
+++ b/lasso/id-ff/server.c
@@ -24,6 +24,8 @@
#include <lasso/environs/server.h>
+static GObjectClass *parent_class = NULL;
+
/*****************************************************************************/
/* public methods */
/*****************************************************************************/
@@ -133,8 +135,8 @@ lasso_server_get_provider(LassoServer *server,
static void
lasso_server_finalize(LassoServer *server)
{
+ parent_class->finalize(LASSO_PROVIDER(server));
/* TODO destroy the providers */
-
g_free(server->private_key);
debug(INFO, "Server object 0x%x finalized ...\n", server);
@@ -157,6 +159,7 @@ static void
lasso_server_class_init(LassoServerClass *class) {
GObjectClass *gobject_class = G_OBJECT_CLASS(class);
+ parent_class = g_type_class_peek_parent(class);
/* override parent class methods */
gobject_class->finalize = (void *)lasso_server_finalize;
}
diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c
index ea97cbd1..cb542eda 100644
--- a/lasso/xml/xml.c
+++ b/lasso/xml/xml.c
@@ -656,6 +656,7 @@ lasso_node_impl_get_attr(LassoNode *node,
prop = node->private->node->properties;
while (prop != NULL) {
+ //debug(ERROR, "%s - %s\n", prop->name, name);
if (xmlStrEqual(prop->name, name)) {
return (prop);
}
@@ -675,8 +676,10 @@ lasso_node_impl_get_attr_value(LassoNode *node,
g_return_val_if_fail (name != NULL, NULL);
prop = lasso_node_get_attr(node, name);
- if(!prop)
- return(NULL);
+ if (prop == NULL) {
+ return(NULL);
+ }
+
return (prop->children->content);
}