diff options
author | Niels De Graef <nielsdegraef@gmail.com> | 2019-02-17 17:33:56 +0100 |
---|---|---|
committer | Niels De Graef <nielsdegraef@gmail.com> | 2019-02-25 21:43:01 +0100 |
commit | fbf21fffea2815e1542595e84170ee2702076e20 (patch) | |
tree | 530032c3bf713b03e63ebb3dad9cc80795104157 | |
parent | ce51e7c4ae3a266677e6e214050cf086133e1f8a (diff) | |
download | gnome-contacts-fbf21fffea2815e1542595e84170ee2702076e20.tar.gz |
docs: Fix the build (again)
Seems I forgot to commit part of my last fix.
See #122
-rw-r--r-- | meson.build | 5 | ||||
-rw-r--r-- | src/contacts-typeset.vala | 12 |
2 files changed, 11 insertions, 6 deletions
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) { |