|
|
@@ -1,9 +1,9 @@
|
|
|
# HG changeset patch
|
|
|
# User Bill Gianopoulos <wgianopoulos@gmail.com>
|
|
|
-# Date 1641471337 18000
|
|
|
-# Thu Jan 06 07:15:37 2022 -0500
|
|
|
-# Node ID b26cee1637d4d447b316f7466fd88cf523119dc4
|
|
|
-# Parent 1ec396b77afd5897a9a0f216ec3e3a90fecb9585
|
|
|
+# Date 1645962131 18000
|
|
|
+# Sun Feb 27 06:42:11 2022 -0500
|
|
|
+# Node ID 97992f8ecdb8a0607194d1f6c460bdbd3e5a25f2
|
|
|
+# Parent 3b2d15d665c735d40769e793b321b02463bf1561
|
|
|
Bug 1611647 - Port bug 1579952 - Fix references to xul files in suite.
|
|
|
|
|
|
diff --git a/suite/app/profile/suite-prefs.js b/suite/app/profile/suite-prefs.js
|
|
|
@@ -5125,7 +5125,7 @@ diff --git a/suite/mailnews/content/folderPane.js b/suite/mailnews/content/folde
|
|
|
/**
|
|
|
* Deletes a folder from its parent. Also handles unsubscribe from newsgroups
|
|
|
* if the selected folder/s happen to be nntp.
|
|
|
-@@ -2000,17 +2000,17 @@ var gFolderTreeController = {
|
|
|
+@@ -1998,17 +1998,17 @@ var gFolderTreeController = {
|
|
|
let folder = aParent || GetSelectedMsgFolders()[0];
|
|
|
if (!folder)
|
|
|
folder = GetDefaultAccountRootFolder();
|
|
|
@@ -5144,7 +5144,7 @@ diff --git a/suite/mailnews/content/folderPane.js b/suite/mailnews/content/folde
|
|
|
/**
|
|
|
* Opens the dialog to edit the properties for a virtual folder
|
|
|
*
|
|
|
-@@ -2022,17 +2022,17 @@ var gFolderTreeController = {
|
|
|
+@@ -2020,17 +2020,17 @@ var gFolderTreeController = {
|
|
|
function editVirtualCallback(aURI) {
|
|
|
// we need to reload the folder if it is the currently loaded folder...
|
|
|
if (gMsgFolderSelected && aURI == gMsgFolderSelected.URI) {
|
Bill Gianopoulos