[gnome-builder] workbench: fixup api from merge
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] workbench: fixup api from merge
- Date: Fri, 17 Jun 2016 18:58:58 +0000 (UTC)
commit 948abbd96f15920126b8ab01eac6aa5be1b14429
Author: Christian Hergert <chergert redhat com>
Date: Fri Jun 17 11:50:37 2016 -0700
workbench: fixup api from merge
We need to fixup the previous commit a bit from the merge, including
modifying the addin interface to match the expectation.
libide/buffers/ide-buffer-manager.h | 2 +-
libide/workbench/ide-workbench-addin.c | 14 ++--
libide/workbench/ide-workbench-addin.h | 82 ++++++++++++-----------
libide/workbench/ide-workbench.h | 116 ++++++++++++++++----------------
4 files changed, 108 insertions(+), 106 deletions(-)
---
diff --git a/libide/buffers/ide-buffer-manager.h b/libide/buffers/ide-buffer-manager.h
index 9172b7e..be1dc5e 100644
--- a/libide/buffers/ide-buffer-manager.h
+++ b/libide/buffers/ide-buffer-manager.h
@@ -23,9 +23,9 @@
#include <gtksourceview/completion-providers/words/gtksourcecompletionwords.h>
#include "ide-object.h"
-#include "ide-workbench.h"
#include "files/ide-file.h"
+#include "workbench/ide-workbench.h"
G_BEGIN_DECLS
diff --git a/libide/workbench/ide-workbench-addin.c b/libide/workbench/ide-workbench-addin.c
index 95f02ca..5704953 100644
--- a/libide/workbench/ide-workbench-addin.c
+++ b/libide/workbench/ide-workbench-addin.c
@@ -137,13 +137,13 @@ ide_workbench_addin_can_open (IdeWorkbenchAddin *self,
}
void
-ide_workbench_addin_open_async (IdeWorkbenchAddin *self,
- IdeUri *uri,
- const gchar *content_type,
- IdeWorkbenchOpenFlags flags,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
+ide_workbench_addin_open_async (IdeWorkbenchAddin *self,
+ IdeUri *uri,
+ const gchar *content_type,
+ IdeWorkbenchOpenFlags flags,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
g_return_if_fail (IDE_IS_WORKBENCH_ADDIN (self));
g_return_if_fail (uri != NULL);
diff --git a/libide/workbench/ide-workbench-addin.h b/libide/workbench/ide-workbench-addin.h
index ad97df0..1b01fdc 100644
--- a/libide/workbench/ide-workbench-addin.h
+++ b/libide/workbench/ide-workbench-addin.h
@@ -33,48 +33,50 @@ struct _IdeWorkbenchAddinInterface
{
GTypeInterface parent;
- gchar *(*get_id) (IdeWorkbenchAddin *self);
- void (*load) (IdeWorkbenchAddin *self,
- IdeWorkbench *workbench);
- void (*unload) (IdeWorkbenchAddin *self,
- IdeWorkbench *workbench);
- gboolean (*can_open) (IdeWorkbenchAddin *self,
- IdeUri *uri,
- const gchar *content_type,
- gint *priority);
- void (*open_async) (IdeWorkbenchAddin *self,
- IdeUri *uri,
- const gchar *content_type,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- gboolean (*open_finish) (IdeWorkbenchAddin *self,
- GAsyncResult *result,
- GError **error);
- void (*perspective_set) (IdeWorkbenchAddin *self,
- IdePerspective *perspective);
+ gchar *(*get_id) (IdeWorkbenchAddin *self);
+ void (*load) (IdeWorkbenchAddin *self,
+ IdeWorkbench *workbench);
+ void (*unload) (IdeWorkbenchAddin *self,
+ IdeWorkbench *workbench);
+ gboolean (*can_open) (IdeWorkbenchAddin *self,
+ IdeUri *uri,
+ const gchar *content_type,
+ gint *priority);
+ void (*open_async) (IdeWorkbenchAddin *self,
+ IdeUri *uri,
+ const gchar *content_type,
+ IdeWorkbenchOpenFlags flags,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ gboolean (*open_finish) (IdeWorkbenchAddin *self,
+ GAsyncResult *result,
+ GError **error);
+ void (*perspective_set) (IdeWorkbenchAddin *self,
+ IdePerspective *perspective);
};
-gchar *ide_workbench_addin_get_id (IdeWorkbenchAddin *self);
-void ide_workbench_addin_load (IdeWorkbenchAddin *self,
- IdeWorkbench *workbench);
-void ide_workbench_addin_unload (IdeWorkbenchAddin *self,
- IdeWorkbench *workbench);
-gboolean ide_workbench_addin_can_open (IdeWorkbenchAddin *self,
- IdeUri *uri,
- const gchar *content_type,
- gint *priority);
-void ide_workbench_addin_open_async (IdeWorkbenchAddin *self,
- IdeUri *uri,
- const gchar *content_type,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-gboolean ide_workbench_addin_open_finish (IdeWorkbenchAddin *self,
- GAsyncResult *result,
- GError **error);
-void ide_workbench_addin_perspective_set (IdeWorkbenchAddin *self,
- IdePerspective *perspective);
+gchar *ide_workbench_addin_get_id (IdeWorkbenchAddin *self);
+void ide_workbench_addin_load (IdeWorkbenchAddin *self,
+ IdeWorkbench *workbench);
+void ide_workbench_addin_unload (IdeWorkbenchAddin *self,
+ IdeWorkbench *workbench);
+gboolean ide_workbench_addin_can_open (IdeWorkbenchAddin *self,
+ IdeUri *uri,
+ const gchar *content_type,
+ gint *priority);
+void ide_workbench_addin_open_async (IdeWorkbenchAddin *self,
+ IdeUri *uri,
+ const gchar *content_type,
+ IdeWorkbenchOpenFlags flags,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+gboolean ide_workbench_addin_open_finish (IdeWorkbenchAddin *self,
+ GAsyncResult *result,
+ GError **error);
+void ide_workbench_addin_perspective_set (IdeWorkbenchAddin *self,
+ IdePerspective *perspective);
G_END_DECLS
diff --git a/libide/workbench/ide-workbench.h b/libide/workbench/ide-workbench.h
index 75b06ab..bdcce00 100644
--- a/libide/workbench/ide-workbench.h
+++ b/libide/workbench/ide-workbench.h
@@ -38,64 +38,64 @@ typedef enum
G_DECLARE_FINAL_TYPE (IdeWorkbench, ide_workbench, IDE, WORKBENCH, GtkApplicationWindow)
-void ide_workbench_open_project_async (IdeWorkbench *self,
- GFile *file_or_directory,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-gboolean ide_workbench_open_project_finish (IdeWorkbench *self,
- GAsyncResult *result,
- GError **error);
-void ide_workbench_open_uri_async (IdeWorkbench *self,
- IdeUri *uri,
- const gchar *hint,
- IdeWorkbenchOpenFlags flags,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-gboolean ide_workbench_open_uri_finish (IdeWorkbench *self,
- GAsyncResult *result,
- GError **error);
-void ide_workbench_open_files_async (IdeWorkbench *self,
- GFile **files,
- guint n_files,
- const gchar *hint,
- IdeWorkbenchOpenFlags flags,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-gboolean ide_workbench_open_files_finish (IdeWorkbench *self,
- GAsyncResult *result,
- GError **error);
-void ide_workbench_save_all_async (IdeWorkbench *self,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-gboolean ide_workbench_save_all_finish (IdeWorkbench *self,
- GAsyncResult *result,
- GError **error);
-void ide_workbench_focus (IdeWorkbench *self,
- GtkWidget *widget);
-void ide_workbench_close (IdeWorkbench *self);
-IdeContext *ide_workbench_get_context (IdeWorkbench *self);
-void ide_workbench_add_perspective (IdeWorkbench *self,
- IdePerspective *perspective);
-void ide_workbench_remove_perspective (IdeWorkbench *self,
- IdePerspective *perspective);
-IdePerspective *ide_workbench_get_perspective_by_name (IdeWorkbench *self,
- const gchar *name);
-IdePerspective *ide_workbench_get_visible_perspective (IdeWorkbench *self);
-void ide_workbench_set_visible_perspective (IdeWorkbench *self,
- IdePerspective *perspective);
-const gchar *ide_workbench_get_visible_perspective_name (IdeWorkbench *self);
-void ide_workbench_set_visible_perspective_name (IdeWorkbench *self,
- const gchar *name);
-gboolean ide_workbench_get_fullscreen (IdeWorkbench *self);
-void ide_workbench_set_fullscreen (IdeWorkbench *self,
- gboolean fullscreen);
-void ide_workbench_views_foreach (IdeWorkbench *self,
- GtkCallback callback,
- gpointer user_data);
+void ide_workbench_open_project_async (IdeWorkbench *self,
+ GFile *file_or_directory,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+gboolean ide_workbench_open_project_finish (IdeWorkbench *self,
+ GAsyncResult *result,
+ GError **error);
+void ide_workbench_open_uri_async (IdeWorkbench *self,
+ IdeUri *uri,
+ const gchar *hint,
+ IdeWorkbenchOpenFlags flags,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+gboolean ide_workbench_open_uri_finish (IdeWorkbench *self,
+ GAsyncResult *result,
+ GError **error);
+void ide_workbench_open_files_async (IdeWorkbench *self,
+ GFile **files,
+ guint n_files,
+ const gchar *hint,
+ IdeWorkbenchOpenFlags flags,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+gboolean ide_workbench_open_files_finish (IdeWorkbench *self,
+ GAsyncResult *result,
+ GError **error);
+void ide_workbench_save_all_async (IdeWorkbench *self,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+gboolean ide_workbench_save_all_finish (IdeWorkbench *self,
+ GAsyncResult *result,
+ GError **error);
+void ide_workbench_focus (IdeWorkbench *self,
+ GtkWidget *widget);
+void ide_workbench_close (IdeWorkbench *self);
+IdeContext *ide_workbench_get_context (IdeWorkbench *self);
+void ide_workbench_add_perspective (IdeWorkbench *self,
+ IdePerspective *perspective);
+void ide_workbench_remove_perspective (IdeWorkbench *self,
+ IdePerspective *perspective);
+IdePerspective *ide_workbench_get_perspective_by_name (IdeWorkbench *self,
+ const gchar *name);
+IdePerspective *ide_workbench_get_visible_perspective (IdeWorkbench *self);
+void ide_workbench_set_visible_perspective (IdeWorkbench *self,
+ IdePerspective *perspective);
+const gchar *ide_workbench_get_visible_perspective_name (IdeWorkbench *self);
+void ide_workbench_set_visible_perspective_name (IdeWorkbench *self,
+ const gchar *name);
+gboolean ide_workbench_get_fullscreen (IdeWorkbench *self);
+void ide_workbench_set_fullscreen (IdeWorkbench *self,
+ gboolean fullscreen);
+void ide_workbench_views_foreach (IdeWorkbench *self,
+ GtkCallback callback,
+ gpointer user_data);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
