Skip to content

Commit

Permalink
json-glib: make some functions virtual
Browse files Browse the repository at this point in the history
  • Loading branch information
benwaffle committed Sep 2, 2019
1 parent 14bcb40 commit 87ef08b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
6 changes: 3 additions & 3 deletions contrib/json-glib-1.0.vapi
Expand Up @@ -324,15 +324,15 @@ namespace Json {
public Json.Node default_serialize_property (string property_name, GLib.Value value, GLib.ParamSpec pspec);
public abstract bool deserialize_property (string property_name, out GLib.Value value, GLib.ParamSpec pspec, Json.Node property_node);
[Version (since = "0.14")]
public abstract unowned GLib.ParamSpec? find_property (string name);
public virtual unowned GLib.ParamSpec? find_property (string name);
[Version (since = "0.14")]
public abstract GLib.Value get_property (GLib.ParamSpec pspec);
public virtual GLib.Value get_property (GLib.ParamSpec pspec);
[CCode (array_length_pos = 0.1, array_length_type = "guint")]
[Version (since = "0.14")]
public (unowned GLib.ParamSpec)[] list_properties ();
public abstract Json.Node serialize_property (string property_name, GLib.Value value, GLib.ParamSpec pspec);
[Version (since = "0.14")]
public abstract void set_property (GLib.ParamSpec pspec, GLib.Value value);
public virtual void set_property (GLib.ParamSpec pspec, GLib.Value value);
}
[CCode (cheader_filename = "json-glib/json-glib.h", has_type_id = false)]
[Version (since = "1.2")]
Expand Down
2 changes: 2 additions & 0 deletions contrib/meson.build
Expand Up @@ -8,3 +8,5 @@ bayes_glib = files([

bayes_glib_args = ['--vapidir=' + meson.current_source_dir(), '--pkg=bayes-glib-1.0']
bayes_glib_inc = include_directories('bayes-glib/src')

json_glib_local_args = ['--vapidir=' + meson.current_source_dir()]
2 changes: 1 addition & 1 deletion meson.build
Expand Up @@ -29,7 +29,7 @@ subdir('src')
executable('vaccine',
[src, res, bayes_glib],
dependencies: deps,
vala_args: [res_args, bayes_glib_args],
vala_args: [res_args, bayes_glib_args, json_glib_local_args],
include_directories: [config_inc, bayes_glib_inc],
c_args: '-w',
install: true)
Expand Down

0 comments on commit 87ef08b

Please sign in to comment.