From 95f90610925a30e05d8f7b3a9f4b1bcccdd51a7d Mon Sep 17 00:00:00 2001
From: "alecf%netscape.com" <alecf%netscape.com>
Date: Mon, 20 Sep 1999 06:50:21 +0000
Subject: [PATCH] depricate old SMTP API.

---
 mailnews/base/public/nsIMsgIdentity.idl   |  5 ----
 mailnews/base/src/nsMsgAccountManager.cpp |  6 ++---
 mailnews/base/src/nsMsgFolderCache.cpp    |  4 +--
 mailnews/base/util/nsMsgIdentity.cpp      | 32 +++--------------------
 4 files changed, 7 insertions(+), 40 deletions(-)

diff --git a/mailnews/base/public/nsIMsgIdentity.idl b/mailnews/base/public/nsIMsgIdentity.idl
index 094560f0f34d..1212f7f564ad 100644
--- a/mailnews/base/public/nsIMsgIdentity.idl
+++ b/mailnews/base/public/nsIMsgIdentity.idl
@@ -71,11 +71,6 @@ interface nsIMsgIdentity : nsISupports {
   /* the current vcard */
   attribute nsIMsgVCard vCard;
 
-  /* the current SMTP server and hostname */
-  /* eventually these will be removed from the identity */
-  attribute string smtpHostname;
-  attribute string smtpUsername;
-
   attribute boolean doFcc;
   attribute string fccFolder;
   
diff --git a/mailnews/base/src/nsMsgAccountManager.cpp b/mailnews/base/src/nsMsgAccountManager.cpp
index 67d55c8fe671..f597652c2962 100644
--- a/mailnews/base/src/nsMsgAccountManager.cpp
+++ b/mailnews/base/src/nsMsgAccountManager.cpp
@@ -1347,9 +1347,9 @@ nsMsgAccountManager::MigrateIdentity(nsIMsgIdentity *identity)
   MIGRATE_SIMPLE_STR_PREF(PREF_4X_MAIL_IDENTITY_REPLY_TO,identity,SetReplyTo)
   MIGRATE_SIMPLE_STR_PREF(PREF_4X_MAIL_IDENTITY_ORGANIZATION,identity,SetOrganization)
   MIGRATE_SIMPLE_BOOL_PREF(PREF_4X_MAIL_COMPOSE_HTML,identity,SetComposeHtml)
-  MIGRATE_SIMPLE_STR_PREF(PREF_4X_NETWORK_HOSTS_SMTP_SERVER,identity,SetSmtpHostname)
+    /*  MIGRATE_SIMPLE_STR_PREF(PREF_4X_NETWORK_HOSTS_SMTP_SERVER,identity,SetSmtpHostname)
   MIGRATE_SIMPLE_STR_PREF(PREF_4X_MAIL_SMTP_NAME,identity,SetSmtpUsername)
-    
+    */
   MIGRATE_SIMPLE_STR_PREF(PREF_4X_MAIL_DEFAULT_DRAFTS,identity,SetDraftFolder)
   CONVERT_4X_URI(identity,GetDraftFolder,SetDraftFolder)
     
@@ -1810,8 +1810,6 @@ nsMsgAccountManager::CopyIdentity(nsIMsgIdentity *srcIdentity, nsIMsgIdentity *d
         COPY_IDENTITY_STR_VALUE(srcIdentity,destIdentity,GetReplyTo,SetReplyTo)
         COPY_IDENTITY_STR_VALUE(srcIdentity,destIdentity,GetFullName,SetFullName)
         COPY_IDENTITY_STR_VALUE(srcIdentity,destIdentity,GetOrganization,SetOrganization)
-        COPY_IDENTITY_STR_VALUE(srcIdentity,destIdentity,GetSmtpHostname,SetSmtpHostname)
-        COPY_IDENTITY_STR_VALUE(srcIdentity,destIdentity,GetSmtpUsername,SetSmtpUsername)
         COPY_IDENTITY_STR_VALUE(srcIdentity,destIdentity,GetDraftFolder,SetDraftFolder)
         COPY_IDENTITY_STR_VALUE(srcIdentity,destIdentity,GetStationaryFolder,SetStationaryFolder)
 
diff --git a/mailnews/base/src/nsMsgFolderCache.cpp b/mailnews/base/src/nsMsgFolderCache.cpp
index 3326349ce11d..f11e9acc48cd 100644
--- a/mailnews/base/src/nsMsgFolderCache.cpp
+++ b/mailnews/base/src/nsMsgFolderCache.cpp
@@ -205,7 +205,7 @@ nsresult nsMsgFolderCache::InitExistingDB()
 
 nsresult nsMsgFolderCache::OpenMDB(const char *dbName, PRBool create)
 {
-	nsresult ret;
+	nsresult ret=NS_OK;
 	nsIMdbFactory *myMDBFactory = GetMDBFactory();
 	if (myMDBFactory)
 	{
@@ -409,7 +409,7 @@ NS_IMETHODIMP nsMsgFolderCache::GetCacheElement(const char *uri, PRBool createIf
 
 NS_IMETHODIMP nsMsgFolderCache::Close()
 {
-	nsresult ret;
+	nsresult ret=NS_OK;
 
 	nsIMdbThumb	*commitThumb = NULL;
 	if (m_mdbStore)
diff --git a/mailnews/base/util/nsMsgIdentity.cpp b/mailnews/base/util/nsMsgIdentity.cpp
index 8ffe85b40b61..1b19fc527a0b 100644
--- a/mailnews/base/util/nsMsgIdentity.cpp
+++ b/mailnews/base/util/nsMsgIdentity.cpp
@@ -21,35 +21,11 @@
 #include "nsIPref.h"
 #include "nsXPIDLString.h"
 
-static NS_DEFINE_IID(kIPrefIID, NS_IPREF_IID);
 static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
 
-NS_IMPL_ADDREF(nsMsgIdentity)
-NS_IMPL_RELEASE(nsMsgIdentity)
-
-nsresult
-nsMsgIdentity::QueryInterface(const nsIID& iid, void **result)
-{
-  nsresult rv = NS_NOINTERFACE;
-  if (!result)
-    return NS_ERROR_NULL_POINTER;
-
-  void *res = nsnull;
-  if (iid.Equals(nsCOMTypeInfo<nsIMsgIdentity>::GetIID()) ||
-      iid.Equals(nsCOMTypeInfo<nsISupports>::GetIID()))
-    res = NS_STATIC_CAST(nsIMsgIdentity*, this);
-  else if (iid.Equals(nsCOMTypeInfo<nsIShutdownListener>::GetIID()))
-    res = NS_STATIC_CAST(nsIShutdownListener*, this);
-
-  if (res) {
-    NS_ADDREF(this);
-    *result = res;
-    rv = NS_OK;
-  }
-
-  return rv;
-}
-
+NS_IMPL_ISUPPORTS2(nsMsgIdentity,
+                   nsIMsgIdentity,
+                   nsIShutdownListener)
 
 nsMsgIdentity::nsMsgIdentity():
   m_signature(0),
@@ -363,8 +339,6 @@ NS_IMPL_IDPREF_STR(Email, "useremail");
 NS_IMPL_IDPREF_STR(ReplyTo, "reply_to");
 NS_IMPL_IDPREF_STR(Organization, "organization");
 NS_IMPL_IDPREF_BOOL(ComposeHtml, "compose_html");
-NS_IMPL_IDPREF_STR(SmtpHostname, "smtp_server");
-NS_IMPL_IDPREF_STR(SmtpUsername, "smtp_name");
 NS_IMPL_IDPREF_BOOL(AttachVCard, "attach_vcard");
 NS_IMPL_IDPREF_BOOL(AttachSignature, "attach_signature");