diff --git a/mozilla/suite/browser/public/nsIBookmarksService.idl b/mozilla/suite/browser/public/nsIBookmarksService.idl index ab528aa3b51..42b3e76cf89 100644 --- a/mozilla/suite/browser/public/nsIBookmarksService.idl +++ b/mozilla/suite/browser/public/nsIBookmarksService.idl @@ -60,7 +60,7 @@ interface nsIBookmarksService : nsISupports boolean isBookmarked(in string aURL); boolean isBookmarkedResource(in nsIRDFResource aSource); - void addBookmarkImmediately(in string aURI, in wstring aTitle, in long bmType, in wstring docCharset); + void addBookmarkImmediately(in wstring aURI, in wstring aTitle, in long bmType, in wstring docCharset); nsIRDFResource createFolder(in wstring aName); nsIRDFResource createFolderInContainer(in wstring aName, in nsIRDFResource aParentFolder, @@ -77,12 +77,12 @@ interface nsIBookmarksService : nsISupports in boolean aRecurse); nsIRDFResource createBookmark(in wstring aName, - in string aURL, + in wstring aURL, in wstring aShortcutURL, in wstring aDescription, in wstring aDocCharSet); nsIRDFResource createBookmarkInContainer(in wstring aName, - in string aURL, + in wstring aURL, in wstring aShortcutURL, in wstring aDescription, in wstring aDocCharSet, diff --git a/mozilla/suite/browser/src/nsBookmarksService.cpp b/mozilla/suite/browser/src/nsBookmarksService.cpp index ee680382692..a4dcc653557 100644 --- a/mozilla/suite/browser/src/nsBookmarksService.cpp +++ b/mozilla/suite/browser/src/nsBookmarksService.cpp @@ -3082,7 +3082,7 @@ nsBookmarksService::SetNewPersonalToolbarFolder(nsIRDFResource* aFolder) NS_IMETHODIMP nsBookmarksService::CreateBookmark(const PRUnichar* aName, - const char* aURL, + const PRUnichar* aURL, const PRUnichar* aShortcutURL, const PRUnichar* aDescription, const PRUnichar* aDocCharSet, @@ -3119,7 +3119,7 @@ nsBookmarksService::CreateBookmark(const PRUnichar* aName, // Resource: URL nsAutoString url; - url.AssignWithConversion(aURL); + url.Assign(aURL); nsCOMPtr urlLiteral; rv = gRDF->GetLiteral(url.get(), getter_AddRefs(urlLiteral)); if (NS_FAILED(rv)) @@ -3181,7 +3181,7 @@ nsBookmarksService::CreateBookmark(const PRUnichar* aName, NS_IMETHODIMP nsBookmarksService::CreateBookmarkInContainer(const PRUnichar* aName, - const char* aURL, + const PRUnichar* aURL, const PRUnichar* aShortcutURL, const PRUnichar* aDescription, const PRUnichar* aDocCharSet, @@ -3275,7 +3275,7 @@ nsBookmarksService::CloneResource(nsIRDFResource* aSource, } NS_IMETHODIMP -nsBookmarksService::AddBookmarkImmediately(const char *aURI, +nsBookmarksService::AddBookmarkImmediately(const PRUnichar *aURI, const PRUnichar *aTitle, PRInt32 aBookmarkType, const PRUnichar *aCharset)