Fix build with vala 0.10.0

diff --git a/configure.in b/configure.in
index 2400705af72a1843f0c5ef1cfe4cb7d3795d3c8e..8cdaa49c6aa74133468a6649c467da2f265e3705 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -25,7 +25,7 @@ AM_CONDITIONAL(ENABLE_VALADOCORG, test x$enable_valadocorg = xyes)
 
 
 
-LIBVALA_REQUIRED=0.3.4
+LIBVALA_REQUIRED=0.10.0
 LIBGEE_REQUIRED=0.5
 LIBGVC_REQUIRED=2.16
 GLIB_REQUIRED=2.12.0
@@ -47,13 +47,14 @@ AC_SUBST(GMODULE_CFLAGS)
 AC_SUBST(GMODULE_LIBS)
 
 PKG_CHECK_EXISTS(vala-0.12,
-  [
-    PKG_CHECK_MODULES(LIBVALA, vala-0.12 >= $LIBVALA_REQUIRED)
-    VALA_PACKAGE=vala-0.12
-  ], [
+[
     PKG_CHECK_MODULES(LIBVALA, vala-0.10 >= $LIBVALA_REQUIRED)
     VALA_PACKAGE=vala-0.10
-  ])
+  ], [
+    PKG_CHECK_MODULES(LIBVALA, vala-0.12 >= $LIBVALA_REQUIRED)
+    VALA_PACKAGE=vala-0.12
+  ]
+)
 AC_SUBST(LIBVALA_CFLAGS)
 AC_SUBST(LIBVALA_LIBS)
 AC_SUBST(VALA_PACKAGE)

diff --git a/src/doclets/valadoc.org/doclet.vala b/src/doclets/valadoc.org/doclet.vala
index 64acc310faa6a5be35a07f664e0a0ed70aa6fd66..a6eda321a2c3ca60191882f9c1acd6e5613c3522 100755 (executable)
--- a/src/doclets/valadoc.org/doclet.vala
+++ b/src/doclets/valadoc.org/doclet.vala
@@ -155,7 +155,7 @@ public class Valadoc.ValadocOrg.Doclet : Valadoc.Html.BasicDoclet {
        }
 
        protected override void write_wiki_page (WikiPage page, string contentp, string css_path, string js_path, string pkg_name) {
-               GLib.FileStream file = GLib.FileStream.open (Path.build_filename(contentp, page.name.ndup(page.name.len()-7).replace ("/", ".")+"wiki.tpl"), "w");
+               GLib.FileStream file = GLib.FileStream.open (Path.build_filename(contentp, page.name.ndup(page.name.length-7).replace ("/", ".")+"wiki.tpl"), "w");
                writer = new Html.MarkupWriter (file);
                _renderer.set_writer (writer);
                _renderer.set_container (page);

diff --git a/src/libvaladoc/html/basicdoclet.vala b/src/libvaladoc/html/basicdoclet.vala
index 0601f66189b26846a1cab7b974938bc6a4672042..151980082ffbaebf6b3c42caa30f9aacde0f11ee 100755 (executable)
--- a/src/libvaladoc/html/basicdoclet.vala
+++ b/src/libvaladoc/html/basicdoclet.vala
@@ -182,7 +182,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
        }
 
        protected virtual void write_wiki_page (WikiPage page, string contentp, string css_path, string js_path, string pkg_name) {
-               GLib.FileStream file = GLib.FileStream.open (Path.build_filename(contentp, page.name.ndup(page.name.len()-7).replace ("/", ".")+"html"), "w");
+               GLib.FileStream file = GLib.FileStream.open (Path.build_filename(contentp, page.name.ndup(page.name.length-7).replace ("/", ".")+"html"), "w");
                writer = new MarkupWriter (file);
                _renderer.set_writer (writer);
                this.write_file_header (css_path, js_path, pkg_name);