[gnome-builder/wip/gtk4-port] plugins/buildui: tweak logging/debugger menus

[Christian Hergert <chergert src gnome org>]

commit 71ae59810b7758f7923d81d16ac2c668894366e0
Author: Christian Hergert <chergert redhat com>
Date:   Mon May 16 22:54:30 2022 -0700

    plugins/buildui: tweak logging/debugger menus
    
    Better to keep these separated so we can introduce additional menus that
    are more specific to observation tools.

 src/plugins/buildui/gtk/menus.ui    | 16 ++++++----------
 src/plugins/debuggerui/gtk/menus.ui | 30 ++++++++++++++++--------------
 2 files changed, 22 insertions(+), 24 deletions(-)
---
diff --git a/src/plugins/buildui/gtk/menus.ui b/src/plugins/buildui/gtk/menus.ui
index 807f97b70..bf951ded1 100644
--- a/src/plugins/buildui/gtk/menus.ui
+++ b/src/plugins/buildui/gtk/menus.ui
@@ -157,16 +157,12 @@
           <attribute name="target" type="s">'rtl'</attribute>
         </item>
       </submenu>
-      <submenu id="run-menu-logging-submenu">
-        <attribute name="label" translatable="yes">Logging</attribute>
-        <section id="run-menu-logging-section">
-          <item>
-            <attribute name="label" translatable="yes">Verbose Log Output</attribute>
-            <attribute name="action">run-manager.messages-debug-all</attribute>
-            <attribute name="role">check</attribute>
-          </item>
-        </section>
-      </submenu>
+      <item>
+        <attribute name="id">run-menu-verbose-logging</attribute>
+        <attribute name="label" translatable="yes">Verbose Logging</attribute>
+        <attribute name="action">run-manager.messages-debug-all</attribute>
+        <attribute name="role">check</attribute>
+      </item>
     </section>
   </menu>
 </interface>
diff --git a/src/plugins/debuggerui/gtk/menus.ui b/src/plugins/debuggerui/gtk/menus.ui
index 6b4e6b6a9..0da26d0b0 100644
--- a/src/plugins/debuggerui/gtk/menus.ui
+++ b/src/plugins/debuggerui/gtk/menus.ui
@@ -13,20 +13,22 @@
       </item>
     </section>
   </menu>
-  <menu id="run-menu-logging-submenu">
-    <section id="run-menu-logging-debug-section">
-      <attribute name="after">run-menu-logging-section</attribute>
-      <attribute name="label" translatable="yes">Debugger</attribute>
-      <item>
-        <attribute name="label" translatable="yes">Stop at Warnings</attribute>
-        <attribute name="action">debug-manager.stop-at-warnings</attribute>
-        <attribute name="role">check</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Stop at Criticals</attribute>
-        <attribute name="action">debug-manager.stop-at-criticals</attribute>
-        <attribute name="role">check</attribute>
-      </item>
+  <menu id="run-menu">
+    <section id="run-menu-settings-section">
+      <submenu id="run-menu-debugger-submenu">
+        <attribute name="before">run-menu-verbose-logging</attribute>
+        <attribute name="label" translatable="yes">Debugger</attribute>
+        <item>
+          <attribute name="label" translatable="yes">Stop at Warnings</attribute>
+          <attribute name="action">debug-manager.stop-at-warnings</attribute>
+          <attribute name="role">check</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Stop at Criticals</attribute>
+          <attribute name="action">debug-manager.stop-at-criticals</attribute>
+          <attribute name="role">check</attribute>
+        </item>
+      </submenu>
     </section>
   </menu>
   <menu id="project-tree-menu">