Bug 1166225 - Archive function for NNTP news post renders target Archive folder unusable until restart - TB version. r=mkmelin

Differential Revision: https://phabricator.services.mozilla.com/D119928

--HG--
extra : amend_source : 9818bc4016e335308c8ddf627e1d7ded791b8016

mail/base/content/folderDisplay.js

@@ -2376,7 +2376,8 @@ FolderDisplayWidget.prototype = {
     for (let i = 0; i < selectedMessages.length; ++i) {
       if (
         selectedMessages[i].folder &&
-        !selectedMessages[i].folder.canDeleteMessages
+        (!selectedMessages[i].folder.canDeleteMessages ||
+         (selectedMessages[i].folder.flags & Ci.nsMsgFolderFlags.Newsgroup))
       ) {
         return false;
       }

mail/base/content/folderPane.js

@@ -1040,7 +1040,8 @@ var gFolderTreeView = {
           .getService(Ci.nsIDragService)
           .getCurrentSession().dragAction ==
         Ci.nsIDragService.DRAGDROP_ACTION_MOVE;
-      if (!sourceFolder.canDeleteMessages) {
+      let isNews = sourceFolder.flags & Ci.nsMsgFolderFlags.Newsgroup;
+      if (!sourceFolder.canDeleteMessages || isNews) {
         isMove = false;
       }
 

mail/modules/MessageArchiver.jsm

@@ -260,13 +260,14 @@ MessageArchiver.prototype = {
     }
 
     if (dstFolder != srcFolder) {
+      let isNews = srcFolder.flags & Ci.nsMsgFolderFlags.Newsgroup;
       // If the source folder doesn't support deleting messages, we
       // make archive a copy, not a move.
       MailServices.copy.copyMessages(
         srcFolder,
         moveArray,
         dstFolder,
-        srcFolder.canDeleteMessages,
+        srcFolder.canDeleteMessages && !isNews,
         this,
         this.msgWindow,
         true