First pass remove chat integration

custom-2020
Matt A. Tobin 4 years ago committed by Roy Tam
parent 525762850d
commit 1915dde65c
  1. 5
      mail/app.mozbuild
  2. 7
      mail/app/profile/all-thunderbird.js
  3. 20
      mail/base/content/mail3PaneWindowCommands.js
  4. 30
      mail/base/content/mailCore.js
  5. 79
      mail/base/content/mailWindowOverlay.xul
  6. 24
      mail/base/content/msgHdrViewOverlay.js
  7. 1
      mail/components/moz.build
  8. 6
      mailnews/base/prefs/content/AccountManager.js
  9. 5
      mailnews/base/prefs/content/AccountManager.xul

@ -17,7 +17,4 @@ DIRS += ['/%s' % CONFIG['MOZ_BRANDING_DIRECTORY']]
if CONFIG['MOZ_COMPOSER']:
DIRS += ['/editor/ui']
DIRS += [
'/chat',
'/mail',
]
DIRS += ['/mail']

@ -84,12 +84,12 @@ pref("app.update.certs.2.issuerName", "CN=thawte SSL CA - G2,O=\"thawte, Inc.\",
pref("app.update.certs.2.commonName", "aus5.mozilla.org");
// Whether or not app updates are enabled
pref("app.update.enabled", true);
pref("app.update.enabled", false);
// If set to true, the Update Service will automatically download updates when
// app updates are enabled per the app.update.enabled preference and if the user
// can apply updates.
pref("app.update.auto", true);
pref("app.update.auto", false);
// If set to true, the Update Service will present no UI for any event.
pref("app.update.silent", false);
@ -99,7 +99,8 @@ pref("app.update.silent", false);
pref("app.update.staging.enabled", true);
// Update service URL:
pref("app.update.url", "https://aus5.mozilla.org/update/6/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%SYSTEM_CAPABILITIES%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml");
//pref("app.update.url", "https://aus5.mozilla.org/update/6/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%SYSTEM_CAPABILITIES%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml");
pref("app.update.url", "https://aus5.mozilla.org/update/6/");
// URL user can browse to manually if for some reason all update installation
// attempts fail.

@ -244,7 +244,6 @@ var DefaultController =
case "cmd_viewAllHeader":
case "cmd_viewNormalHeader":
case "cmd_stop":
case "cmd_chat":
case "cmd_watchThread":
case "cmd_killThread":
case "cmd_killSubthread":
@ -258,10 +257,6 @@ var DefaultController =
return !!gFolderTreeController;
case "cmd_goFolder":
return !!gFolderTreeView;
case "cmd_joinChat":
case "cmd_addChatBuddy":
case "cmd_chatStatus":
return !!chatHandler;
default:
return false;
@ -578,17 +573,11 @@ var DefaultController =
if (document.getElementById("tabmail").selectedTab.mode.name == "message")
return true;
return IsFolderSelected() && !IsMessagePaneCollapsed();
case "cmd_chat":
return true;
case "cmd_newFolder":
case "cmd_newVirtualFolder":
return !!gFolderTreeController;
case "cmd_goFolder":
return !!gFolderTreeView;
case "cmd_joinChat":
case "cmd_addChatBuddy":
case "cmd_chatStatus":
return !!chatHandler;
default:
return false;
@ -997,21 +986,12 @@ var DefaultController =
case "cmd_fullZoomToggle":
ZoomManager.toggleZoom();
break;
case "cmd_chat":
showChatTab();
break;
case "cmd_newFolder":
gFolderTreeController.newFolder();
break;
case "cmd_newVirtualFolder":
gFolderTreeController.newVirtualFolder();
break;
case "cmd_joinChat":
chatHandler.joinChat();
break;
case "cmd_addChatBuddy":
chatHandler.addBuddy();
break;
}
},

