Changes to compile against gtk3.

diff --git a/configure.ac b/configure.ac
index fdf6e7d6c8d68a0bf131dca25cd4639f2e057e08..2e268f2b748cd05d68cec7a0d444100615a8c5c0 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([audit-gui], [0.0.1], [azagli@libero.it])
+AC_INIT([audit-gui], [0.5.0], [azagli@libero.it])
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_HEADER([config.h])
 
@@ -18,7 +18,7 @@ AC_CANONICAL_SYSTEM
 AC_PROG_CC
 
 # Checks for libraries.
-PKG_CHECK_MODULES(AUDITGUI, [libgda-ui-4.0 >= 4.1.0])
+PKG_CHECK_MODULES(AUDITGUI, [libgda-ui-5.0 >= 5.1.0])
 
 AC_SUBST(AUDITGUI_CFLAGS)
 AC_SUBST(AUDITGUI_LIBS)

diff --git a/src/datasources.c b/src/datasources.c
index 1b1767be981a08f07e83a2a5adb8ae7adfcf45e8..826eba4a7d2acd09b8e17835a572fcdb0ff86e73 100644 (file)
--- a/src/datasources.c
+++ b/src/datasources.c
@@ -296,7 +296,7 @@ datasources_add_all_tables (Datasources *datasources)
                                                               &error);
                                        if (thr == NULL || error != NULL)
                                                {
-                                                       gtk_widget_hide_all (dialog);
+                                                       gtk_widget_hide (dialog);
                                                        dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_builder_get_object (priv->commons->gtkbuilder, "w_main")),
                                                                                         GTK_DIALOG_DESTROY_WITH_PARENT,
                                                                                         GTK_MESSAGE_WARNING,
@@ -322,7 +322,7 @@ datasources_add_all_tables (Datasources *datasources)
 
                                        if (priv->error_update_metastore != NULL)
                                                {
-                                                       gtk_widget_hide_all (dialog);
+                                                       gtk_widget_hide (dialog);
                                                        dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_builder_get_object (priv->commons->gtkbuilder, "w_main")),
                                                                                         GTK_DIALOG_DESTROY_WITH_PARENT,
                                                                                         GTK_MESSAGE_WARNING,
@@ -375,7 +375,7 @@ datasources_add_all_tables (Datasources *datasources)
                                                                                        stmt = gda_sql_parser_parse_string (priv->commons->gdaparser, sql, NULL, &error);
                                                                                        if (stmt == NULL || error != NULL)
                                                                                                {
-                                                                                                       gtk_widget_hide_all (dialog);
+                                                                                                       gtk_widget_hide (dialog);
                                                                                                        dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_builder_get_object (priv->commons->gtkbuilder, "w_main")),
                                                                                                                                         GTK_DIALOG_DESTROY_WITH_PARENT,
                                                                                                                                         GTK_MESSAGE_WARNING,
@@ -404,7 +404,7 @@ datasources_add_all_tables (Datasources *datasources)
                                                                                                        stmt = gda_sql_parser_parse_string (priv->commons->gdaparser, sql, NULL, &error);
                                                                                                        if (stmt == NULL || error != NULL)
                                                                                                                {
-                                                                                                                       gtk_widget_hide_all (dialog);
+                                                                                                                       gtk_widget_hide (dialog);
                                                                                                                        dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_builder_get_object (priv->commons->gtkbuilder, "w_main")),
                                                                                                                                                         GTK_DIALOG_DESTROY_WITH_PARENT,
                                                                                                                                                         GTK_MESSAGE_WARNING,
@@ -438,7 +438,7 @@ datasources_add_all_tables (Datasources *datasources)
                                                                                                        stmt = gda_sql_parser_parse_string (priv->commons->gdaparser, sql, NULL, &error);
                                                                                                        if (stmt == NULL || error != NULL)
                                                                                                                {
-                                                                                                                       gtk_widget_hide_all (dialog);
+                                                                                                                       gtk_widget_hide (dialog);
                                                                                                                        dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_builder_get_object (priv->commons->gtkbuilder, "w_main")),
                                                                                                                                                         GTK_DIALOG_DESTROY_WITH_PARENT,
                                                                                                                                                         GTK_MESSAGE_WARNING,
@@ -456,7 +456,7 @@ datasources_add_all_tables (Datasources *datasources)
                                                                                                        if (gda_connection_statement_execute_non_select (priv->commons->gdacon, stmt, NULL, NULL, &error) != 1
                                                                                                            || error != NULL)
                                                                                                                {
-                                                                                                                       gtk_widget_hide_all (dialog);
+                                                                                                                       gtk_widget_hide (dialog);
                                                                                                                        dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_builder_get_object (priv->commons->gtkbuilder, "w_main")),
                                                                                                                                                         GTK_DIALOG_DESTROY_WITH_PARENT,
                                                                                                                                                         GTK_MESSAGE_WARNING,
@@ -470,7 +470,7 @@ datasources_add_all_tables (Datasources *datasources)
                                                                                                }
                                                                                        else if (error != NULL)
                                                                                                {
-                                                                                                       gtk_widget_hide_all (dialog);
+                                                                                                       gtk_widget_hide (dialog);
                                                                                                        dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_builder_get_object (priv->commons->gtkbuilder, "w_main")),
                                                                                                                                         GTK_DIALOG_DESTROY_WITH_PARENT,
                                                                                                                                         GTK_MESSAGE_WARNING,
