From a19f47a6ab9bbb00aec469405bd9a597b4a0ae6e Mon Sep 17 00:00:00 2001
From: "scott%scott-macgregor.org" <scott%scott-macgregor.org>
Date: Tue, 29 Jun 2004 23:15:38 +0000
Subject: [PATCH] Bug #207861 --> Rename Folder option is useless for
 newsgroups and should not show up. Patch by Serge GAUTHERIE

---
 mail/base/content/mailContextMenus.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/mail/base/content/mailContextMenus.js b/mail/base/content/mailContextMenus.js
index e21f428c2045..b37619a17230 100644
--- a/mail/base/content/mailContextMenus.js
+++ b/mail/base/content/mailContextMenus.js
@@ -100,7 +100,6 @@ function fillThreadPaneContextMenu()
     isNewsgroup = IsNewsMessage(selectedMessage);
   }
 
-
   SetupNewMessageWindowMenuItem("threadPaneContext-openNewWindow", numSelected, false);
   SetupEditAsNewMenuItem("threadPaneContext-editAsNew", numSelected, false);
 
@@ -126,7 +125,6 @@ function fillThreadPaneContextMenu()
   SetupAddSenderToABMenuItem("threadPaneContext-addSenderToAddressBook", numSelected, false);
   SetupAddAllToABMenuItem("threadPaneContext-addAllToAddressBook", numSelected, false);
 
-
   ShowMenuItem("threadPaneContext-sep-edit", (numSelected <= 1));
 
   return(true);
@@ -273,7 +271,6 @@ function fillFolderPaneContextMenu()
   var specialFolder = GetFolderAttribute(folderTree, folderResource, "SpecialFolder");
   var canSubscribeToFolder = (serverType == "nntp") || (serverType == "imap");
   var isNewsgroup = !isServer && serverType == 'nntp';
-
   var isMailFolder = !isServer && serverType != 'nntp';
   var canGetMessages =  (isServer && (serverType != "nntp") && (serverType !="none")) || isNewsgroup;
 
@@ -327,7 +324,6 @@ function fillFolderPaneContextMenu()
 function SetupRenameMenuItem(folderResource, numSelected, isServer, serverType, specialFolder)
 {
   var msgFolder = folderResource.QueryInterface(Components.interfaces.nsIMsgFolder);
-  var isMail = serverType != 'nntp';
   var folderTree = GetFolderTree();
   var isSpecialFolder = !(specialFolder == "none" || (specialFolder == "Junk" && CanRenameDeleteJunkMail(msgFolder.URI)));
   var canRename = GetFolderAttribute(folderTree, folderResource, "CanRename") == "true";
@@ -350,7 +346,6 @@ function SetupRemoveMenuItem(folderResource, numSelected, isServer, serverType,
   //Can't currently delete Accounts or special folders.
   var showRemove = (numSelected <=1) && (isMail && !isSpecialFolder) && !isServer;
 
-
   ShowMenuItem("folderPaneContext-remove", showRemove);
   if(showRemove)
   {
@@ -426,7 +421,6 @@ function SetMenuItemLabel(id, label)
   var item = document.getElementById(id);
   if(item)
     item.setAttribute('label', label);
-
 }
 
 function SetMenuItemAccessKey(id, accessKey)
@@ -434,7 +428,6 @@ function SetMenuItemAccessKey(id, accessKey)
   var item = document.getElementById(id);
   if(item)
     item.setAttribute('accesskey', accessKey);
-
 }
 
 function fillMessagePaneContextMenu()
@@ -618,4 +611,3 @@ function CopyMessageUrl()
     dump("ex="+ex+"\n");
   }
 }
-