@ -482,36 +482,14 @@ function openActivityMgr()
function openIMAccountMgr()
{
var win = Services.wm.getMostRecentWindow("Messenger:Accounts");
if (win)
win.focus();
else {
win = Services.ww.openWindow(null,
"chrome://messenger/content/chat/imAccounts.xul",
"Accounts", "chrome,resizable,centerscreen",
null);
}
return win;
// XXXTobin: Remove consumers
return;
}
function openIMAccountWizard()
{
const kFeatures = "chrome,centerscreen,modal,titlebar";
const kUrl = "chrome://messenger/content/chat/imAccountWizard.xul";
const kName = "IMAccountWizard";
if (AppConstants.platform == "macosx") {
// On Mac, avoid using the hidden window as a parent as that would
// make it visible.
let hiddenWindowUrl =
Services.prefs.getCharPref("browser.hiddenWindowChromeURL");
if (window.location.href == hiddenWindowUrl) {
Services.ww.openWindow(null, kUrl, kName, kFeatures, null);
return;
}
}
window.openDialog(kUrl, kName, kFeatures);
// XXXTobin: Remove consumers
return;
}
function openSavedFilesWnd()

@ -231,7 +231,6 @@
<command id="cmd_goForward" oncommand="goDoCommand('cmd_goForward')" disabled="true"/>
<command id="cmd_goBack" oncommand="goDoCommand('cmd_goBack')" disabled="true"/>
<command id="cmd_goFolder" oncommand="gFolderTreeView.selectFolder(event.target._folder, true);" disabled="true"/>
<command id="cmd_chat" oncommand="goDoCommand('cmd_chat')" disabled="true"/>
</commandset>
<commandset id="mailMessageMenuItems"
@ -286,7 +285,6 @@
<command id="button_junk"/>
<command id="button_showconversation"/>
<command id="button_compact"/>
<command id="cmd_chat"/>
</commandset>
<commandset id="mailGetMsgMenuItems"
@ -344,9 +342,6 @@
valueMessageAccessKey="&filtersApplyToMessage.accesskey;"/>
<command id="cmd_runJunkControls" oncommand="goDoCommand('cmd_runJunkControls');" disabled="true"/>
<command id="cmd_deleteJunk" oncommand="goDoCommand('cmd_deleteJunk');" disabled="true"/>
<command id="cmd_joinChat" oncommand="goDoCommand('cmd_joinChat');" disabled="true"/>
<command id="cmd_chatStatus" oncommand="chatHandler.setStatusMenupopupCommand(event);" disabled="true"/>
<command id="cmd_addChatBuddy" oncommand="goDoCommand('cmd_addChatBuddy');" disabled="true"/>
</commandset>
#ifdef XP_MACOSX
@ -418,7 +413,6 @@
<key id="key_archive" key="&archiveMsgCmd.key;" oncommand="goDoCommand('cmd_archive')"/>
<key id="key_goForward" key="&goForwardCmd.commandKey;" oncommand="goDoCommand('cmd_goForward')"/>
<key id="key_goBack" key="&goBackCmd.commandKey;" oncommand="goDoCommand('cmd_goBack')"/>
<key id="key_goChat" key="&goChatCmd.key;" oncommand="goDoCommand('cmd_chat')" modifiers="accel,shift"/>
<key id="key_goStartPage" keycode="VK_HOME" oncommand="goDoCommand('cmd_goStartPage')" modifiers="alt"/>
<key id="key_undoCloseTab" key="&undoCloseTabCmd.commandkey;" oncommand="goDoCommand('cmd_undoCloseTab')" modifiers="accel, shift"/>
<key id="key_reply" key="&replyMsgCmd.key;" oncommand="goDoCommand('cmd_reply')" modifiers="accel"/>
@ -1089,9 +1083,6 @@
<menuitem id="appmenu_newMailAccountMenuItem"
label="&newExistingEmailAccountCmd.label;"
oncommand="NewMailAccount(msgWindow);"/>
<menuitem id="appmenu_newIMAccountMenuItem"
label="&newIMAccountCmd.label;"
oncommand="openIMAccountWizard();"/>
<menuitem id="appmenu_newFeedAccountMenuItem"
label="&newFeedAccountCmd.label;"
accesskey="&newFeedAccountCmd.accesskey;"
@ -1103,9 +1094,6 @@
<menuitem id="appmenu_newCard"
label="&appmenuNewContactCmd.label;"
command="cmd_newCard"/>
<menuitem id="appmenu_newIMContactMenuItem"
label="&newIMContactCmd.label;"
command="cmd_addChatBuddy"/>
</menupopup>
</splitmenu>
<menu id="appmenu_msgAttachmentMenu"
@ -1850,11 +1838,6 @@
key="key_goBack"
command="cmd_goBack"/>
<menuseparator id="appmenu_goNextSeparator"/>
<menuitem id="appmenu_goChat"
label="&goChatCmd.label;"
key="key_goChat"
command="cmd_chat"/>
<menuseparator id="appmenu_goChatSeparator"/>
<menu id="appmenu_goFolderMenu"
label="&folderMenu.label;"
command="cmd_goFolder">
@ -2089,32 +2072,6 @@
label="&savedFiles.label;"
key="key_savedFiles"
oncommand="openSavedFilesWnd();"/>
<menu id="appmenu_imAccountsStatus"
label="&imAccountsStatus.label;"
command="cmd_chatStatus">
<menupopup id="appmenu_imStatusMenupopup">
<menuitem id="appmenu_imStatusAvailable"
status="available"
label="&imStatus.available;"
class="menuitem-iconic"/>
<menuitem id="appmenu_imStatusUnavailable"
status="unavailable"
label="&imStatus.unavailable;"
class="menuitem-iconic"/>
<menuseparator id="appmenu_imStatusOfflineSeparator"/>
<menuitem id="appmenu_imStatusOffline"
status="offline"
label="&imStatus.offline;"
class="menuitem-iconic"/>
<menuseparator id="appmenu_imStatusShowAccountsSeparator"/>
<menuitem id="appmenu_imStatusShowAccounts"
label="&imStatus.showAccounts;"/>
</menupopup>
</menu>
<menuitem id="appmenu_joinChatMenuItem"
label="&joinChatCmd.label;"
command="cmd_joinChat"/>
<menuseparator id="appmenu_afterChatSeparator"/>
<menuitem id="appmenu_runJunkControls"
label="&runJunkControls.label;"
command="cmd_runJunkControls"/>
@ -2297,10 +2254,6 @@
label="&newExistingEmailAccountCmd.label;"
accesskey="&newExistingEmailAccountCmd.accesskey;"
oncommand="NewMailAccount(msgWindow);"/>
<menuitem id="newIMAccountMenuItem"
label="&newIMAccountCmd.label;"
accesskey="&newIMAccountCmd.accesskey;"
oncommand="openIMAccountWizard();"/>
<menuitem id="newFeedAccountMenuItem"
label="&newFeedAccountCmd.label;"
accesskey="&newFeedAccountCmd.accesskey;"
@ -2311,10 +2264,6 @@
oncommand="MsgAccountWizard();"/>
<menuseparator id="newPopupMenuSeparator"/>
<menuitem id="menu_newCard"/>
<menuitem id="newIMContactMenuItem"
label="&newIMContactCmd.label;"
accesskey="&newIMContactCmd.accesskey;"
command="cmd_addChatBuddy"/>
</menupopup>
</menu>
<menuitem id="openMessageFileMenuitem" label="&openMessageFileCmd.label;"
@ -2738,11 +2687,6 @@
accesskey="&goBackCmd.accesskey;" command="cmd_goBack"
key="key_goBack"/>
<menuseparator id="goNextSeparator"/>
<menuitem id="menu_goChat" label="&goChatCmd.label;"
accesskey="&goChatCmd.accesskey;"
command="cmd_chat"
key="key_goChat"/>
<menuseparator id="goChatSeparator"/>
<menu id="goFolderMenu"
label="&folderMenu.label;"
accesskey="&folderMenu.accesskey;"
@ -2994,23 +2938,6 @@
<menuitem id="activityManager" label="&activitymanager.label;"
accesskey="&activitymanager.accesskey;"
oncommand="openActivityMgr();"/>
<menu id="imAccountsStatus" label="&imAccountsStatus.label;"
accesskey="&imAccountsStatus.accesskey;"
command="cmd_chatStatus">
<menupopup id="imStatusMenupopup">
<menuitem id="imStatusAvailable" status="available" label="&imStatus.available;" class="menuitem-iconic"/>
<menuitem id="imStatusUnavailable" status="unavailable" label="&imStatus.unavailable;" class="menuitem-iconic"/>
<menuseparator id="imStatusOfflineSeparator"/>
<menuitem id="imStatusOffline" status="offline" label="&imStatus.offline;" class="menuitem-iconic"/>
<menuseparator id="imStatusShowAccountsSeparator"/>
<menuitem id="imStatusShowAccounts" label="&imStatus.showAccounts;"/>
</menupopup>
</menu>
<menuitem id="joinChatMenuItem"
label="&joinChatCmd.label;"
accesskey="&joinChatCmd.accesskey;"
command="cmd_joinChat"/>
<menuseparator id="devToolsSeparator"/>
<menuitem id="filtersCmd" label="&filtersCmd2.label;"
accesskey="&filtersCmd2.accesskey;"
@ -3400,12 +3327,6 @@
label="&addressBookButton.label;"
oncommand="toAddressBook();"
tooltiptext="&addressBookButton.tooltip;"/>
<toolbarbutton id="button-chat"
class="toolbarbutton-1"
label="&chatButton.label;"
command="cmd_chat"
observes="cmd_chat"
tooltiptext="&chatButton.tooltip;"/>
<toolbaritem id="throbber-box" title="&throbberItem.title;" align="center" pack="center"
mousethrough="always">
<image/>

