Added gir.

diff --git a/.gitignore b/.gitignore
index a0f8da4a98408e5cd068122ad4e53c5f7b76ce63..7b7a89ddf94cdea73477fca3d2ff7e96386ca2d6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -51,4 +51,6 @@ Rules-quot
 .project
 .settings
 compile
-config.h.in
\ No newline at end of file
+config.h.in
+*.gir
+*.typelib
\ No newline at end of file

diff --git a/Makefile.am b/Makefile.am
index 87239262b46e5dcbfe02dab2dfb31f5ba906d363..d3043d9ecb19ee17aea59322cfaa93c9750d8880 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS =  --enable-introspection --enable-gtk-doc
 
 SUBDIRS = src tests docs
 

diff --git a/configure.ac b/configure.ac
index 105d35ecfd76d5f89d705b23ee8aa04db31d5f2f..22a82b547d6e2613c6d27928de43725b2330c1cf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -29,6 +29,8 @@ AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL
 AC_PROG_RANLIB
 
+GOBJECT_INTROSPECTION_CHECK([1.30.0])
+
 GTK_DOC_CHECK
 
 # Checks for libraries.

diff --git a/src/Makefile.am b/src/Makefile.am
index b785dff966a78760c8db878d05c318bcec67257b..f880c963b55bea2c52217b3430b988f76dd1efb3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,3 +11,29 @@ libzakdbt_la_LDFLAGS = -no-undefined
 libzakdbt_include_HEADERS = libzakdbt.h
 
 libzakdbt_includedir = $(includedir)/$(PACKAGE)
+
+CLEANFILES =
+
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all
+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+
+if HAVE_INTROSPECTION
+introspection_sources = $(libzakdbt_la_SOURCES) $(libzakdbt_include_HEADERS)
+
+ZakDbtDbt-1.0.gir: libzakdbt.la
+ZakDbtDbt_1_0_gir_INCLUDES = Gda-5.0
+ZakDbtDbt_1_0_gir_CFLAGS = $(AM_CPPFLAGS)
+ZakDbtDbt_1_0_gir_LIBS = libzakdbt.la
+ZakDbtDbt_1_0_gir_FILES = $(introspection_sources)
+INTROSPECTION_GIRS += ZakDbtDbt-1.0.gir
+
+girdir = $(datadir)/gir-1.0
+gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibdir = $(libdir)/girepository-1.0
+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+CLEANFILES += $(gir_DATA) $(typelib_DATA)
+endif

diff --git a/src/dbt.c b/src/dbt.c
index 3a6bac21d7e97058d24b3a89ccd10950c68c92ac..2d1e5dbc5695abd503e37cec1d7a51059cae889f 100644 (file)
--- a/src/dbt.c
+++ b/src/dbt.c
@@ -51,7 +51,7 @@ static gchar *str_xslt_doc =
 "</xsl:stylesheet>";
 
 static void zak_dbt_dbt_class_init (ZakDbtDbtClass *class);
-static void zak_dbt_dbt_init (ZakDbtDbt *dbt);
+static void zak_dbt_dbt_init (ZakDbtDbt *zak_dbt_dbt);
 
 static void zak_dbt_dbt_set_property (GObject *object,
                                guint property_id,
@@ -62,7 +62,7 @@ static void zak_dbt_dbt_get_property (GObject *object,
                                GValue *value,
                                GParamSpec *pspec);
 
-static gboolean zak_dbt_dbt_check_db (ZakDbtDbt *dbt, gboolean create_tables);
+static gboolean zak_dbt_dbt_check_db (ZakDbtDbt *zak_dbt_dbt, gboolean create_tables);
 
 #define ZAK_DBT_DBT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_DBT_TYPE_DBT, ZakDbtDbtPrivate))
 
@@ -91,9 +91,9 @@ zak_dbt_dbt_class_init (ZakDbtDbtClass *class)
 }
 
 static void
