Right free function for datasource boxed type.

diff --git a/src/audit.c b/src/audit.c
index 04583da19ac975d3618321f195fb6fac7cc458fd..f319bad941651a080b97bfbd9849c7f33f97fd4e 100644 (file)
--- a/src/audit.c
+++ b/src/audit.c
@@ -257,19 +257,6 @@ free_table (gpointer data)
        g_free (t->keys_sql);
 }
 
-static void
-free_datasource (gpointer data)
-{
-       Datasource *d;
-
-       d = (Datasource *)data;
-
-       g_free (d->name);
-       g_free (d->cnc_string);
-       g_free (d->gdaex);
-       g_list_free_full (d->tables, free_table);
-}
-
 static gboolean
 load_fields (ZakAudit *zak_audit,
              ZakAuditDatasource *datasource,
@@ -431,7 +418,7 @@ load_datasources (ZakAudit *zak_audit, va_list ap)
 
        str_in = NULL;
 
-       g_list_free_full (priv->datasources, free_datasource);
+       g_list_free_full (priv->datasources, g_free);
 
        datasource_name = va_arg (ap, char *);
        if (datasource_name != NULL)
@@ -2395,6 +2382,6 @@ zak_audit_datasource_free (ZakAuditDatasource *datasource)
        g_free (datasource->name);
        g_free (datasource->cnc_string);
        g_object_unref (datasource->gdaex);
-       g_list_free (datasource->tables);
+       g_list_free_full (datasource->tables, free_table);
        g_slice_free (ZakAuditDatasource, datasource);
 }

diff --git a/src/libzakaudit.h b/src/libzakaudit.h
index 097329cf676f355d0a11329ae2ab99dff2da6e00..e4ceb547971763ad608af852d38051a02b482c4b 100644 (file)
--- a/src/libzakaudit.h
+++ b/src/libzakaudit.h
@@ -68,11 +68,11 @@ ZakAudit *zak_audit_new_from_string_with_datasources (const gchar *cnc_string, .
 ZakAudit *zak_audit_new (GdaConnection *gda_connection);
 ZakAudit *zak_audit_new_from_string (const gchar *cnc_string);
 
-gboolean zak_audit_set_gda_connection_with_datasources (ZakAudit *zak_audit,GdaConnection *gda_connection, ...);
-gboolean zak_audit_set_gda_connection (ZakAudit *zak_audit,GdaConnection *gda_connection);
+gboolean zak_audit_set_gda_connection_with_datasources (ZakAudit *zak_audit, GdaConnection *gda_connection, ...);
+gboolean zak_audit_set_gda_connection (ZakAudit *zak_audit, GdaConnection *gda_connection);
 
-gboolean zak_audit_set_cnc_string_with_datasources (ZakAudit *zak_audit,const gchar *cnc_string, ...);
-gboolean zak_audit_set_cnc_string (ZakAudit *zak_audit,const gchar *cnc_string);
+gboolean zak_audit_set_cnc_string_with_datasources (ZakAudit *zak_audit, const gchar *cnc_string, ...);
+gboolean zak_audit_set_cnc_string (ZakAudit *zak_audit, const gchar *cnc_string);
 
 gboolean zak_audit_action (ZakAudit *zak_audit,
                        enum ZakAuditActions action,