commit 769f1b2d897db0ac9ed8a9ed0f9e40c9eedf51a2 Author: Sukhbir Singh sukhbir@torproject.org Date: Sat Mar 19 07:53:54 2016 -0400

Rebase trac-17896.patch --- projects/instantbird/trac-17896.patch | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/projects/instantbird/trac-17896.patch b/projects/instantbird/trac-17896.patch index 41781e1..ebef6e4 100644 --- a/projects/instantbird/trac-17896.patch +++ b/projects/instantbird/trac-17896.patch @@ -11,12 +11,7 @@ Adding an edit menu also enables the emoji panel and dictation. diff --git a/im/content/instantbird.xul b/im/content/instantbird.xul --- a/im/content/instantbird.xul +++ b/im/content/instantbird.xul -@@ -43,17 +43,38 @@ - #else - <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/> - #endif - <script type="application/javascript" src="chrome://global/content/viewZoomOverlay.js"/> - <script type="application/javascript" src="chrome://instantbird/content/convZoom.js"/> +@@ -48,7 +48,28 @@ <script type="application/javascript" src="chrome://instantbird/content/nsContextMenu.js"/>

#ifdef XP_MACOSX @@ -46,20 +41,10 @@ diff --git a/im/content/instantbird.xul b/im/content/instantbird.xul #endif

<commandset id="conversationsCommands"> - <command id="cmd_newtab" oncommand="Conversations.showNewTab()"/> - <command id="cmd_close" oncommand="getTabBrowser().removeCurrentTab()"/> - <command id="cmd_putOnHold" - oncommand="var tabbrowser = getTabBrowser(); - if (!tabbrowser.selectedConversation) return; diff --git a/im/content/menus.xul b/im/content/menus.xul --- a/im/content/menus.xul +++ b/im/content/menus.xul -@@ -38,17 +38,17 @@ - <key id="key_quitApplication" key="&quitApplicationCmdMac.key;" command="cmd_quitApplication" modifiers="accel"/> - <key id="joinChatkey" key="&joinChat.commandkey;" command="cmd_joinchat" modifiers="accel"/> - <key id="addBuddykey" key="&addContact.commandkey;" command="cmd_addbuddy" modifiers="accel"/> - <key id="newtabkey" key="&newtab.commandkey;" command="cmd_newtab" modifiers="accel"/> - <key id="addonskey" key="&addonManager.commandkey;" command="cmd_addons" modifiers="accel"/> +@@ -43,7 +43,7 @@ </keyset>

<menubar id="blistMenubar"> @@ -68,16 +53,10 @@ diff --git a/im/content/menus.xul b/im/content/menus.xul <menupopup id="fileMenuPopup" onpopupshowing="menus.updateFileMenuitems();"> <menuitem id="addBuddyMenuItem" label="&addContact;" command="cmd_addbuddy" key="addBuddykey" accesskey="&addContact.accesskey;"/> <menuitem id="newTabMenuItem" label="&newtab;" command="cmd_newtab" key="newtabkey" accesskey="&newtab.accesskey;"/> - <menuitem id="joinChatMenuItem" label="&joinChat;" command="cmd_joinchat" key="joinChatkey" accesskey="&joinChat.accesskey;"/> - <menuseparator/> - <menu id="setStatusTo" label="&setStatusTo;" oncommand="menus.setStatus(event);" accesskey="&setStatusTo.accesskey;" > - <menupopup id="setStatusMenupopup"> <!-- has onpopupshowing on mac --> - <menuitem id="statusAvailable" status="available" label="&available;" accesskey="&available.accesskey;" class="menuitem-iconic"/> diff --git a/im/content/menus.xul.inc b/im/content/menus.xul.inc --- a/im/content/menus.xul.inc +++ b/im/content/menus.xul.inc -@@ -1,8 +1,10 @@ - # This Source Code Form is subject to the terms of the Mozilla Public +@@ -2,6 +2,8 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/.

@@ -86,4 +65,3 @@ diff --git a/im/content/menus.xul.inc b/im/content/menus.xul.inc <commandset id="maincommandset"/> <keyset id="mainkeyset"/> <menubar id="blistMenubar"/> - <popupset id="mainPopupSet"/>