Bug #350543 --> use ctrl-shift-m for accessing move/copy to folder again. Hook up drag and drop to the new command. Fix an access key problem reported by hasse. sr=bienvenu

mail/base/content/mail3PaneWindowCommands.js

@@ -429,7 +429,7 @@ var DefaultController =
       case "cmd_settingsOffline":
         return IsAccountOfflineEnabled();
       case "cmd_moveToFolderAgain":
-        return pref.getCharPref("mail.last_msg_movecopy_target_uri") && GetNumSelectedMessages() > 0;
+        return (pref.getCharPref("mail.last_msg_movecopy_target_uri") && GetNumSelectedMessages() > 0);
       default:
         return false;
     }

mail/base/content/mailWindowOverlay.js

@@ -464,7 +464,6 @@ function initMoveToFolderAgainMenu(aMenuItem)
 {
   var lastFolderURI = pref.getCharPref("mail.last_msg_movecopy_target_uri");
   var isMove = pref.getBoolPref("mail.last_msg_movecopy_was_move");  
-  aMenuItem.setAttribute("disabled", !lastFolderURI);
   if (lastFolderURI)
   {
     var destResource = RDF.GetResource(lastFolderURI);

mail/base/content/mailWindowOverlay.xul

@@ -606,7 +606,7 @@
       </template>
     </menu>
     <menuitem id="threadPaneContext-moveToFolderAgain" observes="cmd_moveToFolderAgain"
-          label="&moveToFolderAgain.label;" accesskey="moveToFolderAgain.accesskey"/>
+          label="&moveToFolderAgain.label;" accesskey="&moveToFolderAgain.accesskey;"/>
     <menu id="threadPaneContext-tags" label="&tagMenu.label;" accesskey="&tagMenu.accesskey;">
       <menupopup id="threadPaneContext-tagpopup" onpopupshowing="InitMessageTags(this)">
         <menuitem id="threadPaneContext-tagRemoveAll" oncommand="RemoveAllMessageTags();"/>
@@ -922,7 +922,7 @@
       </template>
     </menu>
     <menuitem id="messagePaneContext-moveToFolderAgain" observes="cmd_moveToFolderAgain"
-              label="&moveToFolderAgain.label;" accesskey="moveToFolderAgain.accesskey"/>    
+              label="&moveToFolderAgain.label;" accesskey="&moveToFolderAgain.accesskey;"/>    
     <menuseparator id="messagePaneContext-sep-tags-1"/>
     <menu id="messagePaneContext-tags" label="&tagMenu.label;" accesskey="&tagMenu.accesskey;">
       <menupopup id="messagePaneContext-tagpopup" onpopupshowing="InitMessageTags(this)">
@@ -1562,7 +1562,7 @@
               </template>
             </menu>
             <menuitem id="moveToFolderAgain" key="key_moveToFolderAgain" observes="cmd_moveToFolderAgain"
-                      label="&moveToFolderAgain.label;" accesskey="moveToFolderAgain.accesskey"/>
+                      label="&moveToFolderAgain.label;" accesskey="&moveToFolderAgain.accesskey;"/>
             <menu id="tagMenu" label="&tagMenu.label;" accesskey="&tagMenu.accesskey;" observes="cmd_tag">
               <menupopup id="tagMenu-tagpopup" onpopupshowing="InitMessageTags(this)">
               <menuitem id="tagMenu-tagRemoveAll" oncommand="RemoveAllMessageTags();"/>

mail/locales/en-US/chrome/messenger/messenger.dtd

@@ -324,7 +324,7 @@
 <!ENTITY copyMsgMenu.accesskey "C">
 <!ENTITY moveToFolderAgain.label "Move Again">
 <!ENTITY moveToFolderAgain.accesskey "i">
-<!ENTITY moveToFolderAgainCmd.key "t">
+<!ENTITY moveToFolderAgainCmd.key "m">
 <!ENTITY killThreadMenu.label "Ignore Thread">
 <!ENTITY killThreadMenu.accesskey "I">
 <!ENTITY killThreadMenu.key "k">

mail/locales/en-US/chrome/messenger/messenger.properties

@@ -402,10 +402,12 @@ folderPaneHeader_recent=Recent Folders
 # Copy / Move to Folder Again
 #LOCALIZATION NOTE %1$S is the name of the folder we will move to. moveToFolderAgainAccessKey
 # should have the same value as copyToFolderAgainAccessKey as they are the same menu item in the UI
+# moveToFolderAgainAccessKey should also be a letter that occurs before %1$S
 moveToFolderAgain=Move to "%1$S" Again
-moveToFolderAgainAccessKey=i
+moveToFolderAgainAccessKey=t
 #LOCALIZATION NOTE %1$S is the name of the folder we will copy to
 # copyToFolderAgainAccessKey
 # should have the same value as moveToFolderAgainAccessKey as they are the same menu item in the UI
+# copyToFolderAgainAccessKey should also be a letter that occurs before %1$S
 copyToFolderAgain=Copy to "%1$S" Again
-copyToFolderAgainAccessKey=i
+copyToFolderAgainAccessKey=t

mailnews/base/resources/content/messengerdnd.js

@@ -318,12 +318,12 @@ function DropOnFolderTree(row, orientation)
                 // news to pop or imap is always a copy
                 messenger.CopyMessages(GetFolderDatasource(), sourceResource, targetResource, list, false);
             }
-            else {
-                var dragAction = dragSession.dragAction;
-                if (dragAction == nsIDragService.DRAGDROP_ACTION_COPY)
-                    messenger.CopyMessages(GetFolderDatasource(), sourceResource, targetResource, list, false);
-                else if (dragAction == nsIDragService.DRAGDROP_ACTION_MOVE)
-                    messenger.CopyMessages(GetFolderDatasource(), sourceResource, targetResource, list, true);
+            else if (dragSession.dragAction == nsIDragService.DRAGDROP_ACTION_COPY ||
+                     dragSession.dragAction == nsIDragService.DRAGDROP_ACTION_MOVE) {
+                var isMove = (dragSession.dragAction == nsIDragService.DRAGDROP_ACTION_MOVE);
+                pref.setCharPref("mail.last_msg_movecopy_target_uri", targetFolder.URI);
+                pref.setBoolPref("mail.last_msg_movecopy_was_move", isMove);  
+                messenger.CopyMessages(GetFolderDatasource(), sourceResource, targetResource, list, isMove);
             }
         }
         catch (ex) {