From b8717cbf7d46fbeceea88815b28abc8d3fc280d4 Mon Sep 17 00:00:00 2001 From: "naving%netscape.com" Date: Wed, 29 Nov 2000 01:17:14 +0000 Subject: [PATCH] 59063 59064, r=sspitzer, sr=bienvenu git-svn-id: svn://10.0.0.236/trunk@83011 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mailnews/imap/src/nsImapMailFolder.h | 4 ++-- .../local/resources/locale/en-US/localMsgs.properties | 4 ++++ mozilla/mailnews/local/src/nsLocalMailFolder.h | 5 +++-- mozilla/mailnews/local/src/nsLocalStringBundle.h | 1 + 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/mozilla/mailnews/imap/src/nsImapMailFolder.h b/mozilla/mailnews/imap/src/nsImapMailFolder.h index d2aa46e5a3f..d55f20af22c 100644 --- a/mozilla/mailnews/imap/src/nsImapMailFolder.h +++ b/mozilla/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); diff --git a/mozilla/mailnews/local/resources/locale/en-US/localMsgs.properties b/mozilla/mailnews/local/resources/locale/en-US/localMsgs.properties index 452ab8b813e..8cee25ad430 100644 --- a/mozilla/mailnews/local/resources/locale/en-US/localMsgs.properties +++ b/mozilla/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. diff --git a/mozilla/mailnews/local/src/nsLocalMailFolder.h b/mozilla/mailnews/local/src/nsLocalMailFolder.h index 8a05a099e98..349bb396e3b 100644 --- a/mozilla/mailnews/local/src/nsLocalMailFolder.h +++ b/mozilla/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 diff --git a/mozilla/mailnews/local/src/nsLocalStringBundle.h b/mozilla/mailnews/local/src/nsLocalStringBundle.h index 8a5e1610170..9bdf9003d14 100644 --- a/mozilla/mailnews/local/src/nsLocalStringBundle.h +++ b/mozilla/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__ */