#ifdef for phoenix, NPOB.
git-svn-id: svn://10.0.0.236/trunk@127119 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
6c6468e474
commit
93e89d0310
@ -1862,13 +1862,23 @@ nsGlobalHistory::Unassert(nsIRDFResource* aSource,
|
||||
// to handle whatever UI updating is necessary when we're finished.
|
||||
if (!mBatchesInProgress)
|
||||
NotifyUnassert(aSource, aProperty, aTarget);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
// ignore any error
|
||||
rv = RemovePage(targetUrl);
|
||||
if (NS_FAILED(rv)) return NS_RDF_ASSERTION_REJECTED;
|
||||
|
||||
|
||||
#ifdef MOZ_PHOENIX
|
||||
if (!mBatchesInProgress && IsFindResource(aSource)) {
|
||||
// if there are batches in progress, we don't want to notify
|
||||
// observers that we're deleting items. the caller promises
|
||||
// to handle whatever UI updating is necessary when we're finished.
|
||||
NotifyUnassert(aSource, aProperty, aTarget);
|
||||
}
|
||||
#endif
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user