[gnome-builder] code-index: be more flexible in context usage
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] code-index: be more flexible in context usage
- Date: Tue, 5 Feb 2019 06:15:56 +0000 (UTC)
commit 26b13130f70a4ca9e13198d4cdba79ec88630392
Author: Christian Hergert <chergert redhat com>
Date: Thu Jan 31 14:27:35 2019 -0800
code-index: be more flexible in context usage
src/plugins/code-index/ide-code-index-index.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/src/plugins/code-index/ide-code-index-index.c b/src/plugins/code-index/ide-code-index-index.c
index d9a449747..d6220b851 100644
--- a/src/plugins/code-index/ide-code-index-index.c
+++ b/src/plugins/code-index/ide-code-index-index.c
@@ -350,13 +350,13 @@ ide_code_index_index_query_cb (GObject *object,
else
{
g_autoptr(GPtrArray) results = g_ptr_array_new_with_free_func (g_object_unref);
- IdeContext *context = ide_object_get_context (IDE_OBJECT (self));
+ g_autoptr(IdeContext) context = ide_object_ref_context (IDE_OBJECT (self));
/*
* Extract match from heap with max score, get next item from the list from which
* the max score match came from and insert that into heap.
*/
- while (data->max_results > 0 && data->fuzzy_matches->len > 0)
+ while (context != NULL && data->max_results > 0 && data->fuzzy_matches->len > 0)
{
IdeCodeIndexSearchResult *item;
FuzzyMatch fuzzy_match;
@@ -581,7 +581,8 @@ ide_code_index_index_class_init (IdeCodeIndexIndexClass *klass)
IdeCodeIndexIndex *
ide_code_index_index_new (IdeObject *parent)
{
- g_return_val_if_fail (IDE_IS_OBJECT (parent), NULL);
+ /* Without parent, no queries are supported */
+ g_return_val_if_fail (!parent || IDE_IS_OBJECT (parent), NULL);
return g_object_new (IDE_TYPE_CODE_INDEX_INDEX,
"parent", parent,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]