[shotwell/wip/stable/new-vala: 3/4] Drop workaround for Markup.collect_attributes()

[Jens Georg <jensgeorg src gnome org>]

commit 229bfd0b50243c570aceb6deadc3881c0c827cb0
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Thu Feb 28 19:08:29 2019 +0000

    Drop workaround for Markup.collect_attributes()
    
    This is fixed in valac >= 0.34.1
    
    (cherry picked from commit a6dbce3c52a10ceb34cc6f2d3888bd1922437cb9)
    
    (cherry picked from commit b283d74acf75984187a23eb0e57c0cd11dddc2c2)

 src/meson.build               |  1 -
 src/photos/PhotoMetadata.vala | 10 +++++-----
 vapi/misc.vapi                |  8 --------
 3 files changed, 5 insertions(+), 14 deletions(-)
---
diff --git a/src/meson.build b/src/meson.build
index c452a986..e252a82f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -244,7 +244,6 @@ executable('shotwell',
            vala_args : ['--pkg', 'libgphoto2',
                         '--pkg', 'libraw',
                         '--pkg', 'libexif',
-                        '--pkg', 'misc',
                         '--gresources',
                         join_paths(meson.source_root(),
                           'org.gnome.Shotwell.gresource.xml')
diff --git a/src/photos/PhotoMetadata.vala b/src/photos/PhotoMetadata.vala
index 288a362f..ad78af8e 100644
--- a/src/photos/PhotoMetadata.vala
+++ b/src/photos/PhotoMetadata.vala
@@ -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)