diff --git a/mozilla/xpcom/string/public/nsTString.h b/mozilla/xpcom/string/public/nsTString.h
index 59dc35eb05d..c9475538cb6 100644
--- a/mozilla/xpcom/string/public/nsTString.h
+++ b/mozilla/xpcom/string/public/nsTString.h
@@ -246,6 +246,7 @@ class nsTString_CharT : public nsTSubstring_CharT
 #endif
 
 
+
         /**
          * Equality check between given string and this string.
          *
@@ -254,7 +255,11 @@ class nsTString_CharT : public nsTSubstring_CharT
          * @param   aCount tells us how many chars to compare
          * @return  boolean
          */
-
+#ifdef CharT_is_char
+      PRBool EqualsIgnoreCase( const char* aString, PRInt32 aCount=-1 ) const {
+        return Compare(aString, PR_TRUE, aCount) == 0;
+      }
+#else
       NS_COM PRBool EqualsWithConversion( const char* aString, PRBool aIgnoreCase=PR_FALSE, PRInt32 aCount=-1 ) const;
       PRBool EqualsIgnoreCase( const char* aString, PRInt32 aCount=-1 ) const
         {
@@ -262,8 +267,6 @@ class nsTString_CharT : public nsTSubstring_CharT
         }
 
 
-#ifdef CharT_is_PRUnichar
-
         /**
          *  Determine if given buffer is plain ascii
          *  
diff --git a/mozilla/xpcom/string/src/nsStringObsolete.cpp b/mozilla/xpcom/string/src/nsStringObsolete.cpp
index a3d55db8bf6..14ec90c9d1e 100644
--- a/mozilla/xpcom/string/src/nsStringObsolete.cpp
+++ b/mozilla/xpcom/string/src/nsStringObsolete.cpp
@@ -1100,12 +1100,6 @@ nsString::CompareWithConversion( const char* aString, PRBool aIgnoreCase, PRInt3
     return result;
   }
 
-PRBool
-nsCString::EqualsWithConversion( const char* aString, PRBool aIgnoreCase, PRInt32 aCount ) const
-  {
-    return Compare(aString, aIgnoreCase, aCount) == 0;
-  }
-
 PRBool
 nsString::EqualsWithConversion( const char* aString, PRBool aIgnoreCase, PRInt32 aCount ) const
   {
diff --git a/mozilla/xpfe/bootstrap/appleevents/nsWindowUtils.cpp b/mozilla/xpfe/bootstrap/appleevents/nsWindowUtils.cpp
index 0cbfb3c7e2e..9970a032787 100644
--- a/mozilla/xpfe/bootstrap/appleevents/nsWindowUtils.cpp
+++ b/mozilla/xpfe/bootstrap/appleevents/nsWindowUtils.cpp
@@ -297,7 +297,7 @@ WindowPtr nsWindowUtils::GetNamedOrFrontmostWindow(TWindowKind windowKind, const
     		    // ...see if its name is the desired one.
     		  Str255 pascalTitle;
     		  GetWTitle(windowRef, pascalTitle);   					
-    			if (windowNameString.EqualsWithConversion((const char*)&pascalTitle[1], PR_FALSE, pascalTitle[0]))
+    			if (windowNameString.Compare((const char*)&pascalTitle[1], PR_FALSE, pascalTitle[0]) == 0)
     			{
     				windowPtr = (WindowPtr)windowRef;		// WindowRef is the WindowPtr.
     				break;