From 3bfe78b5fd8b231e723be1372f9522d1ae63828c Mon Sep 17 00:00:00 2001
From: "sspitzer%netscape.com" <sspitzer%netscape.com>
Date: Tue, 18 Mar 2003 18:39:34 +0000
Subject: [PATCH] fix for bug #196777 [mailviews] case insensitivity in the
 "People I Know" view. [junk] case insensitivity in the junk mail white
 listing r=cavin, sr=bienvenu

---
 mailnews/addrbook/public/nsIAddrDatabase.idl | 3 ++-
 mailnews/addrbook/src/nsAbMDBDirectory.cpp   | 2 +-
 mailnews/addrbook/src/nsAddrDatabase.cpp     | 4 +---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/mailnews/addrbook/public/nsIAddrDatabase.idl b/mailnews/addrbook/public/nsIAddrDatabase.idl
index 1917127e4c3d..77c0ecd285a5 100644
--- a/mailnews/addrbook/public/nsIAddrDatabase.idl
+++ b/mailnews/addrbook/public/nsIAddrDatabase.idl
@@ -118,7 +118,8 @@ interface nsIMdbRow;
 #define kMailListNickName         "ListNickName"
 #define kMailListDescription      "ListDescription"
 #define kMailListTotalAddresses   "ListTotalAddresses"
-
+// not shown in the UI
+#define kLowerPriEmailColumn      "LowercasePrimaryEmail"
 %}
 
 [scriptable, uuid(ca536e0e-1dd1-11b2-951a-e02b86e4f60e)]
diff --git a/mailnews/addrbook/src/nsAbMDBDirectory.cpp b/mailnews/addrbook/src/nsAbMDBDirectory.cpp
index cee69eaa2a4b..b5de2ae04528 100644
--- a/mailnews/addrbook/src/nsAbMDBDirectory.cpp
+++ b/mailnews/addrbook/src/nsAbMDBDirectory.cpp
@@ -1023,7 +1023,7 @@ NS_IMETHODIMP nsAbMDBDirectory::HasCardForEmailAddress(const char * aEmailAddres
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsIAbCard> cardExists; 
-  mDatabase->GetCardFromAttribute(this, kPriEmailColumn, aEmailAddress, PR_TRUE /* caseInsensitive, see bug #191798 */, getter_AddRefs(cardExists));
+  mDatabase->GetCardFromAttribute(this, kLowerPriEmailColumn, aEmailAddress, PR_TRUE /* caseInsensitive, see bug #191798 */, getter_AddRefs(cardExists));
   if (cardExists)
     *aCardExists = PR_TRUE;
   return NS_OK;
diff --git a/mailnews/addrbook/src/nsAddrDatabase.cpp b/mailnews/addrbook/src/nsAddrDatabase.cpp
index 76f31a652b62..bb3e031f4827 100644
--- a/mailnews/addrbook/src/nsAddrDatabase.cpp
+++ b/mailnews/addrbook/src/nsAddrDatabase.cpp
@@ -87,8 +87,6 @@ const char *kDataRowScope = "ns:addrbk:db:row:scope:data:all";
 #define PURGE_CUTOFF_COUNT 50
 
 const char *kRecordKeyColumn = "RecordKey";
-const char *kLowerPriEmailColumn = "LowercasePrimaryEmail";
-
 const char *kLastRecordKeyColumn = "LastRecordKey";
 
 const char *kMailListTotalLists = "ListTotalLists";    // total number of mail list in a mailing list
@@ -1054,7 +1052,7 @@ nsresult nsAddrDatabase::UpdateLowercaseEmailListName()
     return NS_ERROR_FAILURE;
   
   do
-  {   //add lowercase primary emial to each card and mailing list row
+  {   //add lowercase primary email to each card and mailing list row
     merror = rowCursor->NextRow(GetEnv(), &findRow, &rowPos);
     if (merror ==NS_OK && findRow)
     {