[tracker/tracker-2.1] libtracker-data: Fix build with Vala 0.43



commit 2a3a3fefe53571690a86aa0df8fad70e0243a003
Author: Jürg Billeter <j bitron ch>
Date:   Wed Feb 6 17:28:01 2019 +0100

    libtracker-data: Fix build with Vala 0.43
    
    https://gitlab.gnome.org/GNOME/tracker/issues/75

 src/libtracker-data/tracker-sparql-pattern.vala |  8 ++++----
 src/libtracker-data/tracker-sparql-query.vala   | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/src/libtracker-data/tracker-sparql-pattern.vala b/src/libtracker-data/tracker-sparql-pattern.vala
index 59810da63..e03ed6f16 100644
--- a/src/libtracker-data/tracker-sparql-pattern.vala
+++ b/src/libtracker-data/tracker-sparql-pattern.vala
@@ -243,10 +243,10 @@ class Tracker.Sparql.Pattern : Object {
                        base (query, parent_context);
 
                        tables = new List<DataTable> ();
-                       table_map = new HashTable<string,DataTable>.full (str_hash, str_equal, g_free, 
g_object_unref);
+                       table_map = new HashTable<string,DataTable>.full (str_hash, str_equal, g_free, 
GLib.Object.unref);
 
                        variables = new List<Variable> ();
-                       var_bindings = new HashTable<Variable,VariableBindingList>.full (Variable.hash, 
Variable.equal, g_object_unref, g_object_unref);
+                       var_bindings = new HashTable<Variable,VariableBindingList>.full (Variable.hash, 
Variable.equal, GLib.Object.unref, GLib.Object.unref);
 
                        bindings = new List<LiteralBinding> ();
                }
@@ -948,7 +948,7 @@ class Tracker.Sparql.Pattern : Object {
 
                        // only export selected variables
                        context.var_set = context.select_var_set;
-                       context.select_var_set = new HashTable<Variable,int>.full (Variable.hash, 
Variable.equal, g_object_unref, null);
+                       context.select_var_set = new HashTable<Variable,int>.full (Variable.hash, 
Variable.equal, GLib.Object.unref, null);
 
                        expect (SparqlTokenType.CLOSE_BRACE);
 
@@ -1229,7 +1229,7 @@ class Tracker.Sparql.Pattern : Object {
 
        private void translate_group_or_union_graph_pattern (StringBuilder sql) throws Sparql.Error {
                Variable[] all_vars = { };
-               HashTable<Variable,int> all_var_set = new HashTable<Variable,int>.full (Variable.hash, 
Variable.equal, g_object_unref, null);
+               HashTable<Variable,int> all_var_set = new HashTable<Variable,int>.full (Variable.hash, 
Variable.equal, GLib.Object.unref, null);
 
                Context[] contexts = { };
                long[] offsets = { };
diff --git a/src/libtracker-data/tracker-sparql-query.vala b/src/libtracker-data/tracker-sparql-query.vala
index 54ce57003..7944e78e5 100644
--- a/src/libtracker-data/tracker-sparql-query.vala
+++ b/src/libtracker-data/tracker-sparql-query.vala
@@ -125,12 +125,12 @@ namespace Tracker.Sparql {
                public Context (Query query, Context? parent_context = null) {
                        this.query = query;
                        this.parent_context = parent_context;
-                       this.var_set = new HashTable<Variable,int>.full (Variable.hash, Variable.equal, 
g_object_unref, null);
+                       this.var_set = new HashTable<Variable,int>.full (Variable.hash, Variable.equal, 
GLib.Object.unref, null);
 
                        if (parent_context == null) {
-                               select_var_set = new HashTable<Variable,int>.full (Variable.hash, 
Variable.equal, g_object_unref, null);
-                               var_map = new HashTable<string,Variable>.full (str_hash, str_equal, g_free, 
g_object_unref);
-                               predicate_variable_map = new HashTable<Variable,PredicateVariable>.full 
(Variable.hash, Variable.equal, g_object_unref, g_object_unref);
+                               select_var_set = new HashTable<Variable,int>.full (Variable.hash, 
Variable.equal, GLib.Object.unref, null);
+                               var_map = new HashTable<string,Variable>.full (str_hash, str_equal, g_free, 
GLib.Object.unref);
+                               predicate_variable_map = new HashTable<Variable,PredicateVariable>.full 
(Variable.hash, Variable.equal, GLib.Object.unref, GLib.Object.unref);
                        } else {
                                select_var_set = parent_context.select_var_set;
                                var_map = parent_context.var_map;
@@ -141,11 +141,11 @@ namespace Tracker.Sparql {
                public Context.subquery (Query query, Context parent_context) {
                        this.query = query;
                        this.parent_context = parent_context;
-                       this.var_set = new HashTable<Variable,int>.full (Variable.hash, Variable.equal, 
g_object_unref, null);
+                       this.var_set = new HashTable<Variable,int>.full (Variable.hash, Variable.equal, 
GLib.Object.unref, null);
 
-                       select_var_set = new HashTable<Variable,int>.full (Variable.hash, Variable.equal, 
g_object_unref, null);
+                       select_var_set = new HashTable<Variable,int>.full (Variable.hash, Variable.equal, 
GLib.Object.unref, null);
                        var_map = parent_context.var_map;
-                       predicate_variable_map = new HashTable<Variable,PredicateVariable>.full 
(Variable.hash, Variable.equal, g_object_unref, g_object_unref);
+                       predicate_variable_map = new HashTable<Variable,PredicateVariable>.full 
(Variable.hash, Variable.equal, GLib.Object.unref, GLib.Object.unref);
                        scalar_subquery = true;
                }
 


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