[gnome-builder] ctags: ensure task is setup up before we can fail
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] ctags: ensure task is setup up before we can fail
- Date: Thu, 20 Oct 2016 19:07:30 +0000 (UTC)
commit 2d992da877187ca26db8ca1c2ada3195b2427204
Author: Christian Hergert <chergert redhat com>
Date: Thu Oct 20 12:06:58 2016 -0700
ctags: ensure task is setup up before we can fail
We were waiting to prepare the task until the final stage, and that is
clearly wrong here. We need it in place so we can short circuit.
plugins/ctags/ide-ctags-symbol-resolver.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/plugins/ctags/ide-ctags-symbol-resolver.c b/plugins/ctags/ide-ctags-symbol-resolver.c
index 0f95196..d7e5c82 100644
--- a/plugins/ctags/ide-ctags-symbol-resolver.c
+++ b/plugins/ctags/ide-ctags-symbol-resolver.c
@@ -632,6 +632,9 @@ ide_ctags_symbol_resolver_get_symbol_tree_async (IdeSymbolResolver *resolver,
g_assert (G_IS_FILE (file));
g_assert (!cancellable || G_IS_CANCELLABLE (cancellable));
+ task = g_task_new (self, cancellable, callback, user_data);
+ g_task_set_source_tag (task, ide_ctags_symbol_resolver_get_symbol_tree_async);
+
context = ide_object_get_context (IDE_OBJECT (self));
service = ide_context_get_service_typed (context, IDE_TYPE_CTAGS_SERVICE);
indexes = ide_ctags_service_get_indexes (service);
@@ -661,9 +664,7 @@ ide_ctags_symbol_resolver_get_symbol_tree_async (IdeSymbolResolver *resolver,
g_ptr_array_add (state->indexes, g_object_ref (index));
}
- task = g_task_new (self, cancellable, callback, user_data);
g_task_set_task_data (task, state, tree_resolver_state_free);
- g_task_set_source_tag (task, ide_ctags_symbol_resolver_get_symbol_tree_async);
g_task_run_in_thread (task, ide_ctags_symbol_resolver_get_symbol_tree_worker);
IDE_EXIT;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]