[tracker/tracker-1.10] Use conditional to work around gtk+-3.0.vapi breakage

[Carlos Garnacho <carlosg src gnome org>]

commit cddd8acb82286ecb18d9634bcf2e29410922eb91
Author: Sam Thursfield <sam afuera me uk>
Date:   Sat Mar 11 12:27:23 2017 +0000

    Use conditional to work around gtk+-3.0.vapi breakage
    
    Commit 53007652ce1ed3cf350ec042b310606e0115377a breaks the build with
    versions of Vala older than 0.35.6. It's more convenient for people
    building Tracker if we use a #if block instead to allow building with
    older stable versions Vala.

 src/tracker-needle/tracker-tags-view.vala        |    4 ++++
 src/tracker-preferences/tracker-preferences.vala |    8 ++++++++
 2 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/src/tracker-needle/tracker-tags-view.vala b/src/tracker-needle/tracker-tags-view.vala
index b9eb25d..688c0f8 100644
--- a/src/tracker-needle/tracker-tags-view.vala
+++ b/src/tracker-needle/tracker-tags-view.vala
@@ -520,7 +520,11 @@ public class TrackerTagsView : Box {
                        yield connection.update_async (query, Priority.DEFAULT, td.cancellable);
 
                        debug ("Tag removed");
+                       #if VALA_0_36
+                       store.remove (ref td.iter);
+                       #else
                        store.remove (td.iter);
+                       #endif
                } catch (GLib.Error e) {
                        warning ("Could not run Sparql update query: %s", e.message);
                        show_error_dialog (_("Could not remove tag"), e);
diff --git a/src/tracker-preferences/tracker-preferences.vala 
b/src/tracker-preferences/tracker-preferences.vala
index f6bfff0..66d557b 100644
--- a/src/tracker-preferences/tracker-preferences.vala
+++ b/src/tracker-preferences/tracker-preferences.vala
@@ -437,7 +437,11 @@ public class Tracker.Preferences {
                                Value value;
                                store.get_value (iter, 0, out value);
                                if (value.get_string () == to_check) {
+                                       #if VALA_0_36
+                                       store.remove (ref iter);
+                                       #else
                                        store.remove (iter);
+                                       #endif
                                        valid = store.get_iter_first (out iter);
                                } else {
                                        valid = store.iter_next (ref iter);
@@ -643,7 +647,11 @@ public class Tracker.Preferences {
                        // Check which UserDirectorys we match with str
                        UserDirectory[] matches = dir_match_user_directories (dir);
 
+                       #if VALA_0_36
+                       store.remove (ref iter);
+                       #else
                        store.remove (iter);
+                       #endif
 
                        // Check if we need to untoggle a button
                        toggles_update (matches, false);