Commit b283d74a authored by Rico Tzschichholz's avatar Rico Tzschichholz Committed by Jens Georg

Drop workaround for Markup.collect_attributes()

This is fixed in valac >= 0.34.1


(cherry picked from commit a6dbce3c)
parent 1de1e124
Pipeline #68335 passed with stages
in 20 minutes and 14 seconds
......@@ -269,7 +269,6 @@ executable('shotwell',
vala_args : ['--pkg', 'libgphoto2',
'--pkg', 'libraw',
'--pkg', 'libexif',
'--pkg', 'misc',
'--pkg', 'version',
'--gresources',
join_paths(meson.source_root(), 'data',
......
......@@ -96,11 +96,11 @@ public class ACDSeeKeywordTransformer : KeywordTransformer {
return;
}
Workaround.markup_collect_attributes (name,
attribute_names,
attribute_values,
Markup.CollectType.BOOLEAN,
"Assigned", out assigned);
Markup.collect_attributes (name,
attribute_names,
attribute_values,
Markup.CollectType.BOOLEAN,
"Assigned", out assigned);
}
private void on_end (MarkupParseContext ctx, string name)
......
namespace Workaround {
[CCode (cheader_filename = "glib.h", cname = "g_markup_collect_attributes", sentinel = "G_MARKUP_COLLECT_INVALID")]
extern bool markup_collect_attributes(string element_name,
[CCode (array_length = false, array_null_terminated = true)]
string[] attribute_names,
[CCode (array_length = false, array_null_terminated = true)]
string[] attribute_values, ...) throws GLib.MarkupError;
}
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