[gnome-builder] menus: move D-Bus Inspector to the workspace menu

[Christian Hergert <chergert src gnome org>]

commit d1b761766a7c0b3d5c25c17478e790700a972a5f
Author: Christian Hergert <chergert redhat com>
Date:   Fri Apr 26 14:07:16 2019 -0700

    menus: move D-Bus Inspector to the workspace menu
    
    We probably want "tools" in general here.

 src/plugins/dspy/gtk/menus.ui   | 18 ++++++------------
 src/plugins/editor/gtk/menus.ui |  1 +
 2 files changed, 7 insertions(+), 12 deletions(-)
---
diff --git a/src/plugins/dspy/gtk/menus.ui b/src/plugins/dspy/gtk/menus.ui
index 182b2938e..e82667e8a 100644
--- a/src/plugins/dspy/gtk/menus.ui
+++ b/src/plugins/dspy/gtk/menus.ui
@@ -1,24 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <menu id="ide-primary-workspace-surfaces-menu">
-    <section id="ide-primary-workspace-surfaces-menu-utils-section">
+  <menu id="ide-primary-workspace-menu">
+    <section id="ide-primary-workspace-menu-placeholder2">
       <item>
-        <attribute name="id">surface-menu-dspy</attribute>
-        <attribute name="label" translatable="yes">D-Bus Inspector</attribute>
-        <attribute name="role">normal</attribute>
+        <attribute name="label" translatable="yes">D-Bus Inspector…</attribute>
         <attribute name="action">app.dspy</attribute>
-        <attribute name="verb-icon-name">org.gnome.dfeet-symbolic</attribute>
       </item>
     </section>
   </menu>
-  <menu id="ide-editor-workspace-surfaces-menu">
-    <section id="ide-editor-workspace-surfaces-menu-utils-section">
+  <menu id="ide-editor-workspace-menu">
+    <section id="ide-editor-workspace-menu-placeholder2">
       <item>
-        <attribute name="id">surface-menu-dspy</attribute>
-        <attribute name="label" translatable="yes">D-Bus Inspector</attribute>
-        <attribute name="role">normal</attribute>
+        <attribute name="label" translatable="yes">D-Bus Inspector…</attribute>
         <attribute name="action">app.dspy</attribute>
-        <attribute name="verb-icon-name">org.gnome.dfeet-symbolic</attribute>
       </item>
     </section>
   </menu>
diff --git a/src/plugins/editor/gtk/menus.ui b/src/plugins/editor/gtk/menus.ui
index 31d92e46d..c7bfa4710 100644
--- a/src/plugins/editor/gtk/menus.ui
+++ b/src/plugins/editor/gtk/menus.ui
@@ -18,6 +18,7 @@
         <attribute name="action">win.new-editor-workspace</attribute>
       </item>
     </section>
+    <section id="ide-editor-workspace-menu-placeholder2"/>
     <section id="ide-editor-workspace-menu-open-section">
       <item>
         <attribute name="id">ide-editor-workspace-menu-open</attribute>