fixes bug 124042 "support internationalized URIs" r=dougt, sr=alecf, a=asa

docshell/shistory/src/nsSHEntry.cpp

@@ -121,9 +121,9 @@ NS_IMETHODIMP nsSHEntry::GetTitle(PRUnichar** aTitle)
    // Check for empty title...
    if ( mTitle.IsEmpty() && mURI ) {
       // Default title is the URL.
-      nsXPIDLCString spec;
-      if ( NS_SUCCEEDED( mURI->GetSpec( getter_Copies( spec ) ) ) ) {
-          mTitle.AssignWithConversion( spec ); 
+      nsCAutoString spec;
+      if ( NS_SUCCEEDED( mURI->GetSpec( spec ) ) ) {
+          mTitle = NS_ConvertUTF8toUCS2( spec ); 
       }
    }
 

docshell/shistory/src/nsSHistory.cpp

@@ -281,8 +281,6 @@ nsSHistory::PrintHistory()
               nsCOMPtr<nsIURI>  uri;
               PRUnichar *  title;
               
-              nsXPIDLCString  url;
-
               entry->GetLayoutHistoryState(getter_AddRefs(layoutHistoryState));
               nsCOMPtr<nsIHistoryEntry> hEntry(do_QueryInterface(entry));
               if (hEntry) {
@@ -290,10 +288,11 @@ nsSHistory::PrintHistory()
                 hEntry->GetTitle(&title);              
               }
               
-			  if (uri)
-                 uri->GetSpec(getter_Copies(url));
-
 #if 0
+              nsCAutoString url;
+			  if (uri)
+                 uri->GetSpec(url);
+
               printf("**** SH Transaction #%d, Entry = %x\n", index, entry.get());
               printf("\t\t URL = %s\n", url);
               printf("\t\t Title = %s\n", NS_LossyConvertUCS2toASCII(title).get());