[gnome-contacts/wip/nielsdg/fix-docs-2] docs: Fix the build (again)

[Niels De Graef <nielsdg src gnome org>]

commit d2b15e09ea458c0c3e7038b2c1a04145451b90f3
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Sun Feb 17 17:33:56 2019 +0100

    docs: Fix the build (again)
    
    Seems I forgot to commit part of my last fix. Let's prevent that from
    happening and just immediately add it to the CI checks.
    
    See #122

 .gitlab-ci.yml            |  2 +-
 meson.build               |  5 +++++
 src/contacts-typeset.vala | 12 ++++++------
 3 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index db3aeb2..c146a3d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ flatpak:master:
     - flatpak-builder --stop-at=gnome-contacts app data/flatpak/org.gnome.Contacts.json
     # Make sure to keep this in sync with the Flatpak manifest, all arguments
     # are passed except the config-args because we build it ourselves
-    - flatpak build app meson --prefix=/app _build
+    - flatpak build app meson --prefix=/app _build -Ddocs=true
     - flatpak build app ninja -C _build test
     - flatpak build app ninja -C _build install
     - flatpak-builder --finish-only --repo=repo app data/flatpak/org.gnome.Contacts.json
diff --git a/meson.build b/meson.build
index ca96889..1a6ceff 100644
--- a/meson.build
+++ b/meson.build
@@ -73,6 +73,7 @@ if not libhandy.found()
       'tests=false',
     ]
   )
+
   # When using libhandy as subproject, make sure we get the VAPI file
   libhandy = declare_dependency(
     dependencies: [
@@ -80,6 +81,10 @@ if not libhandy.found()
       libhandy_subproj.get_variable('libhandy_vapi'),
     ]
   )
+
+  libhandy_vapidir = join_paths(meson.build_root(), 'subprojects', 'libhandy', 'src')
+else
+  libhandy_vapidir = ''
 endif
 
 valadoc = find_program('valadoc', required: docs_enabled)
diff --git a/src/contacts-typeset.vala b/src/contacts-typeset.vala
index 87878a2..f771436 100644
--- a/src/contacts-typeset.vala
+++ b/src/contacts-typeset.vala
@@ -62,7 +62,7 @@ public class Contacts.TypeSet : Object  {
 
   /**
    * Returns the TreeIter which corresponds the best to the given vcard type.
-   * @param type: A VCard-like type, such as "HOME" or "CELL".
+   * @param type A VCard-like type, such as "HOME" or "CELL".
    */
   public void get_iter_for_vcard_type (string type, out TreeIter iter) {
     unowned TypeDescriptor? d = lookup_descriptor_by_vcard_type (type);
@@ -88,8 +88,8 @@ public class Contacts.TypeSet : Object  {
   }
 
   /**
-   * Adds the TypeDescriptor to the {@link Typeset}'s store.
-   * @param descriptor: The TypeDescription to be added
+   * Adds the TypeDescriptor to the {@link TypeSet}'s store.
+   * @param descriptor The TypeDescription to be added
    */
   private void add_descriptor_to_store (TypeDescriptor descriptor) {
     debug ("%s: Adding type %s to store", this.category, descriptor.to_string ());
@@ -104,9 +104,9 @@ public class Contacts.TypeSet : Object  {
 
   /**
    * Returns the TypeDescriptor for the given display name in the
-   * {@link Typeset}'s store, if any.
+   * {@link TypeSet}'s store, if any.
    *
-   * @param display_name: The translated display name
+   * @param display_name The translated display name
    * @return The appropriate TypeDescriptor or null if no match was found.
    */
   public unowned TypeDescriptor? lookup_descriptor_in_store (string display_name) {
@@ -168,7 +168,7 @@ public class Contacts.TypeSet : Object  {
 
   /**
    * Returns the TypeDescriptor which corresponds the best to the given vcard type.
-   * @param str: A VCard-like type, such as "HOME" or "CELL".
+   * @param str A VCard-like type, such as "HOME" or "CELL".
    */
   private unowned TypeDescriptor? lookup_descriptor_by_vcard_type (string str) {
     foreach (VcardTypeMapping? mapping in this.vcard_type_mappings) {