[gnome-builder] source-view: various code style cleanup
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] source-view: various code style cleanup
- Date: Wed, 3 Jan 2018 12:50:54 +0000 (UTC)
commit 113e72deb89b4763130475b4a17e3b816f11347c
Author: Christian Hergert <chergert redhat com>
Date: Wed Jan 3 04:50:21 2018 -0800
source-view: various code style cleanup
src/libide/sourceview/ide-source-view.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/libide/sourceview/ide-source-view.c b/src/libide/sourceview/ide-source-view.c
index 8360609..9af3184 100644
--- a/src/libide/sourceview/ide-source-view.c
+++ b/src/libide/sourceview/ide-source-view.c
@@ -2568,8 +2568,7 @@ ide_source_view_get_definition_on_mouse_over_cb (GObject *object,
GtkTextIter word_start;
GtkTextIter word_end;
- if (priv->definition_src_location &&
- (priv->definition_src_location != srcloc))
+ if (priv->definition_src_location != NULL && priv->definition_src_location != srcloc)
g_clear_pointer (&priv->definition_src_location, ide_source_location_unref);
if (priv->definition_src_location == NULL)
@@ -5254,23 +5253,24 @@ ide_source_view_find_references_cb (GObject *object,
gpointer user_data)
{
IdeSymbolResolver *symbol_resolver = (IdeSymbolResolver *)object;
+ g_autoptr(GPtrArray) references = NULL;
+ g_autoptr(GError) error = NULL;
+ g_autoptr(GTask) task = user_data;
FindReferencesTaskData *data;
IdeSourceView *self;
IdeSourceViewPrivate *priv;
- g_autoptr(GPtrArray) references = NULL;
- g_autoptr(GError) error = NULL;
GtkScrolledWindow *scroller;
GtkPopover *popover;
GtkListBox *list_box;
GtkTextMark *insert;
GtkTextIter iter;
GdkRectangle loc;
- g_autoptr(GTask) task = user_data;
IDE_ENTRY;
g_assert (IDE_IS_SYMBOL_RESOLVER (symbol_resolver));
g_assert (G_IS_ASYNC_RESULT (result));
+ g_assert (G_IS_TASK (task));
references = ide_symbol_resolver_find_references_finish (symbol_resolver, result, &error);
@@ -5286,7 +5286,7 @@ ide_source_view_find_references_cb (GObject *object,
g_ptr_array_remove_index (data->resolvers, data->resolvers->len - 1);
/* If references are not found and symbol resolvers are left try those */
- if (references == NULL && data->resolvers->len)
+ if (references == NULL && data->resolvers->len > 0)
{
GCancellable *cancellable;
IdeSymbolResolver *resolver;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]