Commit b5aeae02 authored by Christoph Goehre's avatar Christoph Goehre
Browse files

Imported Upstream version 3.0.7

parent 8d97d8b9
......@@ -841,12 +841,21 @@ FolderDisplayWidget.prototype = {
aFolderIsComingBack) {
// try and persist the selection's content if we can
if (this._active) {
// if a new selection is coming up, there's no point in trying to persist
// any selections
if (aFolderIsComingBack && !this._aboutToSelectMessage)
this._saveSelection();
else
this._clearSavedSelection();
// If saving the selection throws an exception, we still want continue
// destroying the view. Saving the selection can fail if an underlying
// local folder has been compacted, invalidating the message keys.
// See bug 536676 for more info.
try {
// If a new selection is coming up, there's no point in trying to
// persist any selections.
if (aFolderIsComingBack && !this._aboutToSelectMessage)
this._saveSelection();
else
this._clearSavedSelection();
}
catch (ex) {
logException(ex);
}
gDBView = null;
}
......
......@@ -111,12 +111,10 @@ APP_NAME = $(MOZ_APP_DISPLAYNAME)
ifdef MOZ_DEBUG
APP_NAME := $(APP_NAME)Debug
endif
PROGRAM_LOCATION = ../../../$(DIST)/$(APP_NAME).app/Contents/MacOS/
PROGRAM = $(PROGRAM_LOCATION)thunderbird-bin$(BIN_SUFFIX)
PROGRAM = ../../../$(DIST)/$(APP_NAME).app/
else
# Non-mac options
PROGRAM_LOCATION = ../../../$(DIST)/bin/
PROGRAM = $(PROGRAM_LOCATION)thunderbird$(BIN_SUFFIX)
PROGRAM = ../../../$(DIST)/bin/thunderbird$(BIN_SUFFIX)
endif
mozmill::
......
......@@ -65,10 +65,6 @@ Var PageName
; are a member of the Administrators group.
!define NONADMIN_ELEVATE
; Don't use the PreDirectoryCommon macro's code for finding a pre-existing
; installation directory.
!define NO_INSTDIR_PREDIRCOMMON
; Disabled until a survey url is provided
!define AbortSurveyURL "http://live.mozillamessaging.com/survey/cancel/?page="
......@@ -103,7 +99,6 @@ VIAddVersionKey "OriginalFilename" "setup.exe"
!insertmacro _LoggingShortcutsCommon
!insertmacro AddHandlerValues
!insertmacro CanWriteToInstallDir
!insertmacro ChangeMUIHeaderImage
!insertmacro CheckForFilesInUse
!insertmacro CleanUpdatesDir
......@@ -128,6 +123,7 @@ VIAddVersionKey "OriginalFilename" "setup.exe"
!insertmacro InstallOnInitCommon
!insertmacro InstallStartCleanupCommon
!insertmacro LeaveDirectoryCommon
!insertmacro LeaveOptionsCommon
!insertmacro OnEndCommon
!insertmacro PreDirectoryCommon
......@@ -481,8 +477,6 @@ Section "-InstallEndCleanup"
${EndIf}
${EndUnless}
${LogHeader} "Updating Uninstall Log With Previous Uninstall Log"
; Refresh desktop icons
System::Call "shell32::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)"
......@@ -717,37 +711,10 @@ Function leaveOptions
StrCmp $R0 "1" +1 +2
StrCpy $InstallType ${INSTALLTYPE_CUSTOM}
!ifndef NO_INSTDIR_FROM_REG
SetShellVarContext all ; Set SHCTX to HKLM
${GetSingleInstallPath} "Software\Mozilla\${BrandFullNameInternal}" $R9
StrCmp "$R9" "false" +1 fix_install_dir
SetShellVarContext current ; Set SHCTX to HKCU
${GetSingleInstallPath} "Software\Mozilla\${BrandFullNameInternal}" $R9
fix_install_dir:
StrCmp "$R9" "false" +2 +1
StrCpy $INSTDIR "$R9"
!endif
${LeaveOptionsCommon}
; If the user doesn't have write access to the installation directory set
; the installation directory to a subdirectory of the All Users application
; directory and if the user can't write to that location set the installation
; directory to a subdirectory of the users local application directory
; (e.g. non-roaming).
${CanWriteToInstallDir} $R8
${If} "$R8" == "false"
SetShellVarContext all ; Set SHCTX to All Users
StrCpy $INSTDIR "$APPDATA\${BrandFullName}\"
${If} ${FileExists} "$INSTDIR"
; Always display the long path if the path already exists.
${GetLongPath} "$INSTDIR" $INSTDIR
${EndIf}
${CanWriteToInstallDir} $R8
${If} "$R8" == "false"
StrCpy $INSTDIR "$LOCALAPPDATA\${BrandFullName}\"
${EndIf}
${If} $InstallType == ${INSTALLTYPE_BASIC}
Call CheckExistingInstall
${EndIf}
FunctionEnd
......@@ -757,10 +724,10 @@ Function preDirectory
FunctionEnd
Function leaveDirectory
${LeaveDirectoryCommon} "$(WARN_DISK_SPACE)" "$(WARN_WRITE_ACCESS)"
${If} $InstallType != ${INSTALLTYPE_CUSTOM}
${If} $InstallType == ${INSTALLTYPE_BASIC}
Call CheckExistingInstall
${EndIf}
${LeaveDirectoryCommon} "$(WARN_DISK_SPACE)" "$(WARN_WRITE_ACCESS)"
FunctionEnd
Function preShortcuts
......@@ -778,6 +745,13 @@ Function leaveShortcuts
${MUI_INSTALLOPTIONS_READ} $AddDesktopSC "shortcuts.ini" "Field 2" "State"
${MUI_INSTALLOPTIONS_READ} $AddStartMenuSC "shortcuts.ini" "Field 3" "State"
${MUI_INSTALLOPTIONS_READ} $AddQuickLaunchSC "shortcuts.ini" "Field 4" "State"
; If Start Menu shortcuts won't be created call CheckExistingInstall here
; since leaveStartMenu will not be called.
${If} $AddStartMenuSC != 1
${AndIf} $InstallType == ${INSTALLTYPE_CUSTOM}
Call CheckExistingInstall
${EndIf}
FunctionEnd
Function preStartMenu
......
......@@ -8,7 +8,7 @@
# @ZI == zip code
# @CO == country
mail.addr_book.mapit_url.format=http://maps.google.com/maps?q=@A1%20@A2%20@CI%20@ST%20@ZI%20@CO
mailnews.messageid_browser.url=http://groups.google.com/groups?selm=%mid&rnum=1
mailnews.messageid_browser.url=http://groups.google.com/search?as_umsgid=%mid
# Recognize non-standard versions of "Re:" in subjects from localized versions of MS Outlook et al.
# Specify a comma-separated list without spaces. For example: mailnews.localizedRe=AW,SV
......
/* ***** 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 Thunderbird Mail Client.
*
* The Initial Developer of the Original Code is
* The Mozilla Foundation.
* Portions created by the Initial Developer are Copyright (C) 2010
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* David Bienvenu <bienvenu@mozillamessaging.com>
*
* 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 ***** */
/**
* Test reload of saved searches over local folders after compaction
* of local folders.
*/
var MODULE_NAME = 'test-vf-load-after-compact';
var RELATIVE_ROOT = '../shared-modules';
var MODULE_REQUIRES = ['folder-display-helpers', 'window-helpers'];
var folderInbox, folderVirtual;
function setupModule(module) {
let fdh = collector.getModule('folder-display-helpers');
fdh.installInto(module);
let wh = collector.getModule('window-helpers');
wh.installInto(module);
}
/**
* Add some messages to a folder, delete the first one, and create a saved
* search over the inbox and the folder. Then, compact folders.
*/
function test_setup_virtual_folder_and_compact() {
otherFolder = create_folder("otherFolder");
let [msgSet] = make_new_sets_in_folder(otherFolder, [{count: 2}]);
/**
* We delete the first message in the local folder, so compaction of the
* folder will invalidate the key of the second message in the folder. Then,
* we select the second message and issue the compact. This causes saving the
* selection on the compaction notification to fail. We test the saved search
* view still gets rebuilt, such that there is a valid msg hdr at row 0.
*/
be_in_folder(otherFolder);
let curMessage = select_click_row(0);
press_delete();
folderVirtual = create_virtual_folder([inboxFolder, otherFolder], {},
true, "SavedSearch");
be_in_folder(folderVirtual);
curMessage = select_click_row(0);
let urlListener = {
compactDone: false,
OnStartRunningUrl: function (aUrl) {
},
OnStopRunningUrl: function (aUrl, aExitCode) {
this.compactDone = true;
}
};
otherFolder.compactAll(urlListener, null, false);
mc.waitForEval("subject.compactDone == true",
10000, 100, urlListener);
// Let the event queue clear.
mc.sleep(0);
// Check view is still valid
let msgHdr = mc.dbView.getMsgHdrAt(0);
}
......@@ -42,7 +42,7 @@ var Cu = Components.utils;
var elib = {};
Cu.import('resource://mozmill/modules/elementslib.js', elib);
var EventUtils = {};
Cu.import('resource://mozmill/modules/EventUtils.js', EventUtils);
Cu.import('resource://mozmill/stdlib/EventUtils.js', EventUtils);
var mozmill = {};
Cu.import('resource://mozmill/modules/mozmill.js', mozmill);
var controller = {};
......
......@@ -32,7 +32,7 @@ function enumerateProperties(obj, excludeComplexTypes)
}
// minimal implementation of nsIOutputStream for use by dumpRDF, adapted from
// http://groups.google.com/groups?selm=20011203111618.C1302%40erde.jan.netgaroo.de
// http://groups.google.com/search?as_umsgid=20011203111618.C1302%40erde.jan.netgaroo.de
var DumpOutputStream = {
write: function(buf, count) { dump(buf); return count; }
};
......
......@@ -1141,6 +1141,8 @@ NS_IMETHODIMP nsImapIncomingServer::PossibleImapMailbox(const nsACString& folder
if (dupFolderPath.Last() == '/')
{
dupFolderPath.SetLength(dupFolderPath.Length()-1);
if (dupFolderPath.IsEmpty())
return NS_ERROR_FAILURE;
// *** this is what we did in 4.x in order to list uw folder only
// mailbox in order to get the \NoSelect flag
explicitlyVerify = !(boxFlags & kNameSpace);
......@@ -1249,7 +1251,8 @@ NS_IMETHODIMP nsImapIncomingServer::PossibleImapMailbox(const nsACString& folder
(kPublicMailbox | kOtherUsersMailbox | kPersonalMailbox))), &parentIsNew);
}
}
hostFolder->CreateClientSubfolderInfo(dupFolderPath, hierarchyDelimiter,boxFlags, PR_FALSE);
rv = hostFolder->CreateClientSubfolderInfo(dupFolderPath, hierarchyDelimiter,boxFlags, PR_FALSE);
NS_ENSURE_SUCCESS(rv, rv);
caseInsensitive = dupFolderPath.LowerCaseEqualsLiteral("inbox");
a_nsIFolder->GetChildWithURI(uri, PR_TRUE, caseInsensitive, getter_AddRefs(child));
}
......
......@@ -59,6 +59,16 @@ const gTestArray =
QueryInterface(Ci.nsIMsgImapMailFolder);
newChild.updateFolderWithListener(null, UrlListener);
},
function checkEmptyFolder() {
try {
let serverSink = gLocalServer.QueryInterface(Ci.nsIImapServerSink);
serverSink.possibleImapMailbox("/", '/', 0);
}
catch (ex) {
// we expect this to fail, but not crash or assert.
}
do_timeout_function(0, function(){doTest(++gCurTestNum)});
},
];
function endTest()
......
......@@ -5780,6 +5780,25 @@ function WindowIsClosing()
reallyClose = false;
}
if (reallyClose && window.toolbar.visible) {
// Figure out if there's at least one other browser window around.
let foundOtherBrowserWindow = false;
let wm = Cc["@mozilla.org/appshell/window-mediator;1"]
.getService(Ci.nsIWindowMediator);
let e = wm.getEnumerator("navigator:browser");
while (e.hasMoreElements() && !foundOtherBrowserWindow) {
let win = e.getNext();
if (win != window && win.toolbar && win.toolbar.visible)
foundOtherBrowserWindow = true;
}
if (!foundOtherBrowserWindow) {
Cc["@mozilla.org/observer-service;1"]
.getService(Ci.nsIObserverService)
.notifyObservers(null, "browser-lastwindow-close-granted", null);
}
}
return reallyClose;
}
......
......@@ -64,10 +64,6 @@ Var PageName
; are a member of the Administrators group.
!define NONADMIN_ELEVATE
; Don't use the PreDirectoryCommon macro's code for finding a pre-existing
; installation directory.
!define NO_INSTDIR_PREDIRCOMMON
!define AbortSurveyURL "http://www.kampyle.com/feedback_form/ff-feedback-form.php?site_code=8166124&form_id=12116&url="
; Other included files may depend upon these includes!
......@@ -103,7 +99,6 @@ VIAddVersionKey "OriginalFilename" "setup.exe"
!insertmacro _LoggingShortcutsCommon
!insertmacro AddDDEHandlerValues
!insertmacro CanWriteToInstallDir
!insertmacro ChangeMUIHeaderImage
!insertmacro CheckForFilesInUse
!insertmacro CleanUpdatesDir
......@@ -130,6 +125,7 @@ VIAddVersionKey "OriginalFilename" "setup.exe"
!insertmacro InstallOnInitCommon
!insertmacro InstallStartCleanupCommon
!insertmacro LeaveDirectoryCommon
!insertmacro LeaveOptionsCommon
!insertmacro OnEndCommon
!insertmacro PreDirectoryCommon
......@@ -279,7 +275,6 @@ Section "-Application" APP_IDX
"$(ERROR_CREATE_DIRECTORY_PREFIX)" \
"$(ERROR_CREATE_DIRECTORY_SUFFIX)"
${LogHeader} "Adding Additional Files"
; Check if QuickTime is installed and copy the nsIQTScriptablePlugin.xpt from
; its plugins directory into the app's components directory.
ClearErrors
......@@ -481,8 +476,6 @@ Section "-InstallEndCleanup"
${EndIf}
${EndUnless}
${LogHeader} "Updating Uninstall Log With Previous Uninstall Log"
; Refresh desktop icons
System::Call "shell32::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)"
......@@ -713,37 +706,10 @@ Function leaveOptions
StrCmp $R0 "1" +1 +2
StrCpy $InstallType ${INSTALLTYPE_CUSTOM}
!ifndef NO_INSTDIR_FROM_REG
SetShellVarContext all ; Set SHCTX to HKLM
${GetSingleInstallPath} "Software\Mozilla\${BrandFullNameInternal}" $R9
StrCmp "$R9" "false" +1 fix_install_dir
SetShellVarContext current ; Set SHCTX to HKCU
${GetSingleInstallPath} "Software\Mozilla\${BrandFullNameInternal}" $R9
fix_install_dir:
StrCmp "$R9" "false" +2 +1
StrCpy $INSTDIR "$R9"
!endif
${LeaveOptionsCommon}
; If the user doesn't have write access to the installation directory set
; the installation directory to a subdirectory of the All Users application
; directory and if the user can't write to that location set the installation
; directory to a subdirectory of the users local application directory
; (e.g. non-roaming).
${CanWriteToInstallDir} $R8
${If} "$R8" == "false"
SetShellVarContext all ; Set SHCTX to All Users
StrCpy $INSTDIR "$APPDATA\${BrandFullName}\"
${If} ${FileExists} "$INSTDIR"
; Always display the long path if the path already exists.
${GetLongPath} "$INSTDIR" $INSTDIR
${EndIf}
${CanWriteToInstallDir} $R8
${If} "$R8" == "false"
StrCpy $INSTDIR "$LOCALAPPDATA\${BrandFullName}\"
${EndIf}
${If} $InstallType == ${INSTALLTYPE_BASIC}
Call CheckExistingInstall
${EndIf}
FunctionEnd
......@@ -753,10 +719,10 @@ Function preDirectory
FunctionEnd
Function leaveDirectory
${LeaveDirectoryCommon} "$(WARN_DISK_SPACE)" "$(WARN_WRITE_ACCESS)"
${If} $InstallType != ${INSTALLTYPE_CUSTOM}
${If} $InstallType == ${INSTALLTYPE_BASIC}
Call CheckExistingInstall
${EndIf}
${LeaveDirectoryCommon} "$(WARN_DISK_SPACE)" "$(WARN_WRITE_ACCESS)"
FunctionEnd
Function preShortcuts
......@@ -774,6 +740,13 @@ Function leaveShortcuts
${MUI_INSTALLOPTIONS_READ} $AddDesktopSC "shortcuts.ini" "Field 2" "State"
${MUI_INSTALLOPTIONS_READ} $AddStartMenuSC "shortcuts.ini" "Field 3" "State"
${MUI_INSTALLOPTIONS_READ} $AddQuickLaunchSC "shortcuts.ini" "Field 4" "State"
; If Start Menu shortcuts won't be created call CheckExistingInstall here
; since leaveStartMenu will not be called.
${If} $AddStartMenuSC != 1
${AndIf} $InstallType == ${INSTALLTYPE_CUSTOM}
Call CheckExistingInstall
${EndIf}
FunctionEnd
Function preStartMenu
......
......@@ -542,7 +542,6 @@
Push "xpcom.dll"
Push "crashreporter.exe"
Push "updater.exe"
Push "xpicleanup.exe"
Push "${FileMainEXE}"
!macroend
!define PushFilesToCheck "!insertmacro PushFilesToCheck"
......
......@@ -10,4 +10,4 @@
# hardcoded milestones in the tree from these two files.
#--------------------------------------------------------
1.9.1.11
1.9.1.12
......@@ -1919,9 +1919,9 @@ chrome::
$(FINAL_TARGET)/chrome:
$(NSINSTALL) -D $@
libs realchrome:: $(CHROME_DEPS) $(FINAL_TARGET)/chrome
ifneq (,$(wildcard $(JAR_MANIFEST)))
ifndef NO_DIST_INSTALL
libs realchrome:: $(CHROME_DEPS) $(FINAL_TARGET)/chrome
$(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \
$(QUIET) -j $(FINAL_TARGET)/chrome \
$(MAKE_JARS_FLAGS) $(XULPPFLAGS) $(DEFINES) $(ACDEFINES) \
......
......@@ -53,6 +53,7 @@ nsIContentIterator.h \
nsContentErrors.h \
nsContentPolicyUtils.h \
nsContentUtils.h \
nsIContentUtils.h \
nsIDocument.h \
nsIDocumentObserver.h \
nsIMutationObserver.h \
......
......@@ -219,6 +219,10 @@
#define NS_HTMLPARANOIDFRAGMENTSINK_CID \
{ 0xa47e9526, 0x6e48, 0x4574, { 0x9d, 0x6c, 0x31, 0x64, 0xe2, 0x71, 0xf7, 0x4e } }
// {A47EF526-6E48-4574-9D60-3164E271F75E}
#define NS_HTMLPARANOIDFRAGMENTSINK2_CID \
{ 0xa47ef526, 0x6e48, 0x4574, { 0x9d, 0x60, 0x31, 0x64, 0xe2, 0x71, 0xf7, 0x5e } }
// {4B664E54-72A2-4bbf-A5C2-66D4DC3066A0}
#define NS_XMLFRAGMENTSINK_CID \
{ 0x4b664e54, 0x72a2, 0x4bbf, { 0xa5, 0xc2, 0x66, 0xd4, 0xdc, 0x30, 0x66, 0xa0 } }
......@@ -231,6 +235,10 @@
#define NS_XHTMLPARANOIDFRAGMENTSINK_CID \
{ 0x2d78bbf0, 0xe26c, 0x482b, { 0x92, 0xb3, 0x78, 0xa7, 0xb2, 0xaf, 0xc8, 0xf7} }
// {AD78BBF0-E261-482B-32B3-78A7B2AFC8F7}
#define NS_XHTMLPARANOIDFRAGMENTSINK2_CID \
{ 0xad78bbf0, 0xe261, 0x482b, { 0x32, 0xb3, 0x78, 0xa7, 0xb2, 0xaf, 0xc8, 0xf7} }
// {3986B301-097C-11d3-BF87-00105A1B0627}
#define NS_XULPOPUPLISTENER_CID \
{ 0x3986b301, 0x97c, 0x11d3, { 0xbf, 0x87, 0x0, 0x10, 0x5a, 0x1b, 0x6, 0x27 } }
......
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** 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.org code.
*
* The Initial Developer of the Original Code is
* Mozilla Foundation.
* Portions created by the Initial Developer are Copyright (C) 2010
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
* either of 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 ***** */
#ifndef nsIContentUtils_h__
#define nsIContentUtils_h__
// C4EA618E-A3D9-4524-8EEA-E92F26FC44DB
#define NS_ICONTENTUTILS_IID \
{ 0xC4EA618E, 0xA3D9, 0x4524, \
{ 0x8E, 0xEA, 0xE9, 0x2F, 0x26, 0xFC, 0x44, 0xDB } }
class nsIContentUtils : public nsISupports
{
public:
NS_DECLARE_STATIC_IID_ACCESSOR(NS_ICONTENTUTILS_IID)
NS_DECL_ISUPPORTS
virtual PRBool IsSafeToRunScript();
};
NS_DEFINE_STATIC_IID_ACCESSOR(nsIContentUtils, NS_ICONTENTUTILS_IID)
#endif /* nsIContentUtils_h__ */
......@@ -128,7 +128,7 @@ public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_CLASS(nsContentIterator)
nsContentIterator();
explicit nsContentIterator(PRBool aPre);
virtual ~nsContentIterator();
// nsIContentIterator interface methods ------------------------------
......@@ -213,25 +213,13 @@ private:
};
/*
* A simple iterator class for traversing the content in "open tag" order
*/
class nsPreContentIterator : public nsContentIterator
{
public:
nsPreContentIterator() { mPre = PR_TRUE; }
};
/******************************************************
* repository cruft
******************************************************/
nsresult NS_NewContentIterator(nsIContentIterator** aInstancePtrResult)
{
nsContentIterator * iter = new nsContentIterator();
nsContentIterator * iter = new nsContentIterator(PR_FALSE);
if (!iter) {
return NS_ERROR_OUT_OF_MEMORY;
}
......@@ -244,7 +232,7 @@ nsresult NS_NewContentIterator(nsIContentIterator** aInstancePtrResult)
nsresult NS_NewPreContentIterator(nsIContentIterator** aInstancePtrResult)
{
nsContentIterator * iter = new nsPreContentIterator();
nsContentIterator * iter = new nsContentIterator(PR_TRUE);
if (!iter) {
return NS_ERROR_OUT_OF_MEMORY;
}
......@@ -278,9 +266,9 @@ NS_IMPL_CYCLE_COLLECTION_4(nsContentIterator,