-zak_dbt_dbt_init (ZakDbtDbt *dbt)
+zak_dbt_dbt_init (ZakDbtDbt *zak_dbt_dbt)
 {
-       ZakDbtDbtPrivate *priv = ZAK_DBT_DBT_GET_PRIVATE (dbt);
+       ZakDbtDbtPrivate *priv = ZAK_DBT_DBT_GET_PRIVATE (zak_dbt_dbt);
 
        priv->gda_conn = NULL;
        priv->gda_parser = NULL;
@@ -113,11 +113,11 @@ ZakDbtDbt
 }
 
 static gboolean
-zak_dbt_dbt_get_connection_parser (ZakDbtDbt *dbt)
+zak_dbt_dbt_get_connection_parser (ZakDbtDbt *zak_dbt_dbt)
 {
        ZakDbtDbtPrivate *priv;
 
-       priv = ZAK_DBT_DBT_GET_PRIVATE (dbt);
+       priv = ZAK_DBT_DBT_GET_PRIVATE (zak_dbt_dbt);
 
        /* create an SQL parser */
        priv->gda_parser = gda_connection_create_parser (priv->gda_conn);
@@ -131,23 +131,23 @@ zak_dbt_dbt_get_connection_parser (ZakDbtDbt *dbt)
 
 /**
  * zak_dbt_dbt_set_db_connection:
- * @dbt:
+ * @zak_dbt_dbt:
  * @gda_conn:
  *
  */
 void
-zak_dbt_dbt_set_db_connection (ZakDbtDbt *dbt, GdaConnection *gda_conn)
+zak_dbt_dbt_set_db_connection (ZakDbtDbt *zak_dbt_dbt, GdaConnection *gda_conn)
 {
        ZakDbtDbtPrivate *priv;
 
-       g_return_if_fail (ZAK_DBT_IS_DBT (dbt));
+       g_return_if_fail (ZAK_DBT_IS_DBT (zak_dbt_dbt));
        g_return_if_fail (GDA_IS_CONNECTION (gda_conn));
 
-       priv = ZAK_DBT_DBT_GET_PRIVATE (dbt);
+       priv = ZAK_DBT_DBT_GET_PRIVATE (zak_dbt_dbt);
 
        priv->gda_conn = gda_conn;
 
-       if (!zak_dbt_dbt_get_connection_parser (dbt))
+       if (!zak_dbt_dbt_get_connection_parser (zak_dbt_dbt))
                {
                        priv->gda_conn= NULL;
 
@@ -159,12 +159,12 @@ zak_dbt_dbt_set_db_connection (ZakDbtDbt *dbt, GdaConnection *gda_conn)
 
 /**
  * zak_dbt_dbt_set_db_connection_from_string:
- * @dbt:
+ * @zak_dbt_dbt:
  * @cnc_string:
  *
  */
 void
-zak_dbt_dbt_set_db_connection_from_string (ZakDbtDbt *dbt, const gchar *cnc_string)
+zak_dbt_dbt_set_db_connection_from_string (ZakDbtDbt *zak_dbt_dbt, const gchar *cnc_string)
 {
        ZakDbtDbtPrivate *priv;
 
@@ -172,14 +172,14 @@ zak_dbt_dbt_set_db_connection_from_string (ZakDbtDbt *dbt, const gchar *cnc_stri
 
        GError *error;
 
-       g_return_if_fail (ZAK_DBT_IS_DBT (dbt));
+       g_return_if_fail (ZAK_DBT_IS_DBT (zak_dbt_dbt));
        g_return_if_fail (cnc_string != NULL);
 
        cnc = g_strstrip (g_strdup (cnc_string));
 
        g_return_if_fail (g_strcmp0 (cnc, "") != 0);
 
-       priv = ZAK_DBT_DBT_GET_PRIVATE (dbt);
+       priv = ZAK_DBT_DBT_GET_PRIVATE (zak_dbt_dbt);
 
        error = NULL;
        priv->gda_conn = gda_connection_open_from_string (NULL, cnc, NULL,
@@ -192,7 +192,7 @@ zak_dbt_dbt_set_db_connection_from_string (ZakDbtDbt *dbt, const gchar *cnc_stri
                        return;
                }
 
-       if (!zak_dbt_dbt_get_connection_parser (dbt))
+       if (!zak_dbt_dbt_get_connection_parser (zak_dbt_dbt))
                {
                        priv->gda_conn= NULL;
                        return;
@@ -216,7 +216,7 @@ zak_dbt_dbt_check_xml_root (xmlNodePtr xml_root)
 }
 
 static gboolean
-zak_dbt_dbt_sort_xml (ZakDbtDbt *dbt)
+zak_dbt_dbt_sort_xml (ZakDbtDbt *zak_dbt_dbt)
 {
        gboolean ret;
 
@@ -227,7 +227,7 @@ zak_dbt_dbt_sort_xml (ZakDbtDbt *dbt)
 
        ret = FALSE;
 
-       priv = ZAK_DBT_DBT_GET_PRIVATE (dbt);
+       priv = ZAK_DBT_DBT_GET_PRIVATE (zak_dbt_dbt);
 
        xmlSubstituteEntitiesDefault (1);
 
@@ -276,19 +276,19 @@ zak_dbt_dbt_sort_xml (ZakDbtDbt *dbt)
 
 /**
  * zak_dbt_dbt_set_xml:
- * @dbt:
+ * @zak_dbt_dbt:
  * @xml_root:
  *
  */
 void
-zak_dbt_dbt_set_xml (ZakDbtDbt *dbt, xmlNodePtr xml_root)
+zak_dbt_dbt_set_xml (ZakDbtDbt *zak_dbt_dbt, xmlNodePtr xml_root)
 {
        ZakDbtDbtPrivate *priv;
 
-       g_return_if_fail (ZAK_DBT_IS_DBT (dbt));
+       g_return_if_fail (ZAK_DBT_IS_DBT (zak_dbt_dbt));
        g_return_if_fail (xml_root != NULL);
 
-       priv = ZAK_DBT_DBT_GET_PRIVATE (dbt);
+       priv = ZAK_DBT_DBT_GET_PRIVATE (zak_dbt_dbt);
 
        priv->xml_root = xml_root;
        if (!zak_dbt_dbt_check_xml_root (priv->xml_root))
@@ -309,16 +309,17 @@ zak_dbt_dbt_set_xml (ZakDbtDbt *dbt, xmlNodePtr xml_root)
                                }
                }
 
-       zak_dbt_dbt_sort_xml (dbt);
+       zak_dbt_dbt_sort_xml (zak_dbt_dbt);
 }
+
 /**
  * zak_dbt_dbt_set_xml_from_filename:
- * @dbt:
+ * @zak_dbt_dbt:
  * @filename:
  *
  */
 void
-zak_dbt_dbt_set_xml_from_filename (ZakDbtDbt *dbt, const gchar *filename)
+zak_dbt_dbt_set_xml_from_filename (ZakDbtDbt *zak_dbt_dbt, const gchar *filename)
 {
        ZakDbtDbtPrivate *priv;
 
@@ -326,7 +327,7 @@ zak_dbt_dbt_set_xml_from_filename (ZakDbtDbt *dbt, const gchar *filename)
 
        xmlDocPtr xdoc;
 
-       g_return_if_fail (ZAK_DBT_IS_DBT (dbt));
+       g_return_if_fail (ZAK_DBT_IS_DBT (zak_dbt_dbt));
        g_return_if_fail (filename != NULL);
 
        filen = g_strstrip (g_strdup (filename));
@@ -342,7 +343,7 @@ zak_dbt_dbt_set_xml_from_filename (ZakDbtDbt *dbt, const gchar *filename)
                        return;
                }
 
-       priv = ZAK_DBT_DBT_GET_PRIVATE (dbt);
+       priv = ZAK_DBT_DBT_GET_PRIVATE (zak_dbt_dbt);
 
        priv->xml_doc = xdoc;
 
@@ -365,16 +366,16 @@ zak_dbt_dbt_set_xml_from_filename (ZakDbtDbt *dbt, const gchar *filename)
                        return;
                }
 
-       zak_dbt_dbt_sort_xml (dbt);
+       zak_dbt_dbt_sort_xml (zak_dbt_dbt);
 }
 
 /**
  * zak_dbt_dbt_db_is_updated:
- * @dbt:
+ * @zak_dbt_dbt:
  *
  */
 gboolean
-zak_dbt_dbt_db_is_updated (ZakDbtDbt *dbt)
+zak_dbt_dbt_db_is_updated (ZakDbtDbt *zak_dbt_dbt)
 {
        gboolean ret;
 
@@ -392,13 +393,13 @@ zak_dbt_dbt_db_is_updated (ZakDbtDbt *dbt)
        GdaDataModel *dm;
        GError *error;
 
-       g_return_val_if_fail (ZAK_DBT_IS_DBT (dbt), FALSE);
+       g_return_val_if_fail (ZAK_DBT_IS_DBT (zak_dbt_dbt), FALSE);
 
-       priv = ZAK_DBT_DBT_GET_PRIVATE (dbt);
+       priv = ZAK_DBT_DBT_GET_PRIVATE (zak_dbt_dbt);
 
        ret = FALSE;
 
-       if (!zak_dbt_dbt_check_db (dbt, FALSE))
+       if (!zak_dbt_dbt_check_db (zak_dbt_dbt, FALSE))
                {
                        return ret;
                }
@@ -461,7 +462,7 @@ zak_dbt_dbt_db_is_updated (ZakDbtDbt *dbt)
 }
 
 static gboolean
-zak_dbt_dbt_check_db (ZakDbtDbt *dbt, gboolean create_tables)
+zak_dbt_dbt_check_db (ZakDbtDbt *zak_dbt_dbt, gboolean create_tables)
 {
        ZakDbtDbtPrivate *priv;
 
@@ -475,7 +476,7 @@ zak_dbt_dbt_check_db (ZakDbtDbt *dbt, gboolean create_tables)
 
        ret = FALSE;
 
-       priv = ZAK_DBT_DBT_GET_PRIVATE (dbt);
+       priv = ZAK_DBT_DBT_GET_PRIVATE (zak_dbt_dbt);
 
        if (!GDA_IS_SQL_PARSER (priv->gda_parser))
                {
@@ -555,7 +556,7 @@ zak_dbt_dbt_check_db (ZakDbtDbt *dbt, gboolean create_tables)
 }
 
 static gboolean
-zak_dbt_dbt_check_to_execute (ZakDbtDbt *dbt, guint id)
+zak_dbt_dbt_check_to_execute (ZakDbtDbt *zak_dbt_dbt, guint id)
 {
        ZakDbtDbtPrivate *priv;
 
@@ -567,7 +568,7 @@ zak_dbt_dbt_check_to_execute (ZakDbtDbt *dbt, guint id)
 
        g_return_val_if_fail (id > 0, FALSE);
 
-       priv = ZAK_DBT_DBT_GET_PRIVATE (dbt);
+       priv = ZAK_DBT_DBT_GET_PRIVATE (zak_dbt_dbt);
 
        ret = FALSE;
 
@@ -607,7 +608,7 @@ zak_dbt_dbt_check_to_execute (ZakDbtDbt *dbt, guint id)
 }
 
 static gboolean
-zak_dbt_dbt_save_transformation (ZakDbtDbt *dbt, guint id, const gchar *operation)
+zak_dbt_dbt_save_transformation (ZakDbtDbt *zak_dbt_dbt, guint id, const gchar *operation)
 {
        ZakDbtDbtPrivate *priv;
 
@@ -617,7 +618,7 @@ zak_dbt_dbt_save_transformation (ZakDbtDbt *dbt, guint id, const gchar *operatio
        GError *error;
        GdaStatement *stmt;
 
-       priv = ZAK_DBT_DBT_GET_PRIVATE (dbt);
+       priv = ZAK_DBT_DBT_GET_PRIVATE (zak_dbt_dbt);
 
        ret = FALSE;
 
@@ -657,7 +658,7 @@ zak_dbt_dbt_save_transformation (ZakDbtDbt *dbt, guint id, const gchar *operatio
 }
 
 static gboolean
-zak_dbt_dbt_parse_sql (ZakDbtDbt *dbt, xmlNodePtr xnode)
+zak_dbt_dbt_parse_sql (ZakDbtDbt *zak_dbt_dbt, xmlNodePtr xnode)
 {
        ZakDbtDbtPrivate *priv;
 
@@ -669,7 +670,7 @@ zak_dbt_dbt_parse_sql (ZakDbtDbt *dbt, xmlNodePtr xnode)
 
        ret = TRUE;
 
-       priv = ZAK_DBT_DBT_GET_PRIVATE (dbt);
+       priv = ZAK_DBT_DBT_GET_PRIVATE (zak_dbt_dbt);
 
        if (!GDA_IS_SQL_PARSER (priv->gda_parser))
                {
@@ -707,7 +708,7 @@ zak_dbt_dbt_parse_sql (ZakDbtDbt *dbt, xmlNodePtr xnode)
 }
 
 static gboolean
-zak_dbt_dbt_parse_gda_op (ZakDbtDbt *dbt, xmlNodePtr xnode)
+zak_dbt_dbt_parse_gda_op (ZakDbtDbt *zak_dbt_dbt, xmlNodePtr xnode)
 {
        ZakDbtDbtPrivate *priv;
 
@@ -722,7 +723,7 @@ zak_dbt_dbt_parse_gda_op (ZakDbtDbt *dbt, xmlNodePtr xnode)
 
        ret = TRUE;
 
-       priv = ZAK_DBT_DBT_GET_PRIVATE (dbt);
+       priv = ZAK_DBT_DBT_GET_PRIVATE (zak_dbt_dbt);
 
        cur = xnode->children;
        while (cur != NULL && ret)
@@ -795,7 +796,7 @@ zak_dbt_dbt_parse_gda_op (ZakDbtDbt *dbt, xmlNodePtr xnode)
 }
 
 static gboolean
-zak_dbt_dbt_parse_drop_table (ZakDbtDbt *dbt, xmlNodePtr xnode)
+zak_dbt_dbt_parse_drop_table (ZakDbtDbt *zak_dbt_dbt, xmlNodePtr xnode)
 {
        ZakDbtDbtPrivate *priv;
 
@@ -808,7 +809,7 @@ zak_dbt_dbt_parse_drop_table (ZakDbtDbt *dbt, xmlNodePtr xnode)
 
        ret = TRUE;
 
-       priv = ZAK_DBT_DBT_GET_PRIVATE (dbt);
+       priv = ZAK_DBT_DBT_GET_PRIVATE (zak_dbt_dbt);
 
        table_name = NULL;
        cur = xnode->children;
@@ -863,7 +864,7 @@ zak_dbt_dbt_parse_drop_table (ZakDbtDbt *dbt, xmlNodePtr xnode)
 }
 
 static gboolean
-zak_dbt_dbt_parse_rename_table (ZakDbtDbt *dbt, xmlNodePtr xnode)
+zak_dbt_dbt_parse_rename_table (ZakDbtDbt *zak_dbt_dbt, xmlNodePtr xnode)
 {
        ZakDbtDbtPrivate *priv;
 
@@ -877,7 +878,7 @@ zak_dbt_dbt_parse_rename_table (ZakDbtDbt *dbt, xmlNodePtr xnode)
 
        ret = TRUE;
 
-       priv = ZAK_DBT_DBT_GET_PRIVATE (dbt);
+       priv = ZAK_DBT_DBT_GET_PRIVATE (zak_dbt_dbt);
 
        table_name = NULL;
        new_table_name = NULL;
@@ -929,7 +930,7 @@ zak_dbt_dbt_parse_rename_table (ZakDbtDbt *dbt, xmlNodePtr xnode)
 }
 
 static gboolean
-zak_dbt_dbt_parse_drop_view (ZakDbtDbt *dbt, xmlNodePtr xnode)
+zak_dbt_dbt_parse_drop_view (ZakDbtDbt *zak_dbt_dbt, xmlNodePtr xnode)
 {
        ZakDbtDbtPrivate *priv;
 
@@ -942,7 +943,7 @@ zak_dbt_dbt_parse_drop_view (ZakDbtDbt *dbt, xmlNodePtr xnode)
 
        ret = TRUE;
 
-       priv = ZAK_DBT_DBT_GET_PRIVATE (dbt);
+       priv = ZAK_DBT_DBT_GET_PRIVATE (zak_dbt_dbt);
 
        view_name = NULL;
        cur = xnode->children;
@@ -997,7 +998,7 @@ zak_dbt_dbt_parse_drop_view (ZakDbtDbt *dbt, xmlNodePtr xnode)
 }
 
 static gboolean
-zak_dbt_dbt_parse_rename_view (ZakDbtDbt *dbt, xmlNodePtr xnode)
+zak_dbt_dbt_parse_rename_view (ZakDbtDbt *zak_dbt_dbt, xmlNodePtr xnode)
 {
        ZakDbtDbtPrivate *priv;
 
@@ -1011,7 +1012,7 @@ zak_dbt_dbt_parse_rename_view (ZakDbtDbt *dbt, xmlNodePtr xnode)
 
        ret = TRUE;
 
-       priv = ZAK_DBT_DBT_GET_PRIVATE (dbt);
+       priv = ZAK_DBT_DBT_GET_PRIVATE (zak_dbt_dbt);
 
        view_name = NULL;
        cur = xnode->children;
@@ -1071,7 +1072,7 @@ zak_dbt_dbt_parse_rename_view (ZakDbtDbt *dbt, xmlNodePtr xnode)
 }
 
 static gboolean
-zak_dbt_dbt_parse_create_index (ZakDbtDbt *dbt, xmlNodePtr xnode)
+zak_dbt_dbt_parse_create_index (ZakDbtDbt *zak_dbt_dbt, xmlNodePtr xnode)
 {
        ZakDbtDbtPrivate *priv;
 
@@ -1087,7 +1088,7 @@ zak_dbt_dbt_parse_create_index (ZakDbtDbt *dbt, xmlNodePtr xnode)
 
        ret = TRUE;
 
-       priv = ZAK_DBT_DBT_GET_PRIVATE (dbt);
+       priv = ZAK_DBT_DBT_GET_PRIVATE (zak_dbt_dbt);
 
        index_name = NULL;
        table_name = NULL;
@@ -1189,7 +1190,7 @@ g_debug("%s",gda_server_provider_render_operation(priv->gda_provider, priv->gda_
 }
 
 static gboolean
-zak_dbt_dbt_parse_drop_index (ZakDbtDbt *dbt, xmlNodePtr xnode)
+zak_dbt_dbt_parse_drop_index (ZakDbtDbt *zak_dbt_dbt, xmlNodePtr xnode)
 {
        ZakDbtDbtPrivate *priv;
 
@@ -1203,7 +1204,7 @@ zak_dbt_dbt_parse_drop_index (ZakDbtDbt *dbt, xmlNodePtr xnode)
 
        ret = TRUE;
 
-       priv = ZAK_DBT_DBT_GET_PRIVATE (dbt);
+       priv = ZAK_DBT_DBT_GET_PRIVATE (zak_dbt_dbt);
 
        index_name = NULL;
 
@@ -1252,11 +1253,11 @@ zak_dbt_dbt_parse_drop_index (ZakDbtDbt *dbt, xmlNodePtr xnode)
 
 /**
  * zak_dbt_dbt_transform:
- * @dbt:
+ * @zak_dbt_dbt:
  *
  */
 void
-zak_dbt_dbt_transform (ZakDbtDbt *dbt)
+zak_dbt_dbt_transform (ZakDbtDbt *zak_dbt_dbt)
 {
        ZakDbtDbtPrivate *priv;
        xmlXPathContextPtr xpcontext;
@@ -1272,14 +1273,14 @@ zak_dbt_dbt_transform (ZakDbtDbt *dbt)
 
        guint i;
 
-       g_return_if_fail (ZAK_DBT_IS_DBT (dbt));
+       g_return_if_fail (ZAK_DBT_IS_DBT (zak_dbt_dbt));
 
-       priv = ZAK_DBT_DBT_GET_PRIVATE (dbt);
+       priv = ZAK_DBT_DBT_GET_PRIVATE (zak_dbt_dbt);
 
        g_return_if_fail (priv->gda_conn != NULL);
        g_return_if_fail (priv->xml_root != NULL);
 
-       if (!zak_dbt_dbt_check_db (dbt, TRUE))
+       if (!zak_dbt_dbt_check_db (zak_dbt_dbt, TRUE))
                {
                        return;
                }
@@ -1310,7 +1311,7 @@ zak_dbt_dbt_transform (ZakDbtDbt *dbt)
                                                        continue;
                                                }
 
-                                       if (zak_dbt_dbt_check_to_execute (dbt, id))
+                                       if (zak_dbt_dbt_check_to_execute (zak_dbt_dbt, id))
                                                {
                                                        /* starting the transaction */
                                                        if (gda_connection_supports_feature (priv->gda_conn, GDA_CONNECTION_FEATURE_TRANSACTIONS))
@@ -1331,35 +1332,35 @@ zak_dbt_dbt_transform (ZakDbtDbt *dbt)
                                                                                {
                                                                                        if (xmlStrcmp (xnode->name, (const xmlChar *)"sql") == 0)
                                                                                                {
-                                                                                                       tosave = zak_dbt_dbt_parse_sql (dbt, xnode);
+                                                                                                       tosave = zak_dbt_dbt_parse_sql (zak_dbt_dbt, xnode);
                                                                                                }
                                                                                        else if (xmlStrcmp (xnode->name, (const xmlChar *)"gda_op") == 0)
                                                                                                {
-                                                                                                       tosave = zak_dbt_dbt_parse_gda_op (dbt, xnode);
+                                                                                                       tosave = zak_dbt_dbt_parse_gda_op (zak_dbt_dbt, xnode);
                                                                                                }
                                                                                        else if (xmlStrcmp (xnode->name, (const xmlChar *)"drop_table") == 0)
                                                                                                {
-                                                                                                       tosave = zak_dbt_dbt_parse_drop_table (dbt, xnode);
+                                                                                                       tosave = zak_dbt_dbt_parse_drop_table (zak_dbt_dbt, xnode);
                                                                                                }
                                                                                        else if (xmlStrcmp (xnode->name, (const xmlChar *)"rename_table") == 0)
                                                                                                {
-                                                                                                       tosave = zak_dbt_dbt_parse_rename_table (dbt, xnode);
+                                                                                                       tosave = zak_dbt_dbt_parse_rename_table (zak_dbt_dbt, xnode);
                                                                                                }
                                                                                        else if (xmlStrcmp (xnode->name, (const xmlChar *)"drop_view") == 0)
                                                                                                {
-                                                                                                       tosave = zak_dbt_dbt_parse_drop_view (dbt, xnode);
+                                                                                                       tosave = zak_dbt_dbt_parse_drop_view (zak_dbt_dbt, xnode);
                                                                                                }
                                                                                        else if (xmlStrcmp (xnode->name, (const xmlChar *)"rename_view") == 0)
                                                                                                {
-                                                                                                       tosave = zak_dbt_dbt_parse_rename_view (dbt, xnode);
+                                                                                                       tosave = zak_dbt_dbt_parse_rename_view (zak_dbt_dbt, xnode);
                                                                                                }
                                                                                        else if (xmlStrcmp (xnode->name, (const xmlChar *)"create_index") == 0)
                                                                                                {
-                                                                                                       tosave = zak_dbt_dbt_parse_create_index (dbt, xnode);
+                                                                                                       tosave = zak_dbt_dbt_parse_create_index (zak_dbt_dbt, xnode);
                                                                                                }
                                                                                        else if (xmlStrcmp (xnode->name, (const xmlChar *)"drop_index") == 0)
                                                                                                {
-                                                                                                       tosave = zak_dbt_dbt_parse_drop_index (dbt, xnode);
+                                                                                                       tosave = zak_dbt_dbt_parse_drop_index (zak_dbt_dbt, xnode);
                                                                                                }
                                                                                        else
                                                                                                {
@@ -1379,7 +1380,7 @@ zak_dbt_dbt_transform (ZakDbtDbt *dbt)
                                                                        xbuf = xmlBufferCreate ();
                                                                        xmlNodeDump (xbuf, priv->xml_doc, xnodeset->nodeTab[i], 0, 0);
                                                                        operation = g_strstrip (g_strdup (xbuf->content));
-                                                                       tosave = zak_dbt_dbt_save_transformation (dbt, id, g_strstrip (operation));
+                                                                       tosave = zak_dbt_dbt_save_transformation (zak_dbt_dbt, id, g_strstrip (operation));
                                                                }
 
                                                        /* ending transaction */