Rest of the fix for 42318 (r=ben, see previous checkin)

xpfe/communicator/resources/content/utilityOverlay.xul

@@ -11,18 +11,12 @@
   <script language="javascript" src="chrome://global/content/builtinURLs.js"></script>
          
   <!-- online/offline status indicators -->
-  <broadcasterset id="broadcasterset">
+  <broadcasterset id="broadcasterset">  	
-  	<broadcaster id="Communicator:Synchronize" value="&offlineSynchronizeCmd.label;" disabled="true" />
 	  <broadcaster id="Communicator:WorkMode" value="&offlineGoOfflineCmd.label;" oncommand="setOfflineStatus(true);"/>
   </broadcasterset>
   <statusbarpanel id="offline-status" tooltip="aTooltip" observes="Communicator:WorkMode"/>
-  <menu id="offlineMenu" value="&offlineMenu.label;" accesskey="&offlineMenu.accesskey;">
+  <menuitem id="offlineGoOfflineCmd" accesskey="&offlineGoOfflineCmd.accesskey;" observes="Communicator:WorkMode"/>
-    <menupopup id="offlineMenuPopup">
+
-      <menuitem position="1" accesskey="&offlineGoOfflineCmd.accesskey;" observes="Communicator:WorkMode"/>
-      <menuseparator position="2"/>
-      <menuitem position="3" accesskey="&offlineSynchronizeCmd.accesskey;" observes="Communicator:Synchronize"/>
-    </menupopup>
-  </menu>
 
 
 	<!-- File Menu -->

xpfe/communicator/resources/locale/en-US/utilityOverlay.dtd

@@ -1,11 +1,7 @@
 
 <!-- these things need to move into utilityOverlay.xul -->
-<!ENTITY  offlineMenu.label                         "Offline">
-<!ENTITY  offlineMenu.accesskey                     "f">
 <!ENTITY  offlineGoOfflineCmd.label                 "Work Offline">
 <!ENTITY  offlineGoOfflineCmd.accesskey             "w">
-<!ENTITY  offlineSynchronizeCmd.label               "Synchronize">
-<!ENTITY  offlineSynchronizeCmd.accesskey           "s">
 
 <!-- LOCALIZATION NOTE : FILE This file contains the global menu items -->