Commit 5680e980 authored by Jonathan Michalon's avatar Jonathan Michalon

Revert "Revert "LibOVCC: Follow gio binding changes from Valac 0.13.0 and bump version check""

This reverts commit c17cc0e1.

We finaly want it since time has gone and it's fine now (current version is 0.17).
parent 43208dc8
......@@ -20,7 +20,7 @@ AC_SUBST(ovccincludedir)
# Checks for programs.
AC_PROG_CC
AM_PROG_VALAC([0.11.1])
AM_PROG_VALAC([0.13.0])
AC_PROG_LIBTOOL
OVCC_VALADOC_CHECK([0.2.1])
......
......@@ -263,13 +263,12 @@ namespace OVCC
File file)
throws Error
{
string data;
size_t length;
uint8[] data;
var uri = file.get_uri ();
debug ("Loading tileset file %s...", uri);
file.load_contents (null, out data, out length, null);
var doc = Xml.Parser.read_memory (data, (int)length, uri, null,
file.load_contents (null, out data, null);
var doc = Xml.Parser.read_memory ((string)data, data.length, uri, null,
Xml.ParserOption.DTDVALID |
Xml.ParserOption.PEDANTIC);
if (doc == null) {
......
......@@ -238,13 +238,12 @@ namespace OVCC
public bool load (File file)
throws Error
{
string data;
size_t length;
uint8[] data;
var uri = file.get_uri ();
debug ("""Loading tiles definitions from "%s"...""", uri);
file.load_contents (null, out data, out length, null);
var doc = Xml.Parser.read_memory (data, (int)length, uri, null,
file.load_contents (null, out data, null);
var doc = Xml.Parser.read_memory ((string)data, data.length, uri, null,
Xml.ParserOption.DTDVALID |
Xml.ParserOption.PEDANTIC);
if (doc == null) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment