Fix fallout from bug 617532 r=bustage

CLOSED TREE

mailnews/base/src/nsMsgCopyService.cpp

@@ -205,7 +205,7 @@ nsMsgCopyService::ClearRequest(nsCopyRequest* aRequest, nsresult rv)
     if (aRequest->m_allowUndo &&
         aRequest->m_copySourceArray.Length() > 1 &&
         aRequest->m_txnMgr)
-        aRequest->m_txnMgr->EndBatch();
+        aRequest->m_txnMgr->EndBatch(false);
 
     m_copyRequests.RemoveElement(aRequest);
     if (aRequest->m_listener)
@@ -525,7 +525,7 @@ nsMsgCopyService::CopyMessages(nsIMsgFolder* srcFolder, /* UI src folder */
   // undo stuff
   if (NS_SUCCEEDED(rv) && copyRequest->m_allowUndo && copyRequest->m_copySourceArray.Length() > 1 &&
       copyRequest->m_txnMgr)
-    copyRequest->m_txnMgr->BeginBatch();
+    copyRequest->m_txnMgr->BeginBatch(nullptr);
 
 done:
 

mailnews/imap/src/nsImapMailFolder.cpp

@@ -7102,7 +7102,7 @@ nsresult nsImapMailFolder::CopyMessagesOffline(nsIMsgFolder* srcFolder,
     if (msgWindow)
       msgWindow->GetTransactionManager(getter_AddRefs(txnMgr));
     if (txnMgr)
-      txnMgr->BeginBatch();
+      txnMgr->BeginBatch(nullptr);
     nsCOMPtr<nsIMsgDatabase> database;
     GetMsgDatabase(getter_AddRefs(database));
     if (database)
@@ -7357,7 +7357,7 @@ nsresult nsImapMailFolder::CopyMessagesOffline(nsIMsgFolder* srcFolder,
       srcFolder->SummaryChanged();
     }
     if (txnMgr)
-      txnMgr->EndBatch();
+      txnMgr->EndBatch(false);
   }
 
   // Do this before delete, as it destroys the messages

suite/common/bookmarks/bm-props.js

@@ -395,7 +395,7 @@ var BookmarkPropertiesPanel = {
     if (this._batching)
       return;
 
-    PlacesUtils.transactionManager.beginBatch();
+    PlacesUtils.transactionManager.beginBatch(nullptr);
     this._batching = true;
   },
 
@@ -403,7 +403,7 @@ var BookmarkPropertiesPanel = {
     if (!this._batching)
       return;
 
-    PlacesUtils.transactionManager.endBatch();
+    PlacesUtils.transactionManager.endBatch(false);
     this._batching = false;
   },
 

suite/common/bookmarks/browser-places.js

@@ -63,7 +63,7 @@ var StarUI = {
           this._restoreCommandsState();
           this._itemId = -1;
           if (this._batching) {
-            PlacesUtils.transactionManager.endBatch();
+            PlacesUtils.transactionManager.endBatch(false);
             this._batching = false;
           }
 
@@ -75,13 +75,13 @@ var StarUI = {
             case "remove": {
               // Remove all bookmarks for the bookmark's url, this also removes
               // the tags for the url.
-              PlacesUtils.transactionManager.beginBatch();
+              PlacesUtils.transactionManager.beginBatch(nullptr);
               let itemIds = PlacesUtils.getBookmarksForURI(this._uriForRemoval);
               for (let i = 0; i < itemIds.length; i++) {
                 let txn = new PlacesRemoveItemTransaction(itemIds[i]);
                 PlacesUtils.transactionManager.doTransaction(txn);
               }
-              PlacesUtils.transactionManager.endBatch();
+              PlacesUtils.transactionManager.endBatch(false);
               this._uriForRemoval = null;
               break;
             }
@@ -230,7 +230,7 @@ var StarUI = {
 
   beginBatch: function SU_beginBatch() {
     if (!this._batching) {
-      PlacesUtils.transactionManager.beginBatch();
+      PlacesUtils.transactionManager.beginBatch(nullptr);
       this._batching = true;
     }
   }

suite/common/src/PlacesUIUtils.jsm

@@ -1338,10 +1338,10 @@ XPCOMUtils.defineLazyGetter(PlacesUIUtils, "ptm", function() {
     //// nsITransactionManager forwarders.
 
     beginBatch: function()
-      PlacesUtils.transactionManager.beginBatch(),
+      PlacesUtils.transactionManager.beginBatch(null),
 
     endBatch: function()
-      PlacesUtils.transactionManager.endBatch(),
+      PlacesUtils.transactionManager.endBatch(false),
 
     doTransaction: function(txn)
       PlacesUtils.transactionManager.doTransaction(txn),