eh, I guess I should fix ports for bug 195262 as well

gfx/src/beos/nsFontMetricsBeOS.cpp

@@ -174,13 +174,11 @@ NS_IMETHODIMP nsFontMetricsBeOS::Init(const nsFont& aFont, nsIAtom* aLangGroup,
       // family is generic string like 
       // "serif" "sans-serif" "cursive" "fantasy" "monospace" "-moz-fixed"
       // so look up preferences and get real family name
-      const PRUnichar *langGroup;
-      aLangGroup->GetUnicode( &langGroup );
-      char *lang = ToNewUTF8String(nsDependentString(langGroup));
+      const char *lang;
+      aLangGroup->GetUTF8String( &lang );
       char prop[256];
       sprintf( prop, "font.name.%s.%s", family, lang );
 
-      nsMemory::Free(lang);
       nsMemory::Free(family);
 
       // look up prefs

gfx/src/os2/nsFontMetricsOS2.cpp

@@ -599,9 +599,8 @@ nsFontMetricsOS2::SetFontHandle( HPS aPS, nsFontOS2* aFont )
    // Encoding:
    //  There doesn't seem to be any encoding stuff yet, so guess.
    //  (XXX unicode hack; use same codepage as converter!)
-  const PRUnichar* langGroup = nsnull;
-  mLangGroup->GetUnicode(&langGroup);
-  nsCAutoString name(NS_LossyConvertUCS2toASCII(langGroup).get());
+  nsCAutoString name;
+  mLangGroup->ToString(name);
   for (int j=0; j < eCharset_COUNT; j++ )
   {
     if (name.get()[0] == gCharsetInfo[j].mLangGroup[0])

gfx/src/photon/nsFontMetricsPh.cpp

@@ -163,18 +163,12 @@ NS_IMETHODIMP nsFontMetricsPh::Init ( const nsFont& aFont, nsIAtom* aLangGroup,
 		str = strdup("serif");
 	}
 	
-	const PRUnichar *uc;
-	aLangGroup->GetUnicode( &uc );
-	nsString language( uc );
-	char *cstring = ToNewCString(language);
+	const char *cstring;
+	aLangGroup->GetUTF8String( &uc );
 	
 	char prop[256];
 	sprintf( prop, "font.name.%s.%s", str, cstring );
 
-	/* Free cstring.  */
-	if (cstring)
-		free (cstring);
-
 	char *font_default = NULL;
 	nsIPref* prefs = nsnull;
 	nsServiceManager::GetService(kPrefCID, NS_GET_IID(nsIPref), (nsISupports**) &prefs);

gfx/src/xlib/nsFontMetricsXlib.cpp

@@ -853,9 +853,9 @@ PRBool CopyFontCharSetMapXlib(nsFontMetricsXlibContext *aFmctx)
 static char*
 atomToName(nsIAtom* aAtom)
 {
-  const PRUnichar *namePRU;
-  aAtom->GetUnicode(&namePRU);
-  return ToNewUTF8String(nsDependentString(namePRU));
+  const char *namePRU;
+  aAtom->GetUTF8String(&namePRU);
+  return ToNewCString(nsDependentCString(namePRU));
 }
 
 //
@@ -1740,9 +1740,9 @@ NS_IMETHODIMP nsFontMetricsXlib::Init(const nsFont& aFont, nsIAtom* aLangGroup,
       name.Append("variable");
     }
     name.Append(char('.'));
-    const PRUnichar* langGroup = nsnull;
-    mLangGroup->GetUnicode(&langGroup);
-    name.AppendWithConversion(langGroup);
+    const char* langGroup = nsnull;
+    mLangGroup->GetUTF8String(&langGroup);
+    name.Append(langGroup);
     PRInt32 minimum = 0;
     res = mFontMetricsContext->mPref->GetIntPref(name.get(), &minimum);
     if (NS_FAILED(res)) {
@@ -5427,9 +5427,9 @@ nsFontMetricsXlib::FindLangGroupPrefFont(nsIAtom* aLangGroup, PRUnichar aChar)
     // check user set pref
     nsCAutoString pref = prefix;
     pref.Append(char('.'));
-    const PRUnichar* langGroup = nsnull;
-    aLangGroup->GetUnicode(&langGroup);
-    pref.AppendWithConversion(langGroup);
+    const char* langGroup = nsnull;
+    aLangGroup->GetUTF8String(&langGroup);
+    pref.Append(langGroup);
     nsXPIDLCString value;
     mFontMetricsContext->mPref->CopyCharPref(pref.get(), getter_Copies(value));
     nsCAutoString str;