[gnome-builder] rename: make rename_finish() transfer-full for edits array
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] rename: make rename_finish() transfer-full for edits array
- Date: Mon, 9 Apr 2018 23:10:27 +0000 (UTC)
commit 1552f800b3d79a7c3164cbdcf3edd96c6fce08df
Author: Christian Hergert <chergert redhat com>
Date: Mon Apr 9 16:10:02 2018 -0700
rename: make rename_finish() transfer-full for edits array
This makes this more easily implementable by language bindings.
src/libide/langserv/ide-langserv-rename-provider.c | 3 ++-
src/libide/rename/ide-rename-provider.c | 2 +-
src/libide/sourceview/ide-source-view.c | 2 ++
3 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/src/libide/langserv/ide-langserv-rename-provider.c
b/src/libide/langserv/ide-langserv-rename-provider.c
index 08554f5d3..9d191199d 100644
--- a/src/libide/langserv/ide-langserv-rename-provider.c
+++ b/src/libide/langserv/ide-langserv-rename-provider.c
@@ -31,6 +31,7 @@
#include "langserv/ide-langserv-rename-provider.h"
#include "diagnostics/ide-source-location.h"
#include "threading/ide-task.h"
+#include "util/ide-glib.h"
typedef struct
{
@@ -341,7 +342,7 @@ ide_langserv_rename_provider_rename_finish (IdeRenameProvider *provider,
ret = (ar != NULL);
if (edits != NULL)
- *edits = g_steal_pointer (&ar);
+ *edits = IDE_PTR_ARRAY_STEAL_FULL (&ar);
IDE_RETURN (ret);
}
diff --git a/src/libide/rename/ide-rename-provider.c b/src/libide/rename/ide-rename-provider.c
index 5f7e603ed..9dab9c4b9 100644
--- a/src/libide/rename/ide-rename-provider.c
+++ b/src/libide/rename/ide-rename-provider.c
@@ -117,7 +117,7 @@ ide_rename_provider_rename_async (IdeRenameProvider *self,
* ide_rename_provider_rename_finish:
* @self: An #IdeRenameProvider
* @result: a #GAsyncResult
- * @edits: (out) (transfer container) (element-type Ide.ProjectEdit) (nullable): A location
+ * @edits: (out) (transfer full) (element-type Ide.ProjectEdit) (optional): A location
* for a #GPtrArray of #IdeProjectEdit instances.
* @error: a location for a #GError, or %NULL.
*
diff --git a/src/libide/sourceview/ide-source-view.c b/src/libide/sourceview/ide-source-view.c
index 85afab61e..ebfe7f142 100644
--- a/src/libide/sourceview/ide-source-view.c
+++ b/src/libide/sourceview/ide-source-view.c
@@ -5057,6 +5057,8 @@ ide_source_view_rename_edits_cb (GObject *object,
g_assert (edits != NULL);
+ IDE_PTR_ARRAY_SET_FREE_FUNC (edits, g_object_unref);
+
context = ide_buffer_get_context (priv->buffer);
buffer_manager = ide_context_get_buffer_manager (context);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]