diff --git a/mailnews/local/src/nsLocalMailFolder.cpp b/mailnews/local/src/nsLocalMailFolder.cpp index 179fce4bbc3f..ab1714a2ebe3 100644 --- a/mailnews/local/src/nsLocalMailFolder.cpp +++ b/mailnews/local/src/nsLocalMailFolder.cpp @@ -776,36 +776,6 @@ NS_IMETHODIMP nsMsgLocalMailFolder::Adopt(nsIMsgFolder *srcFolder, PRUint32 *out return NS_OK; } - -NS_IMETHODIMP nsMsgLocalMailFolder::GetName(PRUnichar **name) -{ - if(!name) - return NS_ERROR_NULL_POINTER; - - if (!mHaveReadNameFromDB) - { - if (mDepth == 1) - { - nsString localMailStr("Local Mail"); - SetName((PRUnichar *) localMailStr.GetUnicode()); - mHaveReadNameFromDB = TRUE; - *name = mName.ToNewUnicode(); - if(!(*name)) - return NS_ERROR_OUT_OF_MEMORY; - return NS_OK; - } - else - { - //Need to read the name from the database - } - } - nsAutoString folderName; - nsLocalURI2Name(kMailboxRootURI, mURI, folderName); - *name = folderName.ToNewUnicode(); - - return NS_OK; -} - NS_IMETHODIMP nsMsgLocalMailFolder::GetPrettyName(PRUnichar ** prettyName) { if (mDepth == 1) { diff --git a/mailnews/local/src/nsLocalMailFolder.h b/mailnews/local/src/nsLocalMailFolder.h index 3219c788899b..7a42a5946812 100644 --- a/mailnews/local/src/nsLocalMailFolder.h +++ b/mailnews/local/src/nsLocalMailFolder.h @@ -93,8 +93,6 @@ public: NS_IMETHOD Rename (const char *newName); NS_IMETHOD Adopt(nsIMsgFolder *srcFolder, PRUint32 *outPos); - // this override pulls the value from the db - NS_IMETHOD GetName(PRUnichar ** name); // Name of this folder (as presented to user). NS_IMETHOD GetPrettyName(PRUnichar** prettyName); // Override of the base, for top-level mail folder NS_IMETHOD BuildFolderURL(char **url);