Merge branch 'wip/carlosg/compiler-warnings' into 'master'

Fix build/compiler warnings

See merge request GNOME/tracker!534

12 files changed, 70 insertions, 38 deletions

diff --git a/config.h.meson.in b/config.h.meson.in
index 4aff15f72..befa786a5 100644
--- a/config.h.meson.in
+++ b/config.h.meson.in
@@ -19,9 +19,6 @@
 /* libunistring Unicode support library */
 #mesondefine HAVE_LIBUNISTRING
 
-/* Define to 1 if you have the `posix_fadvise' function. */
-#mesondefine HAVE_POSIX_FADVISE
-
 /* Define to 1 if you have the `statvfs64' function. */
 #mesondefine HAVE_STATVFS64
 
diff --git a/docs/reference/libtracker-sparql/meson.build b/docs/reference/libtracker-sparql/meson.build
index 72c03e352..b6dad9c9a 100644
--- a/docs/reference/libtracker-sparql/meson.build
+++ b/docs/reference/libtracker-sparql/meson.build
@@ -13,8 +13,10 @@ base_ontology_docs = custom_target('ontology-docgen',
     output: ['dc-ontology.md'],
     command: [tracker_docgen,
               '--md',
-              '-d', join_paths(source_root, 'src/ontologies/'),
-              '-o', join_paths(meson.current_build_dir())],
+              '--ontology-dir', meson.current_build_dir(), # Directory without ontology files
+              '--output-dir', meson.current_build_dir(),
+              '--introduction-dir', meson.current_source_dir(),
+              '--ontology-description-dir', join_paths(source_root, 'src/ontologies/')],
     depends: tracker_docgen,
     depend_files: [base_ontology],
     build_by_default: true,
@@ -24,9 +26,9 @@ nepomuk_ontology_docs = custom_target('nepomuk-docgen',
     output: ['nie-ontology.md'],
     command: [tracker_docgen,
               '--md',
-              '-d', join_paths(source_root, 'src/ontologies/nepomuk'),
-              '-o', join_paths(meson.current_build_dir()),
-              '-e', meson.current_source_dir()],
+              '--ontology-dir', join_paths(source_root, 'src/ontologies/nepomuk'),
+              '--output-dir', meson.current_build_dir(),
+              '--introduction-dir', meson.current_source_dir()],
     depends: tracker_docgen,
     depend_files: [base_ontology],
     build_by_default: true,
