--- a/rdf/datasource/nsFileSystemDataSource.cpp
+++ b/rdf/datasource/nsFileSystemDataSource.cpp
@@ -181,17 +181,17 @@ FileSystemDataSource::Init()
     nsCOMPtr<nsIFile> file;
     NS_GetSpecialDirectory(NS_WIN_FAVORITES_DIR, getter_AddRefs(file));
     if (file)
     {
         nsCOMPtr<nsIURI> furi;
         NS_NewFileURI(getter_AddRefs(furi), file);
         NS_ENSURE_TRUE(furi, NS_ERROR_FAILURE);
 
-        file->GetNativePath(ieFavoritesDir);
+        file->GetPath(ieFavoritesDir);
     }
 #endif
 
     return NS_OK;
 }
 
 //static
 nsresult
@@ -1165,17 +1165,18 @@ FileSystemDataSource::GetName(nsIRDFReso
         return(rv);
     if (name.IsEmpty())
         return(NS_ERROR_UNEXPECTED);
 
 #ifdef  XP_WIN
     // special hack for IE favorites under Windows; strip off the
     // trailing ".url" or ".lnk" at the end of IE favorites names
     int32_t nameLen = name.Length();
-    if ((strncmp(uri, ieFavoritesDir.get(), ieFavoritesDir.Length()) == 0) && (nameLen > 4))
+    if ((NS_strncmp(NS_ConvertUTF8toUTF16(uri).get(),
+                    ieFavoritesDir.get(), ieFavoritesDir.Length()) == 0) && (nameLen > 4))
     {
         nsAutoString extension;
         name.Right(extension, 4);
         if (extension.LowerCaseEqualsLiteral(".url") ||
             extension.LowerCaseEqualsLiteral(".lnk"))
         {
             name.Truncate(nameLen - 4);
         }

--- a/rdf/datasource/nsFileSystemDataSource.h
+++ b/rdf/datasource/nsFileSystemDataSource.h
@@ -67,13 +67,13 @@ private:
     nsCOMPtr<nsIRDFResource>       mNC_extension;
 #endif
 
 #ifdef  XP_WIN
     bool     isValidFolder(nsIRDFResource *source);
     nsresult getIEFavoriteURL(nsIRDFResource *source, nsString aFileURL, nsIRDFLiteral **urlLiteral);
     nsCOMPtr<nsIRDFResource>       mNC_IEFavoriteObject;
     nsCOMPtr<nsIRDFResource>       mNC_IEFavoriteFolder;
-    nsCString                      ieFavoritesDir;
+    nsString                       ieFavoritesDir;
 #endif
 };
 
 #endif // nsFileSystemDataSource_h__