[gnome-builder/wip/gtk4-port: 55/67] gui: move IdeMenuManager to libide-gui

[Christian Hergert <chergert src gnome org>]

commit a5794c930d39adfd85429526458ceedb21c7148d
Author: Christian Hergert <chergert redhat com>
Date:   Fri Sep 24 14:16:21 2021 -0700

    gui: move IdeMenuManager to libide-gui
    
    We actually need GTK access here for GtkBuildable, so just keep it in
    libide-gui.

 src/libide/core/libide-core.h               | 1 -
 src/libide/core/meson.build                 | 2 --
 src/libide/gui/ide-application-private.h    | 2 +-
 src/libide/{core => gui}/ide-menu-manager.c | 7 ++++---
 src/libide/{core => gui}/ide-menu-manager.h | 0
 src/libide/gui/libide-gui.h                 | 1 +
 src/libide/gui/meson.build                  | 2 ++
 7 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/src/libide/core/libide-core.h b/src/libide/core/libide-core.h
index d83ab32df..da92b41a0 100644
--- a/src/libide/core/libide-core.h
+++ b/src/libide/core/libide-core.h
@@ -31,7 +31,6 @@
 #include "ide-global.h"
 #include "ide-log.h"
 #include "ide-macros.h"
-#include "ide-menu-manager.h"
 #include "ide-notification.h"
 #include "ide-notifications.h"
 #include "ide-object.h"
diff --git a/src/libide/core/meson.build b/src/libide/core/meson.build
index 681cdfe89..32031963a 100644
--- a/src/libide/core/meson.build
+++ b/src/libide/core/meson.build
@@ -58,7 +58,6 @@ libide_core_public_headers = [
   'ide-global.h',
   'ide-log.h',
   'ide-macros.h',
-  'ide-menu-manager.h',
   'ide-notification.h',
   'ide-notifications.h',
   'ide-object.h',
@@ -87,7 +86,6 @@ libide_core_public_sources = [
   'ide-context-addin.c',
   'ide-global.c',
   'ide-log.c',
-  'ide-menu-manager.c',
   'ide-notification.c',
   'ide-notifications.c',
   'ide-object.c',
diff --git a/src/libide/gui/ide-application-private.h b/src/libide/gui/ide-application-private.h
index 0b0f51282..defd7f18d 100644
--- a/src/libide/gui/ide-application-private.h
+++ b/src/libide/gui/ide-application-private.h
@@ -26,7 +26,7 @@
 
 #include "ide-application.h"
 #include "ide-keybindings.h"
-#include "ide-worker-manager.h"
+#include "ide-menu-manager.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/libide/core/ide-menu-manager.c b/src/libide/gui/ide-menu-manager.c
similarity index 99%
rename from src/libide/core/ide-menu-manager.c
rename to src/libide/gui/ide-menu-manager.c
index 89238121e..6c52342e4 100644
--- a/src/libide/core/ide-menu-manager.c
+++ b/src/libide/gui/ide-menu-manager.c
@@ -20,10 +20,11 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
 #include <string.h>
 
-#include "menus/ide-menu-manager.h"
-#include "util/ide-util-private.h"
+#include "ide-macros.h"
+#include "ide-menu-manager.h"
 
 struct _IdeMenuManager
 {
@@ -37,7 +38,7 @@ G_DEFINE_TYPE (IdeMenuManager, ide_menu_manager, G_TYPE_OBJECT)
 
 #define IDE_MENU_ATTRIBUTE_BEFORE   "before"
 #define IDE_MENU_ATTRIBUTE_AFTER    "after"
-#define IDE_MENU_ATTRIBUTE_MERGE_ID "dazzle-merge-id"
+#define IDE_MENU_ATTRIBUTE_MERGE_ID "ide-merge-id"
 
 /**
  * IdeMenuManager:
diff --git a/src/libide/core/ide-menu-manager.h b/src/libide/gui/ide-menu-manager.h
similarity index 100%
rename from src/libide/core/ide-menu-manager.h
rename to src/libide/gui/ide-menu-manager.h
diff --git a/src/libide/gui/libide-gui.h b/src/libide/gui/libide-gui.h
index 47baf66ea..e3a7f1408 100644
--- a/src/libide/gui/libide-gui.h
+++ b/src/libide/gui/libide-gui.h
@@ -47,6 +47,7 @@
 #include "ide-gui-global.h"
 #include "ide-header-bar.h"
 #include "ide-marked-view.h"
+#include "ide-menu-manager.h"
 #include "ide-notifications-button.h"
 #include "ide-omni-bar-addin.h"
 #include "ide-omni-bar.h"
diff --git a/src/libide/gui/meson.build b/src/libide/gui/meson.build
index 8b0195d59..0bbebc800 100644
--- a/src/libide/gui/meson.build
+++ b/src/libide/gui/meson.build
@@ -26,6 +26,7 @@ libide_gui_public_headers = [
   'ide-gui-global.h',
   'ide-header-bar.h',
   'ide-marked-view.h',
+  'ide-menu-manager.h',
   'ide-notifications-button.h',
   'ide-omni-bar-addin.h',
   'ide-omni-bar.h',
@@ -128,6 +129,7 @@ libide_gui_public_sources = [
   'ide-gui-global.c',
   'ide-header-bar.c',
   'ide-marked-view.c',
+  'ide-menu-manager.c',
   'ide-notifications-button.c',
   'ide-omni-bar-addin.c',
   'ide-omni-bar.c',