Changes to compile with libgda5.

diff --git a/configure.ac b/configure.ac
index 25590aa774853482f596a98bd8c32f848940ef3f..72507fb3c50356faa01154755196df102d24c15a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.65)
-AC_INIT([libautoz], [0.0.2], [azagli@libero.it])
+AC_INIT([libautoz], [0.0.5], [azagli@libero.it])
 AC_CONFIG_SRCDIR([src/autoz.c])
 AC_CONFIG_HEADER([config.h])
 
@@ -32,10 +32,8 @@ AC_PROG_RANLIB
 GTK_DOC_CHECK
 
 # Checks for libraries.
-PKG_CHECK_MODULES(AUTOZ, [gobject-2.0 >= 2.24.0
-                          glib-2.0 >= 2.24.0
-                          libxml-2.0 >= 2.7
-                          libgda-4.0 >= 4.0.0])
+PKG_CHECK_MODULES(AUTOZ, [libxml-2.0 >= 2.7
+                          libgda-5.0 >= 5.0.0])
 
 AC_SUBST(AUTOZ_CFLAGS)
 AC_SUBST(AUTOZ_LIBS)

diff --git a/src/autoz.c b/src/autoz.c
index 406a716db935ae4b0e22b45fcd5321c8ddb9f257..cd5d31224b1fa4f1c4c44de0d6c84850c28a463c 100644 (file)
--- a/src/autoz.c
+++ b/src/autoz.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2012 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2010-2013 Andrea Zagli <azagli@libero.it>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -1509,7 +1509,7 @@ _autoz_delete_table_content (GdaConnection *gdacon, const gchar *table_prefix)
 
        error = NULL;
        sql = g_strdup_printf ("DELETE FROM %sroles", table_prefix);
-       gda_execute_non_select_command (gdacon, sql, &error);
+       gda_connection_execute_non_select_command (gdacon, sql, &error);
        g_free (sql);
        if (error != NULL)
                {
@@ -1518,7 +1518,7 @@ _autoz_delete_table_content (GdaConnection *gdacon, const gchar *table_prefix)
                }
        error = NULL;
        sql = g_strdup_printf ("DELETE FROM %sroles_parents", table_prefix);
-       gda_execute_non_select_command (gdacon, sql, &error);
+       gda_connection_execute_non_select_command (gdacon, sql, &error);
        g_free (sql);
        if (error != NULL)
                {
@@ -1527,7 +1527,7 @@ _autoz_delete_table_content (GdaConnection *gdacon, const gchar *table_prefix)
                }
        error = NULL;
        sql = g_strdup_printf ("DELETE FROM %sresources", table_prefix);
-       gda_execute_non_select_command (gdacon, sql, &error);
+       gda_connection_execute_non_select_command (gdacon, sql, &error);
        g_free (sql);
        if (error != NULL)
                {
@@ -1536,7 +1536,7 @@ _autoz_delete_table_content (GdaConnection *gdacon, const gchar *table_prefix)
                }
        error = NULL;
        sql = g_strdup_printf ("DELETE FROM %sresources_parents", table_prefix);
-       gda_execute_non_select_command (gdacon, sql, &error);
+       gda_connection_execute_non_select_command (gdacon, sql, &error);
        g_free (sql);
        if (error != NULL)
                {
@@ -1545,7 +1545,7 @@ _autoz_delete_table_content (GdaConnection *gdacon, const gchar *table_prefix)
                }
        error = NULL;
        sql = g_strdup_printf ("DELETE FROM %srules", table_prefix);
