[libgda/gtk3] Minor corrections following the previous commit

[Vivien Malerba <vivien src gnome org>]

commit 87d7c227ffcb3852bf177ddef43cb350b003feb3
Author: Vivien Malerba <malerba gnome-db org>
Date:   Thu Dec 23 15:20:40 2010 +0100

    Minor corrections following the previous commit

 libgda-ui/Makefile.am            |    9 ++++++---
 libgda-ui/demos/geninclude.pl.in |    4 ++--
 libgda/Makefile.am               |    9 ++++++---
 libgda/gda-xa-transaction.c      |    7 ++++---
 4 files changed, 18 insertions(+), 11 deletions(-)
---
diff --git a/libgda-ui/Makefile.am b/libgda-ui/Makefile.am
index 28b2c2b..4b3b107 100644
--- a/libgda-ui/Makefile.am
+++ b/libgda-ui/Makefile.am
@@ -4,7 +4,7 @@ lib_LTLIBRARIES = libgda-ui-5.0.la
 
 SUBDIRS = marshallers data-entries internal data . data-entries/plugins demos
 
-AM_CPPFLAGS = \
+GLOBAL_CFLAGS = \
 	-I$(top_builddir)/ui \
 	-I$(top_srcdir)/ui \
 	-I$(top_builddir) \
@@ -13,10 +13,13 @@ AM_CPPFLAGS = \
 	-DPLUGINSDIR=\""$(top_builddir)/libgda-ui/plugins/.libs"\" \
 	-DGDA_ABI_VERSION=\""$(GDA_ABI_VERSION)"\" \
 	$(LIBGDA_CFLAGS) \
-	$(LIBGDA_WFLAGS) \
 	$(GTK_CFLAGS) \
 	$(GIO_CFLAGS)
 
+AM_CPPFLAGS = \
+	$(GLOBAL_CFLAGS) \
+	$(LIBGDA_WFLAGS)
+
 ui_headers = \
 	gdaui-basic-form.h \
 	gdaui-combo.h \
@@ -214,7 +217,7 @@ introspection_sources = \
 
 Gdaui-5.0.gir: $(lib_LTLIBRARIES)
 Gdaui_5_0_gir_INCLUDES = Gtk-3.0 Gda-5.0
-Gdaui_5_0_gir_CFLAGS = $(AM_CPPFLAGS)
+Gdaui_5_0_gir_CFLAGS = $(GLOBAL_CFLAGS)
 Gdaui_5_0_gir_LIBS = $(lib_LTLIBRARIES) ../libgda/libgda-5.0.la
 Gdaui_5_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
 INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/libgda
diff --git a/libgda-ui/demos/geninclude.pl.in b/libgda-ui/demos/geninclude.pl.in
index 71494a4..ce8a1fd 100755
--- a/libgda-ui/demos/geninclude.pl.in
+++ b/libgda-ui/demos/geninclude.pl.in
@@ -92,7 +92,7 @@ if (defined @parents) {
 	}
 
 	print ",\n";
-	print qq (  { NULL } );
+	print qq (  { NULL, NULL, NULL, NULL } );
 	print "\n};\n";
     }   
 }
@@ -157,7 +157,7 @@ foreach $href (@demos) {
 }
 
 print ",\n";
-print qq (  { NULL } );
+print qq (  { NULL, NULL, NULL, NULL } );
 print "\n};\n";
 
 exit 0;
diff --git a/libgda/Makefile.am b/libgda/Makefile.am
index cf99b83..bb1a3de 100644
--- a/libgda/Makefile.am
+++ b/libgda/Makefile.am
@@ -10,18 +10,21 @@ GDA_BDB_S=gda-data-model-bdb.c
 DEF_FLAGS=-DHAVE_BDB
 endif
 
-AM_CPPFLAGS = \
+GLOBAL_CFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
 	-I$(top_srcdir)/libgda/sqlite \
 	-I$(top_srcdir)/libgda \
 	-DABI_VERSION=\""$(GDA_ABI_VERSION)"\" \
 	$(LIBGDA_CFLAGS) \
-	$(LIBGDA_WFLAGS) \
 	$(BDB_CFLAGS) \
 	-DBDB_LIB=\""$(BDB_LIB)"\" \
 	$(GIO_CFLAGS) $(GNOME_KEYRING_CFLAGS)
 
+AM_CPPFLAGS = \
+	$(GLOBAL_CFLAGS) \
+	$(LIBGDA_WFLAGS)
+
 _gda_marshal_built_files = gda-marshal.h gda-marshal.c
 
 gda-marshal.h: gda-marshal.list $(GLIB_GENMARSHAL)
@@ -348,7 +351,7 @@ introspection_sources = $(gda_sources) \
 	$(handlers)
 Gda-5.0.gir: $(lib_LTLIBRARIES)
 Gda_5_0_gir_INCLUDES = GObject-2.0 libxml2-2.0
-Gda_5_0_gir_CFLAGS = $(AM_CPPFLAGS)
+Gda_5_0_gir_CFLAGS = $(GLOBAL_CFLAGS)
 Gda_5_0_gir_LIBS = $(lib_LTLIBRARIES)
 Gda_5_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
 INTROSPECTION_GIRS += Gda-5.0.gir
diff --git a/libgda/gda-xa-transaction.c b/libgda/gda-xa-transaction.c
index 42ca710..c4134f7 100644
--- a/libgda/gda-xa-transaction.c
+++ b/libgda/gda-xa-transaction.c
@@ -846,11 +846,12 @@ gda_xa_transaction_string_to_id (const gchar *str)
 	if (*ptr != ',') 
 		goto onerror;
 	ptr++;
-	gint tmp = atoi (ptr); /* Flawfinder: ignore */
-	if ((tmp < 0) || (tmp >= G_MAXUINT32))
+	gchar *endptr;
+	gint64 tmp = g_ascii_strtoll (ptr, &endptr, 10);
+	if (*endptr || (tmp < 0) || (tmp >= G_MAXUINT32))
 		goto onerror;
 
-	xid->format = tmp;
+	xid->format = (guint32) tmp;
 	
 	return xid;