Issue MoonchildProductions/UXP#1578 - Add global menubar support for GTK

mail/base/content/mailCore.js

@@ -297,6 +297,11 @@ function onViewToolbarsPopupShowing(aEvent, toolboxIds, aInsertPoint)
       let toolbarName = toolbar.getAttribute("toolbarname");
       if (toolbarName) {
         if (toolbar.id == "mail-toolbar-menubar2") {
+#ifdef MOZ_WIDGET_GTK
+          if (document.documentElement.getAttribute("shellshowingmenubar") == "true") {
+            continue;
+          }
+#endif
           if (!mailToolbarMenubar) {
             mailToolbarMenubar = true;
           }

mail/base/jar.mn

@@ -38,7 +38,7 @@ messenger.jar:
 *   content/messenger/msgMail3PaneWindow.js         (content/msgMail3PaneWindow.js)
     content/messenger/mail3PaneWindowCommands.js    (content/mail3PaneWindowCommands.js)
     content/messenger/mailCommands.js               (content/mailCommands.js)
-    content/messenger/mailCore.js                   (content/mailCore.js)
+*   content/messenger/mailCore.js                   (content/mailCore.js)
     content/messenger/customizeToolbarOverlay.xul   (content/customizeToolbarOverlay.xul)
     content/messenger/mailTabs.js                   (content/mailTabs.js)
     content/messenger/commandglue.js                (content/commandglue.js)

navigator/comm/content/utilityOverlay.js

@@ -350,6 +350,11 @@ function onViewToolbarsPopupShowing(aEvent, aInsertPoint)
                                       function(toolbar) {
                                         return toolbar.hasAttribute("toolbarname")});
   var toolbars = Array.slice(toolbox.getElementsByAttribute("toolbarname", "*"));
+#ifdef MOZ_WIDGET_GTK
+  if (document.documentElement.getAttribute("shellshowingmenubar") == "true") {
+    toolbars = toolbars.filter(bar => bar.id !== "toolbar-menubar");
+  }
+#endif
   toolbars = toolbars.concat(externalToolbars);
   var menusep = document.getElementById("toolbarmode-sep");
 

navigator/comm/jar.mn

@@ -40,7 +40,7 @@ comm.jar:
   content/communicator/sanitize.xul                                (content/sanitize.xul)  
   content/communicator/tasksOverlay.js                             (content/tasksOverlay.js)
   content/communicator/tasksOverlay.xul                            (content/tasksOverlay.xul)
-  content/communicator/utilityOverlay.js                           (content/utilityOverlay.js)
+* content/communicator/utilityOverlay.js                           (content/utilityOverlay.js)
   content/communicator/utilityOverlay.xul                          (content/utilityOverlay.xul)
   content/communicator/viewSourceOverlay.js                        (content/viewSourceOverlay.js)
   content/communicator/viewSourceOverlay.xul                       (content/viewSourceOverlay.xul)

navigator/components/bookmarks/content/bookmarksManager.xul

@@ -125,7 +125,12 @@
     <toolbar id="placesToolbar"
              class="chromeclass-toolbar"
              align="center">
+#ifdef MOZ_WIDGET_GTK
+      <menubar id="placesMenu" 
+             _moz-menubarkeeplocal="true">
+#else
       <menubar id="placesMenu">
+#endif
         <menu id="menu_File">
           <menupopup id="menu_FilePopup">
             <menuitem id="newbookmark"

navigator/components/bookmarks/jar.mn

@@ -11,7 +11,7 @@ comm.jar:
   content/communicator/bookmarks/bm-props.xul                      (content/bm-props.xul)
   content/communicator/bookmarks/bookmarksManager.css              (content/bookmarksManager.css)
   content/communicator/bookmarks/bookmarksManager.js               (content/bookmarksManager.js)
-  content/communicator/bookmarks/bookmarksManager.xul              (content/bookmarksManager.xul)
+* content/communicator/bookmarks/bookmarksManager.xul              (content/bookmarksManager.xul)
   content/communicator/bookmarks/browser-places.js                 (content/browser-places.js)
   content/communicator/bookmarks/editBookmarkOverlay.js            (content/editBookmarkOverlay.js)
   content/communicator/bookmarks/editBookmarkOverlay.xul           (content/editBookmarkOverlay.xul)

navigator/components/history/content/history.xul

@@ -68,6 +68,9 @@
     <toolbar id="placesToolbar"
              type="menubar">
       <menubar id="history-menu"
+#ifdef MOZ_WIDGET_GTK
+               _moz-menubarkeeplocal="true"
+#endif
                grippytooltiptext="&menuBar.tooltip;">
 
         <menu id="menu_File">

navigator/components/history/jar.mn

@@ -6,7 +6,7 @@
 comm.jar:
   content/communicator/history/controller.js                       (content/controller.js)
   content/communicator/history/history.js                          (content/history.js)
-  content/communicator/history/history.xul                         (content/history.xul)
+* content/communicator/history/history.xul                         (content/history.xul)
   content/communicator/history/history-panel.xul                   (content/history-panel.xul)
   content/communicator/history/places.css                          (content/places.css)
   content/communicator/history/placesOverlay.xul                   (content/placesOverlay.xul)