-       gda_execute_non_select_command (gdacon, sql, &error);
+       gda_connection_execute_non_select_command (gdacon, sql, &error);
        g_free (sql);
        if (error != NULL)
                {
@@ -1568,7 +1568,7 @@ _autoz_find_new_table_id (GdaConnection *gdacon, const gchar *table_name)
        error = NULL;
        sql = g_strdup_printf ("SELECT COALESCE (MAX (id), 0) FROM %s",
                               table_name);
-       dm = gda_execute_select_command (gdacon, sql, &error);
+       dm = gda_connection_execute_select_command (gdacon, sql, &error);
        g_free (sql);
        if (dm != NULL && gda_data_model_get_n_rows (dm) == 1)
                {
@@ -1606,7 +1606,7 @@ _autoz_get_role_id_db (GdaConnection *gdacon, const gchar *table_name, const gch
                               " WHERE role_id = '%s'",
                               table_name,
                               role_id);
-       dm = gda_execute_select_command (gdacon, sql, &error);
+       dm = gda_connection_execute_select_command (gdacon, sql, &error);
        g_free (sql);
        if (dm != NULL && gda_data_model_get_n_rows (dm) == 1)
                {
@@ -1638,7 +1638,7 @@ _autoz_get_resource_id_db (GdaConnection *gdacon, const gchar *table_name, const
                               " WHERE resource_id = '%s'",
                               table_name,
                               resource_id);
-       dm = gda_execute_select_command (gdacon, sql, &error);
+       dm = gda_connection_execute_select_command (gdacon, sql, &error);
        g_free (sql);
        if (dm != NULL && gda_data_model_get_n_rows (dm) == 1)
                {
@@ -1746,7 +1746,7 @@ autoz_save_to_db (Autoz *autoz, GdaConnection *gdacon,
                                               table_name,
                                               new_id,
                                               autoz_irole_get_role_id (AUTOZ_IROLE (role->irole)));
-                       gda_execute_non_select_command (gdacon, sql, &error);
+                       gda_connection_execute_non_select_command (gdacon, sql, &error);
                        g_free (sql);
                        if (error != NULL)
                                {
@@ -1771,7 +1771,7 @@ autoz_save_to_db (Autoz *autoz, GdaConnection *gdacon,
                                                                               table_name_parent,
                                                                               new_id,
                                                                               id_parent);
-                                                       gda_execute_non_select_command (gdacon, sql, &error);
+                                                       gda_connection_execute_non_select_command (gdacon, sql, &error);
                                                        g_free (sql);
                                                        if (error != NULL)
                                                                {
@@ -1820,7 +1820,7 @@ autoz_save_to_db (Autoz *autoz, GdaConnection *gdacon,
                                               table_name,
                                               new_id,
                                               autoz_iresource_get_resource_id (AUTOZ_IRESOURCE (resource->iresource)));
-                       gda_execute_non_select_command (gdacon, sql, &error);
+                       gda_connection_execute_non_select_command (gdacon, sql, &error);
                        g_free (sql);
                        if (error != NULL)
                                {
@@ -1845,7 +1845,7 @@ autoz_save_to_db (Autoz *autoz, GdaConnection *gdacon,
                                                                               table_name_parent,
                                                                               new_id,
                                                                               id_parent);
-                                                       gda_execute_non_select_command (gdacon, sql, &error);
+                                                       gda_connection_execute_non_select_command (gdacon, sql, &error);
                                                        g_free (sql);
                                                        if (error != NULL)
                                                                {
@@ -1905,7 +1905,7 @@ autoz_save_to_db (Autoz *autoz, GdaConnection *gdacon,
                                                               new_id,
                                                               id_roles,
                                                               id_resources);
-                                       gda_execute_non_select_command (gdacon, sql, &error);
+                                       gda_connection_execute_non_select_command (gdacon, sql, &error);
                                        g_free (sql);
                                        if (error != NULL)
                                                {
@@ -1948,7 +1948,7 @@ autoz_save_to_db (Autoz *autoz, GdaConnection *gdacon,
                                                               new_id,
                                                               id_roles,
                                                               id_resources);
-                                       gda_execute_non_select_command (gdacon, sql, &error);
+                                       gda_connection_execute_non_select_command (gdacon, sql, &error);
                                        g_free (sql);
                                        if (error != NULL)
                                                {
@@ -2035,7 +2035,7 @@ autoz_load_from_db (Autoz *autoz, GdaConnection *gdacon, const gchar *table_pref
        error = NULL;
        sql = g_strdup_printf ("SELECT role_id FROM %sroles ORDER BY id",
                               prefix);
-       dm = gda_execute_select_command (gdacon, sql, &error);
+       dm = gda_connection_execute_select_command (gdacon, sql, &error);
        g_free (sql);
        if (dm != NULL && error == NULL)
                {
@@ -2065,7 +2065,7 @@ autoz_load_from_db (Autoz *autoz, GdaConnection *gdacon, const gchar *table_pref
                               prefix,
                               prefix,
                               prefix);
-       dm = gda_execute_select_command (gdacon, sql, &error);
+       dm = gda_connection_execute_select_command (gdacon, sql, &error);
        g_free (sql);
        if (dm != NULL && error == NULL)
                {
@@ -2091,7 +2091,7 @@ autoz_load_from_db (Autoz *autoz, GdaConnection *gdacon, const gchar *table_pref
        error = NULL;
        sql = g_strdup_printf ("SELECT resource_id FROM %sresources ORDER BY id",
                               prefix);
-       dm = gda_execute_select_command (gdacon, sql, &error);
+       dm = gda_connection_execute_select_command (gdacon, sql, &error);
        g_free (sql);
        if (dm != NULL && error == NULL)
                {
@@ -2121,7 +2121,7 @@ autoz_load_from_db (Autoz *autoz, GdaConnection *gdacon, const gchar *table_pref
                               prefix,
                               prefix,
                               prefix);
-       dm = gda_execute_select_command (gdacon, sql, &error);
+       dm = gda_connection_execute_select_command (gdacon, sql, &error);
        g_free (sql);
        if (dm != NULL && error == NULL)
                {
@@ -2152,7 +2152,7 @@ autoz_load_from_db (Autoz *autoz, GdaConnection *gdacon, const gchar *table_pref
                               prefix,
                               prefix,
                               prefix);
-       dm = gda_execute_select_command (gdacon, sql, &error);
+       dm = gda_connection_execute_select_command (gdacon, sql, &error);
        g_free (sql);
        if (dm != NULL && error == NULL)
                {
@@ -2290,7 +2290,7 @@ _autoz_check_updated (Autoz *autoz)
        error = NULL;
        sql = g_strdup_printf ("SELECT update FROM %stimestamp_update",
                               priv->table_prefix);
-       dm = gda_execute_select_command (priv->gdacon, sql, &error);
+       dm = gda_connection_execute_select_command (priv->gdacon, sql, &error);
        g_free (sql);
        if (dm != NULL && error == NULL && gda_data_model_get_n_rows (dm) > 0)
                {

diff --git a/tests/test.c b/tests/test.c
index 2f9985f7e52e34f9c5452ffa99c465c2c7785939..8f0d66726db6cb9131149eb50de1371f69891992 100644 (file)
--- a/tests/test.c
+++ b/tests/test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2010-2013 Andrea Zagli <azagli@libero.it>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -34,8 +34,6 @@ main (int argc, char **argv)
        xmlDocPtr xdoc;
        xmlNodePtr xnode;
 
-       g_type_init ();
-
        autoz = autoz_new ();
 
        autoz_add_role (autoz, AUTOZ_IROLE (autoz_role_new ("super-admin")));

diff --git a/tests/test_from_xml.c b/tests/test_from_xml.c
index c85f9040ae5e729c2c94b32458fea71a341814d3..80dd907030b85a417b701e176cf7d05925b4a869 100644 (file)
--- a/tests/test_from_xml.c
+++ b/tests/test_from_xml.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2010-2013 Andrea Zagli <azagli@libero.it>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -28,8 +28,6 @@ main (int argc, char **argv)
        xmlDocPtr xdoc;
        xmlNodePtr xnode;
 
-       g_type_init ();
-
        autoz = autoz_new ();
 
        if (argc <= 1)

diff --git a/tests/test_from_xml_to_db.c b/tests/test_from_xml_to_db.c
index 7f214f41142f6db37822ffa734dad29e466680f4..210f6726a1ab8508907584f6957ba260943f5283 100644 (file)
--- a/tests/test_from_xml_to_db.c
+++ b/tests/test_from_xml_to_db.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2010-2013 Andrea Zagli <azagli@libero.it>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -33,8 +33,6 @@ main (int argc, char **argv)
        GError *error;
        GdaConnection *gdacon;
 
-       g_type_init ();
-
        gda_init ();
 
        autoz = autoz_new ();