[libgda/LIBGDA_4.2] Don't use G_TYPE_ERROR for GLib versions which don't support it

[Vivien Malerba <vivien src gnome org>]

commit 53ceb5b0bcdaabbfc7b3fd80b6f167688ec4968e
Author: Vivien Malerba <malerba gnome-db org>
Date:   Wed May 9 15:40:43 2012 +0200

    Don't use G_TYPE_ERROR for GLib versions which don't support it

 libgda/sqlite/virtual/gda-vprovider-data-model.c |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/libgda/sqlite/virtual/gda-vprovider-data-model.c b/libgda/sqlite/virtual/gda-vprovider-data-model.c
index c0f96e4..c781198 100644
--- a/libgda/sqlite/virtual/gda-vprovider-data-model.c
+++ b/libgda/sqlite/virtual/gda-vprovider-data-model.c
@@ -31,6 +31,9 @@
 #include <libgda/gda-blob-op.h>
 #include "../gda-sqlite.h"
 #include <sql-parser/gda-statement-struct-util.h>
+#if !GLIB_CHECK_VERSION(2,26,0)
+#include <libgda/gda-types.h>
+#endif
 
 #define GDA_DEBUG_VIRTUAL
 #undef GDA_DEBUG_VIRTUAL
@@ -821,7 +824,11 @@ virtualNext (sqlite3_vtab_cursor *cur)
 				GError *lerror = NULL;
 				if (! gda_holder_is_valid_e (h, &lerror)) {
 					GValue value = {0};
+#if GLIB_CHECK_VERSION(2,26,0)
 					g_value_init (&value, G_TYPE_ERROR);
+#else
+					g_value_init (&value, GDA_TYPE_ERROR);
+#endif
 					g_value_take_boxed (&value, lerror);
 					g_value_array_append (data->values, &value);
 					g_value_unset (&value);
@@ -923,7 +930,13 @@ virtualColumn (sqlite3_vtab_cursor *cur, sqlite3_context *ctx, int i)
 		g_hash_table_insert (error_blobs_hash, lerror, GINT_TO_POINTER (1));
 		SQLITE3_CALL (sqlite3_result_blob) (ctx, lerror, sizeof (GError), NULL);
 	}
-	else if (G_VALUE_TYPE (value) == G_TYPE_ERROR) {
+	else if (
+#if GLIB_CHECK_VERSION(2,26,0)
+		 G_VALUE_TYPE (value) == G_TYPE_ERROR
+#else
+		 G_VALUE_TYPE (value) == GDA_TYPE_ERROR
+#endif
+		 ) {
 		GError *lerror;
 		lerror = g_value_get_boxed (value);
 		//SQLITE3_CALL (sqlite3_result_error) (ctx, lerror && lerror->message ? lerror->message : _("No detail"), -1);