[libgda] Fix introspection build

[Vivien Malerba <vivien src gnome org>]

commit 87d6e09f2a20871b5eca0e44f6f27971190b746c
Author: Robert Ancell <robert ancell canonical com>
Date:   Mon Aug 30 15:48:40 2010 +1000

    Fix introspection build

 libgda-ui/Makefile.am            |    2 +-
 libgda/Makefile.am               |    2 +-
 libgda/gda-tree-manager.h        |    5 +++--
 libgda/sqlite/gda-symbols-util.c |    2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/libgda-ui/Makefile.am b/libgda-ui/Makefile.am
index d602fbb..a766ffc 100644
--- a/libgda-ui/Makefile.am
+++ b/libgda-ui/Makefile.am
@@ -211,7 +211,7 @@ Gdaui-4_0.gir: $(lib_LTLIBRARIES)
 Gdaui_4_0_gir_INCLUDES = Gtk-2.0 Gda-4.0
 Gdaui_4_0_gir_CFLAGS = $(AM_CPPFLAGS)
 Gdaui_4_0_gir_LIBS = $(lib_LTLIBRARIES)
-Gdaui_4_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
+Gdaui_4_0_gir_FILES = $(introspection_sources)
 INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/libgda
 INTROSPECTION_GIRS += Gdaui-4.0.gir
 
diff --git a/libgda/Makefile.am b/libgda/Makefile.am
index 04836ce..e231b55 100644
--- a/libgda/Makefile.am
+++ b/libgda/Makefile.am
@@ -348,7 +348,7 @@ Gda-4_0.gir: $(lib_LTLIBRARIES)
 Gda_4_0_gir_INCLUDES = GObject-2.0 libxml2-2.0
 Gda_4_0_gir_CFLAGS = $(AM_CPPFLAGS)
 Gda_4_0_gir_LIBS = $(lib_LTLIBRARIES)
-Gda_4_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
+Gda_4_0_gir_FILES = $(introspection_sources)
 INTROSPECTION_GIRS += Gda-4.0.gir
 
 girdir = $(datadir)/gir-1.0
diff --git a/libgda/gda-tree-manager.h b/libgda/gda-tree-manager.h
index 1adcd0c..921ac9e 100644
--- a/libgda/gda-tree-manager.h
+++ b/libgda/gda-tree-manager.h
@@ -62,8 +62,9 @@ struct _GdaTreeManagerClass {
 	 *
 	 * Returns: NULL if an error occurred, and @out_error is set to TRUE
 	 */
-	GdaTreeManagerNodesFunc update_children;
-
+	GSList *(*update_children) (GdaTreeManager *manager, GdaTreeNode *node,
+                                const GSList *children_nodes,
+                                gboolean *out_error, GError **error);
 
 	/*< private >*/
 	/* Padding for future expansion */
diff --git a/libgda/sqlite/gda-symbols-util.c b/libgda/sqlite/gda-symbols-util.c
index 98e8457..1da7dcc 100644
--- a/libgda/sqlite/gda-symbols-util.c
+++ b/libgda/sqlite/gda-symbols-util.c
@@ -21,7 +21,7 @@
  */
 
 #include <glib/gi18n-lib.h>
-#include <libgda.h>
+#include <libgda/libgda.h>
 #include "gda-symbols-util.h"
 
 Sqlite3ApiRoutines *s3r = NULL;