diff --git a/docs/tools/tracker-docgen-xml.c b/docs/tools/tracker-docgen-xml.c
index 5751a93ec..d39f8a86d 100644
--- a/docs/tools/tracker-docgen-xml.c
+++ b/docs/tools/tracker-docgen-xml.c
@@ -63,7 +63,7 @@ print_class_hierarchy (FILE                 *f,
 {
 	GPtrArray *strings;
 	const gchar *id;
-	gint i;
+	guint i;
 
 	strings = class_get_parent_hierarchy_strings (klass, model);
 
diff --git a/docs/tools/tracker-main.c b/docs/tools/tracker-main.c
index 754193e25..863b2ab2d 100644
--- a/docs/tools/tracker-main.c
+++ b/docs/tools/tracker-main.c
@@ -27,8 +27,9 @@
 #include "tracker-ontology-model.h"
 
 static gchar *ontology_dir = NULL;
+static gchar *ontology_desc_dir = NULL;
 static gchar *output_dir = NULL;
-static gchar *description_dir = NULL;
+static gchar *introduction_dir = NULL;
 static gboolean xml = FALSE;
 static gboolean markdown = FALSE;
 
@@ -37,12 +38,16 @@ static GOptionEntry   entries[] = {
 	  "Ontology directory",
 	  NULL
 	},
+	{ "ontology-description-dir", 'e', 0, G_OPTION_ARG_FILENAME, &ontology_desc_dir,
+	  "Ontology description directory",
+	  NULL
+	},
 	{ "output-dir", 'o', 0, G_OPTION_ARG_FILENAME, &output_dir,
 	  "File to write the output (default stdout)",
 	  NULL
 	},
-	{ "description-dir", 'e', 0, G_OPTION_ARG_FILENAME, &description_dir,
-	  "Directory to find ontology descriptions",
+	{ "introduction-dir", 'i', 0, G_OPTION_ARG_FILENAME, &introduction_dir,
+	  "Directory to find ontology introduction",
 	  NULL
 	},
 	{ "xml", 'x', 0, G_OPTION_ARG_NONE, &xml,
@@ -62,7 +67,7 @@ main (gint argc, gchar **argv)
 	GOptionContext *context;
 	TrackerOntologyDescription *description = NULL;
 	TrackerOntologyModel *model = NULL;
-	g_autoptr(GFile) ontology_file = NULL, output_file = NULL;
+	g_autoptr(GFile) ontology_file = NULL, output_file = NULL, ontology_desc_file = NULL;
 	gchar *path;
 	GStrv prefixes = NULL;
 	gint i;
@@ -75,7 +80,11 @@ main (gint argc, gchar **argv)
 	/* Translators: this message will appear after the usage string */
 	/* and before the list of options.                              */
 	g_option_context_add_main_entries (context, entries, NULL);
-	g_option_context_parse (context, &argc, &argv, NULL);
+
+	if (!g_option_context_parse (context, &argc, &argv, &error)) {
+		g_printerr ("%s\n", error->message);
+		return -1;
+	}
 
 	if (!!xml == !!markdown) {
 		g_printerr ("%s\n",
@@ -100,7 +109,12 @@ main (gint argc, gchar **argv)
 	ontology_file = g_file_new_for_commandline_arg (ontology_dir);
 	output_file = g_file_new_for_commandline_arg (output_dir);
 
-	model = tracker_ontology_model_new (ontology_file, &error);
+	if (ontology_desc_dir)
+		ontology_desc_file = g_file_new_for_commandline_arg (ontology_desc_dir);
+	else
+		ontology_desc_file = g_object_ref (ontology_file);
+
+	model = tracker_ontology_model_new (ontology_file, ontology_desc_file, &error);
 	if (error) {
 		g_printerr ("Error loading ontology: %s\n", error->message);
 		return -1;
@@ -118,9 +132,9 @@ main (gint argc, gchar **argv)
 			continue;
 
 		if (xml)
-			ttl_xml_print (description, model, prefixes[i], output_file, description_dir);
+			ttl_xml_print (description, model, prefixes[i], output_file, introduction_dir);
 		else if (markdown)
-			ttl_md_print (description, model, prefixes[i], output_file, description_dir);
+			ttl_md_print (description, model, prefixes[i], output_file, introduction_dir);
 	}
 
 	g_strfreev (prefixes);
diff --git a/docs/tools/tracker-ontology-model.c b/docs/tools/tracker-ontology-model.c
index 7ecbd1af6..51236608a 100644
--- a/docs/tools/tracker-ontology-model.c
+++ b/docs/tools/tracker-ontology-model.c
@@ -299,7 +299,8 @@ tracker_ontology_model_init_properties (TrackerOntologyModel *model)
 
 TrackerOntologyModel *
 tracker_ontology_model_new (GFile   *ontology_location,
-			    GError **error)
+                            GFile   *description_location,
+                            GError **error)
 {
 	TrackerOntologyModel *model;
 	TrackerSparqlConnection *ontology_conn, *desc_conn = NULL;
@@ -325,7 +326,7 @@ tracker_ontology_model_new (GFile   *ontology_location,
 		goto error;
 
 	/* Load all .description files into desc_conn */
-	enumerator = g_file_enumerate_children (ontology_location,
+	enumerator = g_file_enumerate_children (description_location,
 						G_FILE_ATTRIBUTE_STANDARD_NAME,
 						G_FILE_QUERY_INFO_NONE,
 						NULL, error);
@@ -385,8 +386,8 @@ tracker_ontology_model_free (TrackerOntologyModel *model)
 {
 	g_object_unref (model->ontology_conn);
 	g_object_unref (model->desc_conn);
-	g_object_unref (model->classes_stmt);
-	g_object_unref (model->props_stmt);
+	g_clear_object (&model->classes_stmt);
+	g_clear_object (&model->props_stmt);
 	g_hash_table_unref (model->stmts);
 	g_hash_table_unref (model->classes);
 	g_hash_table_unref (model->properties);
diff --git a/docs/tools/tracker-ontology-model.h b/docs/tools/tracker-ontology-model.h
index 60339fe46..8ea6d17cd 100644
--- a/docs/tools/tracker-ontology-model.h
+++ b/docs/tools/tracker-ontology-model.h
@@ -72,6 +72,7 @@ typedef struct {
 } TrackerOntologyDescription;
 
 TrackerOntologyModel * tracker_ontology_model_new (GFile   *ontology_location,
+                                                   GFile   *description_location,
                                                    GError **error);
 void tracker_ontology_model_free (TrackerOntologyModel *model);
 
diff --git a/meson.build b/meson.build
index 391170400..7d74c4079 100644
--- a/meson.build
+++ b/meson.build
@@ -236,8 +236,8 @@ endif
 ####################################################################
 
 if get_option('dbus_services_dir') == ''
-  dbus_services_dir = dbus.get_pkgconfig_variable('session_bus_services_dir',
-                                                  define_variable: [ 'datadir', datadir ])
+  dbus_services_dir = dbus.get_variable(pkgconfig: 'session_bus_services_dir',
+                                        pkgconfig_define: [ 'datadir', datadir ])
 else
   dbus_services_dir = get_option('dbus_services_dir')
 endif
@@ -253,8 +253,8 @@ if install_systemd_user_services
   if systemd_user_services_dir == ''
     systemd = dependency('systemd', version: '>= 242', required: false)
     if systemd.found()
-      systemd_user_services_dir = systemd.get_pkgconfig_variable('systemduserunitdir',
-                                                                 define_variable: ['prefix', get_option('prefix')])
+      systemd_user_services_dir = systemd.get_variable(pkgconfig: 'systemduserunitdir',
+                                                       pkgconfig_define: ['prefix', get_option('prefix')])
     else
       error('systemd user services were enabled, but systemd was not found. ' +
             'Please set the systemd_user_services_dir option if you want to ' +
@@ -273,8 +273,8 @@ if get_option('bash_completion')
   if bash_completion_dir == ''
     bash_completion_package = dependency('bash-completion', required: false)
     if bash_completion_package.found()
-      bash_completion_dir = bash_completion_package.get_pkgconfig_variable('completionsdir',
-                                                                           define_variable: [ 'prefix', get_option('prefix') ])
+      bash_completion_dir = bash_completion_package.get_variable(pkgconfig: 'completionsdir',
+                                                                 pkgconfig_define: [ 'prefix', get_option('prefix') ])
     else
       bash_completion_dir = join_paths(datadir, 'bash-completion', 'completions')
     endif
@@ -289,7 +289,6 @@ conf.set('HAVE_LIBICU', unicode_library_name == 'icu')
 conf.set('HAVE_LIBSTEMMER', have_libstemmer)
 conf.set('HAVE_LIBUNISTRING', unicode_library_name == 'unistring')
 
-conf.set('HAVE_POSIX_FADVISE', cc.has_function('posix_fadvise', prefix : '#include <fcntl.h>'))
 conf.set('HAVE_STATVFS64', cc.has_header_symbol('sys/statvfs.h', 'statvfs64', args: '-D_LARGEFILE64_SOURCE'))
 
 conf.set('LOCALEDIR', '"@0@/@1@"'.format(get_option('prefix'), get_option('localedir')))
@@ -342,8 +341,8 @@ tracker_ontologies_dir = join_paths(get_option('prefix'), get_option('datadir'),
 vapi_dir = join_paths(get_option('prefix'), get_option('datadir'), 'vala', 'vapi')
 
 if gobject_introspection.found()
-  typelib_dir = gobject_introspection.get_pkgconfig_variable('typelibdir',
-                                                             define_variable: [ 'libdir', libdir ])
+  typelib_dir = gobject_introspection.get_variable(pkgconfig: 'typelibdir',
+                                                   pkgconfig_define: [ 'libdir', libdir ])
 endif
 
 subdir('src')
diff --git a/src/libtracker-sparql/core/tracker-data-manager.c b/src/libtracker-sparql/core/tracker-data-manager.c
index 3bbdc0d0d..9ca4372fb 100644
--- a/src/libtracker-sparql/core/tracker-data-manager.c
+++ b/src/libtracker-sparql/core/tracker-data-manager.c
@@ -746,7 +746,7 @@ ensure_inverse_functional_property (TrackerDataManager  *manager,
 	g_free (query);
 
 	if (cursor && tracker_db_cursor_iter_next (cursor, NULL, error)) {
-		if (!tracker_sparql_cursor_get_boolean (cursor, 0)) {
+		if (!tracker_sparql_cursor_get_boolean (TRACKER_SPARQL_CURSOR (cursor), 0)) {
 			handle_unsupported_ontology_change (manager,
 			                                    NULL, -1, -1,
 			                                    property_uri,
diff --git a/src/libtracker-sparql/remote/tracker-http-module.c b/src/libtracker-sparql/remote/tracker-http-module.c
index 421005001..0c6c17dc7 100644
--- a/src/libtracker-sparql/remote/tracker-http-module.c
+++ b/src/libtracker-sparql/remote/tracker-http-module.c
@@ -141,7 +141,12 @@ server_callback (SoupServer        *server,
 	request = g_new0 (TrackerHttpRequest, 1);
 	request->server = http_server;
 	request->message = message;
+
+#if SOUP_CHECK_VERSION (3, 1, 3)
+	soup_server_message_pause (message);
+#else
 	soup_server_pause_message (server, message);
+#endif
 
 	g_signal_emit_by_name (http_server, "request",
 	                       remote_address,
@@ -193,7 +198,7 @@ tracker_http_server_soup_error (TrackerHttpServer       *server,
                                 gint                     code,
                                 const gchar             *message)
 {
-	TrackerHttpServerSoup *server_soup =
+	G_GNUC_UNUSED TrackerHttpServerSoup *server_soup =
 		TRACKER_HTTP_SERVER_SOUP (server);
 
 	g_assert (request->server == server);
@@ -203,7 +208,12 @@ tracker_http_server_soup_error (TrackerHttpServer       *server,
 #else
 	soup_message_set_status_full (request->message, code, message);
 #endif
+
+#if SOUP_CHECK_VERSION (3, 1, 3)
+	soup_server_message_unpause (request->message);
+#else
 	soup_server_unpause_message (server_soup->server, request->message);
+#endif
 	g_free (request);
 }
 
@@ -256,7 +266,7 @@ write_finished_cb (GObject      *object,
                    gpointer      user_data)
 {
 	TrackerHttpRequest *request = user_data;
-	TrackerHttpServerSoup *server =
+	G_GNUC_UNUSED TrackerHttpServerSoup *server =
 		TRACKER_HTTP_SERVER_SOUP (request->server);
 	GError *error = NULL;
 
@@ -272,7 +282,13 @@ write_finished_cb (GObject      *object,
 #else
 		soup_message_set_status (request->message, 200);
 #endif
+
+#if SOUP_CHECK_VERSION (3, 1, 3)
+		soup_server_message_unpause (request->message);
+#else
 		soup_server_unpause_message (server->server, request->message);
+#endif
+
 		g_free (request);
 	}
 }
diff --git a/src/libtracker-sparql/tracker-deserializer-resource.c b/src/libtracker-sparql/tracker-deserializer-resource.c
index 33e873bb4..4c3e09fab 100644
--- a/src/libtracker-sparql/tracker-deserializer-resource.c
+++ b/src/libtracker-sparql/tracker-deserializer-resource.c
@@ -203,6 +203,7 @@ value_type_from_gtype (const GValue *value)
 	} else if (G_VALUE_HOLDS (value, G_TYPE_BOOLEAN)) {
 		return TRACKER_SPARQL_VALUE_TYPE_BOOLEAN;
 	} else if (G_VALUE_HOLDS (value, G_TYPE_INT) ||
+	           G_VALUE_HOLDS (value, G_TYPE_UINT) ||
 	           G_VALUE_HOLDS (value, G_TYPE_INT64)) {
 		return TRACKER_SPARQL_VALUE_TYPE_INTEGER;
 	} else if (G_VALUE_HOLDS (value, G_TYPE_DOUBLE)) {
diff --git a/src/libtracker-sparql/tracker-resource.c b/src/libtracker-sparql/tracker-resource.c
index c027eecee..fa3d1fe2f 100644
--- a/src/libtracker-sparql/tracker-resource.c
+++ b/src/libtracker-sparql/tracker-resource.c
@@ -19,9 +19,6 @@
 
 #include "config.h"
 
-/* Allow usage of tracker_namespace_manager_get_default() */
-#define TRACKER_VERSION_MIN_REQUIRED TRACKER_VERSION_3_2
-
 #include <glib.h>
 #include <json-glib/json-glib.h>
 
@@ -1169,7 +1166,9 @@ tracker_resource_print_turtle (TrackerResource         *self,
 	g_return_val_if_fail (TRACKER_IS_RESOURCE (self), "");
 
 	if (namespaces == NULL) {
+		G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 		namespaces = tracker_namespace_manager_get_default ();
+		G_GNUC_END_IGNORE_DEPRECATIONS
 	}
 
 	return tracker_resource_print_rdf (self, namespaces, TRACKER_RDF_FORMAT_TURTLE, NULL);
@@ -1403,7 +1402,9 @@ tracker_resource_print_sparql_update (TrackerResource         *resource,
 	priv = GET_PRIVATE(resource);
 
 	if (namespaces == NULL) {
+		G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 		namespaces = tracker_namespace_manager_get_default ();
+		G_GNUC_END_IGNORE_DEPRECATIONS
 	}
 
 	if (g_hash_table_size (priv->properties) == 0) {
@@ -1587,7 +1588,9 @@ tracker_resource_print_jsonld (TrackerResource         *self,
 	char *result;
 
 	if (namespaces == NULL) {
+		G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 		namespaces = tracker_namespace_manager_get_default ();
+		G_GNUC_END_IGNORE_DEPRECATIONS
 	}
 
 	context.all_namespaces = namespaces;
diff --git a/tests/libtracker-sparql/tracker-namespaces-test.c b/tests/libtracker-sparql/tracker-namespaces-test.c
index 4fe749603..d26250883 100644
--- a/tests/libtracker-sparql/tracker-namespaces-test.c
+++ b/tests/libtracker-sparql/tracker-namespaces-test.c
@@ -126,8 +126,6 @@ namespace_check_foreach (gpointer key,
                          gpointer user_data)
 {
 	TrackerNamespaceManager *spec = user_data;
-	gboolean found = FALSE;
-	int i;
 
 	g_assert_true (tracker_namespace_manager_has_prefix (spec, key));
 	g_assert_cmpstr (value, ==, tracker_namespace_manager_lookup_prefix (spec, key));