--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -181,25 +181,21 @@ EXTRA_DEPS += \
$(STATIC_EXTRA_DEPS) \
$(NULL)
DEFINES += $(STATIC_DEFINES)
CPPSRCS += $(STATIC_CPPSRCS)
EXTRA_DSO_LIBS += $(STATIC_EXTRA_DSO_LIBS)
REQUIRES += $(STATIC_REQUIRES)
EXTRA_LIBS += $(STATIC_EXTRA_LIBS)
-ifndef MOZILLA_1_9_2_BRANCH
-
# OpenGL is required by (mozilla/)content/canvas: see (mozilla/)layout/build/Makefile.in.
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
OS_LIBS += -framework OpenGL
endif
-endif # MOZILLA_1_9_2_BRANCH
-
endif # BUILD_STATIC_LIBS
ifeq ($(OS_ARCH),WINNT)
OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool)
OS_LIBS += $(call EXPAND_LIBNAME,usp10 msimg32)
RCINCLUDE = splash.rc
ifndef GNU_CC
RCFLAGS += -DMOZ_THUNDERBIRD -I$(srcdir)
--- a/mail/app/profile/all-thunderbird.js
+++ b/mail/app/profile/all-thunderbird.js
@@ -475,23 +475,16 @@ pref("toolbar.customization.usesheet", f
pref("mail.compose.attachment_reminder", true);
// Words that should trigger a missing attachments warning.
pref("mail.compose.attachment_reminder_keywords", "chrome://messenger/locale/messengercompose/composeMsgs.properties");
// When no action is taken on the inline missing attachement notification,
// show an alert on send?
pref("mail.compose.attachment_reminder_aggressive", true);
pref("browser.formfill.enable", true);
-#ifdef MOZILLA_1_9_2_BRANCH
-// Override the all.js values so that unit tests pass and we get sane values.
-pref("browser.formfill.expire_days", 180);
-pref("browser.history_expire_days", 180);
-pref("browser.history_expire_days_min", 90);
-pref("browser.history_expire_sites", 40000);
-#endif
// Disable autoplay as we don't handle audio elements in emails very well.
// See bug 515082.
pref("media.autoplay.enabled", false);
// whether to hide the timeline view by default in the faceted search display
pref("gloda.facetview.hidetimeline", true);
--- a/mail/base/content/utilityOverlay.js
+++ b/mail/base/content/utilityOverlay.js
@@ -223,21 +223,17 @@ function checkForUpdates()
* Set up the help menu software update items to show proper status,
* also disabling the items if update is disabled.
*/
function buildHelpMenu()
{
#ifdef MOZ_UPDATER
var updates =
Components.classes["@mozilla.org/updates/update-service;1"].
-#ifdef MOZILLA_1_9_2_BRANCH
- getService(Components.interfaces.nsIApplicationUpdateService2);
-#else
getService(Components.interfaces.nsIApplicationUpdateService);
-#endif
var um =
Components.classes["@mozilla.org/updates/update-manager;1"].
getService(Components.interfaces.nsIUpdateManager);
// Disable the UI if the update enabled pref has been locked by the
// administrator or if we cannot update for some other reason.
var checkForUpdates = document.getElementById("checkForUpdates");
var canCheckForUpdates = updates.canCheckForUpdates;
--- a/mail/build.mk
+++ b/mail/build.mk
@@ -36,24 +36,16 @@
# ***** END LICENSE BLOCK *****
ifndef COMM_BUILD # Mozilla Makefile
ifndef LIBXUL_SDK
include $(topsrcdir)/toolkit/toolkit-tiers.mk
endif
-## storage backfork.
-# this is temporary until we branch for MOZILLA_1_9_2_BRANCH
-# replace toolkit's storage with our own
-tier_gecko_dirs := $(patsubst storage,../storage-backport,$(tier_gecko_dirs))
-# necko also has a dependency...
-tier_necko_dirs := $(patsubst storage/public,../storage-backport/public,$(tier_necko_dirs))
-
-
TIERS += app
ifdef MOZ_EXTENSIONS
tier_app_dirs += extensions
endif
else # toplevel Makefile
--- a/mail/components/Makefile.in
+++ b/mail/components/Makefile.in
@@ -49,21 +49,19 @@ DIRS = compose preferences addrbook m
ifneq (,$(filter windows gtk2 cocoa, $(MOZ_WIDGET_TOOLKIT)))
DIRS += shell
endif
ifdef MOZ_SAFE_BROWSING
DIRS += phishing
endif
-ifndef MOZILLA_1_9_2_BRANCH
ifndef MOZ_PLACES
DIRS += history
endif
-endif
DIRS += build
EXTRA_COMPONENTS = \
nsMailDefaultHandler.js \
mailContentHandler.js \
aboutRights.js \
$(NULL)
--- a/mail/components/build/Makefile.in
+++ b/mail/components/build/Makefile.in
@@ -107,21 +107,19 @@ SHARED_LIBRARY_LIBS += ../shell/$(LIB_PR
endif
ifneq (,$(filter windows, $(MOZ_WIDGET_TOOLKIT)))
ifndef MOZ_DISABLE_VISTA_SDK_REQUIREMENTS
SHARED_LIBRARY_LIBS += ../search/$(LIB_PREFIX)winsearch_s.$(LIB_SUFFIX)
endif
endif
-ifndef MOZILLA_1_9_2_BRANCH
ifndef MOZ_PLACES
SHARED_LIBRARY_LIBS += ../history/$(LIB_PREFIX)mailhistory_s.$(LIB_SUFFIX)
endif
-endif
ifdef MOZILLA_INTERNAL_API
EXTRA_DSO_LDOPTS += \
$(LIBXUL_DIST)/../modules/libreg/src/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(NULL)
else
--- a/mail/components/build/nsModule.cpp
+++ b/mail/components/build/nsModule.cpp
@@ -41,27 +41,25 @@
#include "nsMailMigrationCID.h"
#include "nsProfileMigrator.h"
#include "nsSeamonkeyProfileMigrator.h"
#if !defined(XP_BEOS)
#include "nsDogbertProfileMigrator.h"
#endif
-#ifndef MOZILLA_1_9_2_BRANCH
#ifndef MOZ_PLACES
#include "nsDocShellCID.h"
#include "history.h"
using namespace mozilla;
NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(History, History::GetSingleton)
#endif
-#endif
NS_GENERIC_FACTORY_CONSTRUCTOR(nsProfileMigrator)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsSeamonkeyProfileMigrator)
#if !defined(XP_BEOS)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDogbertProfileMigrator)
#endif
@@ -145,19 +143,17 @@ static const nsModuleComponentInfo compo
nsMailMacIntegrationConstructor },
#endif
#if defined(XP_WIN32) && !defined(MOZ_DISABLE_VISTA_SDK_REQUIREMENTS)
{ "Mail Windows Search Integration Helper",
NS_MAILWINSEARCHHELPER_CID,
"@mozilla.org/mail/windows-search-helper;1",
nsMailWinSearchHelperConstructor },
#endif
-#ifndef MOZILLA_1_9_2_BRANCH
#ifndef MOZ_PLACES
{ "Mail History Empty implementation",
NS_HISTORYSERVICE_CID,
NS_IHISTORY_CONTRACTID,
HistoryConstructor },
#endif
-#endif
};
NS_IMPL_NSGETMODULE(nsMailCompsModule, components)
--- a/mail/components/preferences/advanced.js
+++ b/mail/components/preferences/advanced.js
@@ -227,21 +227,17 @@ var gAdvancedPane = {
* iii 0/1/2 t true
*
*/
#ifdef MOZ_UPDATER
updateAppUpdateItems: function ()
{
var aus =
Components.classes["@mozilla.org/updates/update-service;1"].
-#ifdef MOZILLA_1_9_2_BRANCH
- getService(Components.interfaces.nsIApplicationUpdateService2);
-#else
getService(Components.interfaces.nsIApplicationUpdateService);
-#endif
var enabledPref = document.getElementById("app.update.enabled");
var enableAppUpdate = document.getElementById("enableAppUpdate");
enableAppUpdate.disabled = !aus.canCheckForUpdates || enabledPref.locked;
},
updateAutoItems: function ()
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -49,31 +49,18 @@ fi
MOZ_STATIC_MAIL_BUILD=1
MOZ_COMPOSER=1
MOZ_SAFE_BROWSING=1
MOZ_TOOLKIT_SEARCH=
MOZ_PLACES=
MOZ_MORKREADER=
MOZ_MORK=1
-# Needed for the mozilla-central build side of the system.
-# Can be dropped when we branch MOZILLA_1_9_2_BRANCH
-MOZILLA_BRANCH_VERSION=`echo ${MOZILLA_VERSION} | sed -e 's/^\([0-9]\.[0-9]\.[0-9]\).*/\1/;'`
-
-if test "$MOZILLA_BRANCH_VERSION" = "1.9.2"; then
- MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version-192.txt
- # Use unofficial branding for the 1.9.2 branch
- MOZ_BRANDING_DIRECTORY=mail/branding/unofficial
- MOZ_NO_XPCOM_OBSOLETE=1
- # MOZ_OJI is only required to be cleared for MOZILLA_1_9_2_BRANCH (OS X).
- MOZ_OJI=
-else
- MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
- MOZ_BRANDING_DIRECTORY=mail/branding/nightly
-fi
+MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
+MOZ_BRANDING_DIRECTORY=mail/branding/nightly
MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
THUNDERBIRD_VERSION=$MOZ_APP_VERSION
MOZ_OFFICIAL_BRANDING_DIRECTORY=other-licenses/branding/thunderbird
# Until we can build with libxul, we can't have ipc either
MOZ_ENABLE_LIBXUL=
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -42,42 +42,34 @@
@BINPATH@/@DLL_PREFIX@xpcom_core@DLL_SUFFIX@
#endif
@BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
@BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
@BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
#ifdef MOZ_IPC
@BINPATH@/mozilla-runtime@BIN_SUFFIX@
#endif
-#ifndef MOZILLA_1_9_2_BRANCH
@BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
-#elifdef XP_WIN32
-@BINPATH@/@DLL_PREFIX@js3250@DLL_SUFFIX@
-#else
-@BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
-#endif
#ifndef XP_WIN32
@BINPATH@/components/@DLL_PREFIX@jsd@DLL_SUFFIX@
#else
@BINPATH@/components/@DLL_PREFIX@jsd3250@DLL_SUFFIX@
#endif
#ifdef XP_WIN32
#ifndef MOZ_MEMORY
@BINPATH@/Microsoft.VC80.CRT.manifest
@BINPATH@/msvcm80.dll
@BINPATH@/msvcp80.dll
@BINPATH@/msvcr80.dll
#else
@BINPATH@/mozcrt19.dll
@BINPATH@/mozcpp19.dll
#endif
#endif
-#ifndef MOZILLA_1_9_2_BRANCH
@BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
-#endif
; Modules
@BINPATH@/modules/*
@BINPATH@/modules/activity/*
@BINPATH@/modules/gloda/*
; Optional RSS extension
[newsblog]
@@ -92,25 +84,21 @@
@BINPATH@/@MOZ_APP_NAME@-bin
#ifndef XP_MACOSX
@BINPATH@/@MOZ_APP_NAME@
#endif
#endif
@BINPATH@/application.ini
@BINPATH@/platform.ini
@BINPATH@/README.txt
-#ifdef MOZILLA_1_9_2_BRANCH
-@BINPATH@/@DLL_PREFIX@sqlite3@DLL_SUFFIX@
-#else
#ifdef XP_OS2
@BINPATH@/@DLL_PREFIX@mozsqlt3@DLL_SUFFIX@
#else
@BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
#endif
-#endif
#ifdef UNIX_BUT_NOT_MAC
@BINPATH@/run-mozilla.sh
@BINPATH@/icons/*.png
#endif
; [OS/2]
#ifdef XP_OS2
@BINPATH@/MozSounds.cmd
@@ -152,23 +140,17 @@
#ifndef XP_OS2
@BINPATH@/components/shellservice.xpt
#endif
@BINPATH@/components/xpcom_base.xpt
@BINPATH@/components/xpcom_system.xpt
@BINPATH@/components/xpcom_components.xpt
@BINPATH@/components/xpcom_ds.xpt
@BINPATH@/components/xpcom_io.xpt
-#ifndef MOZILLA_1_9_2_BRANCH
@BINPATH@/components/xpcom_threads.xpt
-#elifdef XP_WIN32
-@BINPATH@/components/xpcom_thread.xpt
-#else
-@BINPATH@/components/xpcom_threads.xpt
-#endif
@BINPATH@/components/xpcom_xpti.xpt
@BINPATH@/chrome/toolkit.jar
@BINPATH@/chrome/toolkit.manifest
@BINPATH@/chrome/comm.jar
@BINPATH@/chrome/comm.manifest
@BINPATH@/chrome/messenger.jar
@BINPATH@/chrome/messenger.manifest
#ifndef XP_UNIX
@@ -225,21 +207,17 @@
; default pref files
@BINPATH@/defaults/pref/all-thunderbird.js
@BINPATH@/defaults/pref/channel-prefs.js
@BINPATH@/defaults/pref/composer.js
@BINPATH@/defaults/pref/mailnews.js
@BINPATH@/defaults/pref/mdn.js
@BINPATH@/defaults/pref/smime.js
@BINPATH@/defaults/pref/thunderbird-branding.js
-#ifdef MOZILLA_1_9_2_BRANCH
-@BINPATH@/greprefs/*
-#else
@BINPATH@/greprefs.js
-#endif
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; App extensions to Mail
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; LDAP components
@BINPATH@/components/mozldap.xpt
@BINPATH@/components/nsAbLDAPAttributeMap.js
@@ -256,19 +234,17 @@
; login manager
@BINPATH@/components/loginmgr.xpt
@BINPATH@/components/nsLoginInfo.js
@BINPATH@/components/nsLoginManager.js
@BINPATH@/components/nsLoginManagerPrompter.js
@BINPATH@/components/storage-Legacy.js
@BINPATH@/components/storage-mozStorage.js
-#ifndef MOZILLA_1_9_2_BRANCH
@BINPATH@/components/crypto-SDR.js
-#endif
; download progress
@BINPATH@/components/nsHelperAppDlg.js
@BINPATH@/components/nsDownloadManagerUI.js
@BINPATH@/components/downloads.xpt
; Protocol/Content handling
@BINPATH@/components/nsContentDispatchChooser.js
@@ -315,28 +291,23 @@
@BINPATH@/components/widget.xpt
#ifdef XP_MACOSX
@BINPATH@/components/widget_cocoa.xpt
#endif
@BINPATH@/components/gfx.xpt
; layout
@BINPATH@/components/content_base.xpt
-#ifndef MOZILLA_1_9_2_BRANCH
@BINPATH@/components/content_canvas.xpt
-#endif
@BINPATH@/components/content_events.xpt
@BINPATH@/components/content_html.xpt
@BINPATH@/components/content_htmldoc.xpt
@BINPATH@/components/content_xmldoc.xpt
@BINPATH@/components/content_xslt.xpt
@BINPATH@/components/content_xtf.xpt
-#ifdef MOZILLA_1_9_2_BRANCH
-@BINPATH@/components/contentprefs.xpt
-#endif
@BINPATH@/components/htmlparser.xpt
@BINPATH@/components/layout_base.xpt
#ifdef NS_PRINTING
@BINPATH@/components/layout_printing.xpt
#endif
@BINPATH@/components/layout_xul.xpt
@BINPATH@/components/xulapp.xpt
@BINPATH@/components/xuldoc.xpt
@@ -358,31 +329,22 @@
#endif
; caps (JavaScript security)
@BINPATH@/components/caps.xpt
; glue: appshell, docshell, uriloader, chrome, components
@BINPATH@/components/appshell.xpt
@BINPATH@/components/appstartup.xpt
-#ifndef MOZILLA_1_9_2_BRANCH
@BINPATH@/components/docshell.xpt
-#elifdef XP_WIN32
-@BINPATH@/components/docshell_base.xpt
-#else
-@BINPATH@/components/docshell.xpt
-#endif
@BINPATH@/components/uriloader.xpt
@BINPATH@/components/webBrowser_core.xpt
@BINPATH@/components/windowwatcher.xpt
@BINPATH@/components/webbrowserpersist.xpt
@BINPATH@/components/commandhandler.xpt
-#ifdef MOZILLA_1_9_2_BRANCH
-@BINPATH@/components/mozbrwsr.xpt
-#endif
; jar
@BINPATH@/components/jar.xpt
; prefs
@BINPATH@/components/pref.xpt
; profile
@@ -540,23 +502,17 @@
@BINPATH@/components/chardet.xpt
@BINPATH@/components/contentAreaDropListener.js
@BINPATH@/components/contentSecurityPolicy.js
@BINPATH@/components/jsconsole-clhandler.js
@BINPATH@/components/layout_xul_tree.xpt
@BINPATH@/components/mozfind.xpt
@BINPATH@/components/mimetype.xpt
@BINPATH@/components/parentalcontrols.xpt
-#ifndef MOZILLA_1_9_2_BRANCH
@BINPATH@/components/proxyObject.xpt
-#elifndef XP_WIN32
-@BINPATH@/components/proxyObjInst.xpt
-#else
-@BINPATH@/components/proxyObject.xpt
-#endif
@BINPATH@/components/exthandler.xpt
@BINPATH@/components/exthelper.xpt
@BINPATH@/components/embed_base.xpt
@BINPATH@/components/webshell_idls.xpt
@BINPATH@/components/windowds.xpt
@BINPATH@/components/dom_xpath.xpt
@BINPATH@/components/lwbrk.xpt
@BINPATH@/components/nsINIProcessor.js
@@ -567,41 +523,16 @@
@BINPATH@/components/saxparser.xpt
@BINPATH@/components/satchel.xpt
@BINPATH@/components/shistory.xpt
@BINPATH@/components/zipwriter.xpt
@BINPATH@/components/nsBadCertHandler.js
@BINPATH@/components/cookie.xpt
@BINPATH@/components/places.xpt
@BINPATH@/components/prefetch.xpt
-
-#ifdef MOZILLA_1_9_2_BRANCH
-@BINPATH@/res/arrow.gif
-@BINPATH@/res/arrowd.gif
-@BINPATH@/res/broken-image.png
-@BINPATH@/res/charsetData.properties
-@BINPATH@/res/charsetalias.properties
-@BINPATH@/res/forms.css
-@BINPATH@/res/hiddenWindow.html
-@BINPATH@/res/html.css
-@BINPATH@/res/loading-image.png
-@BINPATH@/res/mathml.css
-@BINPATH@/res/quirk.css
-@BINPATH@/res/ua.css
-@BINPATH@/res/viewsource.css
-#ifdef XP_WIN32
-@BINPATH@/res/wincharset.properties
-#elifdef XP_MACOSX
-@BINPATH@/res/maccharset.properties
-#elifdef XP_OS2
-@BINPATH@/res/os2charset.properties
-#else
-@BINPATH@/res/unixcharset.properties
-#endif
-#endif
@BINPATH@/res/langGroups.properties
@BINPATH@/res/language.properties
@BINPATH@/res/entityTables/*
@BINPATH@/res/dtd/*
@BINPATH@/res/fonts/*
@BINPATH@/res/contenteditable.css
@BINPATH@/res/designmode.css
@BINPATH@/res/html/folder.png
@@ -678,17 +609,16 @@
#ifdef XP_OS2
@BINPATH@/components/@DLL_PREFIX@autocfg@DLL_SUFFIX@
#else
@BINPATH@/components/@DLL_PREFIX@autoconfig@DLL_SUFFIX@
#endif
@BINPATH@/components/@DLL_PREFIX@caps@DLL_SUFFIX@
@BINPATH@/components/@DLL_PREFIX@chardet@DLL_SUFFIX@
@BINPATH@/components/@DLL_PREFIX@chrome@DLL_SUFFIX@
-#ifndef MOZILLA_1_9_2_BRANCH
#ifdef XP_OS2
@BINPATH@/components/@DLL_PREFIX@cmdlines@DLL_SUFFIX@
@BINPATH@/components/@DLL_PREFIX@gkparser@DLL_SUFFIX@
@BINPATH@/components/@DLL_PREFIX@appshell@DLL_SUFFIX@
@BINPATH@/components/@DLL_PREFIX@perms@DLL_SUFFIX@
@BINPATH@/components/@DLL_PREFIX@spellchk@DLL_SUFFIX@
@BINPATH@/components/@DLL_PREFIX@strgcmps@DLL_SUFFIX@
@BINPATH@/components/@DLL_PREFIX@tkautoc@DLL_SUFFIX@
@@ -700,37 +630,16 @@
@BINPATH@/components/@DLL_PREFIX@nsappshell@DLL_SUFFIX@
@BINPATH@/components/@DLL_PREFIX@permissions@DLL_SUFFIX@
@BINPATH@/components/@DLL_PREFIX@spellchecker@DLL_SUFFIX@
@BINPATH@/components/@DLL_PREFIX@storagecomps@DLL_SUFFIX@
@BINPATH@/components/@DLL_PREFIX@tkautocomplete@DLL_SUFFIX@
@BINPATH@/components/@DLL_PREFIX@toolkitcomps@DLL_SUFFIX@
@BINPATH@/components/@DLL_PREFIX@xpautocomplete@DLL_SUFFIX@
#endif
-#elifndef XP_UNIX
-@BINPATH@/components/@DLL_PREFIX@cmdlines@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@gkparser@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@appshell@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@perms@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@spellchk@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@strgcmps@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@tkautoc@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@tkitcmps@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@xpautoc@DLL_SUFFIX@
-#else
-@BINPATH@/components/@DLL_PREFIX@commandlines@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@htmlpars@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@nsappshell@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@permissions@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@spellchecker@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@storagecomps@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@tkautocomplete@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@toolkitcomps@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@xpautocomplete@DLL_SUFFIX@
-#endif
@BINPATH@/components/@DLL_PREFIX@composer@DLL_SUFFIX@
@BINPATH@/components/@DLL_PREFIX@cookie@DLL_SUFFIX@
@BINPATH@/components/@DLL_PREFIX@docshell@DLL_SUFFIX@
#ifdef XP_OS2
@BINPATH@/components/@DLL_PREFIX@embedcmp@DLL_SUFFIX@
#else
@BINPATH@/components/@DLL_PREFIX@embedcomponents@DLL_SUFFIX@
#endif
--- a/mail/makefiles.sh
+++ b/mail/makefiles.sh
@@ -58,19 +58,9 @@ mail/locales/Makefile
mail/test/mozmill/Makefile
mail/themes/Makefile
mail/themes/gnomestripe/Makefile
mail/themes/pinstripe/Makefile
mail/themes/qute/Makefile
$MOZ_BRANDING_DIRECTORY/Makefile
$MOZ_BRANDING_DIRECTORY/locales/Makefile
"
-
-# storage-backport stuff.
-# this is temporary until we branch for MOZILLA_1_9_2_BRANCH
-add_makefiles "
-storage-backport/Makefile
-storage-backport/public/Makefile
-storage-backport/src/Makefile
-storage-backport/build/Makefile
-storage-backport/test/Makefile
-"
fi
--- a/mail/test/mozmill/runtest.py
+++ b/mail/test/mozmill/runtest.py
@@ -49,22 +49,20 @@ import os, os.path, platform, subprocess
import shutil
import mozrunner
import jsbridge
import mozmill
import socket
import copy
SCRIPT_DIRECTORY = os.path.abspath(os.path.realpath(os.path.dirname(sys.argv[0])))
sys.path.append(SCRIPT_DIRECTORY)
-# The try case handles trunk. The exception case handles MOZILLA_1_9_2_BRANCH.
-try:
- from automation import Automation
- automation = Automation()
-except ImportError:
- import automation
+
+from automation import Automation
+automation = Automation()
+
from automationutils import checkForCrashes
from time import sleep
import imp
PROFILE_DIR = os.path.join(SCRIPT_DIRECTORY, 'mozmillprofile')
SYMBOLS_PATH = None
# XXX This breaks any semblance of test runner modularity, and only works
# because we know that we run MozMill only once per process. This needs to be
--- a/mailnews/base/src/nsMsgMailSession.cpp
+++ b/mailnews/base/src/nsMsgMailSession.cpp
@@ -43,21 +43,17 @@
#include "nsIMsgAccountManager.h"
#include "nsIChromeRegistry.h"
#include "nsIDirectoryService.h"
#include "nsAppDirectoryServiceDefs.h"
#include "nsPIDOMWindow.h"
#include "nsIDocShell.h"
#include "nsIObserverService.h"
#include "nsIAppStartup.h"
-#ifdef MOZILLA_1_9_2_BRANCH
-#include "nsXPFEComponentsCID.h"
-#else
#include "nsToolkitCompsCID.h"
-#endif
#include "nsISupportsPrimitives.h"
#include "nsIAppShellService.h"
#include "nsAppShellCID.h"
#include "nsIWindowMediator.h"
#include "nsIWindowWatcher.h"
#include "nsIMsgMailNewsUrl.h"
#include "prcmon.h"
#include "nsThreadUtils.h"
--- a/mailnews/base/util/nsMsgDBFolder.cpp
+++ b/mailnews/base/util/nsMsgDBFolder.cpp
@@ -135,38 +135,26 @@ NS_IMPL_ISUPPORTS_INHERITED6(nsMsgDBFold
nsIDBChangeListener, nsIUrlListener,
nsIJunkMailClassificationListener,
nsIMsgTraitClassificationListener)
#define MSGDBFOLDER_ATOM(name_, value_) nsIAtom* nsMsgDBFolder::name_ = nsnull;
#include "nsMsgDBFolderAtomList.h"
#undef MSGDBFOLDER_ATOM
-#ifdef MOZILLA_1_9_2_BRANCH
-
-const nsStaticAtom nsMsgDBFolder::folder_atoms[] = {
-#define MSGDBFOLDER_ATOM(name_, value_) { value_, &nsMsgDBFolder::name_ },
-#include "nsMsgDBFolderAtomList.h"
-#undef MSGDBFOLDER_ATOM
-};
-
-#else // i.e. !MOZILLA_1_9_2_BRANCH
-
#define MSGDBFOLDER_ATOM(name_, value_) NS_STATIC_ATOM_BUFFER(name_##_buffer, value_)
#include "nsMsgDBFolderAtomList.h"
#undef MSGDBFOLDER_ATOM
const nsStaticAtom nsMsgDBFolder::folder_atoms[] = {
#define MSGDBFOLDER_ATOM(name_, value_) NS_STATIC_ATOM(name_##_buffer, &nsMsgDBFolder::name_),
#include "nsMsgDBFolderAtomList.h"
#undef MSGDBFOLDER_ATOM
};
-#endif // end MOZILLA_1_9_2_BRANCH
-
nsMsgDBFolder::nsMsgDBFolder(void)
: mAddListener(PR_TRUE),
mNewMessages(PR_FALSE),
mGettingNewMessages(PR_FALSE),
mLastMessageLoaded(nsMsgKey_None),
mFlags(0),
mNumUnreadMessages(-1),
mNumTotalMessages(-1),
--- a/mailnews/compose/src/nsMsgComposeService.cpp
+++ b/mailnews/compose/src/nsMsgComposeService.cpp
@@ -73,21 +73,17 @@
#include "nsIPrefService.h"
#include "nsIPrefBranch.h"
#include "nsIPrefBranch2.h"
#include "nsMsgBaseCID.h"
#include "nsIMsgAccountManager.h"
#include "nsIMimeMiscStatus.h"
#include "nsIStreamConverter.h"
#include "nsMsgMimeCID.h"
-#ifdef MOZILLA_1_9_2_BRANCH
-#include "nsXPFEComponentsCID.h"
-#else
#include "nsToolkitCompsCID.h"
-#endif
#include "nsNetUtil.h"
#include "nsIMsgMailNewsUrl.h"
#include "nsIInterfaceRequestorUtils.h"
#include "nsIMsgDatabase.h"
#include "nsIDocumentEncoder.h"
#include "nsContentCID.h"
#include "nsISelection.h"
#include "nsUTF8Utils.h"
--- a/mailnews/imap/src/nsImapProtocol.cpp
+++ b/mailnews/imap/src/nsImapProtocol.cpp
@@ -8820,21 +8820,17 @@ nsImapMockChannel::OnCacheEntryAvailable
if (NS_SUCCEEDED(rv))
{
nsCOMPtr<nsIOutputStream> out;
// this will fail with the mem cache turned off, so we need to fall through
// to ReadFromImapConnection instead of aborting with NS_ENSURE_SUCCESS(rv,rv)
rv = entry->OpenOutputStream(0, getter_AddRefs(out));
if (NS_SUCCEEDED(rv))
{
- rv = tee->Init(m_channelListener, out
-#ifndef MOZILLA_1_9_2_BRANCH
- , nsnull
-#endif
- );
+ rv = tee->Init(m_channelListener, out, nsnull);
m_channelListener = do_QueryInterface(tee);
}
}
}
else
{
rv = ReadFromMemCache(entry);
NotifyStartEndReadFromCache(PR_TRUE);
--- a/mailnews/import/eudora/src/nsEudoraEditor.cpp
+++ b/mailnews/import/eudora/src/nsEudoraEditor.cpp
@@ -400,35 +400,31 @@ NS_IMETHODIMP nsEudoraEditor::Paste(PRIn
// boolean canPaste (in long aSelectionType)
NS_IMETHODIMP nsEudoraEditor::CanPaste(PRInt32 aSelectionType, PRBool *_retval)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
-#ifndef MOZILLA_1_9_2_BRANCH
-
class nsITransferable;
// void pasteTransferable(in nsITransferable aTransferable)
NS_IMETHODIMP nsEudoraEditor::PasteTransferable(nsITransferable *aTransferable)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
// boolean canPasteTransferable([optional] in nsITransferable aTransferable)
NS_IMETHODIMP nsEudoraEditor::CanPasteTransferable(nsITransferable *aTransferable, PRBool *aCanPaste)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
-#endif
-
// void selectAll ()
NS_IMETHODIMP nsEudoraEditor::SelectAll()
{
return NS_ERROR_NOT_IMPLEMENTED;
}
--- a/mailnews/mime/src/mimemcms.h
+++ b/mailnews/mime/src/mimemcms.h
@@ -35,29 +35,16 @@
*
* ***** END LICENSE BLOCK ***** */
#ifndef _MIMEMPKC_H_
#define _MIMEMPKC_H_
#include "mimemsig.h"
-#ifdef MOZILLA_1_9_2_BRANCH
-// On trunk these are defined in nsMimeTypes.h
-#define PARAM_MICALG_SHA256 "sha-256"
-#define PARAM_MICALG_SHA256_2 "sha256"
-#define PARAM_MICALG_SHA256_3 "2.16.840.1.101.3.4.2.1"
-#define PARAM_MICALG_SHA384 "sha-384"
-#define PARAM_MICALG_SHA384_2 "sha384"
-#define PARAM_MICALG_SHA384_3 "2.16.840.1.101.3.4.2.2"
-#define PARAM_MICALG_SHA512 "sha-512"
-#define PARAM_MICALG_SHA512_2 "sha512"
-#define PARAM_MICALG_SHA512_3 "2.16.840.1.101.3.4.2.3"
-#endif
-
class nsICMSMessage;
/* The MimeMultipartSignedCMS class implements a multipart/signed MIME
container with protocol=application/x-CMS-signature, which passes the
signed object through CMS code to verify the signature. See mimemsig.h
for details of the general mechanism on which this is built.
*/
--- a/mailnews/news/src/nsNNTPProtocol.cpp
+++ b/mailnews/news/src/nsNNTPProtocol.cpp
@@ -910,21 +910,17 @@ nsNNTPProtocol::OnCacheEntryAvailable(ns
nsCOMPtr<nsIStreamListener> newListener;
nsCOMPtr<nsIStreamListenerTee> tee = do_CreateInstance(NS_STREAMLISTENERTEE_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIOutputStream> out;
rv = entry->OpenOutputStream(0, getter_AddRefs(out));
NS_ENSURE_SUCCESS(rv, rv);
- rv = tee->Init(m_channelListener, out
-#ifndef MOZILLA_1_9_2_BRANCH
- , nsnull
-#endif
- );
+ rv = tee->Init(m_channelListener, out, nsnull);
m_channelListener = do_QueryInterface(tee);
NS_ENSURE_SUCCESS(rv, rv);
}
else
{
rv = ReadFromMemCache(entry);
if (access & nsICache::ACCESS_WRITE)
entry->MarkValid();
--- a/mailnews/test/performance/bloat/runtest.py
+++ b/mailnews/test/performance/bloat/runtest.py
@@ -40,22 +40,18 @@
Runs the Bloat test harness
"""
import optparse
import sys
import os
import shutil
-# The try case handles trunk. The exception case handles MOZILLA_1_9_2_BRANCH.
-try:
- from automation import Automation
- automation = Automation()
-except ImportError:
- import automation
+from automation import Automation
+automation = Automation()
from automationutils import checkForCrashes
class BloatRunTestOptions(optparse.OptionParser):
"""Parses Bloat runtest.py commandline options."""
def __init__(self, **kwargs):
optparse.OptionParser.__init__(self, **kwargs)
defaults = {}
--- a/mailnews/test/resources/logHelper.js
+++ b/mailnews/test/resources/logHelper.js
@@ -59,20 +59,17 @@ let _errorConsoleTunnel = {
this.shutdown();
return;
}
try {
// meh, let's just use mark_failure for now.
// and let's avoid feedback loops (happens in mozmill)
if ((aMessage instanceof Components.interfaces.nsIScriptError) &&
- (aMessage.errorMessage.indexOf("Error console says") == -1) &&
- // MOZILLA_1_9_2_BRANCH fix: gre-resources alias causes an expected
- // warning that should not cause us to fail.
- (aMessage.errorMessage.indexOf("Duplicate resource declaration") == -1))
+ (aMessage.errorMessage.indexOf("Error console says") == -1))
mark_failure(["Error console says", aMessage]);
}
catch (ex) {
// This is to avoid pathological error loops. we definitely do not
// want to propagate an error here.
}
}
};