diff -aurN gnumeric-1.7.0.orig/configure.in gnumeric-1.7.0/configure.in --- gnumeric-1.7.0.orig/configure.in 2006-05-08 07:17:34.000000000 +0200 +++ gnumeric-1.7.0/configure.in 2006-07-31 22:54:45.521026580 +0200 @@ -368,11 +368,11 @@ fi ) if test "$try_gda" = "true"; then - PKG_CHECK_MODULES(GDA, [libgda-2.0 >= 1.3.0], + PKG_CHECK_MODULES(GDA, [libgda >= 1.2.3], [gda_msg=yes], [gda_msg="NO. libgda problem"]) if test "$gda_msg" = "yes"; then - PKG_CHECK_MODULES(GNOMEDB, [libgnomedb-2.0 >= 1.3.0], + PKG_CHECK_MODULES(GNOMEDB, [libgnomedb >= 1.2.1], [gnomedb_msg="yes"], [gnomedb_msg="NO. libgnomedb problem"]) if test "$gnomedb_msg" = "yes"; then diff -aurN gnumeric-1.7.0.orig/plugins/gda/plugin-gda.c gnumeric-1.7.0/plugins/gda/plugin-gda.c --- gnumeric-1.7.0.orig/plugins/gda/plugin-gda.c 2006-03-09 04:29:33.000000000 +0100 +++ gnumeric-1.7.0/plugins/gda/plugin-gda.c 2006-07-31 23:10:24.000000000 +0200 @@ -142,7 +142,6 @@ #ifdef HAVE_LIBGNOMEDB GtkWidget *dialog, *login; #endif - GError *error = NULL; /* initialize connection pool if first time */ if (!GDA_IS_CLIENT (connection_pool)) { @@ -198,11 +197,7 @@ real_password = g_strdup (password); #endif - cnc = gda_client_open_connection (connection_pool, real_dsn, real_user, real_password, options, &error); - if (!cnc) { - g_warning ("Libgda error: %s\n", error->message); - g_error_free (error); - } + cnc = gda_client_open_connection (connection_pool, real_dsn, real_user, real_password, options); g_free (real_dsn); g_free (real_user); @@ -256,7 +251,6 @@ GdaDataModel* recset; GList* recset_list; GdaCommand* cmd; - GError* error = NULL; dsn_name = value_get_as_string (args[0]); user_name = value_get_as_string (args[1]); @@ -272,7 +266,7 @@ /* execute command */ cmd = gda_command_new (sql, GDA_COMMAND_TYPE_SQL, 0); - recset_list = gda_connection_execute_command (cnc, cmd, NULL, &error); + recset_list = gda_connection_execute_command (cnc, cmd, NULL); gda_command_free (cmd); if (recset_list) { recset = (GdaDataModel *) recset_list->data; @@ -283,13 +277,9 @@ g_list_foreach (recset_list, (GFunc) g_object_unref, NULL); g_list_free (recset_list); - } else { - if (error) { - ret = value_new_error (ei->pos, error->message); - g_error_free (error); - } else + + } else ret = value_new_empty (); - } return ret; } @@ -348,7 +338,7 @@ /* execute command */ cmd = gda_command_new (table, GDA_COMMAND_TYPE_TABLE, 0); - recset_list = gda_connection_execute_command (cnc, cmd, NULL, &error); + recset_list = gda_connection_execute_command (cnc, cmd, NULL); gda_command_free (cmd); if (recset_list) { recset = (GdaDataModel *) recset_list->data;