Bug #359469 --> undo the changes to make offline support a (non-optional) extension. sr=bienvenu

This commit is contained in:
scott%scott-macgregor.org 2006-11-04 05:17:04 +00:00
Родитель 64d02213e0
Коммит b5a001f838
21 изменённых файлов: 298 добавлений и 1325 удалений

Просмотреть файл

@ -1005,10 +1005,11 @@ function Redo()
{
messenger.Redo(msgWindow);
}
var mailOfflineObserver = {
observe: function(subject, topic, state) {
// sanity checks
if (topic != "network:offline-status-changed") return;
if (topic == "network:offline-status-changed")
MailOfflineStateChanged(state == "offline");
}
}

Просмотреть файл

@ -0,0 +1,260 @@
# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is Mozilla Communicator client code, released
# March 31, 1998.
#
# The Initial Developer of the Original Code is
# Netscape Communications Corporation.
# Portions created by the Initial Developer are Copyright (C) 1998-2001
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
var gMailOfflinePrefs = null;
var gOfflinePromptsBundle;
var gPromptService;
var gOfflineManager;
function MailOfflineStateChanged(goingOffline)
{
// tweak any mail UI here that needs to change when we go offline or come back online
gFolderJustSwitched = true;
}
function MsgSettingsOffline()
{
window.parent.MsgAccountManager('am-offline.xul');
}
// Init PrefsService
function GetMailOfflinePrefs()
{
gMailOfflinePrefs = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefService).getBranch(null);
}
// Check for unsent messages
function CheckForUnsentMessages()
{
try
{
var am = Components.classes["@mozilla.org/messenger/account-manager;1"]
.getService(Components.interfaces.nsIMsgAccountManager);
var msgSendlater = Components.classes["@mozilla.org/messengercompose/sendlater;1"]
.getService(Components.interfaces.nsIMsgSendLater);
var identitiesCount, allIdentities, currentIdentity, numMessages, msgFolder;
if(am) {
allIdentities = am.allIdentities;
identitiesCount = allIdentities.Count();
for (var i = 0; i < identitiesCount; i++) {
currentIdentity = allIdentities.QueryElementAt(i, Components.interfaces.nsIMsgIdentity);
msgFolder = msgSendlater.getUnsentMessagesFolder(currentIdentity);
if(msgFolder) {
// if true, descends into all subfolders
numMessages = msgFolder.getTotalMessages(false);
if(numMessages > 0) return true;
}
}
}
}
catch(ex) {
}
return false;
}
// Init nsIPromptService & strings.
function InitPrompts()
{
if(!gPromptService) {
gPromptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService();
gPromptService = gPromptService.QueryInterface(Components.interfaces.nsIPromptService);
}
if (!gOfflinePromptsBundle)
gOfflinePromptsBundle = document.getElementById("bundle_offlinePrompts");
}
// prompt for sending messages while going online, and go online.
function PromptSendMessages()
{
InitPrompts();
InitServices();
if (gPromptService) {
var checkValue = {value:true};
var buttonPressed = gPromptService.confirmEx(window,
gOfflinePromptsBundle.getString('sendMessagesWindowTitle'),
gOfflinePromptsBundle.getString('sendMessagesLabel'),
gPromptService.BUTTON_TITLE_IS_STRING * (gPromptService.BUTTON_POS_0 +
gPromptService.BUTTON_POS_1 + gPromptService.BUTTON_POS_2),
gOfflinePromptsBundle.getString('sendMessagesSendButtonLabel'),
gOfflinePromptsBundle.getString('sendMessagesCancelButtonLabel'),
gOfflinePromptsBundle.getString('sendMessagesNoSendButtonLabel'),
gOfflinePromptsBundle.getString('sendMessagesCheckboxLabel'),
checkValue);
if(buttonPressed == 0) {
gMailOfflinePrefs.setIntPref("offline.send.unsent_messages", !checkValue.value);
gOfflineManager.goOnline(true, true, msgWindow);
return true;
}
if(buttonPressed == 1) {
return false;
}
if(buttonPressed == 2) {
gMailOfflinePrefs.setIntPref("offline.send.unsent_messages", 2*!checkValue.value);
gOfflineManager.goOnline(false, true, msgWindow);
return true;
}
}
return false;
}
// prompt for downlading messages while going offline, and synchronise
function PromptDownloadMessages()
{
InitPrompts();
InitServices();
if(gPromptService) {
var checkValue = {value:true};
var buttonPressed = gPromptService.confirmEx(window,
gOfflinePromptsBundle.getString('downloadMessagesWindowTitle'),
gOfflinePromptsBundle.getString('downloadMessagesLabel'),
gPromptService.BUTTON_TITLE_IS_STRING * (gPromptService.BUTTON_POS_0 +
gPromptService.BUTTON_POS_1 + gPromptService.BUTTON_POS_2),
gOfflinePromptsBundle.getString('downloadMessagesDownloadButtonLabel'),
gOfflinePromptsBundle.getString('downloadMessagesCancelButtonLabel'),
gOfflinePromptsBundle.getString('downloadMessagesNoDownloadButtonLabel'),
gOfflinePromptsBundle.getString('downloadMessagesCheckboxLabel'),
checkValue);
if(buttonPressed == 0) {
gMailOfflinePrefs.setIntPref("offline.download.download_messages", !checkValue.value);
gOfflineManager.synchronizeForOffline(true, true, false, true, msgWindow);
return true;
}
if(buttonPressed == 1) {
return false;
}
if(buttonPressed == 2) {
gMailOfflinePrefs.setIntPref("offline.download.download_messages", 2*!checkValue.value);
gOfflineManager.synchronizeForOffline(false, false, false, true, msgWindow);
return true;
}
}
return false;
}
// online?
function CheckOnline()
{
var ioService = Components.classes["@mozilla.org/network/io-service;1"]
.getService(Components.interfaces.nsIIOService);
return (!ioService.offline);
}
// Init Pref Service & Offline Manager
function InitServices()
{
if (!gMailOfflinePrefs)
GetMailOfflinePrefs();
if (!gOfflineManager)
GetOfflineMgrService();
}
// Init Offline Manager
function GetOfflineMgrService()
{
if (!gOfflineManager) {
gOfflineManager = Components.classes["@mozilla.org/messenger/offline-manager;1"]
.getService(Components.interfaces.nsIMsgOfflineManager);
}
}
// This function must always return false to prevent toggling of offline state because
// we change the offline state ourselves
function MailCheckBeforeOfflineChange()
{
var ioService = Components.classes["@mozilla.org/network/io-service;1"]
.getService(Components.interfaces.nsIIOService);
var goingOnline = ioService.offline;
var bundle = srGetStrBundle("chrome://communicator/locale/utilityOverlay.properties");
// messenger.SetWindow(window, msgWindow);
InitServices();
var prefSendUnsentMessages = gMailOfflinePrefs.getIntPref("offline.send.unsent_messages");
var prefDownloadMessages = gMailOfflinePrefs.getIntPref("offline.download.download_messages");
if(goingOnline) {
switch(prefSendUnsentMessages) {
case 0:
if(CheckForUnsentMessages()) {
if(! PromptSendMessages())
return false;
}
else
gOfflineManager.goOnline(false /* sendUnsentMessages */,
true /* playbackOfflineImapOperations */,
msgWindow);
break;
case 1:
gOfflineManager.goOnline(CheckForUnsentMessages() /* sendUnsentMessages */,
true /* playbackOfflineImapOperations */,
msgWindow);
break;
case 2:
gOfflineManager.goOnline(false /* sendUnsentMessages */,
true /* playbackOfflineImapOperations */,
msgWindow);
break;
}
}
else {
// going offline
switch(prefDownloadMessages) {
case 0:
if(! PromptDownloadMessages()) return false;
break;
case 1:
// download news, download mail, send unsent messages, go offline when done, msg window
gOfflineManager.synchronizeForOffline(true, true, false, true, msgWindow);
break;
case 2:
// download news, download mail, send unsent messages, go offline when done, msg window
gOfflineManager.synchronizeForOffline(false, false, false, true, msgWindow);
break;
}
}
return false;
}

