[gnome-builder] gui: make _ide_workbench_from_context() public API

[Christian Hergert <chergert src gnome org>]

commit 19fb0065a91695efa403aa56a6518bd86ff190e1
Author: Christian Hergert <chergert redhat com>
Date:   Wed Mar 3 14:50:12 2021 -0800

    gui: make _ide_workbench_from_context() public API
    
    This got used a lot, just make it public.

 src/libide/gui/ide-command-manager.c               |  6 +++---
 src/libide/gui/ide-gui-private.h                   |  1 -
 src/libide/gui/ide-workbench.c                     |  4 ++--
 src/libide/gui/ide-workbench.h                     |  2 ++
 src/plugins/flatpak/gbp-flatpak-runtime-provider.c |  2 +-
 src/plugins/rust-analyzer/rust-analyzer-service.c  |  3 +--
 src/plugins/shellcmd/gbp-shellcmd-command.c        | 10 +++++-----
 7 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/src/libide/gui/ide-command-manager.c b/src/libide/gui/ide-command-manager.c
index ad717404f..1a56f4899 100644
--- a/src/libide/gui/ide-command-manager.c
+++ b/src/libide/gui/ide-command-manager.c
@@ -60,7 +60,7 @@ static void
 query_free (Query *q)
 {
   g_assert (q->n_active == 0);
-  
+
   g_clear_object (&q->workspace);
   g_clear_pointer (&q->typed_text, g_free);
   g_clear_pointer (&q->results, g_ptr_array_unref);
@@ -99,7 +99,7 @@ ide_command_manager_provider_added_cb (IdeExtensionSetAdapter *set,
   g_debug ("Adding command provider %s", G_OBJECT_TYPE_NAME (exten));
 
   context = ide_object_ref_context (IDE_OBJECT (self));
-  workbench = _ide_workbench_from_context (context);
+  workbench = ide_workbench_from_context (context);
 
   ide_workbench_foreach_workspace (workbench,
                                    ide_command_manager_load_shortcuts_cb,
@@ -138,7 +138,7 @@ ide_command_manager_provider_removed_cb (IdeExtensionSetAdapter *set,
   g_debug ("Removing command provider %s", G_OBJECT_TYPE_NAME (exten));
 
   context = ide_object_ref_context (IDE_OBJECT (self));
-  workbench = _ide_workbench_from_context (context);
+  workbench = ide_workbench_from_context (context);
 
   ide_workbench_foreach_workspace (workbench,
                                    ide_command_manager_unload_shortcuts_cb,
diff --git a/src/libide/gui/ide-gui-private.h b/src/libide/gui/ide-gui-private.h
index 82c1f28a4..9fbe9be5e 100644
--- a/src/libide/gui/ide-gui-private.h
+++ b/src/libide/gui/ide-gui-private.h
@@ -103,7 +103,6 @@ void      _ide_workspace_set_context            (IdeWorkspace        *workspace,
                                                  IdeContext          *context);
 gboolean  _ide_workbench_is_last_workspace      (IdeWorkbench        *self,
                                                  IdeWorkspace        *workspace);
-IdeWorkbench *_ide_workbench_from_context       (IdeContext           *context);
 void      _ide_header_bar_init_shortcuts        (IdeHeaderBar        *self);
 void      _ide_header_bar_show_menu             (IdeHeaderBar        *self);
 void      _ide_gtk_progress_bar_start_pulsing   (GtkProgressBar      *progress);
diff --git a/src/libide/gui/ide-workbench.c b/src/libide/gui/ide-workbench.c
index 3002274c4..61c0981e6 100644
--- a/src/libide/gui/ide-workbench.c
+++ b/src/libide/gui/ide-workbench.c
@@ -185,10 +185,10 @@ ignore_error (GError *error)
  *
  * Returns: (transfer none) (nullable): an #IdeWorkbench or %NULL
  *
- * Since: 3.34
+ * Since: 3.40
  */
 IdeWorkbench *
-_ide_workbench_from_context (IdeContext *context)
+ide_workbench_from_context (IdeContext *context)
 {
   g_return_val_if_fail (IDE_IS_CONTEXT (context), NULL);
 
diff --git a/src/libide/gui/ide-workbench.h b/src/libide/gui/ide-workbench.h
index f27d3e0cf..3014a8ab0 100644
--- a/src/libide/gui/ide-workbench.h
+++ b/src/libide/gui/ide-workbench.h
@@ -39,6 +39,8 @@ G_BEGIN_DECLS
 IDE_AVAILABLE_IN_3_32
 G_DECLARE_FINAL_TYPE (IdeWorkbench, ide_workbench, IDE, WORKBENCH, GtkWindowGroup)
 
+IDE_AVAILABLE_IN_3_40
+IdeWorkbench    *ide_workbench_from_context          (IdeContext           *context);
 IDE_AVAILABLE_IN_3_32
 IdeWorkbench    *ide_workbench_new                   (void);
 IDE_AVAILABLE_IN_3_32
diff --git a/src/plugins/flatpak/gbp-flatpak-runtime-provider.c 
b/src/plugins/flatpak/gbp-flatpak-runtime-provider.c
index 9b96a9fe8..58b0e6855 100644
--- a/src/plugins/flatpak/gbp-flatpak-runtime-provider.c
+++ b/src/plugins/flatpak/gbp-flatpak-runtime-provider.c
@@ -788,7 +788,7 @@ gbp_flatpak_runtime_provider_bootstrap_async (IdeRuntimeProvider  *provider,
     }
 
   /* Create dialog to potentially query user if we are allowed to install */
-  workbench = _ide_workbench_from_context (context);
+  workbench = ide_workbench_from_context (context);
   workspace = ide_workbench_get_current_workspace (workbench);
   dialog = gbp_flatpak_install_dialog_new (GTK_WINDOW (workspace));
   gtk_window_group_add_window (GTK_WINDOW_GROUP (workbench), GTK_WINDOW (dialog));
diff --git a/src/plugins/rust-analyzer/rust-analyzer-service.c 
b/src/plugins/rust-analyzer/rust-analyzer-service.c
index e9253eb88..17f1dc0fd 100644
--- a/src/plugins/rust-analyzer/rust-analyzer-service.c
+++ b/src/plugins/rust-analyzer/rust-analyzer-service.c
@@ -32,7 +32,6 @@
 #include <libide-io.h>
 #include <libide-editor.h>
 #include <libide-gui.h>
-#include <ide-gui-private.h>
 #include "rust-analyzer-search-provider.h"
 
 struct _RustAnalyzerService
@@ -110,7 +109,7 @@ rust_analyzer_service_get_current_file (RustAnalyzerService *self)
   g_assert (RUST_IS_ANALYZER_SERVICE (self));
 
   context = ide_object_ref_context (IDE_OBJECT (self));
-  workbench = _ide_workbench_from_context (context);
+  workbench = ide_workbench_from_context (context);
   workspace = ide_workbench_get_current_workspace (workbench);
   surface = ide_workspace_get_surface_by_name (workspace, "editor");
   page = ide_editor_surface_get_active_page (IDE_EDITOR_SURFACE (surface));
diff --git a/src/plugins/shellcmd/gbp-shellcmd-command.c b/src/plugins/shellcmd/gbp-shellcmd-command.c
index 9815e7711..48700471e 100644
--- a/src/plugins/shellcmd/gbp-shellcmd-command.c
+++ b/src/plugins/shellcmd/gbp-shellcmd-command.c
@@ -294,7 +294,7 @@ gbp_shellcmd_command_class_init (GbpShellcmdCommandClass *klass)
                          "The title of the command for display purposes",
                          NULL,
                          (G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS));
-  
+
   g_object_class_install_properties (object_class, N_PROPS, properties);
 
   signals [CHANGED] =
@@ -443,7 +443,7 @@ gbp_shellcmd_command_run_host (GbpShellcmdCommand  *self,
   context = ide_object_ref_context (IDE_OBJECT (self));
   workdir = ide_context_ref_workdir (context);
 
-  if (!(workbench = _ide_workbench_from_context (context)) ||
+  if (!(workbench = ide_workbench_from_context (context)) ||
       (!(workspace = ide_workbench_get_workspace_by_type (workbench, IDE_TYPE_PRIMARY_WORKSPACE)) &&
        !(workspace = ide_workbench_get_workspace_by_type (workbench, IDE_TYPE_EDITOR_WORKSPACE)) &&
        !(workspace = ide_workbench_get_workspace_by_type (workbench, IDE_TYPE_TERMINAL_WORKSPACE))) ||
@@ -499,7 +499,7 @@ gbp_shellcmd_command_run_app (GbpShellcmdCommand  *self,
   context = ide_object_ref_context (IDE_OBJECT (self));
   workdir = ide_context_ref_workdir (context);
 
-  if (!(workbench = _ide_workbench_from_context (context)) ||
+  if (!(workbench = ide_workbench_from_context (context)) ||
       (!(workspace = ide_workbench_get_workspace_by_type (workbench, IDE_TYPE_PRIMARY_WORKSPACE)) &&
        !(workspace = ide_workbench_get_workspace_by_type (workbench, IDE_TYPE_EDITOR_WORKSPACE)) &&
        !(workspace = ide_workbench_get_workspace_by_type (workbench, IDE_TYPE_TERMINAL_WORKSPACE))) ||
@@ -566,7 +566,7 @@ gbp_shellcmd_command_run_runner (GbpShellcmdCommand  *self,
       return;
     }
 
-  if (!(workbench = _ide_workbench_from_context (context)) ||
+  if (!(workbench = ide_workbench_from_context (context)) ||
       (!(workspace = ide_workbench_get_workspace_by_type (workbench, IDE_TYPE_PRIMARY_WORKSPACE)) &&
        !(workspace = ide_workbench_get_workspace_by_type (workbench, IDE_TYPE_EDITOR_WORKSPACE)) &&
        !(workspace = ide_workbench_get_workspace_by_type (workbench, IDE_TYPE_TERMINAL_WORKSPACE))) ||
@@ -644,7 +644,7 @@ gbp_shellcmd_command_run_build (GbpShellcmdCommand  *self,
       return;
     }
 
-  if (!(workbench = _ide_workbench_from_context (context)) ||
+  if (!(workbench = ide_workbench_from_context (context)) ||
       (!(workspace = ide_workbench_get_workspace_by_type (workbench, IDE_TYPE_PRIMARY_WORKSPACE)) &&
        !(workspace = ide_workbench_get_workspace_by_type (workbench, IDE_TYPE_EDITOR_WORKSPACE)) &&
        !(workspace = ide_workbench_get_workspace_by_type (workbench, IDE_TYPE_TERMINAL_WORKSPACE))) ||