[tracker/tracker-0.10] Remove glib-2.0-fixes.vapi

[Martyn James Russell <mr src gnome org>]

commit b3b6c4c3e386640f82739b0fddded06eca9ebbb7
Author: JÃrg Billeter <j bitron ch>
Date:   Wed Nov 23 16:35:57 2011 +0100

    Remove glib-2.0-fixes.vapi
    
    This was fixed upstream in Vala 0.12.0.

 src/libtracker-data/Makefile.am            |    1 -
 src/libtracker-sparql/Makefile.am          |    3 +--
 src/libtracker-sparql/tracker-builder.vala |    2 +-
 src/miners/flickr/Makefile.am              |    1 -
 src/vapi/Makefile.am                       |    3 +--
 src/vapi/glib-2.0-fixes.vapi               |   24 ------------------------
 6 files changed, 3 insertions(+), 31 deletions(-)
---
diff --git a/src/libtracker-data/Makefile.am b/src/libtracker-data/Makefile.am
index 72c02a0..b82974f 100644
--- a/src/libtracker-data/Makefile.am
+++ b/src/libtracker-data/Makefile.am
@@ -7,7 +7,6 @@ AM_VALAFLAGS =                                         \
 	--pkg gio-2.0                                  \
 	$(BUILD_VALAFLAGS)                             \
 	$(top_srcdir)/src/vapi/posix.vapi              \
-	$(top_srcdir)/src/vapi/glib-2.0-fixes.vapi     \
 	$(top_srcdir)/src/libtracker-common/libtracker-common.vapi \
 	$(top_srcdir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi \
 	libtracker-data.vapi
diff --git a/src/libtracker-sparql/Makefile.am b/src/libtracker-sparql/Makefile.am
index 7f142be..94e27bb 100644
--- a/src/libtracker-sparql/Makefile.am
+++ b/src/libtracker-sparql/Makefile.am
@@ -9,8 +9,7 @@ libtracker_sparql_la_VALAFLAGS =                       \
 	--header $(vala_header:.h=-no-checks.h)        \
 	--vapi tracker-sparql.vapi                     \
 	--pkg gio-2.0 --pkg gmodule-2.0 --pkg posix    \
-	$(BUILD_VALAFLAGS)                             \
-	$(top_srcdir)/src/vapi/glib-2.0-fixes.vapi
+	$(BUILD_VALAFLAGS)
 
 AM_CPPFLAGS =                                          \
 	$(BUILD_CFLAGS)                                \
diff --git a/src/libtracker-sparql/tracker-builder.vala b/src/libtracker-sparql/tracker-builder.vala
index bbd6a25..aa81619 100644
--- a/src/libtracker-sparql/tracker-builder.vala
+++ b/src/libtracker-sparql/tracker-builder.vala
@@ -570,7 +570,7 @@ public class Tracker.Sparql.Builder : Object {
 	public void object_unvalidated (string value) {
 		char* end;
 
-		if (!utf8_validate (value, -1, out end)) {
+		if (!value.validate (-1, out end)) {
 			if (value != end) {
 				object_string (value.substring (0, (long) (end - (char*) value)));
 			} else {
diff --git a/src/miners/flickr/Makefile.am b/src/miners/flickr/Makefile.am
index 415d01a..aba248c 100644
--- a/src/miners/flickr/Makefile.am
+++ b/src/miners/flickr/Makefile.am
@@ -7,7 +7,6 @@ AM_VALAFLAGS =                                         \
 	--includedir=libtracker-client                 \
 	--pkg gio-2.0 --pkg rest-0.6 --pkg posix       \
 	$(BUILD_VALAFLAGS)                             \
-	$(top_srcdir)/src/vapi/glib-2.0-fixes.vapi     \
 	$(top_srcdir)/src/libtracker-sparql/tracker-sparql- TRACKER_API_VERSION@.vapi \
 	$(top_srcdir)/src/libtracker-miner/tracker-miner.vapi
 
diff --git a/src/vapi/Makefile.am b/src/vapi/Makefile.am
index 9f7f46e..9bad68b9 100644
--- a/src/vapi/Makefile.am
+++ b/src/vapi/Makefile.am
@@ -1,6 +1,5 @@
 include $(top_srcdir)/Makefile.decl
 
 EXTRA_DIST =                                           \
-	posix.vapi                                     \
-	glib-2.0-fixes.vapi
+	posix.vapi