59063 59064, r=sspitzer, sr=bienvenu

mailnews/imap/src/nsImapMailFolder.h

@@ -119,14 +119,14 @@ public:
   NS_IMETHOD GetMessages(nsIMsgWindow *aMsgWindow, nsISimpleEnumerator* *result);
 	NS_IMETHOD UpdateFolder(nsIMsgWindow *aWindow);
     
-	NS_IMETHOD CreateSubfolder(const PRUnichar *folderName);
+	NS_IMETHOD CreateSubfolder(const PRUnichar *folderName,nsIMsgWindow *msgWindow );
 	NS_IMETHOD AddSubfolderWithPath(nsAutoString *name, nsIFileSpec *dbPath, nsIMsgFolder **child);
   NS_IMETHODIMP CreateStorageIfMissing(nsIUrlListener* urlListener);
     
   NS_IMETHOD Compact();
   NS_IMETHOD EmptyTrash(nsIMsgWindow *msgWindow, nsIUrlListener *aListener);
 	NS_IMETHOD Delete ();
-	NS_IMETHOD Rename (const PRUnichar *newName);
+	NS_IMETHOD Rename (const PRUnichar *newName, nsIMsgWindow *msgWindow);
 	NS_IMETHOD Adopt(nsIMsgFolder *srcFolder, PRUint32 *outPos);
     NS_IMETHOD GetNoSelect(PRBool *aResult);
 

mailnews/local/resources/locale/en-US/localMsgs.properties

@@ -157,3 +157,7 @@
 ## @name moveFolderToTrash
 ## @loc None
 4021=Are you sure you want to move the selected folders into the Trash?
+
+## @name POP3_FOLDER_ALREADY_EXISTS
+## @loc None
+4022=A folder with that name already exists.

mailnews/local/src/nsLocalMailFolder.h

@@ -101,7 +101,7 @@ public:
 	NS_IMETHOD GetMessages(nsIMsgWindow *aMsgWindow, nsISimpleEnumerator* *result);
 	NS_IMETHOD UpdateFolder(nsIMsgWindow *aWindow);
 
-	NS_IMETHOD CreateSubfolder(const PRUnichar *folderName);
+	NS_IMETHOD CreateSubfolder(const PRUnichar *folderName ,nsIMsgWindow *msgWindow);
   NS_IMETHOD AddSubfolder(nsAutoString *folderName, nsIMsgFolder** newFolder);
 
   NS_IMETHOD Compact();
@@ -109,7 +109,7 @@ public:
 	NS_IMETHOD Delete ();
   NS_IMETHOD DeleteSubFolders(nsISupportsArray *folders, nsIMsgWindow *msgWindow);
   NS_IMETHOD CreateStorageIfMissing(nsIUrlListener* urlListener);
-	NS_IMETHOD Rename (const PRUnichar *aNewName);
+	NS_IMETHOD Rename (const PRUnichar *aNewName, nsIMsgWindow *msgWindow);
 	NS_IMETHOD Adopt(nsIMsgFolder *srcFolder, PRUint32 *outPos);
 
 	NS_IMETHOD GetPrettyName(PRUnichar** prettyName);	// Override of the base, for top-level mail folder
@@ -151,6 +151,7 @@ protected:
     nsresult WriteStartOfNewMessage();
   nsresult IsChildOfTrash(PRBool *result);
   nsresult RecursiveSetDeleteIsMoveTrash(PRBool bVal);
+  nsresult AlertFolderExists(nsIMsgWindow *msgWindow);
 
 	/* Finds the directory associated with this folder.  That is if the path is
 	c:\Inbox, it will return c:\Inbox.sbd if it succeeds.  If that path doesn't

mailnews/local/src/nsLocalStringBundle.h

@@ -64,5 +64,6 @@ private:
 #define POP3_NO_ANSWER                                      4019
 #define POP3_ENTER_PASSWORD_PROMPT_TITLE			4020
 #define POP3_MOVE_FOLDER_TO_TRASH                           4021
+#define POP3_FOLDER_ALREADY_EXISTS                          4022
 
 #endif /* _nsImapStringBundle_H__ */