@ -12,8 +12,6 @@ Components.utils.import("resource://gre/modules/Services.jsm");
Components.utils.import("resource:///modules/displayNameUtils.js");
Components.utils.import("resource:///modules/mailServices.js");
Components.utils.import("resource:///modules/gloda/utils.js");
var {Status: statusUtils} =
Components.utils.import("resource:///modules/imStatusUtils.jsm");
////////////////////////////////////////////////////////////////////////////////////
// Warning: It's critical that the code in here for displaying the message
@ -1360,26 +1358,8 @@ function UpdateEmailNodeDetails(aEmailAddress, aDocumentNode, aCardDetails) {
}
function UpdateEmailPresenceDetails(aDocumentNode, aChatContact) {
if (!aChatContact) {
aDocumentNode.removeAttribute("chatStatus");
aDocumentNode.removeAttribute("presenceTooltip");
return;
}
let statusType = aChatContact.statusType;
if (statusType < Ci.imIStatusInfo.STATUS_IDLE)
aDocumentNode.removeAttribute("chatStatus");
else if (statusType == Ci.imIStatusInfo.STATUS_AVAILABLE)
aDocumentNode.setAttribute("chatStatus", "available");
else
aDocumentNode.setAttribute("chatStatus", "away");
let tooltipText = aChatContact.preferredBuddy.protocol.name + "\n" +
statusUtils.toLabel(aChatContact.statusType);
let statusText = aChatContact.statusText;
if (statusText)
tooltipText += " - " + statusText;
aDocumentNode.setAttribute("presenceTooltip", tooltipText);
aDocumentNode.removeAttribute("chatStatus");
aDocumentNode.removeAttribute("presenceTooltip");
}
function UpdateExtraAddressProcessing(aAddressData, aDocumentNode, aAction,

@ -18,7 +18,6 @@ DIRS += [
'about-support',
'wintaskbar',
'newmailaccount',
'im',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa', 'qt'):

@ -666,12 +666,6 @@ function AddMailAccount()
NewMailAccount(MailServices.mailSession.topmostMsgWindow);
}
function AddIMAccount()
{
window.openDialog("chrome://messenger/content/chat/imAccountWizard.xul",
"", "chrome,modal,titlebar,centerscreen");
}
/**
* Highlight the default account row in the account tree,
* optionally un-highlight the previous one.

@ -46,11 +46,6 @@
accesskey="&addMailAccountButton.accesskey;"
prefstring="mail.disable_new_account_addition"
oncommand="AddMailAccount(event); event.stopPropagation();"/>
<menuitem id="accountActionsAddIMAccount"
label="&addIMAccountButton.label;"
accesskey="&addIMAccountButton.accesskey;"
prefstring="mail.disable_new_account_addition"
oncommand="AddIMAccount(event); event.stopPropagation();"/>
<menuitem id="accountActionsAddFeedAccount"
label="&addFeedAccountButton.label;"
accesskey="&addFeedAccountButton.accesskey;"

Loading…
Cancel
Save