[shotwell/wip/vala-fixes: 2/2] Drop workaround for Markup.collect_attributes()



commit a6dbce3c52a10ceb34cc6f2d3888bd1922437cb9
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Thu Feb 28 20:08:29 2019 +0100

    Drop workaround for Markup.collect_attributes()
    
    This is fixed in valac >= 0.34.1

 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 d5bbeb04..69e721f1 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -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',
diff --git a/src/photos/PhotoMetadata.vala b/src/photos/PhotoMetadata.vala
index cd890c56..2245428d 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)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]