@@ -496,7 +496,7 @@ datasources_add_all_tables (Datasources *datasources)
                                                                                                        stmt = gda_sql_parser_parse_string (priv->commons->gdaparser, sql, NULL, &error);
                                                                                                        if (stmt == NULL || error != NULL)
                                                                                                                {
-                                                                                                                       gtk_widget_hide_all (dialog);
+                                                                                                                       gtk_widget_hide (dialog);
                                                                                                                        dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_builder_get_object (priv->commons->gtkbuilder, "w_main")),
                                                                                                                                                         GTK_DIALOG_DESTROY_WITH_PARENT,
                                                                                                                                                         GTK_MESSAGE_WARNING,
@@ -514,7 +514,7 @@ datasources_add_all_tables (Datasources *datasources)
                                                                                                        if (gda_connection_statement_execute_non_select (priv->commons->gdacon, stmt, NULL, NULL, &error) != 1
                                                                                                            || error != NULL)
                                                                                                                {
-                                                                                                                       gtk_widget_hide_all (dialog);
+                                                                                                                       gtk_widget_hide (dialog);
                                                                                                                        dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_builder_get_object (priv->commons->gtkbuilder, "w_main")),
                                                                                                                                                         GTK_DIALOG_DESTROY_WITH_PARENT,
                                                                                                                                                         GTK_MESSAGE_WARNING,
@@ -541,7 +541,7 @@ datasources_add_all_tables (Datasources *datasources)
                                                                                                             gda_sql_identifier_quote (table_name, priv->gdacon, NULL, FALSE, FALSE));
                                                                                        if (!gda_connection_update_meta_store (priv->gdacon, &mcontext, &error))
                                                                                                {
-                                                                                                       gtk_widget_hide_all (dialog);
+                                                                                                       gtk_widget_hide (dialog);
                                                                                                        dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_builder_get_object (priv->commons->gtkbuilder, "w_main")),
                                                                                                                                         GTK_DIALOG_DESTROY_WITH_PARENT,
                                                                                                                                         GTK_MESSAGE_WARNING,
@@ -580,7 +580,7 @@ datasources_add_all_tables (Datasources *datasources)
                                                                                                                        stmt = gda_sql_parser_parse_string (priv->commons->gdaparser, sql, NULL, &error);
                                                                                                                        if (stmt == NULL || error != NULL)
                                                                                                                                {
-                                                                                                                                       gtk_widget_hide_all (dialog);
+                                                                                                                                       gtk_widget_hide (dialog);
                                                                                                                                        dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_builder_get_object (priv->commons->gtkbuilder, "w_main")),
                                                                                                                                                                         GTK_DIALOG_DESTROY_WITH_PARENT,
                                                                                                                                                                         GTK_MESSAGE_WARNING,
@@ -603,7 +603,7 @@ datasources_add_all_tables (Datasources *datasources)
                                                                                                                                }
                                                                                                                        else if (error != NULL)
                                                                                                                                {
-                                                                                                                                       gtk_widget_hide_all (dialog);
+                                                                                                                                       gtk_widget_hide (dialog);
                                                                                                                                        dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_builder_get_object (priv->commons->gtkbuilder, "w_main")),
                                                                                                                                                                         GTK_DIALOG_DESTROY_WITH_PARENT,
                                                                                                                                                                         GTK_MESSAGE_WARNING,
@@ -690,7 +690,7 @@ datasources_add_all_tables (Datasources *datasources)
                                                }
                                        else
                                                {
-                                                       gtk_widget_hide_all (dialog);
+                                                       gtk_widget_hide (dialog);
                                                        dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_builder_get_object (priv->commons->gtkbuilder, "w_main")),
                                                                                         GTK_DIALOG_DESTROY_WITH_PARENT,
                                                                                         GTK_MESSAGE_WARNING,
@@ -739,7 +739,7 @@ datasources_add_all_tables (Datasources *datasources)
                                                        g_object_unref (stmt);
                                                }
 
-                                       gtk_widget_hide_all (dialog);
+                                       gtk_widget_hide (dialog);
 
                                        datasources_load (datasources);
                                }

diff --git a/src/table.c b/src/table.c
index 2ceb37a86846de7b8fee1279559ac18c583fefae..bd23b8bd381b6ed719f0118599abe0438c15bae6 100644 (file)
--- a/src/table.c
+++ b/src/table.c
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2010-2011 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
@@ -292,7 +292,7 @@ table_load_db_tables (Table *table)
                               &error);
        if (thr == NULL || error != NULL)
                {
-                       gtk_widget_hide_all (dialog);
+                       gtk_widget_hide (dialog);
                        dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_builder_get_object (priv->commons->gtkbuilder, "w_main")),
                                                         GTK_DIALOG_DESTROY_WITH_PARENT,
                                                         GTK_MESSAGE_WARNING,
@@ -318,7 +318,7 @@ table_load_db_tables (Table *table)
 
        if (priv->error_update_metastore != NULL)
                {
-                       gtk_widget_hide_all (dialog);
+                       gtk_widget_hide (dialog);
                        dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_builder_get_object (priv->commons->gtkbuilder, "w_main")),
                                                         GTK_DIALOG_DESTROY_WITH_PARENT,
                                                         GTK_MESSAGE_WARNING,
@@ -328,7 +328,7 @@ table_load_db_tables (Table *table)
                        gtk_widget_destroy (dialog);
                        return;
                }
-       gtk_widget_hide_all (dialog);
+       gtk_widget_hide (dialog);
 
        error = NULL;
        dm = gda_connection_get_meta_store_data (priv->gdacon,