Просмотреть файл

@ -149,6 +149,8 @@ function fillThreadPaneContextMenu()
ShowMenuItem("threadPaneContext-sep-edit", (numSelected <= 1));
EnableMenuItem('downloadSelected', GetNumSelectedMessages() > 0);
return(true);
}

Просмотреть файл

@ -147,12 +147,6 @@ function toImport()
window.openDialog("chrome://messenger/content/importDialog.xul","importDialog","chrome, modal, titlebar", {importType: "addressbook"});
}
// this method is overridden by mail-offline.js if we build with the offline extensions
function CheckOnline()
{
return true;
}
// aPaneID
function openOptionsDialog(aPaneID, aTabID)
{

Просмотреть файл

@ -62,6 +62,7 @@
<script type="application/x-javascript" src="chrome://messenger/content/mailCommands.js"/>
<script type="application/x-javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
<script type="application/x-javascript" src="chrome://messenger/content/mail-offline.js"/>
<script type="application/x-javascript" src="chrome://messenger/content/mailCore.js"/>
<script type="application/x-javascript" src="chrome://global/content/findBar.js"/>
<script type="application/x-javascript" src="chrome://communicator/content/printing.js"/>
@ -72,6 +73,7 @@
<stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
<stringbundle id="bundle_shell" src="chrome://messenger/locale/shellservice.properties"/>
<stringbundle id="bundle_findBar" src="chrome://global/locale/findbar.properties"/>
<stringbundle id="bundle_offlinePrompts" src="chrome://messenger/locale/offline.properties"/>
</stringbundleset>
<!-- Performance optimization...we include utilityOverlay.xul which defines some command sets
@ -113,6 +115,10 @@
<command id="cmd_getNextNMessages" oncommand="goDoCommand('cmd_getNextNMessages')" disabled="true"/>
<command id="cmd_renameFolder" oncommand="goDoCommand('cmd_renameFolder')" />
<command id="cmd_sendUnsentMsgs" oncommand="goDoCommand('cmd_sendUnsentMsgs')" />
<command id="cmd_synchronizeOffline" oncommand="goDoCommand('cmd_synchronizeOffline')" disabled="true"/>
<command id="cmd_downloadFlagged" oncommand="goDoCommand('cmd_downloadFlagged')" disabled="true"/>
<command id="cmd_downloadSelected" oncommand="goDoCommand('cmd_downloadSelected')" disabled="true"/>
<command id="cmd_settingsOffline" oncommand="goDoCommand('cmd_settingsOffline')" disabled="true"/>
</commandset>
<commandset id="mailCommands">
@ -713,6 +719,8 @@
oncommand="PrintEnginePrint();"/>
<menuitem id="threadPaneContext-delete"
command="cmd_delete"/>
<menuitem id="downloadSelected" label="&downloadSelectedCmd.label;"
accesskey="&downloadSelectedCmd.accesskey;" observes="cmd_downloadSelected"/>
</popup>
<popup id="folderPaneContext" onpopupshowing="return fillFolderPaneContextMenu();"
@ -1206,6 +1214,18 @@
accesskey="&emptyTrashCmd.accesskey;"
observes="cmd_emptyTrash"/>
<menuseparator id="trashMenuSeparator"/>
<menu id="offlineMenuItem" label="&offlineMenu.label;" accesskey="&offlineMenu.accesskey;">
<menupopup>
<menuitem id="offlineGoOfflineCmd"/>
<menuseparator/>
<menuitem label="&synchronizeOfflineCmd.label;" accesskey="&synchronizeOfflineCmd.accesskey;" observes="cmd_synchronizeOffline"/>
<menuitem label="&settingsOfflineCmd.label;" accesskey="&settingsOfflineCmd.accesskey;" oncommand="openOptionsDialog('paneAdvanced', 'offlineTab');"/>
<menuseparator/>
<menuitem label="&downloadStarredCmd.label;" accesskey="&downloadStarredCmd.accesskey;" observes="cmd_downloadFlagged"/>
<menuitem label="&downloadSelectedCmd.label;" accesskey="&downloadSelectedCmd.accesskey;" observes="cmd_downloadSelected"/>
</menupopup>
</menu>
<menuseparator/>
<menuitem id="printSetupMenuItem" label="&printSetupCmd.label;" accesskey="&printSetupCmd.accesskey;" command="cmd_printSetup"/>
#ifndef XP_MACOSX
@ -2181,6 +2201,7 @@
<statusbar class="chromeclass-status" id="status-bar">
<hbox insertbefore="unreadMessageCount" id="statusTextBox" flex="1">
<statusbarpanel checkfunc="MailCheckBeforeOfflineChange()" id="offline-status" class="statusbarpanel-iconic"/>
<statusbarpanel id="statusText" label="&statusText.label;" flex="1"/>
<statusbarpanel class="statusbarpanel-progress" collapsed="true" id="statusbar-progresspanel">
<progressmeter class="progressmeter-statusbar" id="statusbar-icon" mode="normal" value="0"/>

Просмотреть файл

@ -32,6 +32,7 @@ messenger.jar:
* content/messenger/msgPrintEngine.xul (content/msgPrintEngine.xul)
* content/messenger/searchBar.js (content/searchBar.js)
* content/messenger/phishingDetector.js (content/phishingDetector.js)
* content/messenger/mail-offline.js (content/mail-offline.js)
content/messenger/about-footer.png (content/about-footer.png)
content/messenger/aboutDialog.css (content/aboutDialog.css)
* content/messenger/credits.xhtml (content/credits.xhtml)

Просмотреть файл

@ -1,48 +0,0 @@
content,install,url,jar:resource:/chrome/mail.jar!/content/necko/
content,install,url,jar:resource:/chrome/mail.jar!/content/mozapps/
content,install,url,jar:resource:/chrome/mail.jar!/content/xbl-marquee/
content,install,url,jar:resource:/chrome/mail.jar!/content/editor/
content,install,url,jar:resource:/chrome/mail.jar!/content/editor-region/
content,install,url,jar:resource:/chrome/mail.jar!/content/help/
content,install,url,jar:resource:/chrome/mail.jar!/content/mozldap/
content,install,url,jar:resource:/chrome/mail.jar!/content/navigator/
content,install,url,jar:resource:/chrome/mail.jar!/content/navigator-region/
content,install,url,jar:resource:/chrome/mail.jar!/content/navigator-platform/
content,install,url,jar:resource:/chrome/mail.jar!/content/communicator-platform/
content,install,url,jar:resource:/chrome/mail.jar!/content/communicator-region/
content,install,url,jar:resource:/chrome/mail.jar!/content/communicator/downloadmanager/
content,install,url,jar:resource:/chrome/mail.jar!/content/global/
content,install,url,jar:resource:/chrome/mail.jar!/content/global-platform/
content,install,url,jar:resource:/chrome/mail.jar!/content/global-region/
content,install,url,jar:resource:/chrome/mail.jar!/content/wallet/
content,install,url,jar:resource:/chrome/mail.jar!/content/communicator/
content,install,url,jar:resource:/chrome/mail.jar!/content/pipnss/
content,install,url,jar:resource:/chrome/mail.jar!/content/pippki/
content,install,url,jar:resource:/chrome/mail.jar!/content/autoconfig/
content,install,url,jar:resource:/chrome/mail.jar!/content/messenger/
content,install,url,jar:resource:/chrome/mail.jar!/content/messenger-mdn/
content,install,url,jar:resource:/chrome/mail.jar!/content/messenger-views/
content,install,url,jar:resource:/chrome/mail.jar!/content/messenger-smime/
content,install,url,jar:resource:/chrome/mail.jar!/content/messenger-mapi/
content,install,url,jar:resource:/chrome/mail.jar!/content/messenger-region/
content,install,url,jar:resource:/chrome/mail.jar!/content/branding/
skin,install,url,jar:resource:/chrome/qute.jar!/skin/classic/global/
skin,install,url,jar:resource:/chrome/qute.jar!/skin/classic/communicator/
skin,install,url,jar:resource:/chrome/qute.jar!/skin/classic/editor/
skin,install,url,jar:resource:/chrome/qute.jar!/skin/classic/messenger/
skin,install,url,jar:resource:/chrome/qute.jar!/skin/classic/navigator/
skin,install,url,jar:resource:/chrome/qute.jar!/skin/classic/mozapps/
# optional registration for dom inspector which may or may not be installed
content,install,url,jar:resource:/chrome/inspector.jar!/content/inspector/
locale,install,url,jar:resource:/chrome/inspector.jar!/locale/en-US/inspector/
skin,install,url,jar:resource:/chrome/inspector.jar!/skin/classic/inspector/
skin,install,url,jar:resource:/chrome/inspector.jar!/skin/modern/inspector/
# optional registration for offline support which may or may not be installed
content,install,url,jar:resource:/chrome/offline.jar!/content/messenger-offline/
skin,install,url,jar:resource:/chrome/offline.jar!/content/messenger-offline/
# optional registration for RSS support which may or may not be installed
content,install,url,jar:resource:/chrome/newsblog.jar!/content/messenger-newsblog/
skin,install,url,jar:resource:/chrome/qute.jar!/skin/classic/messenger-newsblog/

Просмотреть файл

@ -1,26 +0,0 @@
locale wallet en-US jar:en-US.jar!/locale/en-US/wallet/
locale pipnss en-US jar:en-US.jar!/locale/en-US/pipnss/
locale pippki en-US jar:en-US.jar!/locale/en-US/pippki/
locale autoconfig en-US jar:en-US.jar!/locale/en-US/autoconfig/
locale messenger en-US jar:en-US.jar!/locale/en-US/messenger/
locale branding en-US jar:en-US.jar!/locale/en-US/branding/
locale messenger-views en-US jar:en-US.jar!/locale/en-US/messenger-views/
locale messenger-smime en-US jar:en-US.jar!/locale/en-US/messenger-smime/
locale messenger-mapi en-US jar:en-US.jar!/locale/en-US/messenger-mapi/
locale messenger-region en-US jar:en-US.jar!/locale/en-US/messenger-region/
locale editor en-US jar:en-US.jar!/locale/en-US/editor/
locale mozldap en-US jar:en-US.jar!/locale/en-US/mozldap/
locale mozapps en-US jar:en-US.jar!/locale/en-US/mozapps/
locale navigator en-US jar:en-US.jar!/locale/en-US/navigator/
locale communicator en-US jar:en-US.jar!/locale/en-US/communicator/
locale global en-US jar:en-US.jar!/locale/en-US/global/
locale global-region en-US jar:en-US.jar!/locale/en-US/global-region/
locale global-platform en-US jar:en-US.jar!/locale/en-US/global-platform/
locale navigator-platform en-US jar:en-US.jar!/locale/en-US/navigator-platform/
locale communicator-platform en-US jar:en-US.jar!/locale/en-US/communicator-platform/
# optional registration for offline support which may or may not be installed
locale messenger-offline en-US jar:en-US.jar!/locale/en-US/messenger-offline/
# optional registration for RSS support which may or may not be installed
locale messenger-newsblog en-US jar:en-US.jar!/locale/en-US/messenger-newsblog/

Просмотреть файл

@ -42,7 +42,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = offline newsblog
DIRS = newsblog
ifdef MOZ_PSM
BUILD_SMIME=1

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

@ -167,6 +167,7 @@ chrome/chrome.rdf
chrome/app-chrome.manifest
chrome/mail.jar
chrome/qute.jar
chrome/offline.jar
chrome/en-US-mail.jar
chrome/overlayinfo/
defaults/pref/all.js

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Просмотреть файл

@ -1,15 +0,0 @@
#filter substitution
VersionLanguage = @AB_CD@
NameCompany = Mozilla
NameProduct = Mozilla Thunderbird
NameProductInternal = Mozilla Thunderbird
ShortNameProduct = Thunderbird
VersionProduct = @MOZ_APP_VERSION@
DistSubdir = bin
FileInstallerEXE = @PKG_BASENAME@.installer.exe
FileInstallerMSI = @PKG_BASENAME@.installer.msi
FileMainEXE = thunderbird.exe
FileInstallerNETRoot = @PKG_BASENAME@.net-installer
ComponentList = xpcom,mail,talkback,@AB_CD@,offline,newsblog
LicenseFile = mail/LICENSE.txt
7ZipSFXModule = other-licenses/7zstub/thunderbird/7zSD.sfx

Просмотреть файл

Просмотреть файл

Просмотреть файл

@ -43,6 +43,16 @@
<!ENTITY emptyTrashCmd.accesskey "y">
<!ENTITY importCmd.label "Import...">
<!ENTITY importCmd.accesskey "I">
<!ENTITY offlineMenu.label "Offline">
<!ENTITY offlineMenu.accesskey "l">
<!ENTITY synchronizeOfflineCmd.label "Download/Sync Now...">
<!ENTITY synchronizeOfflineCmd.accesskey "S">
<!ENTITY settingsOfflineCmd.label "Offline Settings...">
<!ENTITY settingsOfflineCmd.accesskey "e">
<!ENTITY downloadSelectedCmd.label "Get Selected Messages">
<!ENTITY downloadSelectedCmd.accesskey "M">
<!ENTITY downloadStarredCmd.label "Get Starred Messages">
<!ENTITY downloadStarredCmd.accesskey "a">
<!ENTITY printCmd.label "Print...">
<!ENTITY printCmd.accesskey "P">
<!ENTITY printCmd.key "p">

Просмотреть файл

@ -141,9 +141,6 @@
locale/@AB_CD@/messenger-smime/msgReadSecurityInfo.dtd (%chrome/messenger-smime/msgReadSecurityInfo.dtd)
locale/@AB_CD@/messenger-smime/certFetchingStatus.dtd (%chrome/messenger-smime/certFetchingStatus.dtd)
locale/@AB_CD@/messenger-smime/msgSecurityInfo.properties (%chrome/messenger-smime/msgSecurityInfo.properties)
% locale messenger-offline @AB_CD@ %locale/@AB_CD@/messenger-offline/
locale/@AB_CD@/messenger-offline/offline.properties (%chrome/messenger-offline/offline.properties)
locale/@AB_CD@/messenger-offline/offline.dtd (%chrome/messenger-offline/offline.dtd)
% locale messenger-region @AB_CD@ %locale/@AB_CD@/messenger-region/
locale/@AB_CD@/messenger-region/region.properties (%chrome/messenger-region/region.properties)
% locale mozldap @AB_CD@ %locale/@AB_CD@/mozldap/