Commit 804dd712 authored by Carlos Garnacho's avatar Carlos Garnacho

Merge branch 'wip/carlosg/ci-fixes' into 'master'

CI Fixes

Closes #110

See merge request !282
parents 21b2c7c8 71246b1e
Pipeline #224448 passed with stages
in 9 minutes and 6 seconds
......@@ -500,7 +500,8 @@ decorator_task_done (GObject *object,
if (priv->n_remaining_items == 0) {
decorator_finish (decorator);
decorator_rebuild_cache (decorator);
if (priv->n_updates == 0)
decorator_rebuild_cache (decorator);
} else if (g_queue_is_empty (&priv->item_cache) &&
g_hash_table_size (priv->tasks) == 0 &&
(!priv->sparql_buffer || !priv->commit_buffer)) {
......
......@@ -168,7 +168,7 @@ update_indexed_files (TrackerMinerFilesIndex *index)
(const gchar * const *) priv->indexed_files->data);
}
static void
static gboolean
tracker_miner_files_index_handle_index_location (TrackerDBusMinerFilesIndex *skeleton,
GDBusMethodInvocation *invocation,
const gchar *file_uri,
......@@ -183,8 +183,6 @@ tracker_miner_files_index_handle_index_location (TrackerDBusMinerFilesIndex *ske
priv = TRACKER_MINER_FILES_INDEX_GET_PRIVATE (index);
tracker_gdbus_async_return_if_fail (file_uri != NULL, invocation);
request = tracker_g_dbus_request_begin (invocation, "%s(uri:'%s')", __FUNCTION__, file_uri);
file = g_file_new_for_uri (file_uri);
......@@ -205,6 +203,8 @@ tracker_miner_files_index_handle_index_location (TrackerDBusMinerFilesIndex *ske
g_dbus_method_invocation_return_value (invocation, NULL);
g_object_unref (file);
return TRUE;
}
static void
......
......@@ -310,7 +310,6 @@ static void
decorator_get_next_file (TrackerDecorator *decorator)
{
TrackerExtractDecoratorPrivate *priv;
guint available_items;
priv = tracker_extract_decorator_get_instance_private (TRACKER_EXTRACT_DECORATOR (decorator));
......@@ -318,11 +317,8 @@ decorator_get_next_file (TrackerDecorator *decorator)
tracker_miner_is_paused (TRACKER_MINER (decorator)))
return;
available_items = tracker_decorator_get_n_items (decorator);
while (priv->n_extracting_files < MAX_EXTRACTING_FILES &&
available_items > 0) {
while (priv->n_extracting_files < MAX_EXTRACTING_FILES) {
priv->n_extracting_files++;
available_items--;
tracker_decorator_next (decorator, NULL,
(GAsyncReadyCallback) decorator_next_item_cb,
NULL);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment